* 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/utils/Makefile.am

@@ -3,6 +3,8 @@ noinst_LIBRARIES = libsub_utils.a
 libsub_utils_a_SOURCES = \
 	directory.cc \
 	directory.h \
+	file_status_cache.cc \
+	file_status_cache.h \
 	list_focus.h \
 	lockfile.cc \
 	lockfile.h \

src/utils/directory.cc

@@ -58,7 +58,6 @@ Directory::is_valid() const {
   return d;
 }
 
-// Update should take various flags and sort functors.
 bool
 Directory::update(int flags) {
   if (m_path.empty())
@@ -80,7 +79,12 @@ Directory::update(int flags) {
     itr->d_fileno = entry->d_fileno;
     itr->d_reclen = entry->d_reclen;
     itr->d_type   = entry->d_type;
+
+#ifdef DIRENT_NAMLEN_EXISTS_FOOBAR
     itr->d_name   = std::string(entry->d_name, entry->d_name + entry->d_namlen);
+#else
+    itr->d_name   = std::string(entry->d_name);
+#endif
   }
 
   closedir(d);

src/utils/directory.h

@@ -48,7 +48,7 @@ struct directory_entry {
 
   // The name and types should match POSIX.
   uint32_t            d_fileno;
-  uint16_t            d_reclen;
+  uint32_t            d_reclen;
   uint8_t             d_type;
 
   std::string         d_name;

src/utils/file_status_cache.cc

@@ -0,0 +1,71 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2007, Jari Sundell
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// In addition, as a special exception, the copyright holders give
+// permission to link the code of portions of this program with the
+// OpenSSL library under certain conditions as described in each
+// individual source file, and distribute linked combinations
+// including the two.
+//
+// You must obey the GNU General Public License in all respects for
+// all of the code used other than OpenSSL.  If you modify file(s)
+// with this exception, you may extend this exception to your version
+// of the file(s), but you are not obligated to do so.  If you do not
+// wish to do so, delete this exception statement from your version.
+// If you delete this exception statement from all source files in the
+// program, then also delete it here.
+//
+// Contact:  Jari Sundell <jaris@ifi.uio.no>
+//
+//           Skomakerveien 33
+//           3185 Skoppum, NORWAY
+
+#include "config.h"
+
+#include <rak/file_stat.h>
+#include <rak/path.h>
+#include <torrent/exceptions.h>
+
+#include "file_status_cache.h"
+
+namespace utils {
+
+bool
+FileStatusCache::insert(const std::string& path, int flags) {
+  rak::file_stat fs;
+
+  // Should we expand somewhere else? Problem is it adds a lot of junk
+  // to the start of the paths added to the cache, causing more work
+  // during search, etc.
+  if (!fs.update(rak::path_expand(path)))
+    return false;
+
+  std::pair<iterator, bool> result = base_type::insert(value_type(path, file_status()));
+
+  // Return false if the file hasn't been modified since last time. We
+  // use 'equal to' instead of 'greater than' since the file might
+  // have been replaced by another file, and thus should be re-tried.
+  if (!result.second && result.first->second.m_mtime == (uint32_t)fs.modified_time())
+    return false;
+
+  result.first->second.m_flags = 0;
+  result.first->second.m_mtime = fs.modified_time();
+
+  return true;
+}
+
+}

src/utils/file_status_cache.h

@@ -0,0 +1,84 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2007, Jari Sundell
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// In addition, as a special exception, the copyright holders give
+// permission to link the code of portions of this program with the
+// OpenSSL library under certain conditions as described in each
+// individual source file, and distribute linked combinations
+// including the two.
+//
+// You must obey the GNU General Public License in all respects for
+// all of the code used other than OpenSSL.  If you modify file(s)
+// with this exception, you may extend this exception to your version
+// of the file(s), but you are not obligated to do so.  If you do not
+// wish to do so, delete this exception statement from your version.
+// If you delete this exception statement from all source files in the
+// program, then also delete it here.
+//
+// Contact:  Jari Sundell <jaris@ifi.uio.no>
+//
+//           Skomakerveien 33
+//           3185 Skoppum, NORWAY
+
+#ifndef RTORRENT_UTILS_FILE_STATUS_CACHE_H
+#define RTORRENT_UTILS_FILE_STATUS_CACHE_H
+
+#include <map>
+#include <string>
+
+namespace utils {
+
+struct file_status {
+  int      m_flags;
+  uint32_t m_mtime;
+};
+
+class FileStatusCache : public std::map<std::string, file_status> {
+public:
+  typedef std::map<std::string, file_status> base_type;
+
+  using base_type::iterator;
+  using base_type::const_iterator;
+  using base_type::reverse_iterator;
+  using base_type::const_reverse_iterator;
+  using base_type::value_type;
+
+  using base_type::begin;
+  using base_type::end;
+  using base_type::rbegin;
+  using base_type::rend;
+
+  using base_type::empty;
+  using base_type::size;
+
+  using base_type::erase;
+
+  // Insert and return true if the entry does not exist or the new
+  // file's mtime is more recent.
+  bool                insert(const std::string& path, int flags);
+
+  // Add a function for pruning a sorted list of paths.
+
+  // Function for removing entries in a container that shouldn't be
+  // there based on some parameters.
+
+  // Function for pruning entries with different mtime or not existing.
+};
+
+}
+
+#endif