summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2017-02-20 16:25:08 +0000
committerCalum Lind <calumlind+deluge@gmail.com>2017-02-20 16:25:08 +0000
commit42ba9086d0d821192df14605e2637d4f54dfcdf9 (patch)
tree1ed3067991940d4f6d9937fbe3ddcbfce83dd54b
parent2d4dec669e8d4be8e264c597795340d52f661ee4 (diff)
downloaddeluge-42ba9086d0d821192df14605e2637d4f54dfcdf9.tar.gz
deluge-42ba9086d0d821192df14605e2637d4f54dfcdf9.tar.bz2
deluge-42ba9086d0d821192df14605e2637d4f54dfcdf9.zip
[#2956] Fix empty file_priorities with magnets
-rw-r--r--deluge/core/torrent.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index bf36e3e6a..df1ef3978 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -579,6 +579,17 @@ class Torrent(object):
"""Returns the torrents queue position"""
return self.handle.queue_position()
+ def get_file_priorities(self):
+ """Return the file priorities"""
+ if not self.handle.has_metadata():
+ return []
+
+ if not self.options["file_priorities"]:
+ # Ensure file_priorities option is populated.
+ set_file_priorities([])
+
+ return self.options["file_priorities"]
+
def get_file_progress(self):
"""Returns the file progress as a list of floats.. 0.0 -> 1.0"""
if not self.handle.has_metadata():
@@ -675,7 +686,7 @@ class Torrent(object):
"compact": self.options["compact_allocation"],
"distributed_copies": distributed_copies,
"download_payload_rate": self.status.download_payload_rate,
- "file_priorities": self.options["file_priorities"],
+ "file_priorities": self.get_file_priorities,
"hash": self.torrent_id,
"is_auto_managed": self.options["auto_managed"],
"is_finished": self.is_finished,