quasarr 1.20.8__tar.gz → 1.21.0__tar.gz

{quasarr-1.20.8 → quasarr-1.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.20.8
+Version: 1.21.0
 Summary: Quasarr connects JDownloader with Radarr, Sonarr and LazyLibrarian. It also decrypts links protected by CAPTCHAs.
 Home-page: https://github.com/rix1337/Quasarr
 Author: rix1337
@@ -151,6 +151,7 @@ docker run -d \
   -e 'HOSTNAMES'='https://pastebin.com/raw/eX4Mpl3'
   -e 'SILENT'='True' \
   -e 'DEBUG'='' \
+  -e 'TZ'='Europe/Berlin' \
   ghcr.io/rix1337/quasarr:latest
   ```
 
@@ -163,6 +164,7 @@ docker run -d \
     * Must contain at least one valid Hostname per line `ab = xyz`
 * `SILENT` is optional and silences all discord notifications except for error messages from SponsorsHelper if `True`.
 * `DEBUG` is optional and enables debug logging if `True`.
+* `TZ` is optional, wrong timezone can cause HTTPS/SSL issues
 
 # Manual setup
 

{quasarr-1.20.8 → quasarr-1.21.0}/README.md

@@ -124,6 +124,7 @@ docker run -d \
   -e 'HOSTNAMES'='https://pastebin.com/raw/eX4Mpl3'
   -e 'SILENT'='True' \
   -e 'DEBUG'='' \
+  -e 'TZ'='Europe/Berlin' \
   ghcr.io/rix1337/quasarr:latest
   ```
 
@@ -136,6 +137,7 @@ docker run -d \
     * Must contain at least one valid Hostname per line `ab = xyz`
 * `SILENT` is optional and silences all discord notifications except for error messages from SponsorsHelper if `True`.
 * `DEBUG` is optional and enables debug logging if `True`.
+* `TZ` is optional, wrong timezone can cause HTTPS/SSL issues
 
 # Manual setup
 

{quasarr-1.20.8 → quasarr-1.21.0}/quasarr/__init__.py

@@ -181,6 +181,13 @@ def run():
             if not user or not password:
                 hostname_credentials_config(shared_state, "NX", nx)
 
+        dl = Config('Hostnames').get('dl')
+        if dl:
+            user = Config('DL').get('user')
+            password = Config('DL').get('password')
+            if not user or not password:
+                hostname_credentials_config(shared_state, "DL", dl)
+
         config = Config('JDownloader')
         user = config.get('user')
         password = config.get('password')

{quasarr-1.20.8 → quasarr-1.21.0}/quasarr/api/arr/__init__.py

@@ -340,13 +340,16 @@ def setup_arr_routes(app):
                         if not "lazylibrarian" in request_from.lower():
                             title = f'[{release.get("hostname", "").upper()}] {title}'
 
+                        # Get publication date - sources should provide valid dates
+                        pub_date = release.get("date", "").strip()
+
                         items += f'''
                         <item>
                             <title>{title}</title>
                             <guid isPermaLink="True">{release.get("link", "")}</guid>
                             <link>{release.get("link", "")}</link>
                             <comments>{source}</comments>
-                            <pubDate>{release.get("date", datetime.now().strftime("%a, %d %b %Y %H:%M:%S +0000"))}</pubDate>
+                            <pubDate>{pub_date}</pubDate>
                             <enclosure url="{release.get("link", "")}" length="{release.get("size", 0)}" type="application/x-nzb" />
                         </item>'''
 

{quasarr-1.20.8 → quasarr-1.21.0}/quasarr/downloads/__init__.py

@@ -12,6 +12,7 @@ from quasarr.downloads.sources.al import get_al_download_links
 from quasarr.downloads.sources.by import get_by_download_links
 from quasarr.downloads.sources.dd import get_dd_download_links
 from quasarr.downloads.sources.dj import get_dj_download_links
+from quasarr.downloads.sources.dl import get_dl_download_links
 from quasarr.downloads.sources.dt import get_dt_download_links
 from quasarr.downloads.sources.dw import get_dw_download_links
 from quasarr.downloads.sources.he import get_he_download_links
@@ -22,6 +23,7 @@ from quasarr.downloads.sources.sf import get_sf_download_links, resolve_sf_redir
 from quasarr.downloads.sources.sj import get_sj_download_links
 from quasarr.downloads.sources.sl import get_sl_download_links
 from quasarr.downloads.sources.wd import get_wd_download_links
+from quasarr.downloads.sources.wx import get_wx_download_links
 from quasarr.providers.log import info
 from quasarr.providers.notifications import send_discord_message
 from quasarr.providers.statistics import StatsHelper
@@ -77,6 +79,31 @@ def handle_protected(shared_state, title, password, package_id, imdb_id, url,
     return {"success": True, "title": title}
 
 
+def handle_hide(shared_state, title, password, package_id, imdb_id, url, links, label):
+    """
+    Attempt to decrypt hide.cx links and handle the result.
+    Returns a dict with 'handled' (bool) and 'result' (response dict or None).
+    """
+    decrypted = decrypt_links_if_hide(shared_state, links)
+
+    if not decrypted or decrypted.get("status") == "none":
+        return {"handled": False, "result": None}
+
+    status = decrypted.get("status", "error")
+    decrypted_links = decrypted.get("results", [])
+
+    if status == "success":
+        result = handle_unprotected(
+            shared_state, title, password, package_id, imdb_id, url,
+            links=decrypted_links, label=label
+        )
+        return {"handled": True, "result": result}
+    else:
+        fail(title, package_id, shared_state,
+             reason=f'Error decrypting hide.cx links for "{title}" on {label} - "{url}"')
+        return {"handled": True, "result": {"success": False, "title": title}}
+
+
 def handle_al(shared_state, title, password, package_id, imdb_id, url, mirror, size_mb):
     data = get_al_download_links(shared_state, url, mirror, title, password)
     links = data.get("links", [])
@@ -96,19 +123,12 @@ def handle_by(shared_state, title, password, package_id, imdb_id, url, mirror, s
              reason=f'Offline / no links found for "{title}" on BY - "{url}"')
         return {"success": False, "title": title}
 
-    decrypted = decrypt_links_if_hide(shared_state, links)
-    if decrypted and decrypted.get("status") != "none":
-        status = decrypted.get("status", "error")
-        links = decrypted.get("results", [])
-        if status == "success":
-            return handle_unprotected(
-                shared_state, title, password, package_id, imdb_id, url,
-                links=links, label='BY'
-            )
-        else:
-            fail(title, package_id, shared_state,
-                 reason=f'Error decrypting hide.cx links for "{title}" on BY - "{url}"')
-            return {"success": False, "title": title}
+    decrypt_result = handle_hide(
+        shared_state, title, password, package_id, imdb_id, url, links, 'BY'
+    )
+
+    if decrypt_result["handled"]:
+        return decrypt_result["result"]
 
     return handle_protected(
         shared_state, title, password, package_id, imdb_id, url,
@@ -119,6 +139,32 @@ def handle_by(shared_state, title, password, package_id, imdb_id, url, mirror, s
     )
 
 
+def handle_dl(shared_state, title, password, package_id, imdb_id, url, mirror, size_mb):
+    links, extracted_password = get_dl_download_links(shared_state, url, mirror, title)
+    if not links:
+        fail(title, package_id, shared_state,
+             reason=f'Offline / no links found for "{title}" on DL - "{url}"')
+        return {"success": False, "title": title}
+
+    # Use extracted password if available, otherwise fall back to provided password
+    final_password = extracted_password if extracted_password else password
+
+    decrypt_result = handle_hide(
+        shared_state, title, final_password, package_id, imdb_id, url, links, 'DL'
+    )
+
+    if decrypt_result["handled"]:
+        return decrypt_result["result"]
+
+    return handle_protected(
+        shared_state, title, final_password, package_id, imdb_id, url,
+        mirror=mirror,
+        size_mb=size_mb,
+        func=lambda ss, u, m, t: links,
+        label='DL'
+    )
+
+
 def handle_sf(shared_state, title, password, package_id, imdb_id, url, mirror, size_mb):
     if url.startswith(f"https://{shared_state.values['config']('Hostnames').get('sf')}/external"):
         url = resolve_sf_redirect(url, shared_state.values["user_agent"])
@@ -162,19 +208,12 @@ def handle_wd(shared_state, title, password, package_id, imdb_id, url, mirror, s
              reason=f'Offline / no links found for "{title}" on WD - "{url}"')
         return {"success": False, "title": title}
 
-    decrypted = decrypt_links_if_hide(shared_state, links)
-    if decrypted and decrypted.get("status") != "none":
-        status = decrypted.get("status", "error")
-        links = decrypted.get("results", [])
-        if status == "success":
-            return handle_unprotected(
-                shared_state, title, password, package_id, imdb_id, url,
-                links=links, label='WD'
-            )
-        else:
-            fail(title, package_id, shared_state,
-                 reason=f'Error decrypting hide.cx links for "{title}" on WD - "{url}"')
-            return {"success": False, "title": title}
+    decrypt_result = handle_hide(
+        shared_state, title, password, package_id, imdb_id, url, links, 'WD'
+    )
+
+    if decrypt_result["handled"]:
+        return decrypt_result["result"]
 
     return handle_protected(
         shared_state, title, password, package_id, imdb_id, url,
@@ -185,6 +224,29 @@ def handle_wd(shared_state, title, password, package_id, imdb_id, url, mirror, s
     )
 
 
+def handle_wx(shared_state, title, password, package_id, imdb_id, url, mirror, size_mb):
+    links = get_wx_download_links(shared_state, url, mirror, title)
+    if not links:
+        fail(title, package_id, shared_state,
+             reason=f'Offline / no links found for "{title}" on WX - "{url}"')
+        return {"success": False, "title": title}
+
+    decrypt_result = handle_hide(
+        shared_state, title, password, package_id, imdb_id, url, links, 'WX'
+    )
+
+    if decrypt_result["handled"]:
+        return decrypt_result["result"]
+
+    return handle_protected(
+        shared_state, title, password, package_id, imdb_id, url,
+        mirror=mirror,
+        size_mb=size_mb,
+        func=lambda ss, u, m, t: links,
+        label='WX'
+    )
+
+
 def download(shared_state, request_from, title, url, mirror, size_mb, password, imdb_id=None):
     if "lazylibrarian" in request_from.lower():
         category = "docs"
@@ -204,6 +266,7 @@ def download(shared_state, request_from, title, url, mirror, size_mb, password,
         'BY': config.get("by"),
         'DD': config.get("dd"),
         'DJ': config.get("dj"),
+        'DL': config.get("dl"),
         'DT': config.get("dt"),
         'DW': config.get("dw"),
         'HE': config.get("he"),
@@ -213,7 +276,8 @@ def download(shared_state, request_from, title, url, mirror, size_mb, password,
         'SF': config.get("sf"),
         'SJ': config.get("sj"),
         'SL': config.get("sl"),
-        'WD': config.get("wd")
+        'WD': config.get("wd"),
+        'WX': config.get("wx")
     }
 
     handlers = [
@@ -221,6 +285,7 @@ def download(shared_state, request_from, title, url, mirror, size_mb, password,
         (flags['BY'], handle_by),
         (flags['DD'], lambda *a: handle_unprotected(*a, func=get_dd_download_links, label='DD')),
         (flags['DJ'], lambda *a: handle_protected(*a, func=get_dj_download_links, label='DJ')),
+        (flags['DL'], handle_dl),
         (flags['DT'], lambda *a: handle_unprotected(*a, func=get_dt_download_links, label='DT')),
         (flags['DW'], lambda *a: handle_protected(*a, func=get_dw_download_links, label='DW')),
         (flags['HE'], lambda *a: handle_unprotected(*a, func=get_he_download_links, label='HE')),
@@ -231,6 +296,7 @@ def download(shared_state, request_from, title, url, mirror, size_mb, password,
         (flags['SJ'], lambda *a: handle_protected(*a, func=get_sj_download_links, label='SJ')),
         (flags['SL'], handle_sl),
         (flags['WD'], handle_wd),
+        (flags['WX'], handle_wx),
     ]
 
     for flag, fn in handlers:

quasarr-1.21.0/quasarr/downloads/sources/dl.py

@@ -0,0 +1,196 @@
+# -*- coding: utf-8 -*-
+# Quasarr
+# Project by https://github.com/rix1337
+
+import re
+
+from bs4 import BeautifulSoup
+
+from quasarr.providers.log import info, debug
+from quasarr.providers.sessions.dl import retrieve_and_validate_session, fetch_via_requests_session, invalidate_session
+
+hostname = "dl"
+
+
+def extract_password_from_post(soup, host):
+    """
+    Extract password from forum post using multiple strategies.
+    Returns empty string if no password found or if explicitly marked as 'no password'.
+    """
+    # Get flattened text from the post - collapse whitespace to single spaces
+    post_text = soup.get_text()
+    post_text = re.sub(r'\s+', ' ', post_text).strip()
+
+    # Strategy 1: Look for password label followed by the password value
+    # Pattern: "Passwort:" followed by optional separators, then the password
+    password_pattern = r'(?:passwort|password|pass|pw)[\s:]+([a-zA-Z0-9._-]{2,50})'
+    match = re.search(password_pattern, post_text, re.IGNORECASE)
+
+    if match:
+        password = match.group(1).strip()
+        # Skip if it looks like a section header or common word
+        if not re.match(r'^(?:download|mirror|link|episode|info|mediainfo|spoiler|hier|click|klick|kein|none|no)',
+                        password, re.IGNORECASE):
+            debug(f"Found password: {password}")
+            return password
+
+    # Strategy 2: Look for explicit "no password" indicators (only if no valid password found)
+    no_password_patterns = [
+        r'(?:passwort|password|pass|pw)[\s:]*(?:kein(?:es)?|none|no|nicht|not|nein|-|–|—)',
+        r'(?:kein(?:es)?|none|no|nicht|not|nein)\s*(?:passwort|password|pass|pw)',
+    ]
+
+    for pattern in no_password_patterns:
+        if re.search(pattern, post_text, re.IGNORECASE):
+            debug("No password required (explicitly stated)")
+            return ""
+
+    # Strategy 3: Default to hostname-based password
+    default_password = f"www.{host}"
+    debug(f"No password found, using default: {default_password}")
+    return default_password
+
+
+def extract_mirror_name_from_link(link_element):
+    """
+    Extract the mirror/hoster name from the link text or nearby text.
+    Returns the extracted name or None.
+    """
+    # Get the link text
+    link_text = link_element.get_text(strip=True)
+
+    # Try to extract a meaningful name from the link text
+    # Look for text that looks like a hoster name (alphanumeric, may contain numbers/dashes)
+    # Filter out common non-hoster words
+    common_non_hosters = {'download', 'mirror', 'link', 'hier', 'click', 'klick', 'code', 'spoiler'}
+
+    # Clean and extract potential mirror name
+    if link_text and len(link_text) > 2:
+        # Remove common symbols and whitespace
+        cleaned = re.sub(r'[^\w\s-]', '', link_text).strip().lower()
+
+        # If it's a single word or hyphenated word and not in common non-hosters
+        if cleaned and cleaned not in common_non_hosters:
+            # Extract the main part (first word if multiple)
+            main_part = cleaned.split()[0] if ' ' in cleaned else cleaned
+            if len(main_part) > 2:  # Must be at least 3 characters
+                return main_part
+
+    # Check if there's a bold tag or nearby text in parent
+    parent = link_element.parent
+    if parent:
+        parent_text = parent.get_text(strip=True)
+        # Look for text before the link that might be the mirror name
+        for sibling in link_element.previous_siblings:
+            if hasattr(sibling, 'get_text'):
+                sibling_text = sibling.get_text(strip=True).lower()
+                if sibling_text and len(sibling_text) > 2 and sibling_text not in common_non_hosters:
+                    cleaned = re.sub(r'[^\w\s-]', '', sibling_text).strip()
+                    if cleaned:
+                        return cleaned.split()[0] if ' ' in cleaned else cleaned
+
+    return None
+
+
+def extract_links_and_password_from_post(post_content, host):
+    """
+    Extract download links and password from a forum post.
+    Only filecrypt and hide are supported - other link crypters will cause an error.
+
+    Returns:
+        tuple of (links, password) where:
+        - links: list of [url, mirror_name] pairs where mirror_name is the actual hoster
+        - password: extracted password string
+    """
+    links = []
+    soup = BeautifulSoup(post_content, 'html.parser')
+
+    for link in soup.find_all('a', href=True):
+        href = link.get('href')
+
+        # Skip internal forum links
+        if href.startswith('/') or host in href:
+            continue
+
+        # Check supported link crypters
+        crypter_type = None
+        if re.search(r'filecrypt\.', href, re.IGNORECASE):
+            crypter_type = "filecrypt"
+        elif re.search(r'hide\.', href, re.IGNORECASE):
+            crypter_type = "hide"
+        else:
+            debug(f"Unsupported link crypter/hoster found: {href}")
+            debug(f"Currently only filecrypt and hide are supported. Other crypters may be added later.")
+            continue
+
+        # Extract mirror name from link text or nearby context
+        mirror_name = extract_mirror_name_from_link(link)
+
+        # Use mirror name if found, otherwise fall back to crypter type
+        identifier = mirror_name if mirror_name else crypter_type
+
+        # Avoid duplicates
+        if [href, identifier] not in links:
+            links.append([href, identifier])
+            if mirror_name:
+                debug(f"Found {crypter_type} link for mirror: {mirror_name}")
+            else:
+                debug(f"Found {crypter_type} link (no mirror name detected)")
+
+    # Only extract password if we found links
+    password = ""
+    if links:
+        password = extract_password_from_post(soup, host)
+
+    return links, password
+
+
+def get_dl_download_links(shared_state, url, mirror, title):
+    """
+    Get download links from a thread.
+
+    Returns:
+        tuple of (links, password) where:
+        - links: list of [url, mirror_name] pairs
+        - password: extracted password string
+    """
+    host = shared_state.values["config"]("Hostnames").get(hostname)
+
+    sess = retrieve_and_validate_session(shared_state)
+    if not sess:
+        info(f"Could not retrieve valid session for {host}")
+        return [], ""
+
+    try:
+        response = fetch_via_requests_session(shared_state, method="GET", target_url=url, timeout=30)
+
+        if response.status_code != 200:
+            info(f"Failed to load thread page: {url} (Status: {response.status_code})")
+            return [], ""
+
+        soup = BeautifulSoup(response.text, 'html.parser')
+
+        first_post = soup.select_one('article.message--post')
+        if not first_post:
+            info(f"Could not find first post in thread: {url}")
+            return [], ""
+
+        post_content = first_post.select_one('div.bbWrapper')
+        if not post_content:
+            info(f"Could not find post content in thread: {url}")
+            return [], ""
+
+        # Extract both links and password from the same post content
+        links, password = extract_links_and_password_from_post(str(post_content), host)
+
+        if not links:
+            info(f"No supported download links found in thread: {url}")
+            return [], ""
+
+        debug(f"Found {len(links)} download link(s) for: {title} (password: {password})")
+        return links, password
+
+    except Exception as e:
+        info(f"Error extracting download links from {url}: {e}")
+        invalidate_session(shared_state)
+        return [], ""

quasarr-1.21.0/quasarr/downloads/sources/wx.py

@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+# Quasarr
+# Project by https://github.com/rix1337
+
+import re
+
+import requests
+
+from quasarr.providers.log import info, debug
+
+hostname = "wx"
+
+
+def get_wx_download_links(shared_state, url, mirror, title):
+    """
+    Get download links from API based on title and mirror.
+
+    Returns:
+        list of [url, hoster] pairs where hoster is the actual mirror (e.g., 'ddownload.com', 'rapidgator.net')
+    """
+    host = shared_state.values["config"]("Hostnames").get(hostname)
+
+    headers = {
+        'User-Agent': shared_state.values["user_agent"],
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
+    }
+
+    try:
+        session = requests.Session()
+
+        # First, load the page to establish session cookies
+        response = session.get(url, headers=headers, timeout=30)
+
+        if response.status_code != 200:
+            info(f"{hostname.upper()}: Failed to load page: {url} (Status: {response.status_code})")
+            return []
+
+        # Extract slug from URL
+        slug_match = re.search(r'/detail/([^/]+)', url)
+        if not slug_match:
+            info(f"{hostname.upper()}: Could not extract slug from URL: {url}")
+            return []
+
+        api_url = f'https://api.{host}/start/d/{slug_match.group(1)}'
+
+        # Update headers for API request
+        api_headers = {
+            'User-Agent': shared_state.values["user_agent"],
+            'Accept': 'application/json'
+        }
+
+        debug(f"{hostname.upper()}: Fetching API data from: {api_url}")
+        api_response = session.get(api_url, headers=api_headers, timeout=30)
+
+        if api_response.status_code != 200:
+            info(f"{hostname.upper()}: Failed to load API: {api_url} (Status: {api_response.status_code})")
+            return []
+
+        data = api_response.json()
+
+        # Navigate to releases in the API response
+        if 'item' not in data or 'releases' not in data['item']:
+            info(f"{hostname.upper()}: No releases found in API response")
+            return []
+
+        releases = data['item']['releases']
+
+        # Find the release matching the title
+        matching_release = None
+        for release in releases:
+            if release.get('fulltitle') == title:
+                matching_release = release
+                break
+
+        if not matching_release:
+            info(f"{hostname.upper()}: No release found matching title: {title}")
+            return []
+
+        # Extract crypted_links based on mirror
+        crypted_links = matching_release.get('crypted_links', {})
+
+        if not crypted_links:
+            info(f"{hostname.upper()}: No crypted_links found for: {title}")
+            return []
+
+        links = []
+
+        # If mirror is specified, find matching hoster (handle partial matches like 'ddownload' -> 'ddownload.com')
+        if mirror:
+            matched_hoster = None
+            for hoster in crypted_links.keys():
+                if mirror.lower() in hoster.lower() or hoster.lower() in mirror.lower():
+                    matched_hoster = hoster
+                    break
+
+            if matched_hoster:
+                link = crypted_links[matched_hoster]
+                # Prefer hide over filecrypt
+                if re.search(r'hide\.', link, re.IGNORECASE):
+                    links.append([link, matched_hoster])
+                    debug(f"{hostname.upper()}: Found hide link for mirror {matched_hoster}")
+                elif re.search(r'filecrypt\.', link, re.IGNORECASE):
+                    links.append([link, matched_hoster])
+                    debug(f"{hostname.upper()}: Found filecrypt link for mirror {matched_hoster}")
+            else:
+                info(
+                    f"{hostname.upper()}: Mirror '{mirror}' not found in available hosters: {list(crypted_links.keys())}")
+        else:
+            # If no mirror specified, get all available crypted links (prefer hide over filecrypt)
+            for hoster, link in crypted_links.items():
+                if re.search(r'hide\.', link, re.IGNORECASE):
+                    links.append([link, hoster])
+                    debug(f"{hostname.upper()}: Found hide link for hoster {hoster}")
+                elif re.search(r'filecrypt\.', link, re.IGNORECASE):
+                    links.append([link, hoster])
+                    debug(f"{hostname.upper()}: Found filecrypt link for hoster {hoster}")
+
+        if not links:
+            info(f"{hostname.upper()}: No supported crypted links found for: {title}")
+            return []
+
+        debug(f"{hostname.upper()}: Found {len(links)} crypted link(s) for: {title}")
+        return links
+
+    except Exception as e:
+        info(f"{hostname.upper()}: Error extracting download links from {url}: {e}")
+        return []

{quasarr-1.20.8 → quasarr-1.21.0}/quasarr/providers/html_images.py

@@ -7,6 +7,7 @@ al = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAA9UlE
 by = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAMAAADz0U65AAAATlBMVEX///8crf/29fQDo//J7f/u7u7w+v/2/P/8/PyytLWenp6IhoWTwNfPz8+mpaVYxP94eHhryf+75fyB0f+oxNPl5eW4yNGrr68xsfmUlJQWKuGqAAAAQklEQVQI1yWLSRKAIBADMzOAsgiC+/8/aiwvSR+6AUB15mJyZ42ev8ldclI4MWvXuvwQCaGblPxQCmNP9fgyqGf+AkFFAeZ3L10cAAAAAElFTkSuQmCC'
 dd = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAABCElEQVR4nAXBP0sCYRzA8e89d6eQ4SRkdNKQOEVSvQQbegdB4dAgLY1tLS1NvYFoDIIIGtqKXPq3JJGWEQkaDQliGJnaPXf6e/p8rGrt4/CxUl777fZQylYGg4iReHyMxez8kXN1c5c/Pj1D7AhKQqKujQgqCDSrK35evTca/InD+sYmyXSWdqeLFvCHhka9bpyvdgsdCpl0msRkin1/xMLcLKXbIs3mp6UG/R5vL2VKzzV29g4oFAokkh7XxQuGgcbxtTYy6Fr97xaZ6QmeHu55rVYIf9poHeAMR8ZCNLvbW8TGY5x0OrgK7KhLEIY4U6nUeS63tBwGWowR5dgziME4bsTyPO/yH3LufRKlNxKMAAAAAElFTkSuQmCC'
 dj = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAMAAADz0U65AAAAIGNIUk0AAHomAACAhAAA+gAAAIDoAAB1MAAA6mAAADqYAAAXcJy6UTwAAAC9UExURY2NjYWGhoeIiYiIiIiIiYWFhoODg4mKillZWYSEhFBMS3x7e0xIR3Bsa0E+PldWVi4wMT4/Px0eHiQkJA8PDwoMDAsMDAsMDAsLCw0NDWxqaHZtZnBrZ2dnZ25qZ21oZJ94XtWNWr6DXG9mYpp2X6p5V6JwVNJ9TsN4UXBgWZhtVaxuTZBbR6xiRMpoQKlgQ6JfRZ5cQHFGN6dOMqFOM5lMM6tPMmZBNCYlJS8mIywlJCglJC8mJCMhIf////64+awAAAAadFJOU1SosLCwokSyl7ugup+6n7ugr5RLlJmYmZA8Hg7dEgAAAAFiS0dEPklkAOMAAAAHdElNRQfpDBESHCL8f1a2AAAAUElEQVQI12NgYGRiYmZhZWNgl5KWkZWT52DgVFBUUlZR5WLgVlPX0NTS5mHg1dHV0zcw5GPgNzI2MTUzF2AQtLC0sraxFWIQFhEVExOXkAQA4WIHfGNBCckAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjUtMTItMTdUMTg6Mjg6MjgrMDA6MDDR5B2HAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDI1LTEyLTE3VDE4OjI4OjI4KzAwOjAwoLmlOwAAACh0RVh0ZGF0ZTp0aW1lc3RhbXAAMjAyNS0xMi0xN1QxODoyODozNCswMDowMPym7g4AAAAASUVORK5CYII='
+dl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAACKADAAQAAAABAAAACAAAAACVhHtSAAAAw0lEQVQYGV2PMQrCQBBF/+6OSUy1aYQgSI7gCSR4Bhs78RKCtQfxAnqGVLYewE6ENELSqHFJdt0hCOIvhtl9zPw/Al55voqCNikFoPntgNpQlRbFvhEMwzZ5MfjXm6oh8aQigdZZ+A2QfpxlJcCMiISeqgwRxYgfGuflHLjfMLuMcbzuND3JYGPXiE2IMjAYHU6YIIMNFKzoQEEzqBdqqzu/21nX20hvZgRkp2ritBxSdr33b/UhU8mncFo+7Qu55z9mH8f7S3Ax+Zg1AAAAAElFTkSuQmCC'
 dt = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAA4ElEQVR4nD2PsWrCUBSGv3ubBoq+QevQUhAXV6dMRcyTZBV8CCfxCTq4ZOmSJwg+giB4t16p1NCpSFECyY2n5EL7LeeD8/PDr5qmEa01+XrNz35PaAxFUXCrNQ/DIVophbWW19WKt+WSp16PYLvlvtNBHY8ESZLg6ppPaxmMRgymUz4WC577fR5nM3SapryMx0RRxPf5jDjHXRi21bQEWZZhjCGeTIiDgOvpxM3hQLXb+QAiImVZSlVV0tS1XEXkPY7laz5vX0K74h/n/KnyXNxm41351B+tKoVcLt5Vt8svgsSBPKnRQSAAAAAASUVORK5CYII='
 dw = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAA70lEQVR4nAXBTUrDQBiA4febmfjbpqZUsFkJxS6UIq4EvYS46CUExRPkBL2HFM/gIdxIFq4Ff2JNia3JzBefR+bzuZ1Op+E+y/q6Fd/GSe8qijZH1lpfN00uADdZNt5NDh7GJ8dng2HKxvYOBtB6jctms/5S3ePpxeWklw69tZE1IqKqrIxT81U1d4PReCJJ338HXBVURCCokhelMZW467YTt9pi1rUntPCHYJ0ljiyubMJh0yJFuZSk26ENjufPFV0CCeAUfLEo8V7pRBHWOMJvBc5Q+xpnIf8pl+fvi1Lztw9zlO6T7sWw9jy9vPIPUL1kPErau3YAAAAASUVORK5CYII='
 fx = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAABB0lEQVR4nB2LP0sCcQBA3/2Uzugu8E4IoT9cSYhUENFWYSA1FFTQ4hK5SENNDW19hoYcImhvaGgLguYgcIk0haLOE7wrNGzo5A4v9K3vPWknmwt0LYrrunieTygkAAm300EIQTg5nWB3e5O39w9s54t4fISEYfBZq/H4VETIsoxp1ftyJpWkR7lSZXFhnsFIhLBtOxR9n1KliqZFeX4po+saZ4VLTMtC9M61TJrTk2OarR9WV5bIpJfZ2ljH8zxEw3EovVaZm01xd//AsKpwfXNLLKaTmDSQ9vJHwWE+x3ezRbv9i6oqTBkTmLU65xdXSNn9g0CWB2jYDuNjo/y5Lqoy1A+63S7/GeVj+5KBt3UAAAAASUVORK5CYII='
@@ -18,3 +19,4 @@ sf = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAA8ElE
 sj = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAMAAADz0U65AAAAIGNIUk0AAHomAACAhAAA+gAAAIDoAAB1MAAA6mAAADqYAAAXcJy6UTwAAAC9UExURY2NjYWGhoeIiYiIiIiIiYWFhoODg4mKillZWYSEhFBMS3x7e0xIR3Bsa0E+PldWVi4wMT4/Px0eHiQkJA8PDwoMDAsMDAsMDAsLCw0NDWxqaHZtZnBrZ2dnZ25qZ21oZJ94XtWNWr6DXG9mYpp2X6p5V6JwVNJ9TsN4UXBgWZhtVaxuTZBbR6xiRMpoQKlgQ6JfRZ5cQHFGN6dOMqFOM5lMM6tPMmZBNCYlJS8mIywlJCglJC8mJCMhIf////64+awAAAAadFJOU1SosLCwokSyl7ugup+6n7ugr5RLlJmYmZA8Hg7dEgAAAAFiS0dEPklkAOMAAAAHdElNRQfpDBESHCL8f1a2AAAAUElEQVQI12NgYGRiYmZhZWNgl5KWkZWT52DgVFBUUlZR5WLgVlPX0NTS5mHg1dHV0zcw5GPgNzI2MTUzF2AQtLC0sraxFWIQFhEVExOXkAQA4WIHfGNBCckAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjUtMTItMTdUMTg6Mjg6MjgrMDA6MDDR5B2HAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDI1LTEyLTE3VDE4OjI4OjI4KzAwOjAwoLmlOwAAACh0RVh0ZGF0ZTp0aW1lc3RhbXAAMjAyNS0xMi0xN1QxODoyODozNCswMDowMPym7g4AAAAASUVORK5CYII='
 sl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAA/ElEQVR4nE3PrUpDYRzH8d/z5tnRozugImIYgjAwGY5egGUG64JRkxgWvIFV0zCIwVsQLLYhWgSDLizJiowVFUHZdJ7zvP7Ftu8NfPgybOwvImcFet0C6FhMtrYTSQg1Ru/id3W7sfTxmc3rQpeE4gk8BZJiigF1kWYLe9rSGZEvR4o/AvRAxBLB8SObzXVqXb/tBjFdJjOCtliJI/U6fDo/CQSwf4ozIM2OGrm2xyGEClQCReO76tZmTabZYcsHmnHOfSvJ+8axCiNtlJDtztdNkLmxbViyEIx7669YxPPlZG44uD99wXs9ltqNbvF8aSbvBgBH9WAWMZX+AJIYacQLryqFAAAAAElFTkSuQmCC'
 wd = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAA90lEQVR4nC3OsS5DUQAG4P8/Pb2kiS4mliaEkMYgTBiQiMVk6C6RsHmAxuoFbHTzCmIR9QSWLko6kIiQCnqHq+fec84vEt8TfMS/5s3jniFf36uD9sTH6Fg9rQ8aDQY2r7trhJmFUY1kW9I4gF0I9wGuZUOM04x+B4o9EvMSZ0D1EVWYkklsnn51TFIOhJ2DwgaN6QiqgsbRh00rseu9J1WsUngGOBmhSvaZnZwdbA1MkWfrwQ2PvXMvwbk7n7taLPKppFpe+cvb8DN8gi09RGmkbEv9GHQLqQZi+bB19WZDdN+WlYskRe/0aNsBaO+fXy4ZxEWKC7/R+XkmFbstdAAAAABJRU5ErkJggg=='
+wx = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAACKADAAQAAAABAAAACAAAAACVhHtSAAAAcUlEQVQYGWNgYGD4B8S4wD+mf7y2jEDZ/0CsiKRKEiT2j9cGLMQGJH8DMUwhyEQQGyTGBcRg3T+hNMgkGP4EYsN0AdlgAHMPE0wARMN0XEASBLHB4ixQQUGgg94xMjCCBMEyTJ8PiwKZr0F8kDW4ACMASI8hUcBfWMAAAAAASUVORK5CYII='