Module: deluge
Branch: chunked-sessionproxy-and-gtkui-speedups
Commit: 837c39fddade76eee67d38f73fc4f30fb5ba31ff

Author: Pedro Algarvio <[email protected]>
Date:   Sun May  8 21:58:26 2011 +0100

Last seen complete checks.

Remove some un-necessary `lt.version_minor` checks since these checks will 
remain for a while, at least until deluge depends on libtorrent >= 0.16 which 
should preferrably not happen.

---

 deluge/core/torrent.py        |   11 +++++------
 deluge/core/torrentmanager.py |    6 +-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index d114bf3..26f3344 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -188,12 +188,11 @@ class Torrent(object):
         else:
             self.owner = owner
 
-        # XXX: Remove when libtorrent 0.16 get's released???
-        if lt.version_minor < 16:
-            if state:
-                self._last_seen_complete = state.last_seen_complete or 0.0
-            else:
-                self._last_seen_complete = 0.0
+        # Keep trac of last seen complete
+        if state:
+            self._last_seen_complete = state.last_seen_complete or 0.0
+        else:
+            self._last_seen_complete = 0.0
 
         # Keep track if we're forcing a recheck of the torrent so that we can
         # repause it after its done if necessary
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 1f49eb3..0a597b5 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -636,7 +636,6 @@ class TorrentManager(component.Component):
                 break
 
 
-        # XXX: Remove when libtorrent 0.16 get's released???
         if lt.version_minor < 16:
             log.debug("libtorrent version is lower than 0.16. Start looping "
                       "callback to calculate last_seen_complete info.")
@@ -681,13 +680,10 @@ class TorrentManager(component.Component):
                 torrent.options["move_completed_path"],
                 torrent.magnet,
                 torrent.time_added,
+                torrent.get_last_seen_complete(),
                 torrent.owner,
                 torrent.options["shared"]
             )
-            # XXX: Remove when libtorrent 0.16 get's released???
-            if lt.version_minor < 16:
-                torrent_state.last_seen_complete = torrent._last_seen_complete
-
             state.torrents.append(torrent_state)
 
         # Pickle the TorrentManagerState object

-- 
You received this message because you are subscribed to the Google Groups 
"deluge-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/deluge-commit?hl=en.

Reply via email to