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/gui/slick/views/displayShow.mako

@@ -404,9 +404,9 @@
                         (season_number, episode_number) = (default_season, default_episode)
                         default_episode_numbering = True
 
-                    epLoc = epResult["location"]
-                    if epLoc and show._location and epLoc.lower().startswith(show._location.lower()):
-                        epLoc = epLoc[len(show._location)+1:]
+                    episode_location = epResult["location"]
+                    if episode_location and show.get_location and episode_location.lower().startswith(show.get_location.lower()):
+                        episode_location = episode_location[len(show.get_location)+1:]
                 %>
                 % if int(epResult["season"]) != curSeason:
                     % if epResult["season"] != sql_results[0]["season"]:
@@ -485,8 +485,8 @@
                         <td class="text-center episode">
                             <%
                                 text = str(epResult['episode'])
-                                if epLoc:
-                                    text = '<span title="' + epLoc + '" class="addQTip">' + text + "</span>"
+                                if episode_location:
+                                    text = '<span title="' + episode_location + '" class="addQTip">' + text + "</span>"
                             %>
                         ${text}
                         </td>
@@ -523,7 +523,7 @@
                             % endif
                             ${epResult["name"]}
                         </td>
-                        <td class="col-name location">${epLoc}</td>
+                        <td class="col-name location">${episode_location}</td>
                         <td class="col-ep size">
                             % if epResult["file_size"]:
                             ${pretty_file_size(epResult["file_size"])}

sickchill/gui/slick/views/editShow.mako

@@ -79,7 +79,7 @@
                                     </div>
                                     <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc">
                                         <input type="hidden" name="show" id="showID" value="${show.indexerid}" />
-                                        <input type="text" name="location" id="location" value="${show._location}"
+                                        <input type="text" name="location" id="location" value="${show.get_location}"
                                                class="form-control input-sm input350"
                                                autocapitalize="off" title="Location" />
                                     </div>

sickchill/gui/slick/views/layouts/main.mako

@@ -382,7 +382,7 @@
                             % if resource:
                                 <span class="footer-item">${_('Memory used')}: <span class="footerhighlight">${pretty_file_size(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss*1024)}</span></span> |
                             % endif
-                            <span class="footer-item">${_('Load time')}: <span class="footerhighlight">${"{:.4f}".format(time() - sbStartTime)}s</span></span> |
+                            <span class="footer-item">${_('Load time')}: <span class="footerhighlight">${"{:.4f}".format(time() - scStartTime)}s</span></span> |
                             <span class="footer-item">Mako: <span class="footerhighlight">${"{:.4f}".format(time() - makoStartTime)}s</span></span> |
                             <span class="footer-item">${_('Version')}: <span class="footerhighlight">${get_current_version()}</span></span> |
                             <span class="footer-item">${_('Now')}: <span class="footerhighlight">${datetime.datetime.now().strftime(settings.DATE_PRESET+" "+settings.TIME_PRESET)}</span></span>

sickchill/gui/slick/views/manage.mako

@@ -109,7 +109,7 @@
                                     <td class="text-center">${statusStrings[curShow.default_ep_status]}</td>
                                     <td class="text-center">${_(curShow.status)}</td>
 
-                                    <td class="text-center">${curShow._location.rsplit('\\', 1)[0]}</td>
+                                    <td class="text-center">${curShow.get_location.rsplit('\\', 1)[0]}</td>
                                     <td class="text-center">
                                         <% disabled = settings.showQueueScheduler.action.is_being_updated(curShow) or settings.showQueueScheduler.action.is_in_update_queue(curShow) %>
                                         <label for="update-${curShow.indexerid}" class="sr-only">${_('Update')} ${curShow.name}</label>

sickchill/gui/slick/views/testRename.mako

@@ -78,14 +78,14 @@
                             % for current_episode in sorted(show.episodes[current_season], reverse=True):
                                 <%
                                     episode_object = show.episodes[current_season][current_episode]
-                                    if not (episode_object and episode_object._location):
+                                    if not (episode_object and episode_object.location):
                                         continue
 
                                     episode_list = episode_object.sorted_episode_list
                                     if episode_object.episode != min(episode_list):
                                         continue
 
-                                    location = episode_object.location[len(show._location)+1:]
+                                    location = episode_object.location[len(show.get_location)+1:]
                                     extension = location.split('.')[-1]
                                     new_location = episode_object.proper_path() + '.' + extension
                                 %>

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
@@ -891,22 +891,22 @@ def _check_against_names(nameInQuestion, show, season=-1):
     return False
 
 
-def get_show(name, tryIndexers=False):
+def get_show(name, try_indexers=False):
     if not settings.showList:
         return
 
-    showObj = None
-    fromCache = False
+    show_object = None
+    from_cache = False
 
     if not name:
-        return showObj
+        return show_object
 
     try:
         # check cache for show
         cache = sickchill.oldbeard.name_cache.get_id_from_name(name)
         if cache:
-            fromCache = True
-            showObj = Show.find(settings.showList, int(cache))
+            from_cache = True
+            show_object = Show.find(settings.showList, int(cache))
         else:
             check_names = [full_sanitizeSceneName(name), name]
             show_matches = [
@@ -917,31 +917,31 @@ def get_show(name, tryIndexers=False):
             ]
 
             if len(show_matches) == 1:
-                showObj = show_matches[0]
+                show_object = show_matches[0]
 
         # try indexers
-        if not showObj and tryIndexers:
+        if not show_object and try_indexers:
             result = sickchill.indexer.search_indexers_for_series_id(name=full_sanitizeSceneName(name))[1]
             if result:
-                showObj = Show.find(settings.showList, result.id)
+                show_object = Show.find(settings.showList, result.id)
 
         # try scene exceptions
-        if not showObj:
+        if not show_object:
             scene_exceptions = sickchill.oldbeard.scene_exceptions.get_scene_exception_by_name_multiple(name)
             for scene_exception in scene_exceptions:
                 if scene_exception[0]:
-                    showObj = Show.find(settings.showList, scene_exception[0])
-                    if showObj:
+                    show_object = Show.find(settings.showList, scene_exception[0])
+                    if show_object:
                         break
 
         # add show to cache
-        if showObj and not fromCache:
-            sickchill.oldbeard.name_cache.add_name(name, showObj.indexerid)
+        if show_object and not from_cache:
+            sickchill.oldbeard.name_cache.add_name(name, show_object.indexerid)
     except Exception as error:
         logger.debug(_("There was a problem when attempting to find {name} in SickChill. Error: {error}").format(name=name, error=error))
         logger.debug(traceback.format_exc())
 
-    return showObj
+    return show_object
 
 
 def is_hidden_folder(folder):