Changeset 1021

Timestamp:

12/23/07 03:05:00 (4 years ago)

Author:

rakshasa

Message:

* Added "d.set_directory_base" command that handles single and multi
file torrent equally.

* Fixed man page entry on 'umask', it should be 0022 not 0664.

* Cleaned up File and FileList? classes.

Location:

trunk

Files:

• libtorrent/src/torrent/data/file.cc (modified) (1 diff)
• libtorrent/src/torrent/data/file.h (modified) (6 diffs)
• libtorrent/src/torrent/data/file_list.cc (modified) (11 diffs)
• libtorrent/src/torrent/data/file_list.h (modified) (3 diffs)
• libtorrent/src/torrent/resume.cc (modified) (1 diff)
• rtorrent/doc/rtorrent.1.xml (modified) (1 diff)
• rtorrent/src/command_download.cc (modified) (2 diffs)
• rtorrent/src/core/download.cc (modified) (2 diffs)

trunk/libtorrent/src/torrent/data/file.cc

@@ -143 +143 @@
 }
 
+void
+File::set_match_depth(File* left, File* right) {
+  uint32_t level = 0;
+
+  Path::const_iterator itrLeft = left->path()->begin();
+  Path::const_iterator itrRight = right->path()->begin();
+
+  while (itrLeft != left->path()->end() && itrRight != right->path()->end() && *itrLeft == *itrRight) {
+    itrLeft++;
+    itrRight++;
+    level++;
+  }
+
+  left->m_matchDepthNext = level;
+  right->m_matchDepthPrev = level;
+}
+
 bool
 File::resize_file() {

trunk/libtorrent/src/torrent/data/file.h

@@ -49 +49 @@
   typedef std::pair<uint32_t, uint32_t> range_type;
 
-  static const int flag_create_queued      = (1 << 0);
-  static const int flag_resize_queued      = (1 << 1);
-  static const int flag_previously_created = (1 << 2);
+  static const int flag_active             = (1 << 0);
+  static const int flag_create_queued      = (1 << 1);
+  static const int flag_resize_queued      = (1 << 2);
+  static const int flag_previously_created = (1 << 3);
 
   File();
@@ -66 +67 @@
   bool                is_previously_created() const            { return m_flags & flag_previously_created; }
 
+  bool                has_flags(int flags)                     { return m_flags & flags; }
+
   void                set_flags(int flags);
   void                unset_flags(int flags);
@@ -77 +80 @@
 
   uint32_t            completed_chunks() const                 { return m_completed; }
+  void                set_completed_chunks(uint32_t v);
 
   const range_type&   range() const                            { return m_range; }
@@ -109 +113 @@
 
 protected:
+  void                set_flags_protected(int flags)           { m_flags |= flags; }
+  void                unset_flags_protected(int flags)         { m_flags &= ~flags; }
+
   void                set_frozen_path(const std::string& path) { m_frozenPath = path; }
 
@@ -115 +122 @@
   void                set_range(uint32_t chunkSize);
 
-  void                set_completed(uint32_t v)                { m_completed = v; }
-  void                inc_completed()                          { m_completed++; }
+  void                set_completed_protected(uint32_t v)      { m_completed = v; }
+  void                inc_completed_protected()                { m_completed++; }
+
+  static void         set_match_depth(File* left, File* right);
 
   void                set_match_depth_prev(uint32_t l)         { m_matchDepthPrev = l; }
@@ -154 +163 @@
 inline void
 File::set_flags(int flags) {
-  m_flags |= flags & (flag_create_queued | flag_resize_queued);
+  set_flags_protected(flags & (flag_create_queued | flag_resize_queued));
 }
 
 inline void
 File::unset_flags(int flags) {
-  m_flags |= flags & (flag_create_queued | flag_resize_queued);
+  unset_flags_protected(flags & (flag_create_queued | flag_resize_queued));
+}
+
+inline void
+File::set_completed_chunks(uint32_t v) {
+  if (!has_flags(flag_active) && v <= size_chunks())
+    m_completed = v;
 }
 

trunk/libtorrent/src/torrent/data/file_list.cc

@@ -275 +275 @@
     newFile->set_match_depth_prev(0);
   else
-    set_match_depth(*(first - 1), newFile);
+    File::set_match_depth(*(first - 1), newFile);
 
   if (first + 1 == end())
     newFile->set_match_depth_next(0);
   else
-    set_match_depth(newFile, *(first + 1));
+    File::set_match_depth(newFile, *(first + 1));
 
   return first;
@@ -294 +294 @@
 
   if (first != begin())
-    set_match_depth(*(first - 1), *first);
+    File::set_match_depth(*(first - 1), *first);
 
   while (first != last && ++first != end())
-    set_match_depth(*(first - 1), *first);
+    File::set_match_depth(*(first - 1), *first);
 
   verify_file_list(this);
 }
 
-void
-FileList::set_file_completed_chunks(iterator itr, uint32_t v) {
-  if (is_open())
-    return;
-
-  (*itr)->set_completed(v);
+bool
+FileList::make_root_path() {
+  if (!is_open())
+    return false;
+
+  return ::mkdir(m_rootDir.c_str(), 0777) == 0 || errno == EEXIST;
+}
+
+bool
+FileList::make_all_paths() {
+  if (!is_open())
+    return false;
+
+  Path dummyPath;
+  const Path* lastPath = &dummyPath;
+
+  for (iterator itr = begin(), last = end(); itr != last; ++itr) {
+    File* entry = *itr;
+
+    // No need to create directories if the entry has already been
+    // opened.
+    if (entry->is_open())
+      continue;
+
+    if (entry->path()->empty())
+      throw storage_error("Found an empty filename.");
+
+    Path::const_iterator lastPathItr   = lastPath->begin();
+    Path::const_iterator firstMismatch = entry->path()->begin();
+
+    // Couldn't find a suitable stl algo, need to write my own.
+    while (firstMismatch != entry->path()->end() && lastPathItr != lastPath->end() && *firstMismatch == *lastPathItr) {
+      lastPathItr++;
+      firstMismatch++;
+    }
+
+    rak::error_number::clear_global();
+
+    make_directory(entry->path()->begin(), entry->path()->end(), firstMismatch);
+    
+    lastPath = entry->path();
+  }
+
+  return true;
 }
 
@@ -354 +392 @@
 
   try {
-    if (!(flags & open_no_create) &&
-        ::mkdir(m_rootDir.c_str(), 0777) != 0 && errno != EEXIST)
+    if (!(flags & open_no_create) && !make_root_path())
       throw storage_error("Could not create directory '" + m_rootDir + "': " + std::strerror(errno));
   
@@ -389 +426 @@
       // it here if necessary.
 
+      entry->set_flags_protected(File::flag_active);
+
       if (!open_file(&*entry, lastPath, flags)) {
         // This needs to check if the error was due to open_no_create
@@ -404 +443 @@
 
   } catch (local_error& e) {
-    for (iterator itr = begin(), last = end(); itr != last; ++itr)
+    for (iterator itr = begin(), last = end(); itr != last; ++itr) {
+      (*itr)->unset_flags_protected(File::flag_active);
       manager->file_manager()->close(*itr);
+    }
 
     // Set to false here in case we tried to open the FileList for the
@@ -422 +463 @@
 
   for (iterator itr = begin(), last = end(); itr != last; ++itr) {
+    (*itr)->unset_flags_protected(File::flag_active);
     manager->file_manager()->close(*itr);
-    
-    // Keep the progress so the user can see it even though he closes
-    // the torrent.
-//     (*itr)->set_completed(0);
   }
 
   m_isOpen = false;
   m_indirectLinks.clear();
-}
-
-bool
-FileList::resize_all() {
-  bool success = true;
-
-  // Remove this function.
-
-//   for (iterator itr = begin(); itr != end(); itr++)
-//     if (!(*itr)->frozen_path().empty() &&
-//         !(*itr)->resize_file())
-//       success = false;
-
-  return success;
 }
 
@@ -476 +500 @@
 bool
 FileList::open_file(File* node, const Path& lastPath, int flags) {
-  const Path* path = node->path();
-
-  Path::const_iterator lastItr = lastPath.begin();
-  Path::const_iterator firstMismatch = path->begin();
-
-  // Couldn't find a suitable stl algo, need to write my own.
-  while (firstMismatch != path->end() && lastItr != lastPath.end() && *firstMismatch == *lastItr) {
-    lastItr++;
-    firstMismatch++;
-  }
-
   rak::error_number::clear_global();
 
-  if (!(flags & open_no_create))
+  if (!(flags & open_no_create)) {
+    const Path* path = node->path();
+
+    Path::const_iterator lastItr = lastPath.begin();
+    Path::const_iterator firstMismatch = path->begin();
+
+    // Couldn't find a suitable stl algo, need to write my own.
+    while (firstMismatch != path->end() && lastItr != lastPath.end() && *firstMismatch == *lastItr) {
+      lastItr++;
+      firstMismatch++;
+    }
+
     make_directory(path->begin(), path->end(), firstMismatch);
+  }
 
   // Some torrents indicate an empty directory by having a path with
   // an empty last element. This entry must be zero length.
-  if (path->back().empty())
+  if (node->path()->back().empty())
     return node->size_bytes() == 0;
 
@@ -596 +621 @@
   std::for_each(firstItr,
                 lastItr == end() ? end() : (lastItr + 1),
-                std::mem_fun(&File::inc_completed));
+                std::mem_fun(&File::inc_completed_protected));
 
   return lastItr;
@@ -608 +633 @@
   if (m_bitfield.is_all_set()) {
     for (iterator itr = begin(), last = end(); itr != last; ++itr)
-      (*itr)->set_completed((*itr)->size_chunks());
+      (*itr)->set_completed_protected((*itr)->size_chunks());
 
   } else {
@@ -614 +639 @@
     // this on close, etc.
     for (iterator itr = begin(), last = end(); itr != last; ++itr)
-      (*itr)->set_completed(0);
+      (*itr)->set_completed_protected(0);
 
     if (m_bitfield.is_all_unset())
@@ -627 +652 @@
 }
 
-void
-FileList::set_match_depth(File* left, File* right) {
-  uint32_t level = 0;
-
-  Path::const_iterator itrLeft = left->path()->begin();
-  Path::const_iterator itrRight = right->path()->begin();
-
-  while (itrLeft != left->path()->end() && itrRight != right->path()->end() && *itrLeft == *itrRight) {
-    itrLeft++;
-    itrRight++;
-    level++;
-  }
-
-  left->set_match_depth_next(level);
-  right->set_match_depth_prev(level);
-}
-
-}
+}

trunk/libtorrent/src/torrent/data/file_list.h

@@ -142 +142 @@
   void                update_paths(iterator first, iterator last);
 
-  void                set_file_completed_chunks(iterator itr, uint32_t v);
+  bool                make_root_path();
+  bool                make_all_paths();
 
 protected:
@@ -152 +153 @@
   void                open(int flags) LIBTORRENT_NO_EXPORT;
   void                close() LIBTORRENT_NO_EXPORT;
-
-  bool                resize_all() LIBTORRENT_NO_EXPORT;
 
   Bitfield*           mutable_bitfield()                               { return &m_bitfield; }
@@ -170 +169 @@
   void                make_directory(Path::const_iterator pathBegin, Path::const_iterator pathEnd, Path::const_iterator startItr) LIBTORRENT_NO_EXPORT;
   MemoryChunk         create_chunk_part(FileList::iterator itr, uint64_t offset, uint32_t length, int prot) LIBTORRENT_NO_EXPORT;
-
-  void                set_match_depth(File* left, File* right);
 
   bool                m_isOpen;

trunk/libtorrent/src/torrent/resume.cc

@@ -239 +239 @@
 
     if (filesItr->has_key_value("completed"))
-      fileList->set_file_completed_chunks(listItr, std::max<int64_t>(filesItr->get_key_value("completed"), (*listItr)->size_chunks()));
+      (*listItr)->set_completed_chunks(filesItr->get_key_value("completed"));
   }
 }

trunk/rtorrent/doc/rtorrent.1.xml

@@ -1013 +1013 @@
 
       <varlistentry>
-        <term>umask = <replaceable>0644</replaceable></term>
+        <term>umask = <replaceable>0022</replaceable></term>
         <listitem><para>
 

trunk/rtorrent/src/command_download.cc

@@ -176 +176 @@
 }
 
+void
+apply_d_directory(core::Download* download, const std::string& name) {
+  if (!download->file_list()->is_multi_file())
+    download->set_root_directory(name);
+  else if (name.empty() || *name.rbegin() == '/')
+    download->set_root_directory(name + download->download()->name());
+  else
+    download->set_root_directory(name + "/" + download->download()->name());
+}
+
 const char*
 retrieve_d_connection_type(core::Download* download) {
@@ -508 +518 @@
   ADD_CD_VALUE_UNI("tracker_size",        std::mem_fun(&core::Download::tracker_list_size));
 
-  ADD_CD_STRING_BI("directory",           std::mem_fun(&core::Download::set_root_directory), rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::root_dir)));
+  ADD_CD_STRING_BI("directory",           std::ptr_fun(&apply_d_directory), rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::root_dir)));
+  ADD_CD_STRING_BI("directory_base",      std::mem_fun(&core::Download::set_root_directory), rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::root_dir)));
+
   ADD_CD_VALUE_BI("priority",             std::mem_fun(&core::Download::set_priority), std::mem_fun(&core::Download::priority));
   ADD_CD_STRING_UNI("priority_str",       std::ptr_fun(&retrieve_d_priority_str));

trunk/rtorrent/src/core/download.cc

@@ -156 +156 @@
 }
 
-// Clean up.
 void
 Download::set_root_directory(const std::string& path) {
@@ -162 +161 @@
 
   control->core()->download_list()->close_directly(this);
-
-  if (path.empty()) {
-    fileList->set_root_dir("./" + (fileList->is_multi_file() ? m_download.name() : std::string()));
-
-  } else {
-    std::string fullPath = rak::path_expand(path);
-
-    fileList->set_root_dir(fullPath +
-                           (*fullPath.rbegin() != '/' ? "/" : "") +
-                           (fileList->is_multi_file() ? m_download.name() : std::string()));
-  }
+  fileList->set_root_dir(rak::path_expand(path));
 
   bencode()->get_key("rtorrent").insert_key("directory", path);