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

Timestamp:

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

Author:

rakshasa

Message:

* Refactoring utils::Directory.

Files:

• trunk/rtorrent/src/core/download_store.cc (modified) (4 diffs)

trunk/rtorrent/src/core/download_store.cc

@@ -51 +51 @@
 #include <torrent/resume.h>
 #include <torrent/object_stream.h>
+
+#include "utils/directory.h"
 
 #include "download.h"
@@ -145 +147 @@
 }
 
+// This also needs to check that it isn't a directory.
+bool
+not_correct_format(const utils::directory_entry& entry) {
+  return !DownloadStore::is_correct_format(entry.d_name);
+}
+
 utils::Directory
 DownloadStore::get_formated_entries() {
@@ -150 +158 @@
     return utils::Directory();
 
-  utils::Directory d(m_path);
+  utils::Directory d;
+  d.set_path(m_path);
 
   if (!d.update())
     throw torrent::storage_error("core::DownloadStore::update() could not open directory \"" + m_path + "\"");
 
-  d.erase(std::remove_if(d.begin(), d.end(), std::not1(std::ptr_fun(&DownloadStore::is_correct_format))), d.end());
+  d.erase(std::remove_if(d.begin(), d.end(), std::ptr_fun(&not_correct_format)), d.end());
 
   return d;
@@ -161 +170 @@
 
 bool
-DownloadStore::is_correct_format(std::string f) {
+DownloadStore::is_correct_format(const std::string& f) {
   if (f.size() != 48 || f.substr(40) != ".torrent")
     return false;