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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyload-ng
-Version: 0.5.0b3.dev97
+Version: 0.5.0b3.dev98
 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

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev98}/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

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev98}/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.dev98}/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.dev98}/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.dev98}/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.dev98}/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
 
@@ -213,9 +214,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.dev98}/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.dev98\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-15 22:37+0000\n"
+"PO-Revision-Date: 2026-04-15 22:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
 "Language-Team: en <LL@li.org>\n"
@@ -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.dev98}/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.dev98}/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")

pyload_ng-0.5.0b3.dev98/src/pyload/plugins/downloaders/DarkiboxCom.py

@@ -0,0 +1,241 @@
+import json
+import re
+
+from ..base.downloader import BaseDownloader
+
+
+class DarkiboxCom(BaseDownloader):
+    __name__ = "DarkiboxCom"
+    __type__ = "downloader"
+    __version__ = "0.01"
+    __status__ = "testing"
+
+    __pattern__ = r"https?://(?:www\.)?darkibox\.com/(?:d/|embed-)?(?P<ID>\w+)(?:\.html)?"
+    __config__ = [
+        ("enabled", "bool", "Activated", True),
+        ("api_key", "str", "Darkibox API key (optional)", ""),
+        (
+            "quality",
+            "Lowest;Highest",
+            "Preferred quality (for multi-quality MP4)",
+            "Highest",
+        ),
+    ]
+
+    __description__ = """Darkibox.com downloader plugin"""
+    __license__ = "GPLv3"
+    __authors__ = []
+
+    OFFLINE_PATTERN = r">File Not Found<|>The file was removed"
+
+    def setup(self):
+        self.multi_dl = True
+        self.chunk_limit = 1
+        self.resume_download = True
+
+    @staticmethod
+    def _unpack(packed):
+        """Unpack Dean Edwards' p.a.c.k.e.r. packed JavaScript."""
+        m = re.search(
+            r"eval\(function\(p,a,c,k,e,[dr]\)\{.*?\}\('(.+?)',(\d+),(\d+),'([^']+)'\.split\('\|'\)",
+            packed,
+            re.S,
+        )
+        if m is None:
+            return None
+
+        payload, radix, count, keywords = m.groups()
+        radix = int(radix)
+        count = int(count)
+        keywords = keywords.split("|")
+
+        def base_n(num, base):
+            """Convert a number to a base-N string (supports up to base 62)."""
+            digits = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            if num < 0:
+                return "-" + base_n(-num, base)
+            result = []
+            while num:
+                result.append(digits[num % base])
+                num //= base
+            return "".join(reversed(result)) or "0"
+
+        def replacer(match):
+            word = match.group(0)
+            for i, kw in enumerate(keywords):
+                if base_n(i, radix) == word:
+                    return kw if kw else word
+            return word
+
+        result = re.sub(r"\b\w+\b", replacer, payload)
+        return result
+
+    @staticmethod
+    def _extract_video_url(unpacked):
+        """Extract video URL from unpacked PlayerJS code.
+
+        Handles three formats:
+        - HLS: file:"https://...m3u8"
+        - Multi-quality MP4: file:"[label1]url1,[label2]url2"
+        - Direct URL: file:"https://...mp4"
+        """
+        m = re.search(r'file\s*:\s*"([^"]+)"', unpacked)
+        if m is None:
+            return None, None
+        file_value = m.group(1)
+        return file_value, None
+
+    @staticmethod
+    def _parse_multi_quality(file_value):
+        """Parse [label]url multi-quality format.
+
+        Returns list of (label, url) tuples sorted by label quality.
+        """
+        entries = re.findall(r"\[([^\]]+)\](https?://[^,\s\"]+)", file_value)
+        return entries
+
+    def _resolve_quality(self, entries):
+        """Pick a URL from multi-quality entries based on config."""
+        if not entries:
+            return None
+
+        def quality_key(entry):
+            m = re.search(r"(\d+)", entry[0])
+            return int(m.group(1)) if m else 0
+
+        entries_sorted = sorted(entries, key=quality_key)
+        desired = self.config.get("quality")
+        if desired == "Lowest":
+            return entries_sorted[0][1]
+        else:
+            return entries_sorted[-1][1]
+
+    def _handle_api(self, file_code):
+        """Try to get a direct link via the Darkibox API.
+
+        Returns a download URL string on success, or None if the API key is
+        not configured or the request fails.
+        """
+        api_key = self.config.get("api_key")
+        if not api_key:
+            return None
+
+        self.log_debug("Trying Darkibox API...")
+
+        # Fetch file info for the filename
+        try:
+            info_resp = self.load(
+                "https://darkibox.com/api/file/info",
+                get={"key": api_key, "file_code": file_code},
+            )
+            info_json = json.loads(info_resp)
+            if info_json.get("status") == 200:
+                result = info_json.get("result", {})
+                if isinstance(result, list) and result:
+                    result = result[0]
+                title = result.get("title") or result.get("name")
+                if title:
+                    if not re.search(r"\.\w{2,5}$", title):
+                        title += ".mp4"
+                    self.pyfile.name = title
+        except Exception as exc:
+            self.log_debug(f"API file info failed: {exc}")
+
+        # Fetch direct link
+        try:
+            dl_resp = self.load(
+                "https://darkibox.com/api/file/direct_link",
+                get={"key": api_key, "file_code": file_code},
+            )
+            dl_json = json.loads(dl_resp)
+            if dl_json.get("status") == 200:
+                result = dl_json.get("result", {})
+                versions = result.get("versions", [])
+                if versions:
+                    url = versions[0].get("url")
+                    if url:
+                        self.log_debug(f"API direct link obtained: {url[:80]}...")
+                        return url
+        except Exception as exc:
+            self.log_debug(f"API direct_link failed: {exc}")
+
+        return None
+
+    def _handle_embed(self, file_code):
+        """Get the download URL via the embed flow (no API key needed).
+
+        1. POST to /dl with embed parameters
+        2. Unpack the packed JavaScript in the response
+        3. Extract the video URL from the PlayerJS parameters
+        """
+        self.log_debug("Using embed flow...")
+
+        embed_url = f"https://darkibox.com/embed-{file_code}.html"
+
+        # Load the embed page first (sets cookies / referrer)
+        self.load(embed_url)
+
+        # POST to the /dl endpoint
+        data = self.load(
+            "https://darkibox.com/dl",
+            post={
+                "op": "embed",
+                "file_code": file_code,
+                "auto": "1",
+            },
+            ref=embed_url,
+        )
+
+        if not data:
+            self.fail("Empty response from embed endpoint")
+
+        # Try to find and unpack the packed JS
+        unpacked = self._unpack(data)
+        if unpacked is None:
+            # Maybe the response contains the URL directly
+            m = re.search(r'file\s*:\s*"([^"]+)"', data)
+            if m is None:
+                self.fail("Could not find packed JS or direct file URL in response")
+            file_value = m.group(1)
+        else:
+            file_value, _ = self._extract_video_url(unpacked)
+            if file_value is None:
+                self.fail("Could not extract video URL from unpacked JS")
+
+        # Determine URL type
+        if re.search(r"\[.+?\]https?://", file_value):
+            # Multi-quality MP4
+            entries = self._parse_multi_quality(file_value)
+            if not entries:
+                self.fail("Could not parse multi-quality entries")
+            url = self._resolve_quality(entries)
+        else:
+            # HLS m3u8 or direct URL
+            url = file_value
+
+        return url
+
+    def process(self, pyfile):
+        file_code = re.match(self.__pattern__, pyfile.url).group("ID")
+
+        # Set a default filename
+        pyfile.name = f"{file_code}.mp4"
+
+        # Try API first if configured
+        url = self._handle_api(file_code)
+
+        # Fall back to embed flow
+        if not url:
+            url = self._handle_embed(file_code)
+
+        if not url:
+            self.fail("Could not obtain download URL")
+
+        self.log_debug(f"Downloading from: {url[:80]}...")
+
+        # Try to extract a nicer filename from the URL
+        m = re.search(r"/([^/]+\.(?:mp4|mkv|avi|m3u8))(?:\?|$)", url, re.I)
+        if m and pyfile.name == f"{file_code}.mp4":
+            pyfile.name = m.group(1)
+
+        self.download(url)

{pyload_ng-0.5.0b3.dev97 → pyload_ng-0.5.0b3.dev98}/src/pyload/plugins/downloaders/MegaCoNz.py

@@ -342,7 +342,7 @@ class MegaClient:
 class MegaCoNz(BaseDownloader):
     __name__ = "MegaCoNz"
     __type__ = "downloader"
-    __version__ = "0.59"
+    __version__ = "0.60"
     __status__ = "testing"
 
     __pattern__ = r"https?://(?:www\.)?mega(?:\.co)?\.nz/(?:file/(?P<ID1>[\w^_]+)#(?P<K1>[\w\-,=]+)|folder/(?P<ID2>[\w^_]+)#(?P<K2>[\w\-,=]+)/file/(?P<NID>[\w^_]+)|#!(?P<ID3>[\w^_]+)!(?P<K3>[\w\-,=]+))"
@@ -487,6 +487,32 @@ class MegaCoNz(BaseDownloader):
                 self.pyfile.name = name
                 self.skip(self._("File exists."))
 
+    def find_root_node(self, res_f):
+        """
+        Build a tree of the folder nodes. Return the handle of the top-most node.
+        """
+        tree = {}
+        for node in res_f:
+            if node['t'] == 1 and node['h'] and node['p']:
+                tree[node['h']] = node['p']
+
+        for key, val in tree.items():
+            if val not in tree:
+                return key
+
+    def build_key_dict(self, node_k):
+        """
+        Take a node's k value, and produce a dictionary.
+        """
+        dict = {}
+        node_k = node_k.split('/')
+        for key_data in node_k:
+            h = key_data[:key_data.index(':')]
+            l = key_data[key_data.index(':') + 1:]
+            dict[h] = l
+
+        return dict
+
     def process(self, pyfile):
         node_id = self.info['pattern']['NID']
         public = node_id in ("", None)
@@ -511,9 +537,17 @@ class MegaCoNz(BaseDownloader):
             elif isinstance(res, dict) and 'e' in res:
                 mega.check_error(res['e'])
 
+            root_handle = self.find_root_node(res['f'])
+            self.log_debug("Root Folder Handle: {}".format(root_handle))
             for node in res['f']:
                 if node['t'] == 0 and ":" in node["k"] and node['h'] == node_id:
-                    master_key = MegaCrypto.decrypt_key(node['k'][node['k'].index(':') + 1:], master_key)
+                    keys = self.build_key_dict(node['k'])
+                    file_key = keys.get(root_handle)
+                    if not file_key:
+                        self.log_error(self._("Root folder handle not found in file keys"))
+                        self.fail(self._("Root folder handle not found in file keys"))
+
+                    master_key = MegaCrypto.decrypt_key(file_key, master_key)
                     break
 
             else: