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/js/core.js

@@ -137,7 +137,7 @@ const SICKCHILL = {
                     + '<input type="checkbox" id="deleteFiles" name="deleteFiles"/>&nbsp;'
                     + '<label for="deleteFiles" class="red-text">Check to delete files as well. IRREVERSIBLE</label>',
                 confirm(event) {
-                    location.href = event.context.href + ($('#deleteFiles')[0].checked ? '&full=1' : '');
+                    location.href = event.context.href + ($('#deleteFiles')[0].checked ? '&full=1' : '&full=0');
                 },
             });
 

sickchill/gui/slick/views/addShows_favoriteShows.mako

@@ -96,7 +96,7 @@
                                         <i>${cur_result.siteRatingCount}</i>
                                         <div class="traktShowTitleIcons">
                                             <a href="${scRoot}/addShows/addShowByID?indexer_id=${cur_result.id}&amp;show_name=${cur_result.seriesName | u}&amp;indexer=TVDB"
-                                               class="btn btn-xs" data-no-redirect>${_('Add Show')}</a>
+                                               class="btn btn-xs">${_('Add Show')}</a>
                                         </div>
                                     </div>
                                 </div>

sickchill/gui/slick/views/addShows_popularShows.mako

@@ -75,7 +75,7 @@
 
                                         <div class="traktShowTitleIcons">
                                             <a href="${scRoot}/addShows/addShowByID?indexer_id=${current_imdb_id}&amp;show_name=${current_result['title'] | u}&amp;indexer=IMDB"
-                                               class="btn btn-xs" data-no-redirect>${_('Add Show')}</a>
+                                               class="btn btn-xs">${_('Add Show')}</a>
                                         </div>
                                     </div>
                                 </div>