summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-06-04 02:26:56 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-06-04 02:26:56 +0000
commitbec83e98ebb7eb7f1fcbe786289e6fa13e07cbe6 (patch)
tree363f036ccf049523a311f9a53eb5022976adce1c
parent261be32b400f2e96730cb0c0ec272074cfe0900c (diff)
downloaddeluge-bec83e98ebb7eb7f1fcbe786289e6fa13e07cbe6.tar.gz
deluge-bec83e98ebb7eb7f1fcbe786289e6fa13e07cbe6.tar.bz2
deluge-bec83e98ebb7eb7f1fcbe786289e6fa13e07cbe6.zip
Add support for lt 0.15
-rw-r--r--deluge/common.py2
-rw-r--r--deluge/core/torrent.py37
2 files changed, 25 insertions, 14 deletions
diff --git a/deluge/common.py b/deluge/common.py
index 215a030e1..20c0671cd 100644
--- a/deluge/common.py
+++ b/deluge/common.py
@@ -53,6 +53,7 @@ LT_TORRENT_STATE = {
"Finished": 4,
"Seeding": 5,
"Allocating": 6,
+ "Checking Resume Data": 7,
0: "Queued",
1: "Checking",
2: "Downloading Metadata",
@@ -60,6 +61,7 @@ LT_TORRENT_STATE = {
4: "Finished",
5: "Seeding",
6: "Allocating",
+ 7: "Checking Resume Data"
}
TORRENT_STATE = [
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 410bbdaa3..3af1f835b 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -189,9 +189,12 @@ class Torrent:
self.trackers = []
# Create a list of trackers
for value in self.handle.trackers():
- tracker = {}
- tracker["url"] = value.url
- tracker["tier"] = value.tier
+ if lt.version_minor < 15:
+ tracker = {}
+ tracker["url"] = value.url
+ tracker["tier"] = value.tier
+ else:
+ tracker = value
self.trackers.append(tracker)
# Various torrent options
@@ -336,26 +339,32 @@ class Torrent:
if trackers == None:
trackers = []
for value in self.handle.trackers():
- tracker = {}
- tracker["url"] = value.url
- tracker["tier"] = value.tier
+ if lt.version_minor < 15:
+ tracker = {}
+ tracker["url"] = value.url
+ tracker["tier"] = value.tier
+ else:
+ tracker = value
trackers.append(tracker)
+
self.trackers = trackers
return
log.debug("Setting trackers for %s: %s", self.torrent_id, trackers)
tracker_list = []
- for tracker in trackers:
- new_entry = lt.announce_entry(tracker["url"])
- new_entry.tier = tracker["tier"]
- tracker_list.append(new_entry)
-
- self.handle.replace_trackers(tracker_list)
+ if lt.version_minor < 15:
+ for tracker in trackers:
+ new_entry = lt.announce_entry(tracker["url"])
+ new_entry.tier = tracker["tier"]
+ tracker_list.append(new_entry)
+ self.handle.replace_trackers(tracker_list)
+ else:
+ self.handle.replace_trackers(trackers)
# Print out the trackers
- for t in self.handle.trackers():
- log.debug("tier: %s tracker: %s", t.tier, t.url)
+ #for t in self.handle.trackers():
+ # log.debug("tier: %s tracker: %s", t.tier, t.url)
# Set the tracker list in the torrent object
self.trackers = trackers
if len(trackers) > 0: