[Core] Refactor default add torrent flags into a constant

valychbreak · Nov 30, 2016 · b69ba02 · b69ba02
1 parent 915f2bf
commit b69ba02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
@@ -34,6 +34,12 @@
 
 log = logging.getLogger(__name__)
 
+LT_DEFAULT_ADD_TORRENT_FLAGS = (
+    lt.add_torrent_params_flags_t.flag_paused |
+    lt.add_torrent_params_flags_t.flag_auto_managed |
+    lt.add_torrent_params_flags_t.flag_update_subscribe |
+    lt.add_torrent_params_flags_t.flag_apply_ip_filter)
+
 
 class TorrentState:  # pylint: disable=old-style-class
     """Create a torrent state.
@@ -353,7 +359,8 @@ def add(self, torrent_info=None, state=None, options=None, save_state=True,
         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)
+                if log.isEnabledFor(logging.DEBUG):
+                    log.debug('renaming file index %s to %s', index, fname)
                 try:
                     torrent_info.rename_file(index, fname)
                 except TypeError:
@@ -377,12 +384,8 @@ def add(self, torrent_info=None, state=None, options=None, save_state=True,
         if resume_data:
             add_torrent_params['resume_data'] = resume_data
 
-        default_flags = (lt.add_torrent_params_flags_t.flag_paused |
-                         lt.add_torrent_params_flags_t.flag_auto_managed |
-                         lt.add_torrent_params_flags_t.flag_update_subscribe |
-                         lt.add_torrent_params_flags_t.flag_apply_ip_filter)
         # Set flags: enable duplicate_is_error & override_resume_data, disable auto_managed.
-        add_torrent_params['flags'] = ((default_flags |
+        add_torrent_params['flags'] = ((LT_DEFAULT_ADD_TORRENT_FLAGS |
                                         lt.add_torrent_params_flags_t.flag_duplicate_is_error |
                                         lt.add_torrent_params_flags_t.flag_override_resume_data) ^
                                        lt.add_torrent_params_flags_t.flag_auto_managed)

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -53,6 +53,9 @@ def __getattr__(cls, name):
         else:
             return Mock()
 
+    def __or__(self, __):
+        return Mock()
+
 
 MOCK_MODULES = ['deluge.ui.gtkui.gtkui', 'deluge._libtorrent',
                 'libtorrent', 'psyco',