Changeset 1022 for trunk/rtorrent/src/core/manager.cc

Timestamp:

12/23/07 14:12:23 (4 years ago)

Author:

rakshasa

Message:

* Refactoring utils::Directory.

Files:

• trunk/rtorrent/src/core/manager.cc (modified) (3 diffs)

trunk/rtorrent/src/core/manager.cc

@@ -57 +57 @@
 
 #include "rpc/parse_commands.h"
+#include "utils/directory.h"
 
 #include "globals.h"
@@ -418 +419 @@
 }
 
+utils::Directory
+path_expand_transform(std::string path, const utils::directory_entry& entry) {
+  return path + entry.d_name;
+}
+
 // Move this somewhere better.
 void
@@ -455 +461 @@
       // starts with the same.
       itr->update(r.pattern()[0] != '.');
-      itr->erase(std::remove_if(itr->begin(), itr->end(), std::not1(r)), itr->end());
-
-      std::transform(itr->begin(), itr->end(), std::back_inserter(nextCache), std::bind1st(std::plus<std::string>(), itr->get_path() + "/"));
+      itr->erase(std::remove_if(itr->begin(), itr->end(), rak::on(rak::mem_ref(&utils::directory_entry::d_name), std::not1(r))), itr->end());
+
+      std::transform(itr->begin(), itr->end(), std::back_inserter(nextCache), rak::bind1st(std::ptr_fun(&path_expand_transform), itr->get_path() + "/"));
     }