codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor owner code in torrentmanager add method

This commit is contained in:
Calum Lind 2013-05-14 01:59:02 +01:00
parent f7888757aa
commit 105e4c0555
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deluge/core/torrentmanager.py
View File

@ -88,7 +88,7 @@ class TorrentState:
magnet=None, magnet=None,
time_added=-1, time_added=-1,
last_seen_complete=0, last_seen_complete=0,
owner="", owner=None,
shared=False shared=False
): ):
self.torrent_id = torrent_id self.torrent_id = torrent_id
@ -323,11 +323,6 @@ class TorrentManager(component.Component):
def add(self, torrent_info=None, state=None, options=None, save_state=True, def add(self, torrent_info=None, state=None, options=None, save_state=True,
filedump=None, filename=None, magnet=None, resume_data=None, owner=None): filedump=None, filename=None, magnet=None, resume_data=None, owner=None):
"""Add a torrent to the manager and returns it's torrent_id""" """Add a torrent to the manager and returns it's torrent_id"""
if owner is None:
owner = component.get("RPCServer").get_session_user()
if not owner:
owner = "localclient"
if torrent_info is None and state is None and filedump is None and magnet is None: if torrent_info is None and state is None and filedump is None and magnet is None:
log.debug("You must specify a valid torrent_info, torrent state or magnet.") log.debug("You must specify a valid torrent_info, torrent state or magnet.")
return return
@ -365,6 +360,7 @@ class TorrentManager(component.Component):
options["move_completed_path"] = state.move_completed_path options["move_completed_path"] = state.move_completed_path
options["add_paused"] = state.paused options["add_paused"] = state.paused
options["shared"] = state.shared options["shared"] = state.shared
owner = state.owner
ti = self.get_torrent_info_from_file( ti = self.get_torrent_info_from_file(
os.path.join(get_config_dir(), os.path.join(get_config_dir(),
@ -443,6 +439,12 @@ class TorrentManager(component.Component):
if log.isEnabledFor(logging.DEBUG): if log.isEnabledFor(logging.DEBUG):
log.debug("options: %s", options) log.debug("options: %s", options)
if not owner:
owner = component.get("RPCServer").get_session_user()
account_exists = component.get("AuthManager").has_account(owner)
if not account_exists:
owner = "localclient"
# Set the right storage_mode # Set the right storage_mode
if options["compact_allocation"]: if options["compact_allocation"]:
storage_mode = lt.storage_mode_t(2) storage_mode = lt.storage_mode_t(2)
@ -480,12 +482,6 @@ class TorrentManager(component.Component):
# Set auto_managed to False because the torrent is paused # Set auto_managed to False because the torrent is paused
handle.auto_managed(False) handle.auto_managed(False)
# Create a Torrent object # Create a Torrent object
owner = state.owner if state else (
owner if owner else component.get("RPCServer").get_session_user()
)
account_exists = component.get("AuthManager").has_account(owner)
if not account_exists:
owner = 'localclient'
torrent = Torrent(handle, options, state, filename, magnet, owner) torrent = Torrent(handle, options, state, filename, magnet, owner)
# Add the torrent object to the dictionary # Add the torrent object to the dictionary