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

[Core] Stop using libtorrent.add_torrent_params_flags_t

Browse source 
The `libtorrent.add_torrent_params_flags_t` is deprecated and when
`libtorrent` is being compiled without deprecated functionality, we will
fail on `AttributeError`.

Refs: 4947602a2f
Closes: https://dev.deluge-torrent.org/ticket/3581
Closes: https://github.com/deluge-torrent/deluge/pull/407
This commit is contained in:
DjLegolas 2023-01-22 22:38:31 +02:00 • committed by Calum Lind
commit 5d7b416373
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
3 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
deluge/core/torrentmanager.py
View file

@ -50,10 +50,10 @@ from deluge.event import (
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
LT_DEFAULT_ADD_TORRENT_FLAGS = ( LT_DEFAULT_ADD_TORRENT_FLAGS = (
lt.add_torrent_params_flags_t.flag_paused lt.torrent_flags.paused
| lt.add_torrent_params_flags_t.flag_auto_managed | lt.torrent_flags.auto_managed
| lt.add_torrent_params_flags_t.flag_update_subscribe | lt.torrent_flags.update_subscribe
| lt.add_torrent_params_flags_t.flag_apply_ip_filter | lt.torrent_flags.apply_ip_filter
) )
@ -369,11 +369,11 @@ class TorrentManager(component.Component):
add_torrent_params.flags = ( add_torrent_params.flags = (
( (
LT_DEFAULT_ADD_TORRENT_FLAGS LT_DEFAULT_ADD_TORRENT_FLAGS
| lt.add_torrent_params_flags_t.flag_duplicate_is_error | lt.torrent_flags.duplicate_is_error
| lt.add_torrent_params_flags_t.flag_upload_mode | lt.torrent_flags.upload_mode
) )
^ lt.add_torrent_params_flags_t.flag_auto_managed ^ lt.torrent_flags.auto_managed
^ lt.add_torrent_params_flags_t.flag_paused ^ lt.torrent_flags.paused
) )
torrent_handle = self.session.add_torrent(add_torrent_params) torrent_handle = self.session.add_torrent(add_torrent_params)
@ -481,16 +481,12 @@ class TorrentManager(component.Component):
# Set flags: enable duplicate_is_error & override_resume_data, disable auto_managed. # Set flags: enable duplicate_is_error & override_resume_data, disable auto_managed.
add_torrent_params['flags'] = ( add_torrent_params['flags'] = (
LT_DEFAULT_ADD_TORRENT_FLAGS LT_DEFAULT_ADD_TORRENT_FLAGS | lt.torrent_flags.duplicate_is_error
| lt.add_torrent_params_flags_t.flag_duplicate_is_error ) ^ lt.torrent_flags.auto_managed
| lt.add_torrent_params_flags_t.flag_override_resume_data
) ^ lt.add_torrent_params_flags_t.flag_auto_managed
if options['seed_mode']: if options['seed_mode']:
add_torrent_params['flags'] |= lt.add_torrent_params_flags_t.flag_seed_mode add_torrent_params['flags'] |= lt.torrent_flags.seed_mode
if options['super_seeding']: if options['super_seeding']:
add_torrent_params[ add_torrent_params['flags'] |= lt.torrent_flags.super_seeding
'flags'
] |= lt.add_torrent_params_flags_t.flag_super_seeding
return torrent_id, add_torrent_params return torrent_id, add_torrent_params

6
deluge/tests/test_core.py
View file

@ -116,9 +116,9 @@ class TestCore(BaseTestCase):
self.patch( self.patch(
deluge.core.torrentmanager, deluge.core.torrentmanager,
'LT_DEFAULT_ADD_TORRENT_FLAGS', 'LT_DEFAULT_ADD_TORRENT_FLAGS',
lt.add_torrent_params_flags_t.flag_auto_managed lt.torrent_flags.auto_managed
| lt.add_torrent_params_flags_t.flag_update_subscribe | lt.torrent_flags.update_subscribe
| lt.add_torrent_params_flags_t.flag_apply_ip_filter, | lt.torrent_flags.apply_ip_filter,
) )
options = {'add_paused': paused, 'auto_managed': False} options = {'add_paused': paused, 'auto_managed': False}
filepath = common.get_test_data_file(filename) filepath = common.get_test_data_file(filename)

5
deluge/tests/test_torrent.py
View file

@ -74,9 +74,8 @@ class TestTorrent(BaseTestCase):
'save_path': os.getcwd(), 'save_path': os.getcwd(),
'storage_mode': lt.storage_mode_t.storage_mode_sparse, 'storage_mode': lt.storage_mode_t.storage_mode_sparse,
'flags': ( 'flags': (
lt.add_torrent_params_flags_t.flag_auto_managed lt.torrent_flags.auto_managed
| lt.add_torrent_params_flags_t.flag_duplicate_is_error | lt.torrent_flags.duplicate_is_error & ~lt.torrent_flags.paused
& ~lt.add_torrent_params_flags_t.flag_paused
), ),
} }
return atp return atp