mass refactor tv.py

.editorconfig

@@ -1,15 +1,10 @@
-# top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
-# and trailing whitespace removed
 [*]
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-# Matches multiple files with brace expansion notation
-# Set default charset
 [*.{py,mako}]
 charset = utf-8
 indent_style = space
@@ -20,12 +15,9 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
-# Matches configuration files for services like Travis, AppVeyor and Codecov
 [*.yml]
 indent_style = space
 indent_size = 2
 
-[{package.json, bower.json, webpack.config.js}]
-charset = utf-8
-indent_style = space
+[{package.json,bower.json,webpack.config.js}]
 indent_size = 2

.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

@@ -120,19 +120,19 @@
         <nav class="navbar navbar-default navbar-fixed-top hidden-print">
             <div class="container-fluid">
                 <%
-                    numCombined = numErrors + numWarnings + settings.NEWS_UNREAD
-                    if numCombined:
-                        if numErrors:
+                    total_warning_error_count = error_count + warning_count + settings.NEWS_UNREAD
+                    if total_warning_error_count:
+                        if error_count:
                             toolsBadgeClass = ' btn-danger'
-                        elif numWarnings:
+                        elif warning_count:
                             toolsBadgeClass = ' btn-warning'
                         else:
                             toolsBadgeClass = ''
                 %>
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#collapsible-navbar">
-                        % if numCombined:
-                            <span class="floating-badge${ toolsBadgeClass }">${ str(numCombined) }</span>
+                        % if total_warning_error_count:
+                            <span class="floating-badge${ toolsBadgeClass }">${ str(total_warning_error_count) }</span>
                         % endif
                         <span class="sr-only">Toggle navigation</span>
                         <span class="icon-bar"></span>
@@ -142,7 +142,7 @@
                     <a class="navbar-brand" href="${static_url('home/', include_version=False)}" title="SickChill"><img alt="SickChill" src="${static_url('images/sickchill.png')}"
                                                                                  class="img-responsive pull-left" /></a>
                 </div>
-                % if scLogin:
+                % if current_user:
                     <div class="collapse navbar-collapse" id="collapsible-navbar">
                         <ul class="nav navbar-nav navbar-right">
                             <%block name="navbar" />
@@ -243,8 +243,8 @@
                                 else:
                                     newsBadge = ''
 
-                                if numCombined:
-                                    toolsBadge = ' <span class="badge'+toolsBadgeClass+'">'+str(numCombined)+'</span>'
+                                if total_warning_error_count:
+                                    toolsBadge = ' <span class="badge'+toolsBadgeClass+'">'+str(total_warning_error_count)+'</span>'
                                 else:
                                     toolsBadge = ''
                             %>
@@ -260,26 +260,26 @@
                                     <li><a href="${static_url('changes/', include_version=False)}"><i class="fa fa-fw fa-globe"></i>&nbsp;${_('Changelog')}</a></li>
                                     <li><a href="${anon_url('https://github.com/SickChill/SickChill/wiki/Donations')}" rel="noreferrer" target="_blank"><i class="fa fa-fw fa-life-ring"></i>&nbsp;${_('Support SickChill')}</a></li>
                                     <li role="separator" class="divider"></li>
-                                    %if numErrors:
-                                        <li><a href="${static_url('errorlogs/', include_version=False)}"><i class="fa fa-fw fa-exclamation-circle"></i>&nbsp;${_('View Errors')} <span class="badge btn-danger">${numErrors}</span></a></li>
+                                    %if error_count:
+                                        <li><a href="${static_url('errorlogs/', include_version=False)}"><i class="fa fa-fw fa-exclamation-circle"></i>&nbsp;${_('View Errors')} <span class="badge btn-danger">${error_count}</span></a></li>
                                     %endif
-                                    %if numWarnings:
+                                    %if warning_count:
                                         <li>
                                           <a href="${static_url('errorlogs/?level={}'.format(logger.WARNING), include_version=False)}">
-                                            <i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;${_('View Warnings')} <span class="badge btn-warning">${numWarnings}</span>
+                                            <i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;${_('View Warnings')} <span class="badge btn-warning">${warning_count}</span>
                                           </a>
                                         </li>
                                     %endif
                                     <li><a href="${static_url('errorlogs/viewlog/', include_version=False)}"><i class="fa fa-fw fa-file-text-o"></i>&nbsp;${_('View Log')}</a></li>
                                     <li role="separator" class="divider"></li>
                                     % if hasattr(settings, "DISABLE_UPDATER") and not settings.DISABLE_UPDATER:
-                                    <li><a href="${static_url('home/updateCheck?pid={}'.format(scPID), include_version=False)}"><i class="fa fa-fw fa-wrench"></i>&nbsp;${_('Check For Updates')}</a></li>
+                                    <li><a href="${static_url('home/updateCheck?pid={}'.format(process_id), include_version=False)}"><i class="fa fa-fw fa-wrench"></i>&nbsp;${_('Check For Updates')}</a></li>
                                     % endif
-                                    <li><a href="${static_url('home/restart/?pid={}'.format(scPID), include_version=False)}" class="confirm restart"><i
+                                    <li><a href="${static_url('home/restart/?pid={}'.format(process_id), include_version=False)}" class="confirm restart"><i
                                         class="fa fa-fw fa-repeat"></i>&nbsp;${_('Restart')}</a></li>
-                                    <li><a href="${static_url('home/shutdown/?pid={}'.format(scPID), include_version=False)}" class="confirm shutdown"><i
+                                    <li><a href="${static_url('home/shutdown/?pid={}'.format(process_id), include_version=False)}" class="confirm shutdown"><i
                                         class="fa fa-fw fa-power-off"></i>&nbsp;${_('Shutdown')}</a></li>
-                                    % if scLogin:
+                                    % if current_user:
                                         <li><a href="${static_url('logout', include_version=False)}" class="confirm logout"><i class="fa fa-fw fa-sign-out"></i>&nbsp;${_('Logout')}</a></li>
                                     % endif
                                     <li role="separator" class="divider"></li>
@@ -320,7 +320,7 @@
                     </div>
                 % endif
                 <div class="clearfix"></div>
-                % if scLogin:
+                % if current_user:
                     <div id="site-messages"></div>
                 % endif
             </div>
@@ -349,7 +349,7 @@
                 </div>
             </div>
 
-            % if scLogin:
+            % if current_user:
                 <div class="row">
                     <div class="footer clearfix col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1 col-sm-12 col-xs-12">
                         <%
@@ -382,8 +382,8 @@
                             % 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">Mako: <span class="footerhighlight">${"{:.4f}".format(time() - makoStartTime)}s</span></span> |
+                            <span class="footer-item">${_('Load time')}: <span class="footerhighlight">${"{:.4f}".format(time() - page_load_start_time)}s</span></span> |
+                            <span class="footer-item">Mako: <span class="footerhighlight">${"{:.4f}".format(time() - mako_load_start_time)}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>
                         </div>

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/restart.mako

@@ -1,6 +1,6 @@
 <%inherit file="/layouts/main.mako" />
 <%block name="metas">
-    <meta data-var="scDefaultPage" data-content="${sbDefaultPage}">
+    <meta data-var="scDefaultPage" data-content="${sc_default_page}">
 </%block>
 
 <%block name="css">

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)