mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use non-deprecated libtorrent parameters and functions

Browse source 
Also added support for seed_mode
This commit is contained in:
Calum Lind 2014-01-17 10:48:32 +00:00
commit b0c3c3dddc
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
deluge/core/torrentmanager.py
View file

@ -315,7 +315,7 @@ class TorrentManager(component.Component):
return torrent_info return torrent_info
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, seed_mode=False, 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 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.")
@ -441,9 +441,12 @@ class TorrentManager(component.Component):
# Fill in the rest of the add_torrent_params dictionary # Fill in the rest of the add_torrent_params dictionary
add_torrent_params["save_path"] = utf8_encoded(options["download_location"]) add_torrent_params["save_path"] = utf8_encoded(options["download_location"])
add_torrent_params["storage_mode"] = storage_mode add_torrent_params["storage_mode"] = storage_mode
add_torrent_params["paused"] = True add_torrent_params["flags"] = (lt.add_torrent_params_flags_t.flag_paused |
add_torrent_params["auto_managed"] = False lt.add_torrent_params_flags_t.flag_duplicate_is_error)
add_torrent_params["duplicate_is_error"] = True if seed_mode:
add_torrent_params["flags"] |= lt.add_torrent_params_flags_t.flag_seed_mode
if magnet:
add_torrent_params["url"] = utf8_encoded(magnet)
# We need to pause the AlertManager momentarily to prevent alerts # We need to pause the AlertManager momentarily to prevent alerts
# for this torrent being generated before a Torrent object is created. # for this torrent being generated before a Torrent object is created.
@ -451,10 +454,7 @@ class TorrentManager(component.Component):
handle = None handle = None
try: try:
if magnet: handle = self.session.add_torrent(add_torrent_params)
handle = lt.add_magnet_uri(self.session, utf8_encoded(magnet), add_torrent_params)
else:
handle = self.session.add_torrent(add_torrent_params)
except RuntimeError as ex: except RuntimeError as ex:
log.warning("Error adding torrent: %s", ex) log.warning("Error adding torrent: %s", ex)