Merging upstream version 2.1.2~dev0+20240910.

Signed-off-by: Daniel Baumann <daniel@debian.org>

.github/workflows/cd.yml

@@ -29,20 +29,20 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       # Checkout Deluge source to subdir to enable packaging any tag/commit
       - name: Checkout Deluge source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.ref }}
           fetch-depth: 0
           path: deluge_src
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python}}
           architecture: ${{ matrix.arch }}
@@ -98,7 +98,7 @@ jobs:
           python setup_nsis.py
           makensis /Darch=${{ matrix.arch }} deluge-win-installer.nsi
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: deluge-py${{ matrix.python }}-lt${{ matrix.libtorrent }}-${{ matrix.arch }}
           path: packaging/win/*.exe

.github/workflows/ci.yml

@@ -19,12 +19,12 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -63,7 +63,7 @@ jobs:
           python -c 'from deluge._libtorrent import lt; print(lt.__version__)';
           $DEBUG_PREFIX pytest -v -m "not (todo or gtkui)" deluge
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         # capture all crashes as build artifacts
         if: failure()
         with:
@@ -78,12 +78,12 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"

.github/workflows/docs.yml

@@ -15,11 +15,11 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "pip"

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
       - name: Run pre-commit linting
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1

.gitignore

@@ -12,7 +12,6 @@ __pycache__/
 *.tar.*
 .tox/
 deluge/i18n/*/
-deluge.pot
 deluge/ui/web/js/*.js
 deluge/ui/web/js/extjs/ext-extensions*.js
 *.desktop

.pre-commit-config.yaml

@@ -6,11 +6,15 @@ exclude: >
       deluge/tests/data/.*svg|
   )$
 repos:
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.6.4
     hooks:
-      - id: black
-        name: Fmt Black
+      - id: ruff
+        name: Chk Ruff
+        args: [--fix]
+      - id: ruff-format
+        name: Fmt Ruff
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.7.1
     hooks:
@@ -18,23 +22,9 @@ repos:
         name: Fmt Prettier
         # Workaround to list modified files only.
         args: [--list-different]
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: Fmt isort
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        name: Chk Flake8
-        additional_dependencies:
-          - pep8-naming==0.12.1
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
-      - id: double-quote-string-fixer
-        name: Fix Double-quotes
       - id: end-of-file-fixer
         name: Fix End-of-files
         exclude_types: [javascript, css]
@@ -47,5 +37,5 @@ repos:
     rev: v3.3.1
     hooks:
       - id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
         stages: [manual]

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Python 3.6 support removed (Python >= 3.7)
 
+### Web UI
+
+- Accept network interface name in addition to IP adress in "Incoming Address"
+
 ## 2.1.1 (2022-07-10)
 
 ### Core

DEPENDS.md

@@ -50,7 +50,7 @@ All modules will require the [common](#common) section dependencies.
 - [PyGObject]
 - [Pycairo]
 - [librsvg] _>= 2_
-- [libappindicator3] w/GIR - Optional: Ubuntu system tray icon.
+- [ayatanaappindicator3] w/GIR - Optional: Ubuntu system tray icon.
 
 ### MacOS
 
@@ -95,6 +95,6 @@ All modules will require the [common](#common) section dependencies.
 [mako]: https://www.makotemplates.org/
 [pygame]: https://www.pygame.org/
 [libnotify]: https://developer.gnome.org/libnotify/
-[python-appindicator]: https://packages.ubuntu.com/xenial/python-appindicator
+[ayatanaappindicator3]: https://lazka.github.io/pgi-docs/AyatanaAppIndicator3-0.1/index.html
 [librsvg]: https://wiki.gnome.org/action/show/Projects/LibRsvg
 [ifaddr]: https://pypi.org/project/ifaddr/

__builtins__.pyi

@@ -0,0 +1,6 @@
+from twisted.web.http import Request
+
+__request__: Request
+
+def _(string: str) -> str: ...
+def _n(string: str) -> str: ...

deluge/_libtorrent.py

@@ -14,6 +14,7 @@
     >>> from deluge._libtorrent import lt
 
 """
+
 from deluge.common import VersionSplit, get_version
 from deluge.error import LibtorrentImportError
 

deluge/common.py

@@ -7,6 +7,7 @@
 #
 
 """Common functions for various parts of Deluge to use."""
+
 import base64
 import binascii
 import functools
@@ -720,6 +721,16 @@ def parse_human_size(size):
     raise InvalidSize(msg % (size, tokens))
 
 
+def anchorify_urls(text: str) -> str:
+    """
+    Wrap all occurrences of text URLs with HTML
+    """
+    url_pattern = r'((htt)|(ft)|(ud))ps?://\S+'
+    html_href_pattern = r'<a href="\g<0>">\g<0></a>'
+
+    return re.sub(url_pattern, html_href_pattern, text)
+
+
 def is_url(url):
     """
     A simple test to check if the URL is valid

deluge/config.py

@@ -38,6 +38,7 @@
 version as this will be done internally.
 
 """
+
 import json
 import logging
 import os

deluge/conftest.py

@@ -53,6 +53,7 @@ def reset(timeout=0.5, *args, **kwargs):
         mock.deferred = deferred
 
     mock = Mock()
+    mock.__qualname__ = 'mock'
     original_reset_mock = mock.reset_mock
     mock.reset_mock = reset
     mock.reset_mock()

deluge/core/alertmanager.py

@@ -14,6 +14,7 @@
 `:mod:EventManager` for similar functionality.
 
 """
+
 import contextlib
 import logging
 import threading

deluge/core/daemon.py

@@ -7,6 +7,7 @@
 #
 
 """The Deluge daemon"""
+
 import logging
 import os
 import socket

deluge/core/pluginmanager.py

@@ -8,6 +8,7 @@
 
 
 """PluginManager for Core"""
+
 import logging
 
 from twisted.internet import defer

deluge/core/rpcserver.py

@@ -7,6 +7,7 @@
 #
 
 """RPCServer Module"""
+
 import logging
 import os
 import sys
@@ -46,13 +47,11 @@
 
 
 @overload
-def export(func: TCallable) -> TCallable:
-    ...
+def export(func: TCallable) -> TCallable: ...
 
 
 @overload
-def export(auth_level: int) -> Callable[[TCallable], TCallable]:
-    ...
+def export(auth_level: int) -> Callable[[TCallable], TCallable]: ...
 
 
 def export(auth_level=AUTH_LEVEL_DEFAULT):
@@ -274,9 +273,9 @@ def send_error():
                     raise IncompatibleClient(deluge.common.get_version())
                 ret = component.get('AuthManager').authorize(*args, **kwargs)
                 if ret:
-                    self.factory.authorized_sessions[
-                        self.transport.sessionno
-                    ] = self.AuthLevel(ret, args[0])
+                    self.factory.authorized_sessions[self.transport.sessionno] = (
+                        self.AuthLevel(ret, args[0])
+                    )
                     self.factory.session_protocols[self.transport.sessionno] = self
             except Exception as ex:
                 send_error()

deluge/core/torrent.py

@@ -1138,9 +1138,8 @@ def _create_status_funcs(self):
             'download_location': lambda: self.options['download_location'],
             'seeds_peers_ratio': lambda: -1.0
             if self.status.num_incomplete == 0
-            else (  # Use -1.0 to signify infinity
-                self.status.num_complete / self.status.num_incomplete
-            ),
+            # Use -1.0 to signify infinity
+            else (self.status.num_complete / self.status.num_incomplete),
             'seed_rank': lambda: self.status.seed_rank,
             'state': lambda: self.state,
             'stop_at_ratio': lambda: self.options['stop_at_ratio'],
@@ -1544,20 +1543,18 @@ def _get_pieces_info(self):
                 self.status.pieces, self.handle.piece_availability()
             ):
                 if piece:
-                    pieces.append(3)  # Completed.
+                    # Completed.
+                    pieces.append(3)
                 elif avail_piece:
-                    pieces.append(
-                        1
-                    )  # Available, just not downloaded nor being downloaded.
+                    # Available, just not downloaded nor being downloaded.
+                    pieces.append(1)
                 else:
-                    pieces.append(
-                        0
-                    )  # Missing, no known peer with piece, or not asked for yet.
+                    # Missing, no known peer with piece, or not asked for yet.
+                    pieces.append(0)
 
             for peer_info in self.handle.get_peer_info():
                 if peer_info.downloading_piece_index >= 0:
-                    pieces[
-                        peer_info.downloading_piece_index
-                    ] = 2  # Being downloaded from peer.
+                    # Being downloaded from peer.
+                    pieces[peer_info.downloading_piece_index] = 2
 
         return pieces

deluge/core/torrentmanager.py

@@ -7,6 +7,7 @@
 #
 
 """TorrentManager handles Torrent objects"""
+
 import datetime
 import logging
 import operator

deluge/decorators.py

@@ -206,7 +206,7 @@ def addCallbacks(self, *args, **kwargs):  # noqa: N802
 
 
 def maybe_coroutine(
-    f: Callable[..., Coroutine[Any, Any, _RetT]]
+    f: Callable[..., Coroutine[Any, Any, _RetT]],
 ) -> 'Callable[..., defer.Deferred[_RetT]]':
     """Wraps a coroutine function to make it usable as a normal function that returns a Deferred."""
 

deluge/event.py

@@ -13,6 +13,7 @@
 and subsequently emitted to the clients.
 
 """
+
 known_events = {}
 
 

deluge/httpdownloader.py

@@ -6,7 +6,7 @@
 # See LICENSE for more details.
 #
 
-import cgi
+import email.message
 import logging
 import os.path
 import zlib
@@ -133,9 +133,10 @@ def request_callback(self, response):
                 content_disp = headers.getRawHeaders(b'content-disposition')[0].decode(
                     'utf-8'
                 )
-                content_disp_params = cgi.parse_header(content_disp)[1]
-                if 'filename' in content_disp_params:
-                    new_file_name = content_disp_params['filename']
+                message = email.message.EmailMessage()
+                message['content-disposition'] = content_disp
+                new_file_name = message.get_filename()
+                if new_file_name:
                     new_file_name = sanitise_filename(new_file_name)
                     new_file_name = os.path.join(
                         os.path.split(self.filename)[0], new_file_name
@@ -152,7 +153,10 @@ def request_callback(self, response):
                     self.filename = new_file_name
 
             cont_type_header = headers.getRawHeaders(b'content-type')[0].decode()
-            cont_type, params = cgi.parse_header(cont_type_header)
+            message = email.message.EmailMessage()
+            message['content-type'] = cont_type_header
+            cont_type = message.get_content_type()
+            params = message['content-type'].params
             # Only re-ecode text content types.
             encoding = None
             if cont_type.startswith('text/'):

deluge/i18n/util.py

@@ -66,6 +66,8 @@ def set_language(lang):
     :type lang: str
     """
     if not lang:
+        os.environ.pop('LANGUAGE', None)
+        os.environ.pop('LANG', None)
         return
 
     # Necessary to set these environment variables for GtkBuilder