From e4ec248eb6ad9d8f9342cc7d868479ee7a44db2e Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Thu, 1 Oct 2015 19:16:11 +0100 Subject: [PATCH] [Core] Mapped files fix and torrentid correction --- deluge/core/torrentmanager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 23f775a76..23169f369 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -259,7 +259,7 @@ class TorrentManager(component.Component): current_user = component.get("RPCServer").get_session_user() 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"]: torrent_ids.pop(torrent_ids.index(torrent_id)) return torrent_ids @@ -348,7 +348,7 @@ class TorrentManager(component.Component): options = _options # 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(): fname = sanitize_filepath(decode_string(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) except TypeError: torrent_info.rename_file(index, utf8_encoded(fname)) + add_torrent_params["ti"] = torrent_info if not options["owner"]: options["owner"] = component.get("RPCServer").get_session_user()