codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-13 13:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Core] Mapped files fix and torrentid correction

Browse Source
This commit is contained in:
Calum Lind 2015-10-01 19:16:11 +01:00
parent cb8e9d3018
commit e4ec248eb6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deluge/core/torrentmanager.py
View File

@ -259,7 +259,7 @@ class TorrentManager(component.Component):
current_user = component.get("RPCServer").get_session_user() current_user = component.get("RPCServer").get_session_user()
for torrent_id in torrent_ids[:]: for torrent_id in torrent_ids[:]:
torrent_status = self[torrent_id].get_status(["owner", "shared"]) torrent_status = self.torrents[torrent_id].get_status(["owner", "shared"])
if torrent_status["owner"] != current_user and not torrent_status["shared"]: if torrent_status["owner"] != current_user and not torrent_status["shared"]:
torrent_ids.pop(torrent_ids.index(torrent_id)) torrent_ids.pop(torrent_ids.index(torrent_id))
return torrent_ids return torrent_ids
@ -348,7 +348,7 @@ class TorrentManager(component.Component):
options = _options options = _options
# Check for renamed files and if so, rename them in the torrent_info before adding. # Check for renamed files and if so, rename them in the torrent_info before adding.
if options["mapped_files"]: if options["mapped_files"] and torrent_info:
for index, fname in options["mapped_files"].items(): for index, fname in options["mapped_files"].items():
fname = sanitize_filepath(decode_string(fname)) fname = sanitize_filepath(decode_string(fname))
log.debug("renaming file index %s to %s", index, fname) log.debug("renaming file index %s to %s", index, fname)
@ -356,6 +356,7 @@ class TorrentManager(component.Component):
torrent_info.rename_file(index, fname) torrent_info.rename_file(index, fname)
except TypeError: except TypeError:
torrent_info.rename_file(index, utf8_encoded(fname)) torrent_info.rename_file(index, utf8_encoded(fname))
add_torrent_params["ti"] = torrent_info
if not options["owner"]: if not options["owner"]:
options["owner"] = component.get("RPCServer").get_session_user() options["owner"] = component.get("RPCServer").get_session_user()