pyload-ng 0.5.0b3.dev97__tar.gz → 0.5.0b3.dev99__tar.gz

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyload-ng
-Version: 0.5.0b3.dev97
+Version: 0.5.0b3.dev99
 Summary: The free and open-source Download Manager written in pure Python
 Home-page: https://pyload.net
 Download-URL: https://github.com/pyload/pyload/releases
@@ -47,7 +47,7 @@ Requires-Dist: Flask
 Requires-Dist: Flask-Babel
 Requires-Dist: Flask-Caching~=1.9
 Requires-Dist: Flask-Compress~=1.8
-Requires-Dist: Flask-Session
+Requires-Dist: Flask-Session>=0.8.0
 Requires-Dist: Flask-Themes2~=1.0
 Requires-Dist: Flask-WTF
 Requires-Dist: bitmath~=1.3
@@ -80,6 +80,11 @@ Requires-Dist: Pillow; extra == "plugins"
 Requires-Dist: pyOpenSSL; extra == "plugins"
 Requires-Dist: slixmpp; extra == "plugins"
 Requires-Dist: Send2Trash; extra == "plugins"
+Provides-Extra: test
+Requires-Dist: tox; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: openapi-spec-validator; extra == "test"
 Dynamic: download-url
 Dynamic: license-file
 
@@ -249,14 +254,18 @@ Invoke `build_locale` before building the package (eg. `bdist_wheel`).
 python3 -m venv .venv
 source .venv/bin/activate
 ```
-* Install pyLoad as editable install
+* Install pyLoad as editable install with main and test dependencies
 ```
-pip install -e .
+pip install -e ".[test]"
 ```
 * Run pyLoad in debug mode
 ```
 pyload -d
 ```
+* To run the tests locally
+```
+pytest tests
+```
 
 ### API specification
 

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/README.md

@@ -164,14 +164,18 @@ Invoke `build_locale` before building the package (eg. `bdist_wheel`).
 python3 -m venv .venv
 source .venv/bin/activate
 ```
-* Install pyLoad as editable install
+* Install pyLoad as editable install with main and test dependencies
 ```
-pip install -e .
+pip install -e ".[test]"
 ```
 * Run pyLoad in debug mode
 ```
 pyload -d
 ```
+* To run the tests locally
+```
+pytest tests
+```
 
 ### API specification
 

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/setup.cfg

@@ -56,7 +56,7 @@ install_requires =
 	Flask-Babel
 	Flask-Caching~=1.9
 	Flask-Compress~=1.8
-	Flask-Session
+	Flask-Session>=0.8.0
 	Flask-Themes2~=1.0
 	Flask-WTF
 	bitmath~=1.3
@@ -96,6 +96,11 @@ plugins =
 	pyOpenSSL
 	slixmpp
 	Send2Trash
+test = 
+	tox
+	pytest
+	pytest-cov
+	openapi-spec-validator
 
 [options.entry_points]
 console_scripts = 
@@ -106,7 +111,6 @@ extras = True
 
 [tool:pytest]
 addopts = 
-	--cov pyload --cov-report term-missing
 	--verbose
 norecursedirs = 
 	dist

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/core/api/__init__.py

@@ -221,7 +221,7 @@ class Api:
         :param category:
         :param option:
         :param value: new config value
-        :param section: 'plugin' or 'core
+        :param section: 'plugin' or 'core'
         """
         try:
             try:
@@ -1105,12 +1105,13 @@ class Api:
     @legacy("uploadContainer")
     @permission(Perms.ADD)
     @post
-    def upload_container(self, filename: str, data: bytes) -> None:
+    def upload_container(self, filename: str, data: bytes, dest: Destination = Destination.COLLECTOR) -> None:
         """
         Uploads and adds a container file to pyLoad.
 
         :param filename: file name - extension is important, so it can correctly decrypt
         :param data: file content
+        :param dest: `Destination`
         """
         upload_path = os.path.join(self.pyload.tempdir, "upload")
         os.makedirs(upload_path, exist_ok=True)
@@ -1119,7 +1120,7 @@ class Api:
         with open(fs.safejoin(upload_path, filename), "wb") as th:
             th.write(data)
 
-        self.add_package(th.name, [th.name], Destination.COLLECTOR)
+        self.add_package(th.name, [th.name], dest)
 
     @legacy("orderPackage")
     @permission(Perms.MODIFY)
@@ -1723,7 +1724,6 @@ class Api:
             return {
                 "success": self.pyload.db.delete_user_apikey(user_id, key_id),
             }
-            return
 
     def check_apikey(self, apikey: str) -> dict[str, Any]:
         """
@@ -1747,7 +1747,7 @@ class Api:
         if not key_data:
             return {
                 "success": False,
-                "error": "Invalid API key",
+                "error": "Invalid or expired API key",
             }
         else:
             self.pyload.db.update_apikey_last_used(key_id)

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/core/database/apikey_database.py

@@ -100,8 +100,8 @@ class ApikeyDatabaseMethods:
         :return: dict with key info or empty dict if not found
         """
         self.c.execute(
-            "SELECT id, user_id, name, key_hash, created_at, expires_at, last_used FROM apikeys WHERE id=?",
-            (key_id,),
+            "SELECT id, user_id, name, key_hash, created_at, expires_at, last_used FROM apikeys WHERE id=? AND (expires_at>? OR expires_at=0)",
+            (key_id, int(time.time() * 1000)),
         )
         r = self.c.fetchone()
         if not r:

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/core/network/http/http_chunk.py

@@ -269,7 +269,9 @@ class HTTPChunk(HTTPRequest):
 
         if self.range and self.arrived > self.size:
             self.aborted = True  #: tell parent to ignore the pycurl Exception
-            return 0  #: close if chunk has enough data
+            return 0  #: close the stansfer if chunk has enough data
+
+        return None  #: Everything is OK, please continue
 
     def parse_header(self):
         """

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/core/network/http/http_download.py

@@ -26,7 +26,7 @@ class HTTPDownload:
         referer=None,
         cj=None,
         bucket=None,
-        options={},
+        options=None,
         status_notify=None,
         disposition=False,
     ):
@@ -37,7 +37,7 @@ class HTTPDownload:
         self.referer = referer
         self.cj = cj  #: cookiejar if cookies are needed
         self.bucket = bucket
-        self.options = options
+        self.options = options or {}
         self.disposition = disposition
         #: all arguments
 
@@ -346,6 +346,8 @@ class HTTPDownload:
             if chunk.c == handle:
                 return chunk
 
+        return None
+
     def close_chunk(self, chunk):
         try:
             self.m.remove_handle(chunk.c)

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/core/utils/web/parse.py

@@ -7,6 +7,7 @@ from email.header import decode_header as parse_mime_header
 from ntpath import basename as ntpath_basename
 from posixpath import basename as posixpath_basename
 
+from ..parse import name as parse_name
 from ..purge import name as safe_nm
 from . import format, purge
 
@@ -117,6 +118,8 @@ def name(url, safe_name=True):
         name = us.query.split("=", 1)[::-1][0].split("&", 1)[0]
     if not name:
         name = ".".join(us.netloc.split(".")[:-1])
+    if us.fragment:
+        name += f"#{us.fragment}"
 
     return safe_nm(name) if safe_name else name
 
@@ -213,9 +216,6 @@ def disposition(disposition_value, location=None, fallback_url=None):
         if _disposition_type.lower() != "attachment":
             return None
 
-        # Import lazily to avoid circular imports with pyload.core.utils.parse
-        from ..parse import name as parse_name
-
         if _location is not None:
             return parse_name(_location)
         elif _fallback_url is not None:

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/locale/en/LC_MESSAGES/pyload.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pyload-ng 0.5.0b3.dev97\n"
+"Project-Id-Version: pyload-ng 0.5.0b3.dev99\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2026-04-07 13:12+0000\n"
-"PO-Revision-Date: 2026-04-07 13:12+0000\n"
+"POT-Creation-Date: 2026-04-20 21:00+0000\n"
+"PO-Revision-Date: 2026-04-20 21:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
 "Language-Team: en <LL@li.org>\n"
@@ -752,47 +752,47 @@ msgstr ""
 msgid "Waiting {}..."
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:66
+#: src/pyload/plugins/addons/ClickNLoad.py:65
 msgid "Could not resolve backend server, ClickNLoad cannot start"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:88
+#: src/pyload/plugins/addons/ClickNLoad.py:87
 #, python-brace-format
 msgid "Backend found on {}://{}:{}"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:99
+#: src/pyload/plugins/addons/ClickNLoad.py:98
 msgid "Could not connect to backend server, ClickNLoad cannot start"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:111
+#: src/pyload/plugins/addons/ClickNLoad.py:110
 msgid "pyLoad's Web interface is not active, ClickNLoad cannot start"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:119
+#: src/pyload/plugins/addons/ClickNLoad.py:118
 msgid "Shutting down proxy..."
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:142
+#: src/pyload/plugins/addons/ClickNLoad.py:141
 msgid "Server was not exited gracefully, shutdown forced"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:165
+#: src/pyload/plugins/addons/ClickNLoad.py:203
 #, python-brace-format
 msgid "Proxy listening on {}:{}"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:194
+#: src/pyload/plugins/addons/ClickNLoad.py:232
 #, python-brace-format
 msgid "Connection from invalid/unsupported host {} ignored"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:221
+#: src/pyload/plugins/addons/ClickNLoad.py:259
 #, python-brace-format
 msgid "Connection from unauthorized host {} ignored"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:239
+#: src/pyload/plugins/addons/ClickNLoad.py:277
 #, python-brace-format
 msgid "SSL error: {}"
 msgstr ""
@@ -2469,27 +2469,6 @@ msgstr ""
 msgid "DL-Link not found"
 msgstr ""
 
-#: src/pyload/plugins/downloaders/BezvadataCz.py:39
-msgid "Page 1 URL not found"
-msgstr ""
-
-#: src/pyload/plugins/downloaders/BezvadataCz.py:48
-msgid "FreeForm"
-msgstr ""
-
-#: src/pyload/plugins/downloaders/BezvadataCz.py:63
-msgid "Page 2 URL not found"
-msgstr ""
-
-#: src/pyload/plugins/downloaders/BezvadataCz.py:80
-#: src/pyload/plugins/downloaders/CzshareCom.py:111
-#: src/pyload/plugins/downloaders/CzshareCom.py:131
-#: src/pyload/plugins/downloaders/CzshareCom.py:168
-#: src/pyload/plugins/downloaders/DepositfilesCom.py:102
-#: src/pyload/plugins/downloaders/EuroshareEu.py:49
-msgid "Download limit reached"
-msgstr ""
-
 #: src/pyload/plugins/downloaders/CzshareCom.py:63
 #, python-brace-format
 msgid "Premium download for {} KiB of Credit"
@@ -2509,6 +2488,14 @@ msgstr ""
 msgid "FREE_URL_PATTERN not found"
 msgstr ""
 
+#: src/pyload/plugins/downloaders/CzshareCom.py:111
+#: src/pyload/plugins/downloaders/CzshareCom.py:131
+#: src/pyload/plugins/downloaders/CzshareCom.py:168
+#: src/pyload/plugins/downloaders/DepositfilesCom.py:102
+#: src/pyload/plugins/downloaders/EuroshareEu.py:49
+msgid "Download limit reached"
+msgstr ""
+
 #: src/pyload/plugins/downloaders/CzshareCom.py:120
 msgid "Form"
 msgstr ""
@@ -2875,21 +2862,26 @@ msgstr ""
 msgid "File exists."
 msgstr ""
 
-#: src/pyload/plugins/downloaders/MegaCoNz.py:523
-#: src/pyload/plugins/downloaders/MegaCoNz.py:524
+#: src/pyload/plugins/downloaders/MegaCoNz.py:547
+#: src/pyload/plugins/downloaders/MegaCoNz.py:548
+msgid "Root folder handle not found in file keys"
+msgstr ""
+
+#: src/pyload/plugins/downloaders/MegaCoNz.py:557
+#: src/pyload/plugins/downloaders/MegaCoNz.py:558
 msgid "Invalid key length"
 msgstr ""
 
-#: src/pyload/plugins/downloaders/MegaCoNz.py:539
+#: src/pyload/plugins/downloaders/MegaCoNz.py:573
 msgid "Decryption failed"
 msgstr ""
 
-#: src/pyload/plugins/downloaders/MegaCoNz.py:552
-#: src/pyload/plugins/downloaders/MegaCoNz.py:553
+#: src/pyload/plugins/downloaders/MegaCoNz.py:586
+#: src/pyload/plugins/downloaders/MegaCoNz.py:587
 msgid "Free download limit reached"
 msgstr ""
 
-#: src/pyload/plugins/downloaders/MegaCoNz.py:562
+#: src/pyload/plugins/downloaders/MegaCoNz.py:596
 msgid "Bandwidth Limit Exceeded"
 msgstr ""
 
@@ -3646,23 +3638,29 @@ msgstr ""
 msgid "Cannot open file"
 msgstr ""
 
-#: src/pyload/webui/webserver_thread.py:56
+#: src/pyload/webui/webserver_thread.py:57
 #, python-brace-format
 msgid "Cannot use HTTPS: {}"
 msgstr ""
 
-#: src/pyload/webui/webserver_thread.py:80
+#: src/pyload/webui/webserver_thread.py:64
+msgid ""
+"*** Use HTTPS is ENABLED but no certificate and/or key file(s) are "
+"provided! ***"
+msgstr ""
+
+#: src/pyload/webui/webserver_thread.py:84
 msgid ""
 "Development mode does not support HTTPS, please disable development mode "
 "to use HTTPS"
 msgstr ""
 
-#: src/pyload/webui/webserver_thread.py:86
+#: src/pyload/webui/webserver_thread.py:90
 #, python-brace-format
 msgid "Starting webserver: {scheme}://{host}:{port}"
 msgstr ""
 
-#: src/pyload/webui/webserver_thread.py:108
+#: src/pyload/webui/webserver_thread.py:112
 msgid ""
 "** FATAL ERROR ** Could not start web server - Address Already in Use | "
 "Exiting pyLoad"
@@ -4750,8 +4748,8 @@ msgstr ""
 #: src/pyload/webui/app/themes/modern/templates/js/base.js:311
 #: src/pyload/webui/app/themes/modern/templates/js/settings.js:82
 #: src/pyload/webui/app/themes/modern/templates/js/settings.js:94
-#: src/pyload/webui/app/themes/modern/templates/js/settings.js:113
-#: src/pyload/webui/app/themes/modern/templates/js/settings.js:167
+#: src/pyload/webui/app/themes/modern/templates/js/settings.js:115
+#: src/pyload/webui/app/themes/modern/templates/js/settings.js:169
 #: src/pyload/webui/app/themes/modern/templates/js/settings.js:204
 #: src/pyload/webui/app/themes/modern/templates/js/settings.js:289
 #: src/pyload/webui/app/themes/modern/templates/js/settings.js:307
@@ -4762,8 +4760,8 @@ msgstr ""
 #: src/pyload/webui/app/themes/pyplex/templates/js/base.js:311
 #: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:82
 #: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:94
-#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:113
-#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:167
+#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:115
+#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:169
 #: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:204
 #: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:289
 #: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:307
@@ -4840,20 +4838,20 @@ msgstr ""
 msgid "Are you sure you want to restart pyLoad?"
 msgstr ""
 
-#: src/pyload/webui/app/themes/modern/templates/js/settings.js:110
-#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:110
+#: src/pyload/webui/app/themes/modern/templates/js/settings.js:112
+#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:112
 msgid "Password successfully changed"
 msgstr ""
 
-#: src/pyload/webui/app/themes/modern/templates/js/settings.js:119
+#: src/pyload/webui/app/themes/modern/templates/js/settings.js:121
 #: src/pyload/webui/app/themes/modern/templates/js/settings.js:208
-#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:119
+#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:121
 #: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:208
 msgid "Passwords did not match."
 msgstr ""
 
-#: src/pyload/webui/app/themes/modern/templates/js/settings.js:154
-#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:154
+#: src/pyload/webui/app/themes/modern/templates/js/settings.js:156
+#: src/pyload/webui/app/themes/pyplex/templates/js/settings.js:156
 #, python-brace-format
 msgid "Are you sure you want to delete the user {}?"
 msgstr ""

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/plugins/accounts/DdownloadCom.py

@@ -6,7 +6,7 @@ from ..base.xfs_account import XFSAccount
 class DdownloadCom(XFSAccount):
     __name__ = "DdownloadCom"
     __type__ = "account"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__ = "testing"
 
     __description__ = """Ddownload.com account plugin"""
@@ -16,10 +16,10 @@ class DdownloadCom(XFSAccount):
     PLUGIN_DOMAIN = "ddownload.com"
     PLUGIN_URL = "http://ddownload.com"
 
-    PREMIUM_PATTERN = r">Premium Member<"
+    PREMIUM_PATTERN = r'<[^<]+ma-ultimate-pill[^>]+>Ultimate<'
     TRAFFIC_LEFT_PATTERN = r'\s*<span id="trafficValue">(?P<S>-?\d+)</span>'
     TRAFFIC_LEFT_UNIT = "MB"
-    VALID_UNTIL_PATTERN = r'class="expires">([\w ]+)<'
+    VALID_UNTIL_PATTERN = r'>Active until\s+([\w ]+[0-9]{4})<'
 
     def setup(self):
         super(DdownloadCom, self).setup()

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/plugins/addons/ClickNLoad.py

@@ -9,14 +9,13 @@ from pyload.core.utils.struct.lock import lock
 from pyload.core.utils.web.convert import host_to_ip
 
 from ..base.addon import BaseAddon, threaded
-from ..helpers import forward
 
 
 # TODO: IPv6 support
 class ClickNLoad(BaseAddon):
     __name__ = "ClickNLoad"
     __type__ = "addon"
-    __version__ = "0.65"
+    __version__ = "0.66"
     __status__ = "testing"
 
     __config__ = [
@@ -142,14 +141,53 @@ class ClickNLoad(BaseAddon):
                     self._("Server was not exited gracefully, shutdown forced")
                 )
 
+    @threaded
+    def _forward(self, source, destination, finished_event=None, recv_timeout=None, buffering=1024):
+        """
+        Forward data from one socket to another
+        """
+        source.settimeout(recv_timeout)
+        try:
+            while True:
+                try:
+                    data = source.recv(buffering)
+                    if not data:  # Peer closed the connection cleanly
+                        break
+
+                    try:
+                        destination.sendall(data)
+                    except (ConnectionResetError, BrokenPipeError, OSError) as e:
+                        break
+
+                except (ConnectionResetError, BrokenPipeError, OSError) as e:
+                    break
+
+        finally:
+            for sock in (source, destination):
+                if sock:
+                    #  Graceful shutdown
+                    try:
+                        sock.shutdown(socket.SHUT_RDWR)
+                    except OSError:
+                        pass  # Socket may already be closed
+
+        if finished_event:
+            finished_event.set()
+
     @lock
     @threaded
-    def forward(self, client_socket, backend_socket, queue=False):
+    def forward_request(self, client_socket, backend_socket, queue=False):
         if queue:
             old_ids = set(pack.pid for pack in self.pyload.api.get_collector())
 
-        forward(client_socket, backend_socket, recv_timeout=0.5)
-        forward(backend_socket, client_socket)
+        e1 = threading.Event()
+        e2 = threading.Event()
+        self._forward(client_socket, backend_socket, recv_timeout=0.75, finished_event=e1)
+        self._forward(backend_socket, client_socket, recv_timeout=0.75, finished_event=e2)
+
+        # Wait for both directions to finish
+        e1.wait()
+        e2.wait()
 
         if queue:
             new_ids = set(pack.pid for pack in self.pyload.api.get_collector())
@@ -235,14 +273,14 @@ class ClickNLoad(BaseAddon):
                                 context.verify_mode = ssl.CERT_NONE
                                 backend_socket = context.wrap_socket(backend_socket, server_hostname=self.web_addr[0])
 
-                            except Exception as exc:
+                            except ssl.SSLError as exc:
                                 self.log_error(self._("SSL error: {}").format(exc))
                                 client_socket.close()
                                 continue
 
                         backend_socket.connect(self.web_addr)
 
-                        self.forward(
+                        self.forward_request(
                             client_socket,
                             backend_socket,
                             self.config.get("dest") == "queue",

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev99}/src/pyload/plugins/addons/UserAgentSwitcher.py

@@ -28,9 +28,7 @@ class UserAgentSwitcher(BaseAddon):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
     def download_preparing(self, pyfile):
-        if not isinstance(pyfile.plugin.req, HTTPRequest) and not isinstance(
-            pyfile.plugin.req, Browser
-        ):
+        if not isinstance(pyfile.plugin.req, (HTTPRequest, Browser)):
             return
 
         connecttimeout = self.config.get("connecttimeout")