quasarr 0.1.6__py3-none-any.whl → 1.23.0__py3-none-any.whl

quasarr/providers/shared_state.py

@@ -2,16 +2,43 @@
 # Quasarr
 # Project by https://github.com/rix1337
 
+import json
 import os
+import re
 import time
+import traceback
+from datetime import datetime, timedelta, date
+from urllib import parse
 
+import quasarr
+from quasarr.providers.log import info, debug
+from quasarr.providers.myjd_api import Myjdapi, TokenExpiredException, RequestTimeoutException, MYJDException, Jddevice
 from quasarr.storage.config import Config
 from quasarr.storage.sqlite_database import DataBase
-from quasarr.providers.myjd_api import Myjdapi, TokenExpiredException, RequestTimeoutException, MYJDException, Jddevice
 
 values = {}
 lock = None
 
+# regex to detect season/episode tags for series filtering during search
+SEASON_EP_REGEX = re.compile(r"(?i)(?:S\d{1,3}(?:E\d{1,3}(?:-\d{1,3})?)?|S\d{1,3}-\d{1,3})")
+# regex to filter out season/episode tags for movies
+MOVIE_REGEX = re.compile(r"^(?!.*(?:S\d{1,3}(?:E\d{1,3}(?:-\d{1,3})?)?|S\d{1,3}-\d{1,3})).*$", re.IGNORECASE)
+# List of known file hosters that should not be used as search/feed sites
+SHARE_HOSTERS = {
+    "rapidgator",
+    "ddownload",
+    "keep2share",
+    "1fichier",
+    "katfile",
+    "filer",
+    "turbobit",
+    "nitroflare",
+    "filefactory",
+    "uptobox",
+    "mediafire",
+    "mega",
+}
+
 
 def set_state(manager_dict, manager_lock):
     global values
@@ -30,10 +57,6 @@ def update(key, value):
         lock.release()
 
 
-def set_sites():
-    update("sites", ["DW", "FX", "NX"])
-
-
 def set_connection_info(internal_address, external_address, port):
     if internal_address.count(":") < 2:
         internal_address = f"{internal_address}:{port}"
@@ -47,13 +70,54 @@ def set_files(config_path):
     update("dbfile", os.path.join(config_path, "Quasarr.db"))
 
 
+def generate_api_key():
+    api_key = os.urandom(32).hex()
+    Config('API').save("key", api_key)
+    info(f'API key replaced with: "{api_key}!"')
+    return api_key
+
+
+def extract_valid_hostname(url, shorthand):
+    try:
+        if '://' not in url:
+            url = 'http://' + url
+        result = parse.urlparse(url)
+        domain = result.netloc
+        parts = domain.split('.')
+
+        if domain.startswith(".") or domain.endswith(".") or "." not in domain[1:-1]:
+            message = f'Error: "{domain}" must contain a "." somewhere in the middle – you need to provide a full domain name!'
+            domain = None
+
+        elif any(hoster in parts for hoster in SHARE_HOSTERS):
+            offending = next(host for host in parts if host in SHARE_HOSTERS)
+            message = (
+                f'Error: "{domain}" is a file‑hosting domain and cannot be used here directly! '
+                f'Instead please provide a valid hostname that serves direct file links (including "{offending}").'
+            )
+            domain = None
+
+        elif all(char in domain for char in shorthand):
+            message = f'"{domain}" contains both characters from shorthand "{shorthand}". Continuing...'
+
+        else:
+            message = f'Error: "{domain}" does not contain both characters from shorthand "{shorthand}".'
+            domain = None
+    except Exception as e:
+        message = f"Error: {e}. Please provide a valid URL."
+        domain = None
+
+    print(message)
+    return {"domain": domain, "message": message}
+
+
 def connect_to_jd(jd, user, password, device_name):
     try:
         jd.connect(user, password)
         jd.update_devices()
         device = jd.get_device(device_name)
     except (TokenExpiredException, RequestTimeoutException, MYJDException) as e:
-        print("Error connecting to JDownloader: " + str(e))
+        info("Error connecting to JDownloader: " + str(e).strip())
         return False
     if not device or not isinstance(device, (type, Jddevice)):
         return False
@@ -61,9 +125,9 @@ def connect_to_jd(jd, user, password, device_name):
         device.downloadcontroller.get_current_state()  # request forces direct_connection info update
         connection_info = device.check_direct_connection()
         if connection_info["status"]:
-            print(f'Direct connection to JDownloader established: "{connection_info['ip']}"')
+            info(f'Direct connection to JDownloader established: "{connection_info['ip']}"')
         else:
-            print("Could not establish direct connection to JDownloader.")
+            info("Could not establish direct connection to JDownloader.")
         update("device", device)
         return True
 
@@ -124,6 +188,7 @@ def connect_device():
 
 def get_device():
     attempts = 0
+    last_backoff_change = 0  # Track when we last changed backoff strategy
 
     while True:
         try:
@@ -135,14 +200,30 @@ def get_device():
 
         update("device", False)
 
-        if attempts % 10 == 0:
-            print(
-                f"WARNUNG: {attempts} aufeinanderfolgende JDownloader Verbindungsfehler. Bitte prüfen und ggf. neu starten!")
-        time.sleep(3)
+        # Determine sleep time based on failure count
+        if attempts <= 10:
+            # First 10 failures: 3 seconds
+            sleep_time = 3
+            if attempts == 10:
+                info(f"WARNING: {attempts} consecutive JDownloader connection errors. Switching to 1-minute intervals.")
+        elif attempts <= 15:
+            # Next 5 failures (11-15): 1 minute
+            sleep_time = 60
+            if attempts % 10 == 0:
+                info(f"WARNING: {attempts} consecutive JDownloader connection errors. Please check your credentials!")
+            if attempts == 15:
+                info(f"WARNING: Still failing after {attempts} attempts. Switching to 5-minute intervals.")
+        else:
+            # After 15 failures: 5 minutes
+            sleep_time = 300
+            if attempts % 10 == 0:
+                info(f"WARNING: {attempts} consecutive JDownloader connection errors. Please check your credentials!")
 
         if connect_device():
             break
 
+        time.sleep(sleep_time)
+
     return values["device"]
 
 
@@ -155,10 +236,216 @@ def get_devices(user, password):
         devices = jd.list_devices()
         return devices
     except (TokenExpiredException, RequestTimeoutException, MYJDException) as e:
-        print("Error connecting to JDownloader: " + str(e))
+        info("Error connecting to JDownloader: " + str(e))
         return []
 
 
+def set_device_settings():
+    device = get_device()
+
+    settings_to_enforce = [
+        {
+            "namespace": "org.jdownloader.settings.GeneralSettings",
+            "storage": None,
+            "setting": "AutoStartDownloadOption",
+            "expected_value": "ALWAYS",  # Downloads must start automatically for Quasarr to work
+        },
+        {
+            "namespace": "org.jdownloader.settings.GeneralSettings",
+            "storage": None,
+            "setting": "IfFileExistsAction",
+            "expected_value": "SKIP_FILE",  # Prevents popups during download
+        },
+        {
+            "namespace": "org.jdownloader.settings.GeneralSettings",
+            "storage": None,
+            "setting": "CleanupAfterDownloadAction",
+            "expected_value": "NEVER",  # Links must be kept after download for Quasarr to work
+        },
+        {
+            "namespace": "org.jdownloader.settings.GraphicalUserInterfaceSettings",
+            "storage": None,
+            "setting": "BannerEnabled",
+            "expected_value": False,  # Removes UI clutter in JDownloader
+        },
+        {
+            "namespace": "org.jdownloader.settings.GraphicalUserInterfaceSettings",
+            "storage": None,
+            "setting": "DonateButtonState",
+            "expected_value": "CUSTOM_HIDDEN",  # Removes UI clutter in JDownloader
+        },
+        {
+            "namespace": "org.jdownloader.extensions.extraction.ExtractionConfig",
+            "storage": "cfg/org.jdownloader.extensions.extraction.ExtractionExtension",
+            "setting": "DeleteArchiveFilesAfterExtractionAction",
+            "expected_value": "NULL",  # "NULL" is the ENUM for "Delete files from Harddisk"
+        },
+        {
+            "namespace": "org.jdownloader.extensions.extraction.ExtractionConfig",
+            "storage": "cfg/org.jdownloader.extensions.extraction.ExtractionExtension",
+            "setting": "IfFileExistsAction",
+            "expected_value": "OVERWRITE_FILE",  # Prevents popups during extraction
+        },
+        {
+            "namespace": "org.jdownloader.extensions.extraction.ExtractionConfig",
+            "storage": "cfg/org.jdownloader.extensions.extraction.ExtractionExtension",
+            "setting": "DeleteArchiveDownloadlinksAfterExtraction",
+            "expected_value": False,  # Links must be kept after extraction for Quasarr to work
+        },
+        {
+            "namespace": "org.jdownloader.gui.views.linkgrabber.addlinksdialog.LinkgrabberSettings",
+            "storage": None,
+            "setting": "OfflinePackageEnabled",
+            "expected_value": False,  # Don't move offline links to extra package
+        },
+        {
+            "namespace": "org.jdownloader.gui.views.linkgrabber.addlinksdialog.LinkgrabberSettings",
+            "storage": None,
+            "setting": "HandleOfflineOnConfirmLatestSelection",
+            "expected_value": "INCLUDE_OFFLINE",  # Offline links must always be kept for Quasarr to handle packages
+        },
+        {
+            "namespace": "org.jdownloader.gui.views.linkgrabber.addlinksdialog.LinkgrabberSettings",
+            "storage": None,
+            "setting": "AutoConfirmManagerHandleOffline",
+            "expected_value": "INCLUDE_OFFLINE",  # Offline links must always be kept for Quasarr to handle packages
+        },
+        {
+            "namespace": "org.jdownloader.gui.views.linkgrabber.addlinksdialog.LinkgrabberSettings",
+            "storage": None,
+            "setting": "DefaultOnAddedOfflineLinksAction",
+            "expected_value": "INCLUDE_OFFLINE",  # Offline links must always be kept for Quasarr to handle packages
+        },
+    ]
+
+    for setting in settings_to_enforce:
+        namespace = setting["namespace"]
+        storage = setting["storage"] or "null"
+        name = setting["setting"]
+        expected_value = setting["expected_value"]
+
+        settings = device.config.get(namespace, storage, name)
+
+        if settings != expected_value:
+            success = device.config.set(namespace, storage, name, expected_value)
+
+            location = f"{namespace}/{storage}" if storage != "null" else namespace
+            status = "Updated" if success else "Failed to update"
+            info(f'{status} "{name}" in "{location}" to "{expected_value}".')
+
+    settings_to_add = [
+        {
+            "namespace": "org.jdownloader.extensions.extraction.ExtractionConfig",
+            "storage": "cfg/org.jdownloader.extensions.extraction.ExtractionExtension",
+            "setting": "BlacklistPatterns",
+            "expected_values": [
+                '.*sample/.*',
+                '.*Sample/.*',
+                '.*\\.jpe?g',
+                '.*\\.idx',
+                '.*\\.sub',
+                '.*\\.srt',
+                '.*\\.nfo',
+                '.*\\.bat',
+                '.*\\.txt',
+                '.*\\.exe',
+                '.*\\.sfv'
+            ]
+        },
+        {
+            "namespace": "org.jdownloader.controlling.filter.LinkFilterSettings",
+            "storage": "null",
+            "setting": "FilterList",
+            "expected_values": [
+                {'conditionFilter':
+                     {'conditions': [], 'enabled': False, 'matchType': 'IS_TRUE'}, 'created': 0,
+                 'enabled': True,
+                 'filenameFilter': {
+                     'enabled': True,
+                     'matchType': 'CONTAINS',
+                     'regex': '.*\\.(sfv|jpe?g|idx|srt|nfo|bat|txt|exe)',
+                     'useRegex': True
+                 },
+                 'filesizeFilter': {'enabled': False, 'from': 0, 'matchType': 'BETWEEN', 'to': 0},
+                 'filetypeFilter': {'archivesEnabled': False, 'audioFilesEnabled': False, 'customs': None,
+                                    'docFilesEnabled': False, 'enabled': False, 'exeFilesEnabled': False,
+                                    'hashEnabled': False, 'imagesEnabled': False, 'matchType': 'IS',
+                                    'subFilesEnabled': False, 'useRegex': False, 'videoFilesEnabled': False},
+                 'hosterURLFilter': {'enabled': False, 'matchType': 'CONTAINS', 'regex': '', 'useRegex': False},
+                 'matchAlwaysFilter': {'enabled': False}, 'name': 'Quasarr_Block_Files',
+                 'onlineStatusFilter': {'enabled': False, 'matchType': 'IS', 'onlineStatus': 'OFFLINE'},
+                 'originFilter': {'enabled': False, 'matchType': 'IS', 'origins': []},
+                 'packagenameFilter': {'enabled': False, 'matchType': 'CONTAINS', 'regex': '', 'useRegex': False},
+                 'pluginStatusFilter': {'enabled': False, 'matchType': 'IS', 'pluginStatus': 'PREMIUM'},
+                 'sourceURLFilter': {'enabled': False, 'matchType': 'CONTAINS', 'regex': '', 'useRegex': False},
+                 'testUrl': ''}]
+        },
+    ]
+
+    for setting in settings_to_add:
+        namespace = setting["namespace"]
+        storage = setting["storage"] or "null"
+        name = setting["setting"]
+        expected_values = setting["expected_values"]
+
+        added_items = 0
+        settings = device.config.get(namespace, storage, name)
+        for item in expected_values:
+            if item not in settings:
+                settings.append(item)
+                added_items += 1
+
+        if added_items:
+            success = device.config.set(namespace, storage, name, json.dumps(settings))
+
+            location = f"{namespace}/{storage}" if storage != "null" else namespace
+            status = "Added" if success else "Failed to add"
+            info(f'{status} {added_items} items to "{name}" in "{location}".')
+
+
+def update_jdownloader():
+    try:
+        if not get_device():
+            set_device_from_config()
+        device = get_device()
+
+        if device:
+            try:
+                current_state = device.downloadcontroller.get_current_state()
+                is_collecting = device.linkgrabber.is_collecting()
+                update_available = device.update.update_available()
+
+                if (current_state.lower() == "idle") and (not is_collecting and update_available):
+                    info("JDownloader update ready. Starting update...")
+                    device.update.restart_and_update()
+            except quasarr.providers.myjd_api.TokenExpiredException:
+                return False
+            return True
+        else:
+            return False
+    except quasarr.providers.myjd_api.MYJDException as e:
+        info(f"Error updating JDownloader: {e}")
+        return False
+
+
+def start_downloads():
+    try:
+        if not get_device():
+            set_device_from_config()
+        device = get_device()
+
+        if device:
+            try:
+                return device.downloadcontroller.start_downloads()
+            except quasarr.providers.myjd_api.TokenExpiredException:
+                return False
+        else:
+            return False
+    except quasarr.providers.myjd_api.MYJDException as e:
+        info(f"Error starting Downloads: {e}")
+        return False
+
+
 def get_db(table):
     return DataBase(table)
 
@@ -184,12 +471,365 @@ def convert_to_mb(item):
     return int(size_mb)
 
 
+def sanitize_title(title: str) -> str:
+    umlaut_map = {
+        "Ä": "Ae", "ä": "ae",
+        "Ö": "Oe", "ö": "oe",
+        "Ü": "Ue", "ü": "ue",
+        "ß": "ss"
+    }
+    for umlaut, replacement in umlaut_map.items():
+        title = title.replace(umlaut, replacement)
+
+    title = title.encode("ascii", errors="ignore").decode()
+
+    # Replace slashes and spaces with dots
+    title = title.replace("/", "").replace(" ", ".")
+    title = title.strip(".")  # no leading/trailing dots
+    title = title.replace(".-.", "-")  # .-. → -
+
+    # Finally, drop any chars except letters, digits, dots, hyphens, ampersands
+    title = re.sub(r"[^A-Za-z0-9.\-&]", "", title)
+
+    # remove any repeated dots
+    title = re.sub(r"\.{2,}", ".", title)
+    return title
+
+
+def sanitize_string(s):
+    s = s.lower()
+
+    # Remove dots / pluses
+    s = s.replace('.', ' ')
+    s = s.replace('+', ' ')
+    s = s.replace('_', ' ')
+    s = s.replace('-', ' ')
+
+    # Umlauts
+    s = re.sub(r'ä', 'ae', s)
+    s = re.sub(r'ö', 'oe', s)
+    s = re.sub(r'ü', 'ue', s)
+    s = re.sub(r'ß', 'ss', s)
+
+    # Remove special characters
+    s = re.sub(r'[^a-zA-Z0-9\s]', '', s)
+
+    # Remove season and episode patterns
+    s = re.sub(r'\bs\d{1,3}(e\d{1,3})?\b', '', s)
+
+    # Remove German and English articles
+    articles = r'\b(?:der|die|das|ein|eine|einer|eines|einem|einen|the|a|an|and)\b'
+    s = re.sub(articles, '', s, re.IGNORECASE)
+
+    # Replace obsolete titles
+    s = s.replace('navy cis', 'ncis')
+
+    # Remove extra whitespace
+    s = ' '.join(s.split())
+
+    return s
+
+
+def search_string_in_sanitized_title(search_string, title):
+    sanitized_search_string = sanitize_string(search_string)
+    sanitized_title = sanitize_string(title)
+
+    # Use word boundaries to ensure full word/phrase match
+    if re.search(rf'\b{re.escape(sanitized_search_string)}\b', sanitized_title):
+        debug(f"Matched search string: {sanitized_search_string} with title: {sanitized_title}")
+        return True
+    else:
+        debug(f"Skipping {title} as it doesn't match search string: {sanitized_search_string}")
+        return False
+
+
+def is_imdb_id(search_string):
+    if bool(re.fullmatch(r"tt\d{7,}", search_string)):
+        return search_string
+    else:
+        return None
+
+
+def match_in_title(title: str, season: int = None, episode: int = None) -> bool:
+    # ensure season/episode are ints (or None)
+    if isinstance(season, str):
+        try:
+            season = int(season)
+        except ValueError:
+            season = None
+    if isinstance(episode, str):
+        try:
+            episode = int(episode)
+        except ValueError:
+            episode = None
+
+    pattern = re.compile(
+        r"(?i)(?:\.|^)[sS](\d+)(?:-(\d+))?"  # season or season‑range
+        r"(?:[eE](\d+)(?:-(?:[eE]?)(\d+))?)?"  # episode or episode‑range
+        r"(?=[\.-]|$)"
+    )
+
+    matches = pattern.findall(title)
+    if not matches:
+        return False
+
+    for s_start, s_end, e_start, e_end in matches:
+        se_start, se_end = int(s_start), int(s_end or s_start)
+
+        # if a season was requested, ensure it falls in the range
+        if season is not None and not (se_start <= season <= se_end):
+            continue
+
+        # if no episode requested, only accept if the title itself had no episode tag
+        if episode is None:
+            if not e_start:
+                return True
+            else:
+                # title did specify an episode — skip this match
+                continue
+
+        # episode was requested, so title must supply one
+        if not e_start:
+            continue
+
+        ep_start, ep_end = int(e_start), int(e_end or e_start)
+        if ep_start <= episode <= ep_end:
+            return True
+
+    return False
+
+
+def is_valid_release(title: str,
+                     request_from: str,
+                     search_string: str,
+                     season: int = None,
+                     episode: int = None) -> bool:
+    """
+    Return True if the given release title is valid for the given search parameters.
+    - title: the release title to test
+    - request_from: user agent, contains 'Radarr' for movie searches or 'Sonarr' for TV searches
+    - search_string: the original search phrase (could be an IMDb id or plain text)
+    - season: desired season number (or None)
+    - episode: desired episode number (or None)
+    """
+    try:
+        # Determine whether this is a movie or TV search
+        rf = request_from.lower()
+        is_movie_search = 'radarr' in rf
+        is_tv_search = 'sonarr' in rf
+        is_docs_search = 'lazylibrarian' in rf
+
+        # if search string is NOT an imdb id check search_string_in_sanitized_title - if not match, its not valid
+        if not is_docs_search and not is_imdb_id(search_string):
+            if not search_string_in_sanitized_title(search_string, title):
+                debug(f"Skipping {title!r} as it doesn't match sanitized search string: {search_string!r}")
+                return False
+
+        # if it's a movie search, don't allow any TV show titles (check for NO season or episode tags in the title)
+        if is_movie_search:
+            if not MOVIE_REGEX.match(title):
+                debug(f"Skipping {title!r} as title doesn't match movie regex: {MOVIE_REGEX.pattern}")
+                return False
+            return True
+
+        # if it's a TV show search, don't allow any movies (check for season or episode tags in the title)
+        if is_tv_search:
+            # must have some S/E tag present
+            if not SEASON_EP_REGEX.search(title):
+                debug(f"Skipping {title!r} as title doesn't match TV show regex: {SEASON_EP_REGEX.pattern}")
+                return False
+            # if caller specified a season or episode, double‑check the match
+            if season is not None or episode is not None:
+                if not match_in_title(title, season, episode):
+                    debug(f"Skipping {title!r} as it doesn't match season {season} and episode {episode}")
+                    return False
+            return True
+
+        # if it's a document search, it should not contain Movie or TV show tags
+        if is_docs_search:
+            # must NOT have any S/E tag present
+            if SEASON_EP_REGEX.search(title):
+                debug(f"Skipping {title!r} as title matches TV show regex: {SEASON_EP_REGEX.pattern}")
+                return False
+            return True
+
+        # unknown search source — reject by default
+        debug(f"Skipping {title!r} as search source is unknown: {request_from!r}")
+        return False
+
+    except Exception as e:
+        # log exception message and short stack trace
+        tb = traceback.format_exc()
+        debug(f"Exception in is_valid_release: {e!r}\n{tb}"
+              f"is_valid_release called with "
+              f"title={title!r}, request_from={request_from!r}, "
+              f"search_string={search_string!r}, season={season!r}, episode={episode!r}")
+        return False
+
+
+def normalize_magazine_title(title: str) -> str:
+    """
+    Massage magazine titles so LazyLibrarian's parser can pick up dates reliably:
+    - Convert date-like patterns into space-delimited numeric tokens (YYYY MM DD or YYYY MM).
+    - Handle malformed "DD.YYYY.YYYY" cases (e.g., 04.2006.2025 → 2025 06 04).
+    - Convert two-part month-year like "3.25" into YYYY MM.
+    - Convert "No/Nr/Sonderheft X.YYYY" when X≤12 into YYYY MM.
+    - Preserve pure issue/volume prefixes and other digit runs untouched.
+    """
+    title = title.strip()
+
+    # 0) Bug: DD.YYYY.YYYY -> treat second YYYY's last two digits as month
+    def repl_bug(match):
+        d = int(match.group(1))
+        m_hint = match.group(2)
+        y = int(match.group(3))
+        m = int(m_hint[-2:])
+        try:
+            date(y, m, d)
+            return f"{y:04d} {m:02d} {d:02d}"
+        except ValueError:
+            return match.group(0)
+
+    title = re.sub(r"\b(\d{1,2})\.(20\d{2})\.(20\d{2})\b", repl_bug, title)
+
+    # 1) DD.MM.YYYY -> "YYYY MM DD"
+    def repl_dmy(match):
+        d, m, y = map(int, match.groups())
+        try:
+            date(y, m, d)
+            return f"{y:04d} {m:02d} {d:02d}"
+        except ValueError:
+            return match.group(0)
+
+    title = re.sub(r"\b(\d{1,2})\.(\d{1,2})\.(\d{4})\b", repl_dmy, title)
+
+    # 2) DD[.]? MonthName YYYY (optional 'vom') -> "YYYY MM DD"
+    def repl_dmony(match):
+        d = int(match.group(1))
+        name = match.group(2)
+        y = int(match.group(3))
+        mm = _month_num(name)
+        if mm:
+            try:
+                date(y, mm, d)
+                return f"{y:04d} {mm:02d} {d:02d}"
+            except ValueError:
+                pass
+        return match.group(0)
+
+    title = re.sub(
+        r"\b(?:vom\s*)?(\d{1,2})\.?\s+([A-Za-zÄÖÜäöüß]+)\s+(\d{4})\b",
+        repl_dmony,
+        title,
+        flags=re.IGNORECASE
+    )
+
+    # 3) MonthName YYYY -> "YYYY MM"
+    def repl_mony(match):
+        name = match.group(1)
+        y = int(match.group(2))
+        mm = _month_num(name)
+        if mm:
+            try:
+                date(y, mm, 1)
+                return f"{y:04d} {mm:02d}"
+            except ValueError:
+                pass
+        return match.group(0)
+
+    title = re.sub(r"\b([A-Za-zÄÖÜäöüß]+)\s+(\d{4})\b", repl_mony, title, flags=re.IGNORECASE)
+
+    # 4) YYYYMMDD -> "YYYY MM DD"
+    def repl_ymd(match):
+        y = int(match.group(1))
+        m = int(match.group(2))
+        d = int(match.group(3))
+        try:
+            date(y, m, d)
+            return f"{y:04d} {m:02d} {d:02d}"
+        except ValueError:
+            return match.group(0)
+
+    title = re.sub(r"\b(20\d{2})(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\b", repl_ymd, title)
+
+    # 5) YYYYMM -> "YYYY MM"
+    def repl_ym(match):
+        y = int(match.group(1))
+        m = int(match.group(2))
+        try:
+            date(y, m, 1)
+            return f"{y:04d} {m:02d}"
+        except ValueError:
+            return match.group(0)
+
+    title = re.sub(r"\b(20\d{2})(0[1-9]|1[0-2])\b", repl_ym, title)
+
+    # 6) X.YY (month.two-digit-year) -> "YYYY MM" (e.g., 3.25 -> 2025 03)
+    def repl_my2(match):
+        mm = int(match.group(1))
+        yy = int(match.group(2))
+        y = 2000 + yy
+        if 1 <= mm <= 12:
+            try:
+                date(y, mm, 1)
+                return f"{y:04d} {mm:02d}"
+            except ValueError:
+                pass
+        return match.group(0)
+
+    title = re.sub(r"\b([1-9]|1[0-2])\.(\d{2})\b", repl_my2, title)
+
+    # 7) No/Nr/Sonderheft <1-12>.<YYYY> -> "YYYY MM"
+    def repl_nmy(match):
+        num = int(match.group(1))
+        y = int(match.group(2))
+        if 1 <= num <= 12:
+            try:
+                date(y, num, 1)
+                return f"{y:04d} {num:02d}"
+            except ValueError:
+                pass
+        return match.group(0)
+
+    title = re.sub(
+        r"\b(?:No|Nr|Sonderheft)\s*(\d{1,2})\.(\d{4})\b",
+        repl_nmy,
+        title,
+        flags=re.IGNORECASE
+    )
+
+    return title
+
+
+# Helper for month name mapping
+def _month_num(name: str) -> int:
+    name = name.lower()
+    mmap = {
+        'januar': 1, 'jan': 1, 'februar': 2, 'feb': 2, 'märz': 3, 'maerz': 3, 'mär': 3, 'mrz': 3, 'mae': 3,
+        'april': 4, 'apr': 4, 'mai': 5, 'juni': 6, 'jun': 6, 'juli': 7, 'jul': 7, 'august': 8, 'aug': 8,
+        'september': 9, 'sep': 9, 'oktober': 10, 'okt': 10, 'november': 11, 'nov': 11, 'dezember': 12, 'dez': 12,
+        'january': 1, 'february': 2, 'march': 3, 'april': 4, 'may': 5, 'june': 6, 'july': 7, 'august': 8,
+        'september': 9, 'october': 10, 'november': 11, 'december': 12
+    }
+    return mmap.get(name)
+
+
+def get_recently_searched(shared_state, context, timeout_seconds):
+    recently_searched = shared_state.values.get(context, {})
+    threshold = datetime.now() - timedelta(seconds=timeout_seconds)
+    keys_to_remove = [key for key, value in recently_searched.items() if value["timestamp"] <= threshold]
+    for key in keys_to_remove:
+        debug(f"Removing '{key}' from recently searched memory ({context})...")
+        del recently_searched[key]
+    return recently_searched
+
+
 def download_package(links, title, password, package_id):
     device = get_device()
-    added = device.linkgrabber.add_links(params=[
+    downloaded = device.linkgrabber.add_links(params=[
         {
             "autostart": False,
-            "links": str(links).replace(" ", ""),
+            "links": json.dumps(links),
             "packageName": title,
             "extractPassword": password,
             "priority": "DEFAULT",
@@ -199,67 +839,4 @@ def download_package(links, title, password, package_id):
             "overwritePackagizerRules": True
         }
     ])
-
-    package_uuids = []
-    link_ids = []
-    archive_id = None
-
-    for _ in range(30):
-        try:
-            collecting = device.linkgrabber.is_collecting()
-            if not collecting:
-                links = device.linkgrabber.query_links()
-                for link in links:
-                    if link["comment"] == package_id:
-                        link_id = link["uuid"]
-                        if link_id not in link_ids:
-                            link_ids.append(link_id)
-                        package_uuid = link["packageUUID"]
-                        if package_uuid not in package_uuids:
-                            package_uuids.append(package_uuid)
-
-                if link_ids and package_uuids:
-                    archive = device.extraction.get_archive_info(link_ids=link_ids, package_ids=package_uuids)
-                    if archive:
-                        archive_id = archive[0].get("archiveId", None)
-                        if archive_id:
-                            break  # Exit the loop as archive_id is found
-
-        except Exception as e:
-            print(f"An error occurred: {e}")
-
-        time.sleep(1)
-
-    if not link_ids and not package_uuids:
-        print(f"No links or packages found within 30 seconds! Adding {title} package failed.")
-        return False
-
-    if not archive_id:
-        print(f"Archive ID for {title} not found! Release may not be compressed.")
-    else:
-        settings = {
-            "autoExtract": True,
-            "removeDownloadLinksAfterExtraction": False,
-            "removeFilesAfterExtraction": True
-        }
-        settings_set = device.extraction.set_archive_settings(archive_id, archive_settings=settings)
-        if not settings_set:
-            print(f"Failed to set archive settings for {title}!")
-
-    time.sleep(3)
-    links = device.linkgrabber.query_links()
-    for link in links:
-        if link["comment"] == package_id:
-            link_id = link["uuid"]
-            if link_id not in link_ids:
-                link_ids.append(link_id)
-            package_uuid = link["packageUUID"]
-            if package_uuid not in package_uuids:
-                package_uuids.append(package_uuid)
-
-    try:
-        device.linkgrabber.move_to_downloadlist(link_ids, package_uuids)
-    except Exception as e:
-        print(f"Failed to start download for {title}: {e}")
-        return False
-    return True
+    return downloaded