mass refactor tv.py

.github/workflows/release.yml

@@ -2,11 +2,9 @@ name: Build develop branch
 
 on:
   workflow_run:
-    workflows: [Python Packaging]
-    branches: |
-      - develop
-    types:
-      - completed
+    workflows: [ Python Packaging ]
+    branches: [ develop ]
+    types: [ completed, requested ]
 
 jobs:
   version:

SickChill.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import datetime
+import mimetypes
 import os
 import platform
 import shutil
@@ -28,14 +29,12 @@
 
 setup_gettext()
 
-import mimetypes
-
 mimetypes.add_type("text/css", ".css")
 mimetypes.add_type("application/sfont", ".otf")
 mimetypes.add_type("application/sfont", ".ttf")
 mimetypes.add_type("application/javascript", ".js")
 mimetypes.add_type("application/font-woff", ".woff")
-# Not sure about this one, but we also have halflings in .woff so I think it wont matter
+# Not sure about this one, but we also have halflings in .woff, so I think it won't matter
 # mimetypes.add_type("application/font-woff2", ".woff2")
 
 from configobj import ConfigObj
@@ -67,6 +66,8 @@ def __init__(self):
         self.run_as_daemon = False
 
         # web server constants
+        self.flask_server = None
+
         self.web_server = None
         self.forced_port = None
         self.no_launch = False
@@ -253,7 +254,7 @@ def load_shows_from_db():
         for sql_show in sql_results:
             try:
                 cur_show = TVShow(sql_show["indexer"], sql_show["indexer_id"])
-                cur_show.nextEpisode()
+                cur_show.next_episode()
                 settings.showList.append(cur_show)
             except Exception as error:
                 logger.exception("There was an error creating the show in {}: Error {}".format(sql_show["location"], error))
@@ -301,7 +302,7 @@ def shutdown(self, event):
         """
         if settings.started:
             sickchill.start.halt()  # stop all tasks
-            sickchill.start.saveAll()  # save all shows to DB
+            sickchill.start.save_all()  # save all shows to DB
 
             # shutdown web server
             if self.web_server:

sickchill/oldbeard/classes.py

@@ -76,7 +76,7 @@ def make_result(cls, result_dict):
             return show[0]
 
         show = show[1]
-        episode_objects = [show.getEpisode(result_dict.get("season"), ep) for ep in result_dict.get("episodes").split("|") if ep]
+        episode_objects = [show.get_episode(result_dict.get("season"), ep) for ep in result_dict.get("episodes").split("|") if ep]
         result = cls(episode_objects)
         result.from_json(result_dict)
         result.show = show

sickchill/oldbeard/dailysearcher.py

@@ -66,7 +66,7 @@ def run(self, force=False):
                 if air_time > curTime:
                     continue
 
-            ep = show.getEpisode(sqlEp["season"], sqlEp["episode"])
+            ep = show.get_episode(sqlEp["season"], sqlEp["episode"])
             with ep.lock:
                 prefix = _("New episode {episode_string} airs today,").format(episode_string=ep.pretty_name)
                 if ep.season == 0:

sickchill/oldbeard/failedProcessor.py

@@ -56,7 +56,7 @@ def process(self):
         self._log(f"{parsed.air_date}", logger.DEBUG)
 
         for episode in parsed.episode_numbers:
-            segment = parsed.show.getEpisode(parsed.season_number, episode)
+            segment = parsed.show.get_episode(parsed.season_number, episode)
 
             cur_failed_queue_item = search_queue.FailedQueueItem(parsed.show, [segment])
             settings.searchQueueScheduler.action.add_item(cur_failed_queue_item)

sickchill/oldbeard/helpers.py

@@ -659,7 +659,7 @@ def get_all_episodes_from_absolute_number(show, absolute_numbers, indexer_id=Non
             show = Show.find(settings.showList, indexer_id)
 
         for absolute_number in absolute_numbers if show else []:
-            ep = show.getEpisode(None, None, absolute_number=absolute_number)
+            ep = show.get_episode(None, None, absolute_number=absolute_number)
             if ep:
                 episodes.append(ep.episode)
                 season = ep.season  # this will always take the last found season so eps that cross the season border are not handeled well

sickchill/oldbeard/nzbSplitter.py

@@ -164,15 +164,15 @@ def split_result(obj):
 
         want_ep = True
         for ep_num in parsed_obj.episode_numbers:
-            if not obj.show.wantEpisode(season, ep_num, obj.quality):
+            if not obj.show.want_episode(season, ep_num, obj.quality):
                 logger.debug("Ignoring result: " + new_nzb)
                 want_ep = False
                 break
         if not want_ep:
             continue
 
         # get all the associated episode objects
-        ep_obj_list = [obj.show.getEpisode(season, ep) for ep in parsed_obj.episode_numbers]
+        ep_obj_list = [obj.show.get_episode(season, ep) for ep in parsed_obj.episode_numbers]
 
         # make a result
         cur_obj = classes.NZBDataSearchResult(ep_obj_list)

sickchill/oldbeard/postProcessor.py

@@ -501,7 +501,7 @@ def _history_lookup(self):
         # search the database for a possible match and return immediately if we find one
         main_db_con = db.DBConnection()
         for curName in names:
-            search_name = re.sub(r"[\.\- ]", "_", curName)
+            search_name = re.sub(r"[.\- ]", "_", curName)
             sql_results = main_db_con.select(
                 "SELECT showid, season, quality, version, resource FROM history WHERE resource LIKE ? AND (action % 100 = 4 OR action % 100 = 6)", [search_name]
             )
@@ -758,7 +758,7 @@ def _get_ep_obj(self, show, season, episodes):
 
             # now that we've figured out which episode this file is just load it manually
             try:
-                curEp = show.getEpisode(season, cur_episode)
+                curEp = show.get_episode(season, cur_episode)
                 if not curEp:
                     raise EpisodeNotFoundException()
             except EpisodeNotFoundException as error:
@@ -840,7 +840,7 @@ def _run_extra_scripts(self, episode_object):
             self._log(f"Absolute path to script: {script_cmd[0]}", logger.DEBUG)
 
             script_cmd += [
-                episode_object._location,
+                episode_object.location,
                 self.directory,
                 str(episode_object.show.indexerid),
                 str(episode_object.season),
@@ -1058,7 +1058,7 @@ def process(self):
                 raise EpisodePostProcessingFailedException(_("Unable to create the show directory: ") + episode_object.show._location)
 
             # get metadata for the show (but not episode because it hasn't been fully processed)
-            episode_object.show.writeMetadata(True)
+            episode_object.show.write_metadata(True)
 
         # update the ep info before we rename so the quality & release name go into the name properly
         sql_l = []
@@ -1174,14 +1174,14 @@ def process(self):
             main_db_con = db.DBConnection()
             main_db_con.mass_action(sql_l)
 
-        episode_object.airdateModifyStamp()
+        episode_object.airdate_modify_stamp()
 
         if settings.USE_ICACLS and os.name == "nt":
-            os.popen('icacls "' + episode_object._location + '"* /reset /T')
+            os.popen(f'icacls "{episode_object._location}"* /reset /T')
 
         # generate nfo/tbn
         try:
-            episode_object.createMetaFiles()
+            episode_object.create_meta_files()
         except Exception:
             logger.info(_("Could not create/update meta files. Continuing with postProcessing..."))
 

sickchill/oldbeard/properFinder.py

@@ -222,7 +222,7 @@ def _download_propers(self, proper_list):
                     continue
 
                 # get the episode object
-                episode_object = proper.show.getEpisode(proper.season, proper.episode)
+                episode_object = proper.show.get_episode(proper.season, proper.episode)
 
                 # make the result object
                 result = proper.provider.get_result([episode_object])

sickchill/oldbeard/providers/bjshare.py

@@ -11,9 +11,7 @@
 
 
 class Provider(TorrentProvider):
-    """
-    BJ-Share Torrent provider.
-    """
+    """BJ-Share Torrent provider."""
 
     def __init__(self):
         """Initialize the class."""

sickchill/oldbeard/scene_numbering.py

@@ -209,7 +209,7 @@ def set_scene_numbering(indexer_id, indexer, season=None, episode=None, absolute
 
     # Reload data from DB so that cache and db are in sync
     show = Show.find(settings.showList, indexer_id)
-    show.flushEpisodes()
+    show.flush_episodes()
 
 
 def find_xem_numbering(indexer_id, indexer, season, episode):

sickchill/oldbeard/search.py

@@ -317,7 +317,7 @@ def wanted_episodes(show, from_date):
             elif quality in allowed_qualities:
                 continue
 
-        episode_object = show.getEpisode(result["season"], result["episode"])
+        episode_object = show.get_episode(result["season"], result["episode"])
         episode_object.wantedQuality = [i for i in all_qualities if i > quality and i != common.Quality.UNKNOWN]
         wanted.append(episode_object)
 
@@ -526,7 +526,7 @@ def search_providers(show, episodes, manual=False, downCurQuality=False):
             some_wanted = False
             for episode_number in all_episodes:
                 for season in (x.season for x in episodes):
-                    if not show.wantEpisode(season, episode_number, season_quality, downCurQuality):
+                    if not show.want_episode(season, episode_number, season_quality, downCurQuality):
                         all_wanted = False
                     else:
                         some_wanted = True
@@ -537,7 +537,7 @@ def search_providers(show, episodes, manual=False, downCurQuality=False):
                 episode_objects = []
                 for episode_number in all_episodes:
                     for season in {x.season for x in episodes}:
-                        episode_objects.append(show.getEpisode(season, episode_number))
+                        episode_objects.append(show.get_episode(season, episode_number))
                 best_season_result.episodes = episode_objects
 
                 # Remove provider from thread name before return results
@@ -575,7 +575,7 @@ def search_providers(show, episodes, manual=False, downCurQuality=False):
                     episode_objects = []
                     for episode_number in all_episodes:
                         for season in {x.season for x in episodes}:
-                            episode_objects.append(show.getEpisode(season, episode_number))
+                            episode_objects.append(show.get_episode(season, episode_number))
                     best_season_result.episodes = episode_objects
 
                     if MULTI_EP_RESULT in found_results[curProvider.name]:

sickchill/oldbeard/searchBacklog.py

@@ -139,7 +139,7 @@ def _get_segments(show, fromDate):
                 elif cur_quality in allowed_qualities:
                     continue
 
-            episode_object = show.getEpisode(sql_result["season"], sql_result["episode"])
+            episode_object = show.get_episode(sql_result["season"], sql_result["episode"])
 
             if episode_object.season not in wanted:
                 wanted[episode_object.season] = [episode_object]

sickchill/oldbeard/show_queue.py

@@ -480,7 +480,7 @@ def run(self):
         self.show.load_imdb_info()
 
         try:
-            self.show.saveToDB()
+            self.show.save_to_db()
         except Exception as error:
             logger.exception(f"Error saving the show to the database: {error}")
             logger.debug(traceback.format_exc())
@@ -492,7 +492,7 @@ def run(self):
             settings.showList.append(self.show)
 
         try:
-            self.show.loadEpisodesFromIndexer(force_all=True)
+            self.show.load_episodes_from_indexer(force_all=True)
         except Exception as error:
             logger.exception(f"Error with {self.show.idxr.name}, not creating episode list: {error}")
             logger.debug(traceback.format_exc())
@@ -501,7 +501,7 @@ def run(self):
         name_cache.build_name_cache(self.show)
 
         try:
-            self.show.loadEpisodesFromDir()
+            self.show.load_episodes_from_dir()
         except Exception as error:
             logger.exception(f"Error searching dir for episodes: {error}")
             logger.debug(traceback.format_exc())
@@ -512,11 +512,11 @@ def run(self):
             logger.info("Launching backlog for this show since its episodes are WANTED")
             settings.backlogSearchScheduler.action.searchBacklog([self.show])
 
-        self.show.writeMetadata()
-        self.show.updateMetadata()
-        self.show.populateCache()
+        self.show.write_metadata()
+        self.show.update_metadata()
+        self.show.populate_cache()
 
-        self.show.flushEpisodes()
+        self.show.flush_episodes()
 
         if settings.USE_TRAKT:
             # if there are specific episodes that need to be added by trakt
@@ -565,11 +565,11 @@ def run(self):
 
         logger.info(f"Performing refresh on {self.show.name}")
 
-        self.show.refreshDir()
-        self.show.writeMetadata()
+        self.show.refresh_dir()
+        self.show.write_metadata()
         if self.force:
-            self.show.updateMetadata()
-        self.show.populateCache()
+            self.show.update_metadata()
+        self.show.populate_cache()
 
         # Load XEM data to DB for show
         scene_numbering.xem_refresh(self.show.indexerid, self.show.indexer)
@@ -597,7 +597,7 @@ def run(self):
 
         ep_obj_rename_list = []
 
-        ep_obj_list = self.show.getAllEpisodes(has_location=True)
+        ep_obj_list = self.show.get_all_episodes(has_location=True)
         for cur_ep_obj in ep_obj_list:
             # Only want to rename if we have a location
             if cur_ep_obj.location:
@@ -655,27 +655,27 @@ def run(self):
 
         # have to save show before reading episodes from db
         try:
-            self.show.saveToDB()
+            self.show.save_to_db()
         except Exception as error:
             logger.exception(f"Error saving show info to the database: {error}")
             logger.debug(traceback.format_exc())
 
         # get episode list from DB
-        DBEpList = self.show.loadEpisodesFromDB()
+        DBEpList = self.show.load_episodes_from_db()
 
         # get episode list from TVDB
         logger.debug(f"Loading all episodes from {self.show.idxr.name}")
         try:
-            IndexerEpList = self.show.loadEpisodesFromIndexer(self.force)
+            IndexerEpList = self.show.load_episodes_from_indexer(self.force)
         except Exception as error:
             logger.exception(f"Unable to get info from {self.show.idxr.name}, the show info will not be refreshed: {error}")
             IndexerEpList = None
 
         if IndexerEpList:
             for curSeason in IndexerEpList:
                 for curEpisode in IndexerEpList[curSeason]:
-                    curEp = self.show.getEpisode(curSeason, curEpisode)
-                    curEp.saveToDB()
+                    curEp = self.show.get_episode(curSeason, curEpisode)
+                    curEp.save_to_db()
 
                     if curSeason in DBEpList and curEpisode in DBEpList[curSeason]:
                         del DBEpList[curSeason][curEpisode]
@@ -684,15 +684,15 @@ def run(self):
             for curSeason in DBEpList:
                 for curEpisode in DBEpList[curSeason]:
                     logger.info("Permanently deleting episode {0:02d}E{1:02d} from the database".format(curSeason, curEpisode))
-                    curEp = self.show.getEpisode(curSeason, curEpisode)
+                    curEp = self.show.get_episode(curSeason, curEpisode)
                     try:
-                        curEp.deleteEpisode()
+                        curEp.delete_episode()
                     except EpisodeDeletedException:
                         pass
 
         #  save show again, in case episodes have changed
         try:
-            self.show.saveToDB()
+            self.show.save_to_db()
         except Exception as error:
             logger.exception(f"Error saving show info to the database: {error}")
             logger.debug(traceback.format_exc())
@@ -716,7 +716,7 @@ def __init__(self, show=None, full=False):
     def run(self):
         super(QueueItemRemove, self).run()
         logger.info(f"Removing {self.show.name}")
-        self.show.deleteShow(full=self.full)
+        self.show.delete_show(full=self.full)
 
         if settings.USE_TRAKT:
             try:

sickchill/oldbeard/subtitles.py

@@ -446,7 +446,7 @@ def dhm(td):
                     logger.debug(f"Show with ID {ep_show_id} not found in the database")
                     continue
 
-                episode_object = show_object.getEpisode(ep_season, ep_episode)
+                episode_object = show_object.get_episode(ep_season, ep_episode)
                 if isinstance(episode_object, str):
                     logger.debug(f"{ep_show_name} {ep_string} not found in the database")
                     continue