Changeset 1021 for trunk/libtorrent/src/torrent/data/file.h

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.h (modified) (6 diffs)

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