Changeset 1021 for trunk/libtorrent/src/torrent/data/file_list.cc

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.

Files:

• trunk/libtorrent/src/torrent/data/file_list.cc (modified) (11 diffs)

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);
-}
-
-}
+}