Changeset 2b08ed

Timestamp:

08/28/2015 02:34:56 PM (10 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Children:

78fcf1

Parents:

0cdab0

git-author:

Calum Lind <calumlind+deluge@gmail.com> (08/28/2015 09:55:01 AM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (08/28/2015 02:34:56 PM)

Message:

[Core] Enable lt extension bindings again for versions >=0.16.7

• This will also no longer enable the lt_trackers extensions that seems

to be an issue for private trackers mixing with public ones #2721.

Location:

deluge/core

Files:

• core.py (modified) (2 diffs)
• preferencesmanager.py (modified) (1 diff)

deluge/core/core.py

@@ -85 +85 @@
             version.append(0)
 
-        # Note: All libtorrent python bindings to set plugins/extensions need to be disabled
-        # due to  GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369
-        # Setting session flags to 1 enables all libtorrent default plugins
-        self.session = lt.session(lt.fingerprint("DE", *version), flags=1)
+        # In libtorrent versions below 0.16.7.0 disable extension bindings due to GIL issue.
+        # https://code.google.com/p/libtorrent/issues/detail?id=369
+        if deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("0.16.7.0"):
+            self.session = lt.session(lt.fingerprint("DE", *version), flags=0)
+        else:
+            # Setting session flags to 1 enables all libtorrent default plugins
+            self.session = lt.session(lt.fingerprint("DE", *version), flags=1)
 
         # Load the session state if available
@@ -109 +112 @@
 
         # Load metadata extension
-        # Note: All libtorrent python bindings to set plugins/extensions need to be disabled
-        # due to  GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369
-        # self.session.add_extension(lt.create_metadata_plugin)
-        # self.session.add_extension(lt.create_ut_metadata_plugin)
-        # self.session.add_extension(lt.create_smart_ban_plugin)
+        # In libtorrent versions below 0.16.7.0 disable extension bindings due to GIL issue.
+        # https://code.google.com/p/libtorrent/issues/detail?id=369
+        if deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("0.16.7.0"):
+            self.session.add_extension("metadata_transfer")
+            self.session.add_extension("ut_metadata")
+            self.session.add_extension("smart_ban")
 
         # Create the components

deluge/core/preferencesmanager.py

@@ -338 +338 @@
     def _on_set_utpex(self, key, value):
         log.debug("utpex value set to %s", value)
-        if value:
-            # Note: All libtorrent python bindings to set plugins/extensions need to be disabled
-            # due to  GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369
-            #self.session.add_extension(lt.create_ut_pex_plugin)
-            pass
+        # In libtorrent versions below 0.16.7.0 disable extension bindings due to GIL issue.
+        # https://code.google.com/p/libtorrent/issues/detail?id=369
+        if value and deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("0.16.7.0"):
+            self.session.add_extension("ut_pex")
 
     def _on_set_encryption(self, key, value):