Author: andar
Revision: 5348
Log:
Add support for lt 0.15
Diff:
Modified: branches/1.1.0_RC/deluge/common.py
===================================================================
--- branches/1.1.0_RC/deluge/common.py 2009-06-03 21:34:14 UTC (rev 5347)
+++ branches/1.1.0_RC/deluge/common.py 2009-06-04 02:26:56 UTC (rev 5348)
@@ -53,6 +53,7 @@
"Finished": 4,
"Seeding": 5,
"Allocating": 6,
+ "Checking Resume Data": 7,
0: "Queued",
1: "Checking",
2: "Downloading Metadata",
@@ -60,6 +61,7 @@
4: "Finished",
5: "Seeding",
6: "Allocating",
+ 7: "Checking Resume Data"
}
TORRENT_STATE = [
Modified: branches/1.1.0_RC/deluge/core/torrent.py
===================================================================
--- branches/1.1.0_RC/deluge/core/torrent.py 2009-06-03 21:34:14 UTC (rev
5347)
+++ branches/1.1.0_RC/deluge/core/torrent.py 2009-06-04 02:26:56 UTC (rev
5348)
@@ -189,9 +189,12 @@
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 @@
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)
+ 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)
- self.handle.replace_trackers(tracker_list)
-
# 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:
Modified: trunk/deluge/common.py
===================================================================
--- trunk/deluge/common.py 2009-06-03 21:34:14 UTC (rev 5347)
+++ trunk/deluge/common.py 2009-06-04 02:26:56 UTC (rev 5348)
@@ -64,6 +64,7 @@
"Finished": 4,
"Seeding": 5,
"Allocating": 6,
+ "Checking Resume Data": 7,
0: "Queued",
1: "Checking",
2: "Downloading Metadata",
@@ -71,8 +72,10 @@
4: "Finished",
5: "Seeding",
6: "Allocating",
+ 7: "Checking Resume Data"
}
+
TORRENT_STATE = [
"Allocating",
"Checking",
Modified: trunk/deluge/core/torrent.py
===================================================================
--- trunk/deluge/core/torrent.py 2009-06-03 21:34:14 UTC (rev 5347)
+++ trunk/deluge/core/torrent.py 2009-06-04 02:26:56 UTC (rev 5348)
@@ -145,9 +145,12 @@
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
@@ -289,9 +292,12 @@
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
self.tracker_host = None
@@ -300,16 +306,18 @@
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)
+ 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)
- self.handle.replace_trackers(tracker_list)
-
# 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:
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
