* Keep a cache listing all, including failed, torrent loads and the

mtimes of those files. This is used to ensure that e.g. the watch dir
does not try to load bad/duplicate torrents, in addition to optimizing
the pruning of those already loaded.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1024 e378c898-3ddf-0310-93e7-cc216c733640

src/core/download_factory.cc

@@ -61,6 +61,14 @@
 
 namespace core {
 
+bool
+is_network_uri(const std::string& uri) {
+  return
+    std::strncmp(uri.c_str(), "http://", 7) == 0 ||
+    std::strncmp(uri.c_str(), "https://", 8) == 0 ||
+    std::strncmp(uri.c_str(), "ftp://", 6) == 0;
+}
+
 DownloadFactory::DownloadFactory(Manager* m) :
   m_manager(m),
   m_stream(NULL),
@@ -69,7 +77,8 @@ DownloadFactory::DownloadFactory(Manager* m) :
 
   m_session(false),
   m_start(false),
-  m_printLog(true) {
+  m_printLog(true),
+  m_isFile(false) {
 
   m_taskLoad.set_slot(rak::mem_fn(this, &DownloadFactory::receive_load));
   m_taskCommit.set_slot(rak::mem_fn(this, &DownloadFactory::receive_commit));
@@ -114,9 +123,7 @@ DownloadFactory::receive_load() {
   if (m_stream)
     throw torrent::internal_error("DownloadFactory::load*() called on an object with m_stream != NULL");
 
-  if (std::strncmp(m_uri.c_str(), "http://", 7) == 0 ||
-      std::strncmp(m_uri.c_str(), "https://", 8) == 0 ||
-      std::strncmp(m_uri.c_str(), "ftp://", 6) == 0) {
+  if (is_network_uri(m_uri)) {
     // Http handling here.
     m_stream = new std::stringstream;
     HttpQueue::iterator itr = m_manager->http_queue()->insert(m_uri, m_stream);
@@ -130,10 +137,14 @@ DownloadFactory::receive_load() {
     std::fstream* stream = new std::fstream(rak::path_expand(m_uri).c_str(), std::ios::in | std::ios::binary);
     m_stream = stream;
 
-    if (stream->is_open())
-      receive_loaded();
-    else
-      receive_failed("Could not open file");
+    // Since FileStatusCache checks file stats, it will automatically
+    // cull away invalid paths.
+    m_isFile = true;
+
+    if (!stream->is_open())
+      return receive_failed("Could not open file");
+
+    receive_loaded();
   }
 }
 

src/core/download_factory.h

@@ -101,6 +101,7 @@ private:
   bool                m_session;
   bool                m_start;
   bool                m_printLog;
+  bool                m_isFile;
 
   command_list_type         m_commands;
   torrent::Object::map_type m_variables;
@@ -110,6 +111,8 @@ private:
   rak::priority_item  m_taskCommit;
 };
 
+bool is_network_uri(const std::string& uri);
+
 }
 
 #endif

src/core/manager.cc

@@ -57,6 +57,7 @@
 
 #include "rpc/parse_commands.h"
 #include "utils/directory.h"
+#include "utils/file_status_cache.h"
 
 #include "globals.h"
 #include "curl_get.h"
@@ -177,10 +178,10 @@ Manager::Manager() :
 
   m_pollManager(NULL) {
 
-  m_downloadStore = new DownloadStore();
-  m_downloadList = new DownloadList();
-
-  m_httpQueue = new HttpQueue();
+  m_downloadStore   = new DownloadStore();
+  m_downloadList    = new DownloadList();
+  m_fileStatusCache = new FileStatusCache();
+  m_httpQueue       = new HttpQueue();
 }
 
 Manager::~Manager() {
@@ -188,6 +189,7 @@ Manager::~Manager() {
 
   delete m_downloadStore;
   delete m_httpQueue;
+  delete m_fileStatusCache;
 }
 
 void
@@ -400,6 +402,12 @@ Manager::receive_http_failed(std::string msg) {
 
 void
 Manager::try_create_download(const std::string& uri, int flags, const command_list_type& commands) {
+  // If the path was attempted loaded before, skip it.
+  if (!(flags & create_raw_data) &&
+      !is_network_uri(uri) &&
+      !m_fileStatusCache->insert(uri, 0))
+    return;
+
   // Adding download.
   DownloadFactory* f = new DownloadFactory(this);
 
@@ -430,7 +438,7 @@ path_expand(std::vector<std::string>* paths, const std::string& pattern) {
   std::vector<utils::Directory> nextCache;
 
   rak::split_iterator_t<std::string> first = rak::split_iterator(pattern, '/');
-  rak::split_iterator_t<std::string> last = rak::split_iterator(pattern);
+  rak::split_iterator_t<std::string> last  = rak::split_iterator(pattern);
     
   if (first == last)
     return;
@@ -489,14 +497,6 @@ Manager::try_create_download_expand(const std::string& uri, int flags, command_l
 
   path_expand(&paths, uri);
 
-  if (flags & create_tied)
-    for (std::vector<std::string>::iterator itr = paths.begin(); itr != paths.end(); )
-      if (std::find_if(m_downloadList->begin(), m_downloadList->end(), rak::bind1st(std::ptr_fun(&manager_equal_tied), *itr))
-          != m_downloadList->end())
-        itr = paths.erase(itr);
-      else
-        itr++;
-
   if (!paths.empty())
     for (std::vector<std::string>::iterator itr = paths.begin(); itr != paths.end(); ++itr)
       try_create_download(*itr, flags, commands);

src/core/manager.h

@@ -48,6 +48,10 @@ namespace torrent {
   class Bencode;
 }
 
+namespace utils {
+class FileStatusCache;
+}
+
 namespace core {
 
 class DownloadStore;
@@ -58,6 +62,8 @@ class View;
 class Manager {
 public:
   typedef DownloadList::iterator                    DListItr;
+  typedef utils::FileStatusCache                    FileStatusCache;
+
   typedef sigc::slot1<void, DownloadList::iterator> SlotReady;
   typedef sigc::slot0<void>                         SlotFailed;
 
@@ -66,6 +72,7 @@ public:
 
   DownloadList*       download_list()                     { return m_downloadList; }
   DownloadStore*      download_store()                    { return m_downloadStore; }
+  FileStatusCache*    file_status_cache()                 { return m_fileStatusCache; }
 
   HttpQueue*          http_queue()                        { return m_httpQueue; }
 
@@ -122,6 +129,7 @@ private:
 
   DownloadList*       m_downloadList;
   DownloadStore*      m_downloadStore;
+  FileStatusCache*    m_fileStatusCache;
   HttpQueue*          m_httpQueue;
 
   View*               m_hashingView;