Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to use get_status in Torrent class

Browse Source
This commit is contained in:
Calum Lind 2014-08-23 22:21:36 +01:00
parent a9293285a0
commit 4ad45b2d4a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deluge/core/torrent.py
View File

@ -865,12 +865,11 @@ class Torrent(object):
if self.state == "Error": if self.state == "Error":
progress = 100.0 progress = 100.0
elif self.moving_storage: elif self.moving_storage:
torrent_status = self.get_status(["files", "total_done"])
# Check if torrent has downloaded any data yet. # Check if torrent has downloaded any data yet.
if torrent_status["total_done"]: if self.status.total_done:
torrent_files = [f["path"] for f in torrent_status["files"]] torrent_files = [f["path"] for f in self.get_files()]
dest_path_size = get_size(torrent_files, self.moving_storage_dest_path) dest_path_size = get_size(torrent_files, self.moving_storage_dest_path)
progress = dest_path_size / torrent_status["total_done"] * 100 progress = dest_path_size / self.status.total_done * 100
else: else:
progress = 100.0 progress = 100.0
else: else:
@ -1154,7 +1153,7 @@ class Torrent(object):
# If the user has requested a copy of the torrent be saved elsewhere we need to do that. # If the user has requested a copy of the torrent be saved elsewhere we need to do that.
if self.config["copy_torrent_file"]: if self.config["copy_torrent_file"]:
if filename is None: if filename is None:
filename = self.get_status(["name"])["name"] + ".torrent" filename = self.get_name() + ".torrent"
filepath = os.path.join(self.config["torrentfiles_location"], filename) filepath = os.path.join(self.config["torrentfiles_location"], filename)
write_file(filepath, filedump) write_file(filepath, filedump)
@ -1275,7 +1274,7 @@ class Torrent(object):
folder (str): The folder to recursively check folder (str): The folder to recursively check
""" """
# Removes leading slashes that can cause join to ignore download_location # Removes leading slashes that can cause join to ignore download_location
download_location = self.get_status(["download_location"])["download_location"] download_location = self.options["download_location"]
folder_full_path = os.path.normpath(os.path.join(download_location, folder.lstrip("\\/"))) folder_full_path = os.path.normpath(os.path.join(download_location, folder.lstrip("\\/")))
try: try: