refactor: try and complete the removal of episode_object parameter fr…

…om all provider search methods, fixes newznab and other providers

Signed-off-by: miigotu <[email protected]>

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Build develop branch
 
 on:
   workflow_run:
-    workflows: [ "Python Packaging" ]
+    workflows: [Python Packaging]
     branches: |
       - develop
     type:

sickchill/oldbeard/notifiers/nmj.py

@@ -1,5 +1,10 @@
 import re
-import telnetlib
+
+try:
+    import telnetlib
+except (ImportError, ModuleNotFoundError):
+    telnetlib = None
+
 import urllib.parse
 import urllib.request
 from xml.etree import ElementTree
@@ -19,6 +24,9 @@ def notify_settings(host):
         """
 
         # establish a terminal session to the PC
+
+        if telnetlib is None:
+            logger.info("telnetlib was removed in python 3.13, use python 3.12, disable nmj, or update this script to use a new library")
         try:
             terminal = telnetlib.Telnet(host)
         except Exception:

sickchill/oldbeard/providers/abnormal.py

@@ -58,7 +58,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/alpharatio.py

@@ -58,7 +58,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/archetorrent.py

@@ -59,7 +59,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/bitcannon.py

@@ -17,7 +17,7 @@ def __init__(self):
 
         self.cache = tvcache.TVCache(self, search_params={"RSS": ["tv", "anime"]})
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
 
         url = "http://localhost:3000/"
@@ -29,7 +29,7 @@ def search(self, search_strings, episode_object=None):
 
         search_params = {}
 
-        anime = episode_object and episode_object.show and episode_object.show.anime
+        anime = self.show and self.show.anime or False
         search_params["category"] = ("tv", "anime")[bool(anime)]
 
         if self.api_key:

sickchill/oldbeard/providers/bjshare.py

@@ -54,22 +54,19 @@ def __init__(self):
         # until they or the source from where they get that info fix it...
         self.absolute_numbering = ["One Piece", "Boruto: Naruto Next Generations"]
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         """
         Search a provider and parse the results.
 
         :param search_strings: A dict with mode (key) and the search value (value)
-        :param episode_object: Information about the episode being searched (when not RSS)
 
         :returns: A list of search results (structure)
         """
         results = []
         if not self.login():
             return results
 
-        anime = False
-        if episode_object and episode_object.show:
-            anime = episode_object.show.anime == 1
+        anime = self.show and self.show.anime == 1 or False
 
         search_params = {"order_by": "time", "order_way": "desc", "group_results": 0, "action": "basic", "searchsubmit": 1}
 

sickchill/oldbeard/providers/btn.py

@@ -47,7 +47,7 @@ def _check_auth_from_data(self, data):
 
         return True
 
-    def search(self, search_params, episode_object=None):
+    def search(self, search_params):
         self._check_auth()
 
         results = []
@@ -183,7 +183,7 @@ def get_season_search_strings(self, episode_object):
         search_params = {"category": "Season"}
 
         # Search for entire seasons: no need to do special things for air by date or sports shows
-        if episode_object.show.air_by_date or episode_object.show.sports:
+        if self.show.air_by_date or self.show.sports:
             # Search for the year of the air by date show
             search_params["name"] = str(episode_object.airdate).split("-")[0]
         else:
@@ -199,7 +199,7 @@ def get_episode_search_strings(self, episode_object, add_string=""):
         search_params = {"category": "Episode"}
 
         # episode
-        if episode_object.show.air_by_date or episode_object.show.sports:
+        if self.show.air_by_date or self.show.sports:
             date_str = str(episode_object.airdate)
 
             # BTN uses dots in dates, we just search for the date since that

sickchill/oldbeard/providers/cpasbien.py

@@ -10,7 +10,7 @@ class Provider(FrenchTorrentProvider):
     def __init__(self):
         super().__init__("Cpasbien", "https://www.cpasbien.ch")
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         for mode in search_strings:
             items = []

sickchill/oldbeard/providers/danishbits.py

@@ -32,7 +32,7 @@ def __init__(self):
         # Cache
         self.cache = tvcache.TVCache(self, min_time=10)  # Only poll Danishbits every 10 minutes max
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/demonoid.py

@@ -30,7 +30,7 @@ def __init__(self):
 
         self.cache = DemonoidCache(self)
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         # https://demonoid.is/files/?category=12&quality=58&seeded=0&external=2&sort=seeders&order=desc&query=SEARCH_STRING
         search_params = {

sickchill/oldbeard/providers/elitetorrent.py

@@ -23,9 +23,9 @@ def __init__(self):
 
         self.url = self.urls["base_url"]
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
-        lang_info = "" if not episode_object or not episode_object.show else episode_object.show.lang
+        lang_info = self.show and self.show.lang or ""
 
         """
         Search query:

sickchill/oldbeard/providers/eztv.py

@@ -25,7 +25,7 @@ def __init__(self):
         # Cache
         self.cache = tvcache.TVCache(self, min_time=30)  # only poll ThePirateBay every 30 minutes max
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         search_params = {"imdb_id": None, "page": 1, "limit": 100}
 
@@ -35,11 +35,11 @@ def search(self, search_strings, episode_object=None):
             logger.debug(_("Search Mode: {mode}").format(mode=mode))
 
             if mode != "RSS":
-                if not (episode_object and episode_object.show and episode_object.show.imdb_id):
+                if not (self.show and self.show.imdb_id):
                     continue
 
-                search_params["imdb_id"] = episode_object.show.imdb_id.strip("tt")
-                logger.debug("Search string: {}".format(episode_object.show.imdb_id))
+                search_params["imdb_id"] = self.show.imdb_id.strip("tt")
+                logger.debug("Search string: {}".format(self.show.imdb_id))
             else:
                 search_params.pop("imdb_id")
 

sickchill/oldbeard/providers/filelist.py

@@ -53,7 +53,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/gimmepeers.py

@@ -65,7 +65,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/hd4free.py

@@ -28,7 +28,7 @@ def _check_auth(self):
         logger.warning("Your authentication credentials for {0} are missing, check your config.".format(self.name))
         return False
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self._check_auth:
             return results

sickchill/oldbeard/providers/hdbits.py

@@ -36,11 +36,11 @@ def _check_auth_from_data(parsed_json):
         return True
 
     def get_season_search_strings(self, episode_object):
-        season_search_string = [self.make_post_data_JSON(show=episode_object.show, season=episode_object)]
+        season_search_string = [self.make_post_data_JSON(show=self.show, season=episode_object)]
         return season_search_string
 
     def get_episode_search_strings(self, episode_object, add_string=""):
-        episode_search_string = [self.make_post_data_JSON(show=episode_object.show, episode=episode_object)]
+        episode_search_string = [self.make_post_data_JSON(show=self.show, episode=episode_object)]
         return episode_search_string
 
     def _get_title_and_url(self, item):
@@ -49,11 +49,10 @@ def _get_title_and_url(self, item):
 
         return title, url
 
-    def search(self, search_params, episode_object=None):
-        # FIXME
+    def search(self, search_params):
         results = []
 
-        logger.debug("Search string: {0}".format(search_params))
+        logger.debug(f"Search string: {search_params}")
 
         self._check_auth()
 

sickchill/oldbeard/providers/hdspace.py

@@ -63,7 +63,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/hdtorrents.py

@@ -58,7 +58,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/hdtorrents_it.py

@@ -58,7 +58,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/horriblesubs.py

@@ -24,7 +24,7 @@ def __init__(self):
 
         self.cache = tvcache.TVCache(self, min_time=15)  # only poll HorribleSubs every 15 minutes max
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if self.show and not self.show.is_anime:
             return results

sickchill/oldbeard/providers/hounddawgs.py

@@ -65,7 +65,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/ilcorsaronero.py

@@ -173,13 +173,13 @@ def _magnet_from_result(info_hash, title):
             hash=info_hash, title=quote_plus(title), trackers="http://tracker.tntvillage.scambioetico.org:2710/announce"
         )
 
-    def search(self, search_params, episode_object=None):
+    def search(self, search_strings):
         results = []
 
-        for mode in search_params:
+        for mode in search_strings:
             items = []
             logger.debug(_("Search Mode: {mode}").format(mode=mode))
-            for search_string in search_params[mode]:
+            for search_string in search_strings[mode]:
                 if search_string == "":
                     continue
 

sickchill/oldbeard/providers/immortalseed.py

@@ -72,7 +72,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/iptorrents.py

@@ -87,17 +87,17 @@ def login(self):
 
         return True
 
-    def search(self, search_params, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results
 
         freeleech = "&free=on" if self.freeleech else ""
 
-        for mode in search_params:
+        for mode in search_strings:
             items = []
             logger.debug(_("Search Mode: {mode}").format(mode=mode))
-            for search_string in search_params[mode]:
+            for search_string in search_strings[mode]:
                 if mode != "RSS":
                     logger.debug(_("Search String: {search_string}").format(search_string=search_string))
 

sickchill/oldbeard/providers/kat.py

@@ -37,14 +37,14 @@ def __init__(self):
 
         self.rows_selector = dict(class_=re.compile(r"even|odd"), id=re.compile(r"torrent_.*_torrents"))
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not (self.url and self.urls):
             self.find_domain()
             if not (self.url and self.urls):
                 return results
 
-        anime = (self.show and self.show.anime) or (episode_object and episode_object.show and episode_object.show.anime) or False
+        anime = self.show and self.show.anime or False
         search_params = OrderedDict(field="seeders", sorder="desc", category=("tv", "anime")[anime])
 
         for mode in search_strings:
@@ -81,7 +81,7 @@ def search(self, search_strings, episode_object=None):
                         return results
 
                     # This will recurse a few times until all of the mirrors are exhausted if none of them work.
-                    return self.search(search_strings, episode_object)
+                    return self.search(search_strings)
 
                 with BS4Parser(data) as html:
                     labels = [cell.get_text() for cell in html.find(class_="firstr")("th")]

sickchill/oldbeard/providers/limetorrents.py

@@ -28,7 +28,7 @@ def __init__(self):
 
         self.cache = tvcache.TVCache(self, search_params={"RSS": ["rss"]})
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         for mode in search_strings:
             items = []

sickchill/oldbeard/providers/magnetdl.py

@@ -24,7 +24,7 @@ def __init__(self):
 
         self.cache = tvcache.TVCache(self)
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
 
         for mode in search_strings:

sickchill/oldbeard/providers/morethantv.py

@@ -69,7 +69,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results

sickchill/oldbeard/providers/ncore.py

@@ -48,7 +48,7 @@ def login(self):
 
         return True
 
-    def search(self, search_strings, episode_object=None):
+    def search(self, search_strings):
         results = []
         if not self.login():
             return results