Merge branch 'feat-steamrip-noschxl' into merge_candidate_noschxl, improve stuff (http dl impl still needed)

src/core/utils/network/download.py

@@ -1,14 +1,19 @@
+from PySide6.QtWidgets import QTableWidgetItem
+from PySide6.QtCore import Qt
 from core.utils.logging.logs import consoleLog
-from core.utils.data.tracker import get_item_url
-from core.utils.data.tracker import get_magnet_link
-from core.network.libtorrent_wrapper import add_download
+from core.network.libtorrent_wrapper import add_magnet
 from core.utils.general.wrappers import run_thread
 from core.utils.logging.logs import add_download_log
 from core.network.libtorrent_int import add_seed
+from core.utils.data.state import state
+from urllib.parse import urlparse, unquote
 import threading
+import re
+import requests
+import random
 
 
-def download_selected(items, posts, post_titles):
+def download_selected(items: list[QTableWidgetItem]):
     if not items:
         consoleLog("No item selected for download.")
         return
@@ -16,25 +21,63 @@ def download_selected(items, posts, post_titles):
     for item in items:
         if item.column() != 0:
             continue
-        text = item.text()
-        if text and text not in seen:
-            seen.add(text)
-            consoleLog(f"Downloading {text}")
-            run_thread(threading.Thread(target=run_download, args=(text, posts, post_titles)))
+        post_idx = item.data(Qt.ItemDataRole.UserRole)
+        if post_idx is None:
+            post_idx = item.row()
+        
+        if post_idx not in seen:
+            seen.add(post_idx)
+            post = state.posts[post_idx]
+            consoleLog(f"Downloading {post.get('title', 'Unknown')}")
+            run_thread(threading.Thread(target=run_download, args=(post,)))
 
-def run_download(item, posts, post_titles):
-    post_url = get_item_url(item, posts, post_titles)
-    consoleLog(f"Selected URL: {post_url}")
-    magnet_uri = get_magnet_link(post_url)
+def get_direct_filename(url: str, headers) -> str:
+    cd = headers.get('content-disposition', '')
+    if cd:
+        match = re.search(r'filename\*=UTF-8\'\'(.+)', cd)  # RFC 5987 encoded
+        if match:
+            return unquote(match.group(1))
+        match = re.search(r'filename="?([^";\n]+)"?', cd)
+        if match:
+                return match.group(1).strip()
 
-    if add_download(magnet_uri):
-        add_download_log(item, post_url, magnet_uri, False)
+    path = urlparse(url).path
+    name = path.split('/')[-1]
+    if name:
+        return unquote(name)
 
-def run_download_direct(magnet_uri):
+    return f"download{random.randint(1,9999)}" #avoid collision
+
+def filedownload(url):
+    try:
+        with requests.get(url, stream=True, timeout=30) as r:
+            r.raise_for_status()
+            name = get_direct_filename(url, r.headers)
+
+            with open(state.download_path + f"/{name}", 'wb') as f:
+                for chunk in r.iter_content(chunk_size=8192):
+                    f.write(chunk)
+
+        consoleLog(f"Finished downloading {name}")
+    except Exception as e:
+        consoleLog(f"Error downloading: {e}")
+
+def run_download(post):
+    linkfunc = state.trackers[state.currenttracker]["linkFunc"]
+    ismagnet = state.trackers[state.currenttracker]["isMagnet"]
+    link = linkfunc(post)
+
+    if ismagnet:
+        add_magnet(link)
+        add_download_log(post.get("title", "Unknown"), "", link, False)
+    else:
+        filedownload(link)
+
+def run_download_direct(magnet_uri, dl_path=None):
     consoleLog(f"Direct download: {magnet_uri[:60]}")
-    add_download(magnet_uri)
+    add_magnet(magnet_uri, dl_path)
     add_download_log("Direct Download", "", magnet_uri, False)
 
 def seed_magnet(magnet_uri, file_path): 
     consoleLog(f"Seeding: {magnet_uri[:60]}")
-    add_seed(magnet_uri, file_path)
+    add_seed(magnet_uri, file_path)

src/core/utils/network/update_checker.py

@@ -8,12 +8,12 @@ def get_updates():
 
     if response.status_code != 200:
         consoleLog(f"Failed to fetch releases: {response.status_code}")
-        return None, None
+        return None
 
     release = response.json()
 
-    latest_version = release["name"]
-    assets = release["assets"]
+    latest_version = release.get("name") or release.get("tag_name")
+    assets = release.get("assets", [])
 
     release_assets = []
 
@@ -26,11 +26,11 @@ def get_updates():
                 release_assets.append(dict(
                     name=asset['name'],
                     url=asset['browser_download_url'],
-                    hash=asset['digest']
+                    hash=asset.get('digest')
                 ))
             return release_assets
         else: 
-            return None, None
+            return None
     else:
         consoleLog("Already up-to-date.")
-        return None, None
+        return None