Merge pull request #8507 from SickChill/paused

Pause and Ended Shows delay, xhtml_unescape

.gitignore

@@ -101,8 +101,6 @@ venv
 **/*.so
 lib[23]/bin
 lib[23]/.libs_cffi_backend
-lib[23]/bin
-lib[23]/.libs_cffi_backend
 lib[23]/cffi.libs
 atlassian-ide-plugin.xml
 

SickChill.py

@@ -44,7 +44,7 @@
 from sickchill.oldbeard.event_queue import Events
 from sickchill.tv import TVShow
 from sickchill.update_manager import PipUpdateManager
-from sickchill.views.server_settings import SRWebServer
+from sickchill.views.server_settings import SCWebServer
 
 # http://bugs.python.org/issue7980#msg221094
 THROWAWAY = datetime.datetime.strptime("20110101", "%Y%m%d")
@@ -122,7 +122,7 @@ def start(self):
 
         settings.NO_RESIZE = args.noresize
         self.console_logging = not (hasattr(sys, "frozen") or args.quiet or args.daemon)
-        self.no_launch = args.nolaunch or args.daemon
+        self.no_launch = args.nolaunch or args.daemon or args.debug
         self.forced_port = args.port
         self.run_as_daemon = args.daemon and platform.system() != "Windows"
 
@@ -168,7 +168,9 @@ def start(self):
         settings.CFG = ConfigObj(settings.CONFIG_FILE, encoding="UTF-8", indent_type="  ")
 
         # Initialize the config and our threads
-        sickchill.start.initialize(consoleLogging=self.console_logging)
+        sickchill.start.initialize(
+            console_logging=self.console_logging, debug=args.debug, dbdebug=args.dbdebug, disable_file_logging=args.no_file_logging or args.debug
+        )
 
         # Get PID
         settings.PID = os.getpid()
@@ -183,7 +185,7 @@ def start(self):
         if settings.DEVELOPER:
             settings.movie_list = MovieList()
 
-        web_options = {}
+        web_options = {"debug": args.debug}
         if self.forced_port:
             logger.info("Forcing web server to port {port}".format(port=self.forced_port))
             self.start_port = self.forced_port
@@ -196,7 +198,7 @@ def start(self):
             self.start_port = settings.WEB_PORT
 
         # start web server
-        self.web_server = SRWebServer(web_options)
+        self.web_server = SCWebServer(web_options)
         self.web_server.start()
 
         if args.flask and FlaskServer:

bower.json

@@ -16,7 +16,7 @@
     "jquery-timeago": "~1.5.4",
     "bootstrap3-typeahead": "~4.0.2",
     "underscore": "~1.8.3",
-    "pnotify": "<3.0",
+    "pnotify": "~3.2.1",
     "qtip2": "~2.2.1",
     "tablesorter": "jquery.tablesorter#~2.28.4",
     "jquery-confirm": "~2.7.0",

contrib/runscripts/init.debian

@@ -30,17 +30,17 @@ fi
 ## Don't edit this file!
 ## Edit user configuation in /etc/default/sickchill to change
 ##
-## SR_USER=         #$RUN_AS, username to run sickchill under, the default is sickchill
-## SR_GROUP=        #$RUN_GROUP, group to run sickchill under, the default is sickchill
-## SR_HOME=         #$APP_PATH, the location of SickChill.py, the default is /opt/sickchill
-## SR_DATA=         #$DATA_DIR, the location of sickchill.db, cache, logs, the default is /opt/sickchill
-## SR_PIDFILE=      #$PID_FILE, the location of sickchill.pid, the default is /var/run/sickchill/sickchill.pid
+## SC_USER=         #$RUN_AS, username to run sickchill under, the default is sickchill
+## SC_GROUP=        #$RUN_GROUP, group to run sickchill under, the default is sickchill
+## SC_HOME=         #$APP_PATH, the location of SickChill.py, the default is /opt/sickchill
+## SC_DATA=         #$DATA_DIR, the location of sickchill.db, cache, logs, the default is /opt/sickchill
+## SC_PIDFILE=      #$PID_FILE, the location of sickchill.pid, the default is /var/run/sickchill/sickchill.pid
 ## PYTHON_BIN=      #$DAEMON, the location of the python binary, the default is /usr/bin/python3
-## SR_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for sickchill, i.e. " --config=/home/sickchill/config.ini"
+## SC_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for sickchill, i.e. " --config=/home/sickchill/config.ini"
 ## SSD_OPTS=        #$EXTRA_SSD_OPTS, extra start-stop-daemon option like " --group=users"
 ##
 ## EXAMPLE if want to run as different user
-## add SR_USER=username to /etc/default/sickchill
+## add SC_USER=username to /etc/default/sickchill
 ## otherwise default sickchill is used
 
 # Script name
@@ -51,25 +51,25 @@ DESC=SickChill
 
 ## The defaults
 # Run as username
-RUN_AS=${SR_USER-sickchill}
+RUN_AS=${SC_USER-sickchill}
 
 # Run as group
-RUN_GROUP=${SR_GROUP-sickchill}
+RUN_GROUP=${SC_GROUP-sickchill}
 
-# Path to app SR_HOME=path_to_app_SickChill.py
-APP_PATH=${SR_HOME-/opt/sickchill}
+# Path to app SC_HOME=path_to_app_SickChill.py
+APP_PATH=${SC_HOME-/opt/sickchill}
 
 # Data directory where sickchill.db, cache and logs are stored
-DATA_DIR=${SR_DATA-/opt/sickchill}
+DATA_DIR=${SC_DATA-/opt/sickchill}
 
 # Path to store PID file
-PID_FILE=${SR_PIDFILE-/var/run/sickchill/sickchill.pid}
+PID_FILE=${SC_PIDFILE-/var/run/sickchill/sickchill.pid}
 
 # path to python bin
 DAEMON=${PYTHON_BIN-/usr/bin/python3}
 
-# Extra daemon option like: SR_OPTS=" --config=/home/sickchill/config.ini"
-EXTRA_DAEMON_OPTS=${SR_OPTS-}
+# Extra daemon option like: SC_OPTS=" --config=/home/sickchill/config.ini"
+EXTRA_DAEMON_OPTS=${SC_OPTS-}
 
 # Extra start-stop-daemon option like START_OPTS=" --group=users"
 EXTRA_SSD_OPTS=${SSD_OPTS-}

contrib/runscripts/init.fedora

@@ -23,11 +23,11 @@ lockfile=/var/lock/subsys/$prog
 
 ## Edit user configuation in /etc/sysconfig/sickchill to change
 ## the defaults
-username=${SR_USER-sickchill}
-homedir=${SR_HOME-/opt/sickchill}
-datadir=${SR_DATA-/opt/sickchill}
-pidfile=${SR_PIDFILE-/var/run/sickchill/sickchill.pid}
-nice=${SR_NICE-}
+username=${SC_USER-sickchill}
+homedir=${SC_HOME-/opt/sickchill}
+datadir=${SC_DATA-/opt/sickchill}
+pidfile=${SC_PIDFILE-/var/run/sickchill/sickchill.pid}
+nice=${SC_NICE-}
 python_bin=${PYTHON_BIN-/usr/bin/python3}
 ##
 

contrib/runscripts/init.systemd

@@ -37,10 +37,10 @@
 # Type=simple
 # ExecStart=/usr/bin/python3 /opt/sickchill/SickChill.py -q --nolaunch
 
-### Example Using simple with EnvironmentFile where SR_DATA=/home/sickchill/.sickchill in /etc/sickchill.conf
+### Example Using simple with EnvironmentFile where SC_DATA=/home/sickchill/.sickchill in /etc/sickchill.conf
 # Type=simple
 # EnvironmentFile=/etc/sickchill.conf
-# ExecStart=/usr/bin/python3 /opt/sickchill/SickChill.py -q --nolaunch --datadir=${SR_DATA}
+# ExecStart=/usr/bin/python3 /opt/sickchill/SickChill.py -q --nolaunch --datadir=${SC_DATA}
 
 ### Configuration
 

contrib/runscripts/init.ubuntu

@@ -31,36 +31,36 @@ DESC=SickChill
 ## Don't edit this file
 ## Edit user configuation in /etc/default/sickchill to change
 ##
-## SR_USER=         #$RUN_AS, username to run sickchill under, the default is sickchill
-## SR_HOME=         #$APP_PATH, the location of SickChill.py, the default is /opt/sickchill
-## SR_DATA=         #$DATA_DIR, the location of sickchill.db, cache, logs, the default is /opt/sickchill
-## SR_PIDFILE=      #$PID_FILE, the location of sickchill.pid, the default is /var/run/sickchill/sickchill.pid
+## SC_USER=         #$RUN_AS, username to run sickchill under, the default is sickchill
+## SC_HOME=         #$APP_PATH, the location of SickChill.py, the default is /opt/sickchill
+## SC_DATA=         #$DATA_DIR, the location of sickchill.db, cache, logs, the default is /opt/sickchill
+## SC_PIDFILE=      #$PID_FILE, the location of sickchill.pid, the default is /var/run/sickchill/sickchill.pid
 ## PYTHON_BIN=      #$DAEMON, the location of the python binary, the default is /usr/bin/python3
-## SR_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for sickchill, i.e. " --config=/home/sickchill/config.ini"
+## SC_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for sickchill, i.e. " --config=/home/sickchill/config.ini"
 ## SSD_OPTS=        #$EXTRA_SSD_OPTS, extra start-stop-daemon option like " --group=users"
 ##
 ## EXAMPLE if want to run as different user
-## add SR_USER=username to /etc/default/sickchill
+## add SC_USER=username to /etc/default/sickchill
 ## otherwise default sickchill is used
 
 ## The defaults
 # Run as username
-RUN_AS=${SR_USER-sickchill}
+RUN_AS=${SC_USER-sickchill}
 
-# Path to app SR_HOME=path_to_app_SickChill.py
-APP_PATH=${SR_HOME-/opt/sickchill}
+# Path to app SC_HOME=path_to_app_SickChill.py
+APP_PATH=${SC_HOME-/opt/sickchill}
 
 # Data directory where sickchill.db, cache and logs are stored
-DATA_DIR=${SR_DATA-/opt/sickchill}
+DATA_DIR=${SC_DATA-/opt/sickchill}
 
 # Path to store PID file
-PID_FILE=${SR_PIDFILE-/var/run/sickchill/sickchill.pid}
+PID_FILE=${SC_PIDFILE-/var/run/sickchill/sickchill.pid}
 
 # path to python bin
 DAEMON=${PYTHON_BIN-/usr/bin/python3}
 
-# Extra daemon option like: SR_OPTS=" --config=/home/sickchill/config.ini"
-EXTRA_DAEMON_OPTS=${SR_OPTS-}
+# Extra daemon option like: SC_OPTS=" --config=/home/sickchill/config.ini"
+EXTRA_DAEMON_OPTS=${SC_OPTS-}
 
 # Extra start-stop-daemon option like START_OPTS=" --group=users"
 EXTRA_SSD_OPTS=${SSD_OPTS-}

contrib/runscripts/init.upstart

@@ -6,9 +6,9 @@
 #    - For all other settings edit /etc/default/sickchill instead of this file.
 #
 #      The following settings can be set in /etc/default/sickchill and are used to run SickChill.
-#       SR_HOME=         #$APP_PATH, the location of SickChill.py, the default is /opt/sickchill
-#       SR_DATA=         #$DATA_DIR, the location of sickchill.db, cache, logs, the default is /opt/sickchill
-#       SR_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for sickchill, i.e. " --config=/home/sickchill/config.ini"
+#       SC_HOME=         #$APP_PATH, the location of SickChill.py, the default is /opt/sickchill
+#       SC_DATA=         #$DATA_DIR, the location of sickchill.db, cache, logs, the default is /opt/sickchill
+#       SC_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for sickchill, i.e. " --config=/home/sickchill/config.ini"
 
 description "SickChill Daemon"
 
@@ -34,5 +34,5 @@ script
         echo "/etc/default/sickchill not found using default settings.";
     fi
 
-    exec ${SR_HOME-/opt/sickchill}/SickChill.py -q --nolaunch --datadir=${SR_DATA-/opt/sickchill} ${SR_OPTS-}
+    exec ${SC_HOME-/opt/sickchill}/SickChill.py -q --nolaunch --datadir=${SC_DATA-/opt/sickchill} ${SC_OPTS-}
 end script

package.json

@@ -66,6 +66,8 @@
     "sass-loader": "^13.1.0",
     "snyk": "^1.1191.0",
     "style-loader": "^3.3.1",
+    "stylelint": "^15.10.2",
+    "stylelint-config-idiomatic-order": "^9.0.0",
     "toml": "^3.0.0",
     "webpack": "^5.76.0",
     "webpack-cli": "^5.0.0",
@@ -90,6 +92,9 @@
       "!**/*.min.js"
     ]
   },
+  "stylelint": {
+    "extends": "stylelint-config-idiomatic-order"
+  },
   "xo": {
     "space": 4,
     "rules": {

pyproject.toml

@@ -291,7 +291,7 @@ SQLAlchemy = ">=2.0.0,<3.0.0"
 python-slugify = ">=4.0.1,<9.0.0"
 guessit = "^3.3.1"
 requests = "^2.25.1"
-IMDbPY = ">=2020.09.25"
+cinemagoer = ">=2023.05.1"
 babelfish = ">=0.6.0b1"
 kodipydent-alt = ">=2022.9.3"
 beekeeper-alt = ">=2022.9.3"

sickchill/gui/slick/css/browser.css

@@ -8,8 +8,8 @@
 }
 
 .fileBrowserDialog ul {
-    margin: 0;
     padding: 0;
+    margin: 0;
 }
 
 .fileBrowserDialog ul li {
@@ -24,8 +24,8 @@
 }
 
 .fileBrowserDialog ul li a:hover {
-    color: #00f;
     background: none;
+    color: #00f;
 }
 
 .fileBrowserDialog ul li a .ui-icon {
@@ -35,9 +35,9 @@
 
 .ui-autocomplete {
     max-height: 180px;
-    overflow-y: auto;
-    /* prevent horizontal scrollbar */
-    overflow-x: hidden;
     /* add padding to account for vertical scrollbar */
     padding-right: 20px;
+    /* prevent horizontal scrollbar */
+    overflow-x: hidden;
+    overflow-y: auto;
 }