flexget 3.22.2__tar.gz → 3.22.4__tar.gz

{flexget-3.22.2 → flexget-3.22.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: flexget
-Version: 3.22.2
+Version: 3.22.4
 Summary: FlexGet is a program aimed to automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more.
 Project-URL: Issue Tracker, https://github.com/Flexget/Flexget/issues
 Project-URL: Forum, https://github.com/Flexget/Flexget/discussions

{flexget-3.22.2 → flexget-3.22.4}/flexget/_version.py

@@ -10,4 +10,4 @@ and update the version again for continued development.
 NOTE: Should always have all three parts of the version, even on major and minor bumps. i.e. 4.0.0.dev, not 4.0.dev
 """
 
-__version__ = '3.22.2'
+__version__ = '3.22.4'

{flexget-3.22.2 → flexget-3.22.4}/flexget/plugins/clients/qbittorrent.py

@@ -22,6 +22,7 @@ class OutputQBitTorrent:
         qbittorrent:
           username: <USERNAME> (default: (none))
           password: <PASSWORD> (default: (none))
+          api_key: <API_KEY> (default: (none), qBittorrent 5.2+, replaces username/password)
           host: <HOSTNAME> (default: localhost)
           port: <PORT> (default: 8080)
           use_ssl: <SSL> (default: False)
@@ -46,6 +47,7 @@ class OutputQBitTorrent:
                 'properties': {
                     'username': {'type': 'string'},
                     'password': {'type': 'string'},
+                    'api_key': {'type': 'string'},
                     'host': {'type': 'string'},
                     'port': {'type': 'integer'},
                     'use_ssl': {'type': 'boolean'},
@@ -118,12 +120,22 @@ class OutputQBitTorrent:
         """Connect to qBittorrent Web UI.
 
         Username and password not necessary if 'Bypass authentication for localhost' is checked and host is 'localhost'.
+        An API key (qBittorrent 5.2+) is used instead of username and password when set.
         """
         self.url = '{}://{}:{}'.format(
             'https' if config['use_ssl'] else 'http', config['host'], config['port']
         )
-        self.check_api_version('Check API version failed.', verify=config['verify_cert'])
-        if config.get('username') and config.get('password'):
+        if config.get('api_key'):
+            self.session.headers['Authorization'] = f'Bearer {config["api_key"]}'
+        response = self.check_api_version(
+            'Check API version failed.', verify=config['verify_cert']
+        )
+        if config.get('api_key'):
+            if response.status_code in (401, 403):
+                raise plugin.PluginError(
+                    'Authentication with API key failed (requires qBittorrent 5.2 or later).'
+                )
+        elif config.get('username') and config.get('password'):
             data = {'username': config['username'], 'password': config['password']}
             if not self._request(
                 'post',
@@ -368,26 +380,40 @@ class FromQBitTorrent:
             'completed': {'type': 'boolean'},
             'username': {'type': 'string'},
             'password': {'type': 'string'},
+            'api_key': {'type': 'string'},
             'host': {'type': 'string'},
             'port': {'type': 'integer'},
         },
         'additionalProperties': False,
-        'required': ['username', 'password', 'host', 'port'],
+        'required': ['host', 'port'],
+        'anyOf': [{'required': ['api_key']}, {'required': ['username', 'password']}],
     }
 
     @staticmethod
-    def client(host: str, port: int, username: str, password: str):
+    def client(
+        host: str,
+        port: int,
+        username: str | None = None,
+        password: str | None = None,
+        api_key: str | None = None,
+    ):
         """Import client or abort task."""
         try:
             import qbittorrentapi
         except ImportError:
             raise plugin.DependencyError(issued_by='from_qbittorrent', missing='qbittorrent-api')
 
-        return qbittorrentapi.Client(host=host, port=port, username=username, password=password)
+        return qbittorrentapi.Client(
+            host=host, port=port, username=username, password=password, api_key=api_key
+        )
 
     def on_task_input(self, task, config):
         client = self.client(
-            config['host'], int(config['port']), config['username'], config['password']
+            config['host'],
+            int(config['port']),
+            config.get('username'),
+            config.get('password'),
+            config.get('api_key'),
         )
 
         for torrent in client.torrents_info():

{flexget-3.22.2 → flexget-3.22.4}/flexget/plugins/clients/transmission.py

@@ -49,6 +49,13 @@ __version__ = '>=7.0.3,<8.0.0'
 __package__ = 'transmission-rpc'
 __requirement__ = packaging.specifiers.SpecifierSet(__version__)
 
+# Read once at import: the installed metadata can disappear while the daemon keeps
+# running with the module already imported (e.g. after an in-place upgrade).
+try:
+    _installed_version = importlib.metadata.version(__package__)
+except importlib.metadata.PackageNotFoundError:
+    _installed_version = None
+
 
 class TransmissionBase:
     def prepare_config(self, config):
@@ -154,8 +161,7 @@ class TransmissionBase:
                 f'{__package__} module version {__version__} required.', logger
             )
 
-        v = importlib.metadata.version(__package__)
-        if not __requirement__.contains(v):
+        if _installed_version is not None and not __requirement__.contains(_installed_version):
             raise plugin.PluginError(
                 f'{__package__} module version mismatch, requiring {__package__}{__version__}',
                 logger,