improve structure, code cleanup and improved switching between uz & rutracker

core/scraping/rutracker_scraper.py

@@ -0,0 +1,14 @@
+import requests
+
+server = "https://pizzasucht.net"
+
+
+def scrape_rutracker(search_text):
+    search = requests.get(f"{server}/search/{search_text}")
+    data = search.json()
+    resulttitles = data["titles"]
+    resultlinks = data["links"]
+    return resulttitles, resultlinks
+
+
+# This Function utilizes the SoftwareManager Server - Source Code can be found in the "Server" branch.

core/scraping/utils.py

@@ -0,0 +1,21 @@
+import requests
+from bs4 import BeautifulSoup
+
+
+def get_magnet_link(post_url, debug):
+    try:
+        response = requests.get(post_url)
+        response.raise_for_status()
+        soup = BeautifulSoup(response.text, 'html.parser')
+        magnet_link = soup.find('a', href=lambda x: x and x.startswith('magnet:'))
+        if magnet_link:
+            if debug:
+                print("Magnet Link Retrieved: ", magnet_link['href'])
+            return magnet_link['href']
+        else:
+            if debug:
+                print("Magnet Link not Found!")
+    except requests.RequestException as e:
+        if debug:
+            print(f"Failed to fetch {post_url}: {e}")
+        return None

core/scraping/uztracker_scraper.py

@@ -76,26 +76,6 @@ def get_post_title(post_url, debug):
         return None   
 
     
-def get_magnet_link(post_url, debug):
-    if up:
-        try:
-            response = requests.get(post_url)
-            response.raise_for_status()
-            soup = BeautifulSoup(response.text, 'html.parser')
-            magnet_link = soup.find('a', href=lambda x: x and x.startswith('magnet:'))
-            if magnet_link:
-                if debug:
-                    print("Magnet Link Retrieved: ", magnet_link['href'])
-                return magnet_link['href']
-            else:
-                if debug:
-                    print("Magnet Link not Found!")
-        except requests.RequestException as e:
-            if debug:
-                print(f"Failed to fetch {post_url}: {e}")
-    else:
-        print("Error: Uztracker down") 
-        return None
 
 # What x and x.startswith('magnet:') Does
 # x - check if x exists (not None/empty)

core/ui/gui.py

@@ -5,7 +5,8 @@ from PySide6.QtGui import QIcon, QAction
 import darkdetect
 import requests
 from core.scraping.uztracker_scraper import scrape_uztracker
-from core.scraping.uztracker_scraper import get_magnet_link
+from core.scraping.rutracker_scraper import scrape_rutracker
+from core.scraping.utils import get_magnet_link
 from core.downloading.download import start_client
 from core.downloading.download import add_magnet
 
@@ -16,16 +17,17 @@ def state_debug(setting):
     else:
         debug = False
 
-def choose_tracker():
+def choose_tracker(): # TEMP SOLUTION: WORK ON GUI IMPL NEXT
-    global rutracker
+    global tracker
-    choice = input("use rutracker? (y/n): ")
+    print("Choose Tracker:")
+    choice = input("(rutracker / uztracker) > ")
     print(choice)
-    if choice.lower() == 'y':
+    if choice.lower() == "rutracker":
-        print("Using rutracker...")
+        print("using rutracker...")
-        rutracker = True
+        tracker = "rutracker"
-    else:
+    if choice.lower() == "uztracker":
-        print("Using uztracker...")
+        print("using uztracker...")
-        rutracker = False
+        tracker = "uztracker"
 
 
 class MainWindow(QtWidgets.QMainWindow, QWidget):
@@ -116,19 +118,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
     def download_selected(self):
         item = self.softwareList.currentItem()
-        if rutracker == True:
         if item is not None:
             if debug:
                 print(f"Downloading {self.softwareList.currentItem().text()}")
-                self.get_item_index(self.softwareList.currentItem().text(), self.postnames_rutracker, self.postlinks_rutracker, debug)
+            self.get_item_index(self.softwareList.currentItem().text(), self.postnames, self.postlinks, debug)
-            else:
-                if debug:
-                    print("No item selected for download.")
-        else:
-            if item is not None:
-                if debug:
-                    print(f"Downloading {self.softwareList.currentItem().text()}")
-                self.get_item_index(self.softwareList.currentItem().text(), self.postnames_uztracker, self.postlinks_uztracker, debug)
         else:
             if debug:
                 print("No item selected for download.")
@@ -143,39 +136,29 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
 
     def return_pressed(self):
-        if rutracker == True:
-            global postnames
-            global postlinks
-            search_text = self.searchbar.text()
-            search = requests.get(f"https://pizzasucht.net/search/{search_text}")
-            self.softwareList.clear()
-            data = search.json()
-            self.postnames_rutracker = data["titles"]
-            for self.postnames_rutracker in data["titles"]:
-                self.softwareList.addItem(self.postnames_rutracker)
-            self.postnames_rutracker = data["titles"]
-            self.postlinks_rutracker = data["links"]
-        else:
         search_text = self.searchbar.text()
         if debug:
             print("User searched for:", search_text)
-            
+        if tracker == "uztracker":
             response = scrape_uztracker(search_text, debug)
+        if tracker == "rutracker":
+            response = scrape_rutracker(search_text)
         if response:
-                self.postnames_uztracker, self.postlinks_uztracker = response
+            self.postnames, self.postlinks = response
             self.softwareList.clear()
-                if self.postnames_uztracker:
+            if self.postnames:
-                    self.softwareList.addItems(self.postnames_uztracker)
+                self.softwareList.addItems(self.postnames)
         elif debug:
             print(f"No Results found for \"{search_text}\"")
 
     def get_item_index(self, item, list, listlinks, debug):
         position = list.index(item)
         if 0 <= position < len(listlinks): # note for myself: py starts counting at 0; check if number is not negative, check if number is not more than list length.
-            if rutracker == True:
+            if tracker == "uztracker":
-                selected = listlinks[position]
-            else:
                 selected = "https://uztracker.net/" + listlinks[position].lstrip("./")
+            if tracker == "rutracker":                
+                selected = listlinks[position]
+
             if debug:
                 print("Selected URL: ", selected)
             selected_magnet = get_magnet_link(selected, debug)