Merge branch 'release/10.0.64'

30f3a470 · echel0n · d66c72ad · 4a62d61c · 30f3a470 · 30f3a470
Commit 30f3a470 authored Jun 17, 2022 by echel0n
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,8 @@
 .gitignore
 .gitattributes
 .eslintc
+**/__pycache__
+**/*.py[cod]
 src
 tests
 runscripts

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,16 @@
  
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
  
+#### [10.0.64](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.63...10.0.64)
+
+- moved loading of core module to outside try/except block for init app settings [`82955e5`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/82955e589d8ba99cf419ff498e4f893fa556e2ec)
+- moved loading of core module to outside try/except block for init app settings [`b9e97aa`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/b9e97aa1afa3bcd3146eabf6e4a1657dd3ba7c87)
+- added missing dev depend mako to requirements-dev.txt [`1bff2fb`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/1bff2fbe57edd679cec068caca5066662556108d)
+
 #### [10.0.63](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.62...10.0.63)
  
+> 2 June 2022
+
 - refactored log level of rarbg provider to debug for rarbg api returned errors [`619e864`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/619e8648e4329e3eacad102bcc9e9801e3ebde40)
  
 #### [10.0.62](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.61...10.0.62)

--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,8 @@ include README.txt
 include COPYING.txt
 include CHANGELOG.md
 include requirements.txt
-recursive-include sickrage *
\ No newline at end of file
+
+recursive-include sickrage *
+
+global-exclude __pycache__
+global-exclude *.py[cod]
\ No newline at end of file
--- a/SiCKRAGE.py
+++ b/SiCKRAGE.py
@@ -19,17 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
 # ##############################################################################
-import os
-import pathlib
-import shutil
+from sickrage import main

 if __name__ == '__main__':
- # remove pyc and pyo files
- [p.unlink() for p in pathlib.Path(os.path.dirname(__file__)).rglob('*.py[co]')]
-
- # remove __pycache__ folder
- [shutil.rmtree(str(p)) for p in pathlib.Path(os.path.dirname(__file__)).rglob('__pycache__')]
-
- from sickrage import main
-
 main()
--- a/package.json
+++ b/package.json
 {
 "name": "sickrage",
- "version": "10.0.63",
+ "version": "10.0.64",
 "private": true,
 "repository": {
 "type": "git",

--- a/requirements-dev.txt
+++ b/requirements-dev.txt
 twine
 crowdin-cli-py
 babel
-wheel
 tox
 vcrpy-unittest
-Mako
\ No newline at end of file
+mako
--- a/requirements.txt
+++ b/requirements.txt
@@ -76,6 +76,7 @@ python-twitter==3.5
 pytz==2020.1
 pyxdg==0.26
 PyYAML==5.4.1
+pywin32==304; sys_platform == 'win32'
 rarfile==3.1
 rebulk==2.0.1
 requests==2.24.0
@@ -93,6 +94,7 @@ SQLAlchemy==1.4.32
 SQLAlchemy-Utils==0.38.2
 stevedore==3.2.0
 subliminal==2.1.0
+telnetlib3==1.0.4
 tornado==6.1
 twilio==6.44.2
 typing-extensions==4.1.1

--- a/setup.cfg
+++ b/setup.cfg
 [bumpversion]
-current_version = 10.0.63
+current_version = 10.0.64
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?

--- a/sickrage.ico
+++ b/sickrage.ico
--- a/sickrage/__init__.py
+++ b/sickrage/__init__.py
@@ -19,36 +19,101 @@
 # along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
 # ##############################################################################

-__version__ = "10.0.63"
+__version__ = "10.0.64"
 __install_type__ = ""

+import sys
+
+# sickrage requires python 3.6+
+if sys.version_info < (3, 6, 0):
+ sys.exit("Sorry, SiCKRAGE requires Python 3.6+")
+
 import argparse
 import atexit
 import gettext
+import multiprocessing
 import os
 import pathlib
 import re
 import site
 import subprocess
-import sys
 import threading
 import time
 import traceback
-from signal import SIGTERM
-
 import pkg_resources

+# pywin32 for windows service
+try:
+ import win32api
+ import win32serviceutil
+ import win32evtlogutil
+ import win32event
+ import win32service
+ import win32ts
+ import servicemanager
+ from win32com.shell import shell, shellcon
+except ImportError:
+ if __install_type__ == 'windows':
+ sys.exit("Sorry, SiCKRAGE requires Python module PyWin32.")
+
+from signal import SIGTERM
+
 app = None

 MAIN_DIR = os.path.abspath(os.path.realpath(os.path.expanduser(os.path.dirname(os.path.dirname(__file__)))))
 PROG_DIR = os.path.abspath(os.path.realpath(os.path.expanduser(os.path.dirname(__file__))))
 LOCALE_DIR = os.path.join(PROG_DIR, 'locale')
-LIBS_DIR = os.path.join(PROG_DIR, 'libs')
 CHANGELOG_FILE = os.path.join(MAIN_DIR, 'CHANGELOG.md')
 REQS_FILE = os.path.join(MAIN_DIR, 'requirements.txt')
 CHECKSUM_FILE = os.path.join(PROG_DIR, 'checksums.md5')
 AUTO_PROCESS_TV_CFG_FILE = os.path.join(*[PROG_DIR, 'autoProcessTV', 'autoProcessTV.cfg'])

+# add sickrage libs path to python system path
+LIBS_DIR = os.path.join(PROG_DIR, 'libs')
+if not (LIBS_DIR in sys.path) and not getattr(sys, 'frozen', False):
+ sys.path, remainder = sys.path[:1], sys.path[1:]
+ site.addsitedir(LIBS_DIR)
+ sys.path.extend(remainder)
+
+# set system default language
+gettext.install('messages', LOCALE_DIR, codeset='UTF-8', names=["ngettext"])
+
+if __install_type__ == 'windows':
+ class SiCKRAGEService(win32serviceutil.ServiceFramework):
+ _svc_name_ = "SiCKRAGE"
+ _svc_display_name_ = "SiCKRAGE"
+ _svc_description_ = (
+ "Automated video library manager for TV shows. "
+ 'Set to "automatic" to start the service at system startup. '
+ "You may need to login with a real user account when you need "
+ "access to network shares."
+ )
+
+ if hasattr(sys, "frozen"):
+ _exe_name_ = "SiCKRAGE.exe"
+
+ def __init__(self, args):
+ win32serviceutil.ServiceFramework.__init__(self, args)
+ self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
+
+ def SvcDoRun(self):
+ msg = "SiCKRAGE-service %s" % __version__
+ self.Logger(servicemanager.PYS_SERVICE_STARTED, msg + " has started")
+ start()
+ self.Logger(servicemanager.PYS_SERVICE_STOPPED, msg + " has stopped")
+
+ def SvcStop(self):
+ if app:
+ app.shutdown()
+
+ self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
+ win32event.SetEvent(self.hWaitStop)
+
+ def Logger(self, state, msg):
+ win32evtlogutil.ReportEvent(
+ self._svc_display_name_, state, 0, servicemanager.EVENTLOG_INFORMATION_TYPE, (self._svc_name_, msg)
+ )
+

 class Daemon(object):
 """
@@ -239,26 +304,43 @@ def verify_checksums(remove_unverified=False):
 print('Unable to delete unverified filename {} during checksum verification, you should delete this file manually!'.format(full_filename))


+def handle_windows_service():
+ if hasattr(sys, "frozen") and win32ts.ProcessIdToSessionId(win32api.GetCurrentProcessId()) == 0:
+ servicemanager.Initialize()
+ servicemanager.PrepareToHostSingle(SiCKRAGEService)
+ servicemanager.StartServiceCtrlDispatcher()
+ return True
+
+ if len(sys.argv) > 1 and sys.argv[1] in ("install", "update", "remove", "start", "stop", "restart", "debug"):
+ win32serviceutil.HandleCommandLine(SiCKRAGEService)
+ del sys.argv[1]
+ return True
+
+
 def main():
- global app
+ multiprocessing.freeze_support()

 # set thread name
- threading.currentThread().setName('MAIN')
+ threading.current_thread().name = 'MAIN'

 # fix threading time bug
 time.strptime("2012", "%Y")

- # add sickrage libs path to python system path
- if not (LIBS_DIR in sys.path):
- sys.path, remainder = sys.path[:1], sys.path[1:]
- site.addsitedir(LIBS_DIR)
- sys.path.extend(remainder)
+ if __install_type__ == 'windows':
+ if not handle_windows_service():
+ start()
+ else:
+ start()
+
+
+def start():
+ global app

- # set system default language
- gettext.install('messages', LOCALE_DIR, codeset='UTF-8', names=["ngettext"])
+ parser = argparse.ArgumentParser(
+ prog='sickrage',
+ description='Automated video library manager for TV shows'
+ )

- # sickrage startup options
- parser = argparse.ArgumentParser(prog='sickrage')
 parser.add_argument('-v', '--version',
 action='version',
 version=version())
@@ -325,23 +407,29 @@ def main():
 # Parse startup args
 args = parser.parse_args()

- # sickrage requires python 3.6+
- if sys.version_info < (3, 6, 0):
- sys.exit("Sorry, SiCKRAGE requires Python 3.6+")
-
- # check lib requirements
- if install_type() not in ['windows', 'synology', 'docker', 'qnap', 'readynas', 'pip']:
- check_requirements()
+ # check requirements
+ # if install_type() not in ['windows', 'synology', 'docker', 'qnap', 'readynas', 'pip']:
+ # check_requirements()

 # verify file checksums, remove unverified files
- verify_checksums(remove_unverified=not args.no_clean)
+ # verify_checksums(remove_unverified=not args.no_clean)

 try:
 from sickrage.core import Core
-
- # main app instance
 app = Core()
+ except ImportError:
+ try:
+ # attempt to send exception to sentry
+ import sentry_sdk
+ sentry_sdk.capture_exception(e)
+ except ImportError:
+ pass

+ traceback.print_exc()
+
+ sys.exit("Sorry, SiCKRAGE requirements need to be installed.")
+
+ try:
 app.quiet = args.quiet
 app.web_host = args.host
 app.web_port = int(args.port)
@@ -369,7 +457,7 @@ def main():
 pid_file = os.path.join(app.data_dir, pid_file)

 # add sickrage module to python system path
- if not (PROG_DIR in sys.path):
+ if not (PROG_DIR in sys.path) and not getattr(sys, 'frozen', False):
 sys.path, remainder = sys.path[:1], sys.path[1:]
 site.addsitedir(PROG_DIR)
 sys.path.extend(remainder)
@@ -404,7 +492,6 @@ def main():
 app.daemon.daemonize()
 app.pid = app.daemon.pid

- # start app
 app.start()
 except (SystemExit, KeyboardInterrupt):
 if app:

--- a/sickrage/checksums.md5
+++ b/sickrage/checksums.md5
-sickrage/__init__.py = ade954e2e782e3fdf1296f07d7a56daf
+sickrage/__init__.py = f98dbaa997b02fa24f57aee35b85d4c3
 sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
-sickrage/version.txt = 2a65c960e68cb8cd221a81f19af467f0
+sickrage/version.txt = a060c4b78c119077a0658de4df7782ea
 sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
 sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
 sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
@@ -54,16 +54,16 @@ sickrage/search_providers/nzb/__init__.py = 2228e977ebea8966e27929f43e39cb67
 sickrage/search_providers/nzb/anizb.py = e6a455928ecca9ebe938f9a984848bff
 sickrage/search_providers/nzb/binsearch.py = 6c994972fe54b82b9d97fd6c1912d830
 sickrage/core/common.py = 8eca84658272c806858b105179285693
-sickrage/core/upnp.py = 51eb609bd1f59baa3c0c346d5ac19787
+sickrage/core/upnp.py = 88671029e1f615c63c7745f7007f22eb
 sickrage/core/ui.py = bc530df3dcdf73126f22b7c5719641be
 sickrage/core/announcements.py = 6c3ed44e7ae50c281383ab5f278102c6
 sickrage/core/google_drive.py = 0129b53b8a649fa7c55bfe0c5ad11bdb
-sickrage/core/__init__.py = 7afdf13aeb03d85bad032ec3ecf25fbf
+sickrage/core/__init__.py = 3a44a0d5d35c146a79a2ce30daab96b9
 sickrage/core/process_tv.py = 192c68108d5b5d1d0c84c7865209e21d
 sickrage/core/enums.py = b4194271791aabd8120fc16b2971b105
 sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8
 sickrage/core/blackandwhitelist.py = 9d0a8e2aae2353a842306730c2690c2c
-sickrage/core/search.py = bcb6d5972f5808d7ab9570a8a39b2d02
+sickrage/core/search.py = 5e354bf967b61ce27eed6b7ac7eeb84a
 sickrage/core/nzbSplitter.py = 8bb813262916d2208e905fb53e575284
 sickrage/core/traktapi.py = e30a23461b7e5d3af7619ad3e229bc40
 sickrage/core/version_updater.py = c01ee102bb19a072360e58c77f168264
@@ -71,7 +71,7 @@ sickrage/core/imdb_popular.py = 4739028ad8dac20901db175ef9df5875
 sickrage/core/scene_numbering.py = e517e5232d3b9ca186fe8b33578abd4b
 sickrage/core/config/__init__.py = 443c425c9768736c197db4af54620858
 sickrage/core/config/helpers.py = 85e376ea8ee26819f85015f6091035e2
-sickrage/core/processors/auto_postprocessor.py = 232044a2b5d2badd2343fb2baa87f838
+sickrage/core/processors/auto_postprocessor.py = 645f2b8ba9b8e9da3b1f73e98d44a4b7
 sickrage/core/processors/post_processor.py = 1d2c118cead05e6ea64f8e062636175c
 sickrage/core/processors/__init__.py = d41d8cd98f00b204e9800998ecf8427e
 sickrage/core/processors/failed_processor.py = c7d4a66b4b1e5c07a3376eb96de80e12
@@ -90,7 +90,7 @@ sickrage/core/webserver/handlers/google_drive.py = 98fde470e65096ec71a8e3f1cce2b
 sickrage/core/webserver/handlers/logs.py = c0e649db7efc0168a8dcbea429878deb
 sickrage/core/webserver/handlers/__init__.py = 4e94a1192bc45368b8cc3cd5f6d1debc
 sickrage/core/webserver/handlers/root.py = be47a31ef1b27e6c8ca4abe9d5c4c3f8
-sickrage/core/webserver/handlers/account.py = 593927d9b1826594dd9ec59101ce1200
+sickrage/core/webserver/handlers/account.py = 1cf412e7a3427fa49205f0478adb657f
 sickrage/core/webserver/handlers/history.py = 34961ffbbb07803515ded9626c7f853a
 sickrage/core/webserver/handlers/base.py = 0242c4eef3dc3c43feb6ac67f1ad1ac5
 sickrage/core/webserver/handlers/changelog.py = 74407bee7cd98416432124fbb2a9c529
@@ -113,7 +113,7 @@ sickrage/core/webserver/handlers/config/general.py = 35e6cb4543ba37722f24f04e683
 sickrage/core/webserver/handlers/config/quality_settings.py = 6a2849c97b8635d46a92b758ba641428
 sickrage/core/webserver/handlers/manage/__init__.py = 6b79f83afdd5565b06310e22245f882b
 sickrage/core/webserver/handlers/manage/queues.py = f92d4a8b34b1872e529886f4aa80ed08
-sickrage/core/webserver/handlers/api/__init__.py = d4e5ae21437bff15091baf20e3632059
+sickrage/core/webserver/handlers/api/__init__.py = 0c1758bf9748dac440f5124d4a4cb4c5
 sickrage/core/webserver/handlers/api/schemas.py = 7fcfd3dee63378ba5bd8fcbaebbf49ef
 sickrage/core/webserver/handlers/api/v1/__init__.py = 97d37e3898f6602c069a3a0cc573ff2e
 sickrage/core/webserver/handlers/api/v2/__init__.py = 331c145796355d52ae1818bf9fd69ced
@@ -168,7 +168,7 @@ sickrage/core/webserver/static/images/backdrops/addshows.jpg = 7f3e186790208b63d
 sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c
 sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015
 sickrage/core/webserver/static/js/core.js.map = cdf19c1422438fb68dd84471031b2c56
-sickrage/core/webserver/static/js/core.min.js = 8705f3a3c143f2cb45f48a63b6192998
+sickrage/core/webserver/static/js/core.min.js = 0c27bbbe8d444c304607b4dda9f90de9
 sickrage/core/webserver/static/fonts/fa-solid-900.eot = 89bd2e38475e441a5cd70f663f921d61
 sickrage/core/webserver/static/fonts/fa-regular-400.eot = ad3a7c0d77e09602f4ab73db3660ffd8
 sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4
@@ -227,7 +227,7 @@ sickrage/core/webserver/views/manage/mass_edit.mako = 474e2ce2ade7f877c987f6c0ff
 sickrage/core/webserver/views/manage/subtitles_missed.mako = 51a48edfe52e59aafef757792862a592
 sickrage/core/webserver/views/manage/queues.mako = 98fc8566c50c3e9df596664996be4ae1
 sickrage/core/webserver/views/manage/torrents.mako = de68a5f927f912000fafd72ae4b7ea81
-sickrage/core/webserver/views/manage/mass_update.mako = 8a58d40e496bf262a049333892018a08
+sickrage/core/webserver/views/manage/mass_update.mako = d976337072d227c5b461eb7649d30ff5
 sickrage/core/webserver/views/manage/backlog_overview.mako = dbcc805fc3c5457851cd5e72b73a63d8
 sickrage/core/webserver/views/manage/episode_statuses.mako = 5eebfd975603aaa45ec4a3b645a243d5
 sickrage/core/webserver/views/manage/failed_downloads.mako = 7f4b1084557d45fb04546f39fb5e1a9b
@@ -250,7 +250,6 @@ sickrage/core/helpers/browser.py = 6da2ce70dea2674b01543ad1a4f216b2
 sickrage/core/helpers/__init__.py = e1d62199754a5212748ae4a36ff332e7
 sickrage/core/helpers/show_names.py = 1db02aeeeb954fff1869b13bca10a1ba
 sickrage/core/helpers/metadata.py = 65108aa990c8bb0218cde3e0834e715c
-sickrage/core/helpers/compat.py = 13a5ce81a9ef355d983d0803c282339d
 sickrage/core/helpers/anidb.py = 69f80b887bc822499ecefbd5ec52ef5c
 sickrage/core/helpers/encryption.py = 8a74f080644fcfe249e56e8a31c2f62e
 sickrage/core/helpers/srdatetime.py = 1ec93b21792f45dbcd8a574c02db4d34
@@ -320,17 +319,17 @@ sickrage/core/databases/main/migrations/versions/018_Convert_Timestamp_Integer_C
 sickrage/core/databases/main/migrations/versions/004_Rename_Columns_On_TVShow_Table.py = 347e30546823c3f7e0d4577b72a97ec7
 sickrage/core/api/__init__.py = 344904bb71a83e91853c9aa37c0fa260
 sickrage/core/api/exceptions.py = bdac7bcebad3d9ce2809f2d7e65810e0
-sickrage/core/updaters/show_updater.py = 878333d1124ffff735a51552042e69c0
+sickrage/core/updaters/show_updater.py = 41d5d772e82d1ae872e7dbcbeee143e7
 sickrage/core/updaters/__init__.py = d41d8cd98f00b204e9800998ecf8427e
 sickrage/core/updaters/tz_updater.py = 45ce45d6e44e5b8ab28bda9520200514
-sickrage/core/updaters/rsscache_updater.py = e98788513592ea63c9f0e523b1822028
-sickrage/core/searchers/backlog_searcher.py = bfc8a80620ee07b21627cc982d07b2e4
+sickrage/core/updaters/rsscache_updater.py = 7317f7476248ebbaf0b35a491b52e2b5
+sickrage/core/searchers/backlog_searcher.py = 7ca68c66a5fd1f9cfd447260e99a69d9
 sickrage/core/searchers/__init__.py = 096e3204587cd29aab63926bec3cd7f6
-sickrage/core/searchers/trakt_searcher.py = 27331bd87d5cfa83e026896bcc41deef
-sickrage/core/searchers/proper_searcher.py = 9cb7e7a56514edc3b2dabe314d209b1d
-sickrage/core/searchers/daily_searcher.py = 5f3e23e80b489528b502be4fc3b3d725
-sickrage/core/searchers/failed_snatch_searcher.py = 710c5b9cbcd6552a56c0e7e07a3fcfd4
-sickrage/core/searchers/subtitle_searcher.py = 3292b7374cc7ad2e9efaf590e78e4f42
+sickrage/core/searchers/trakt_searcher.py = 28493c9611e4f2e6b239fe77a7cf97a0
+sickrage/core/searchers/proper_searcher.py = 8176da80b50a517e7d444b5ed4bae3fe
+sickrage/core/searchers/daily_searcher.py = 433444d93fca22d05930524e0a550c91
+sickrage/core/searchers/failed_snatch_searcher.py = 48125f4837802db70036dad8a1c0629f
+sickrage/core/searchers/subtitle_searcher.py = 64cac68c62879d5ff95ea238bcc900f8
 sickrage/core/nameparser/__init__.py = e164d40646cd722306eb61a144abe4e0
 sickrage/core/nameparser/regexes.py = fbfb89e90f012a287266be8db0e2faf9
 sickrage/core/nameparser/validator.py = f40f97984b47eefa927fedcaaa314a6c
@@ -348,88 +347,88 @@ sickrage/subtitles/providers/wizdom.py = 490dfcceb11b368a0ecd8ce253e9775b
 sickrage/subtitles/refiners/__init__.py = 4e94a1192bc45368b8cc3cd5f6d1debc
 sickrage/subtitles/refiners/tv_episode.py = e53792a1cfc400aeac48919602b404da
 sickrage/subtitles/refiners/release.py = 2f47898120c18d4f22fde2aa3fd6cfbd
-sickrage/locale/messages.pot = b473412f511b6b1941292732af45ddb0
+sickrage/locale/messages.pot = 5ab4d965254251846ab2ed3cd6632ce4
 sickrage/locale/pt_PT/LC_MESSAGES/messages.po = 921e8079ed264e70bd55b1416a5803f5
 sickrage/locale/pt_PT/LC_MESSAGES/messages.json = 4cafff364f49dcd688b134f0d4f8c263
-sickrage/locale/pt_PT/LC_MESSAGES/messages.mo = de386413d75717dda09b5778110f7b76
+sickrage/locale/pt_PT/LC_MESSAGES/messages.mo = d73b0ce2023a7ba53fe12d3ecbb10e6a
 sickrage/locale/ru_RU/LC_MESSAGES/messages.po = 206264240d7c884b90c603dc8b21306d
 sickrage/locale/ru_RU/LC_MESSAGES/messages.json = 988243181b9dacee3a72e17b5d2bf470
-sickrage/locale/ru_RU/LC_MESSAGES/messages.mo = 72126969d9d9b5c3bef497d1f5941058
+sickrage/locale/ru_RU/LC_MESSAGES/messages.mo = 89bdc86a19a66cd2665c70a19c90697b
 sickrage/locale/ar_SA/LC_MESSAGES/messages.po = 905109fc0c7ea4b653122b7397d2d55b
 sickrage/locale/ar_SA/LC_MESSAGES/messages.json = 8c47f610aec954cc75530578b9e1af6a
-sickrage/locale/ar_SA/LC_MESSAGES/messages.mo = 40c217dfcc15eef7b61ddab8318825cc
-sickrage/locale/en_US/LC_MESSAGES/messages.po = 3a6eec7956c3c5e75ee6da5967447f54
+sickrage/locale/ar_SA/LC_MESSAGES/messages.mo = 321ff4f3e9135d499c8da6b9bdd97cc6
+sickrage/locale/en_US/LC_MESSAGES/messages.po = 02456db0637e5cc6522665c3acb7499f
 sickrage/locale/en_US/LC_MESSAGES/messages.json = 34be851b221b72688c9c5c7caa9f450a
-sickrage/locale/en_US/LC_MESSAGES/messages.mo = 7856692b7771250bf3b0afcdbf001619
+sickrage/locale/en_US/LC_MESSAGES/messages.mo = 8e5ae989105fab6717b80136f2d7484c
 sickrage/locale/he_IL/LC_MESSAGES/messages.po = cb111ee31f8c51131fab5f7c30048a38
 sickrage/locale/he_IL/LC_MESSAGES/messages.json = f5adb599fa9d361736e014edcd5f675c
-sickrage/locale/he_IL/LC_MESSAGES/messages.mo = 5156183a70aafe8dff0e3a75edfa33d6
+sickrage/locale/he_IL/LC_MESSAGES/messages.mo = b9a422febc99e1ebccd9ff73d86f8f6e
 sickrage/locale/fr_FR/LC_MESSAGES/messages.po = df1c5b45cf2d85889c00bf87d537ff10
 sickrage/locale/fr_FR/LC_MESSAGES/messages.json = b3614d2d4643b92a4f7b30144000888f
-sickrage/locale/fr_FR/LC_MESSAGES/messages.mo = 9b76b95cfa22099cd653347601c092d3
+sickrage/locale/fr_FR/LC_MESSAGES/messages.mo = 4f6fbf05a1c78cbb8e181781ffdf04db
 sickrage/locale/hu_HU/LC_MESSAGES/messages.po = 2c112a3ae614daebdb556d2e8bb53020
 sickrage/locale/hu_HU/LC_MESSAGES/messages.json = 109ca4f061b35b21f99f640e18c7fcc0
-sickrage/locale/hu_HU/LC_MESSAGES/messages.mo = 0859b7ae4b1f05c680c62e97065fb221
+sickrage/locale/hu_HU/LC_MESSAGES/messages.mo = 24275c2cfbb3a41525f071dcb780c3d1
 sickrage/locale/sv_SE/LC_MESSAGES/messages.po = 1cba4ec68035ce8f5e9e231b6e7da592
 sickrage/locale/sv_SE/LC_MESSAGES/messages.json = 533d3da874d90c7374b050b5e3f02f6e
-sickrage/locale/sv_SE/LC_MESSAGES/messages.mo = 6306b4ddb9e255c1fc1e47947e0559a6
+sickrage/locale/sv_SE/LC_MESSAGES/messages.mo = 21a34cef1c9c308ab5a9b9cde00e1c8d
 sickrage/locale/it_IT/LC_MESSAGES/messages.po = 0dfc9ed56e22026f2af906553d29c981
 sickrage/locale/it_IT/LC_MESSAGES/messages.json = fa5adea561949bd1a5e7501066d276e3
-sickrage/locale/it_IT/LC_MESSAGES/messages.mo = 6585e439124f0e978d7f9b40c5133432
+sickrage/locale/it_IT/LC_MESSAGES/messages.mo = 6f1ed1ff95e60a29f3db176232628bfa
 sickrage/locale/fi_FI/LC_MESSAGES/messages.po = df83ff2af5e853c35687363613afa425
 sickrage/locale/fi_FI/LC_MESSAGES/messages.json = 702957f4e92c4b9fbd42c7344757faf5
-sickrage/locale/fi_FI/LC_MESSAGES/messages.mo = dc9b16bb12a98ca1d98a254bdf28d24d
+sickrage/locale/fi_FI/LC_MESSAGES/messages.mo = 361c951f4b9d5eada3de1f4133147be1
 sickrage/locale/de_DE/LC_MESSAGES/messages.po = bd5ed473dd2699daea174bd7d1dbe628
 sickrage/locale/de_DE/LC_MESSAGES/messages.json = c59b6211b3e35ac6daee91a7bfeca461
-sickrage/locale/de_DE/LC_MESSAGES/messages.mo = b1f66240cb5922b8dfa9b1f10f402f7b
+sickrage/locale/de_DE/LC_MESSAGES/messages.mo = 7dc6d61256845955afb06d02db17d3a9
 sickrage/locale/ko_KR/LC_MESSAGES/messages.po = 87a1c8a9c47db8d89be6190e4a282d61
 sickrage/locale/ko_KR/LC_MESSAGES/messages.json = 5a10ae5681018100ccea95c54b7bf530
-sickrage/locale/ko_KR/LC_MESSAGES/messages.mo = 37f30b197cb0c40a40e60f3fc02446ff
+sickrage/locale/ko_KR/LC_MESSAGES/messages.mo = 41fa7818661f18d52d37a4faceda5e83
 sickrage/locale/el_GR/LC_MESSAGES/messages.po = 9d8087cfea2d4348f804c043f3d3e740
 sickrage/locale/el_GR/LC_MESSAGES/messages.json = d0043052f4d192e19eaec90b2d907e5d
-sickrage/locale/el_GR/LC_MESSAGES/messages.mo = e6c8522c5232bd7835e5f85c0e5d93f3
+sickrage/locale/el_GR/LC_MESSAGES/messages.mo = 7b1bd663fb68ba7811c25dc571b7ab78
 sickrage/locale/ja_JP/LC_MESSAGES/messages.po = 44ca2dbb69d8603543ec69d725dbaa4b
 sickrage/locale/ja_JP/LC_MESSAGES/messages.json = fc408f0ed796549cc129ba3f6fe39c99
-sickrage/locale/ja_JP/LC_MESSAGES/messages.mo = 1ebd5f338cfae6a68fa549d49072444e
+sickrage/locale/ja_JP/LC_MESSAGES/messages.mo = 484a90a66768fee8559ff252e6fa2358
 sickrage/locale/ca_ES/LC_MESSAGES/messages.po = d185131608800f875ed1145f79e7748d
 sickrage/locale/ca_ES/LC_MESSAGES/messages.json = c20e610cf8beeb5a48a491e564c6f419
-sickrage/locale/ca_ES/LC_MESSAGES/messages.mo = 30c737339d31978ca623d273e5114e5d
+sickrage/locale/ca_ES/LC_MESSAGES/messages.mo = ab3cf2d2e5b822cf09646ec89c5e8c30
 sickrage/locale/pl_PL/LC_MESSAGES/messages.po = cc8a596ec2355da4e6cee7b0ce7e68c7
 sickrage/locale/pl_PL/LC_MESSAGES/messages.json = 8839fd0d017baac58ebb241018a894db
-sickrage/locale/pl_PL/LC_MESSAGES/messages.mo = 6998197c6bf3c8b228475f65a03b32b8
+sickrage/locale/pl_PL/LC_MESSAGES/messages.mo = bd86d517046530de080574d6ccc5d3fb
 sickrage/locale/tr_TR/LC_MESSAGES/messages.po = aa32903fd625cad26146f112f0776e2a
 sickrage/locale/tr_TR/LC_MESSAGES/messages.json = 7cee7334ba4c362dc47ce0b0232c6ca2
-sickrage/locale/tr_TR/LC_MESSAGES/messages.mo = 32b584116795b2739d80d88c093bb32e
+sickrage/locale/tr_TR/LC_MESSAGES/messages.mo = 74bd23f9cd498bda81d55c7fa4f682d6
 sickrage/locale/da_DK/LC_MESSAGES/messages.po = 83ae706177d29e709f9bd12ba0cc9daf
 sickrage/locale/da_DK/LC_MESSAGES/messages.json = 84464936e333e8c211f713b3a5051249
-sickrage/locale/da_DK/LC_MESSAGES/messages.mo = c449a985a1e2d77a28f62614bfbebce9
+sickrage/locale/da_DK/LC_MESSAGES/messages.mo = d086ecfa710a47a5da125704c7fce2cd
 sickrage/locale/uk_UA/LC_MESSAGES/messages.po = b4558b84a001c5896d85da7ae7c80322
 sickrage/locale/uk_UA/LC_MESSAGES/messages.json = 820326fde3bb61ff445e95d8ddfda3b8
-sickrage/locale/uk_UA/LC_MESSAGES/messages.mo = 0c4aad64d4bff9766e81b5d05a1f3d60
+sickrage/locale/uk_UA/LC_MESSAGES/messages.mo = a96ab6745d9b4f0dfed70e57534b717b
 sickrage/locale/zh_CN/LC_MESSAGES/messages.po = 899a30b200d2f27dc317f8f87454c42e
 sickrage/locale/zh_CN/LC_MESSAGES/messages.json = 577195a58a2bcd4510bd89b6057f9318
-sickrage/locale/zh_CN/LC_MESSAGES/messages.mo = ed1c8d879fe0e3eb9fdeae41ec8a4fd9
+sickrage/locale/zh_CN/LC_MESSAGES/messages.mo = 88bd1bfb8758a8e043cc052a60aa9bce
 sickrage/locale/ro_RO/LC_MESSAGES/messages.po = bbcebfea9ea859c84c5e912e1efaa9b9
 sickrage/locale/ro_RO/LC_MESSAGES/messages.json = ba858e47b67a0acf5d51cc8157663d46
-sickrage/locale/ro_RO/LC_MESSAGES/messages.mo = 34dfb2d167aa64fa8fb76a2fb62ec554
+sickrage/locale/ro_RO/LC_MESSAGES/messages.mo = d040cb439f087c81d424b02c050509cd
 sickrage/locale/nl_NL/LC_MESSAGES/messages.po = 83faecb1f8196ffaabacc716739bd3f1
 sickrage/locale/nl_NL/LC_MESSAGES/messages.json = b98e9a1cc46afcb0cc3270566f33d9d3
-sickrage/locale/nl_NL/LC_MESSAGES/messages.mo = 599bbd9cdba9029bb08d7d818adcd71b
+sickrage/locale/nl_NL/LC_MESSAGES/messages.mo = 3577e70a3449a98cc7dd9567079dcac3
 sickrage/locale/no_NO/LC_MESSAGES/messages.po = 665add0ac4385bce84e16cb1dba3267a
 sickrage/locale/no_NO/LC_MESSAGES/messages.json = a8e45d067d9f0e279a23e959db8fa1e7
-sickrage/locale/no_NO/LC_MESSAGES/messages.mo = 81d7c78f3be5a5c414493c37657a1097
+sickrage/locale/no_NO/LC_MESSAGES/messages.mo = 03e7053c751ec73ec0dc2c4bc49419aa
 sickrage/locale/zh_TW/LC_MESSAGES/messages.po = 96d0f43d4b4f065da9fc155633846389
 sickrage/locale/zh_TW/LC_MESSAGES/messages.json = 10a920f77d9a5e906e019b9290f99db1
-sickrage/locale/zh_TW/LC_MESSAGES/messages.mo = d946e6bf24f511ffa16bd567484998fb
+sickrage/locale/zh_TW/LC_MESSAGES/messages.mo = daa835d74b90797b5119c520b42ea887
 sickrage/locale/es_ES/LC_MESSAGES/messages.po = 155986191104954b6dc789acad18bcc3
 sickrage/locale/es_ES/LC_MESSAGES/messages.json = a448d6f87055f057ba6f194e76ed1de2
-sickrage/locale/es_ES/LC_MESSAGES/messages.mo = 6e4581eb66209a11364955e4b7bc25da
+sickrage/locale/es_ES/LC_MESSAGES/messages.mo = b7945b2b79d75173f534b8507e2188a0
 sickrage/locale/cs_CZ/LC_MESSAGES/messages.po = 9a3efb305d936665d5f4fa8ecec53e02
 sickrage/locale/cs_CZ/LC_MESSAGES/messages.json = 69e048f44bd16052756c4ea12a58fc45
-sickrage/locale/cs_CZ/LC_MESSAGES/messages.mo = c4920fc1b68f5d48e986b615d8cfb845
+sickrage/locale/cs_CZ/LC_MESSAGES/messages.mo = d871e3d287d6e3a5f92ffaec4e603db2
 sickrage/locale/vi_VN/LC_MESSAGES/messages.po = cd35076e006e32a7fbbfb54fc03d5be4
 sickrage/locale/vi_VN/LC_MESSAGES/messages.json = a938a325ae85b7d4ff1a06777b40c488
-sickrage/locale/vi_VN/LC_MESSAGES/messages.mo = aa90acb7cbbc84f861f7f998bea8b988
+sickrage/locale/vi_VN/LC_MESSAGES/messages.mo = 2bcd399a1f37732f82abd61dd541d242
 sickrage/clients/__init__.py = abafc862109398700c9fee676cdeef6b
 sickrage/clients/torrent/utorrent.py = b18de6ea4d6e427714f9c059882d83da
 sickrage/clients/torrent/deluged.py = f7291242ab46a4668c0b54cd7821dff0
@@ -482,10 +481,10 @@ sickrage/libs/adba/aniDBtvDBmaper.py = fd66ab7037e60853fb304112bc9edf3e
 sickrage/libs/adba/aniDBcommands.py = b7e461bb7a24909e9bfdc010a584eabb
 sickrage/libs/upnpclient/util.py = f56420ccaf0b0c4993afc7d3ed7259ae
 sickrage/libs/upnpclient/ssdp.py = d7e4399530dc38ee0f6fd16394cac694
-sickrage/libs/upnpclient/upnp.py = 8ef2018d11628928beea27b16276eaae
+sickrage/libs/upnpclient/upnp.py = 6fe2d7a0fe23f6010bf50db977b86a61
 sickrage/libs/upnpclient/errors.py = 5d93a721620f78934746366f8703df97
 sickrage/libs/upnpclient/__init__.py = 0bd05e7c1ce885552b2635e34014bdc0
-sickrage/libs/upnpclient/soap.py = 1aaa52581b9f1d0d1db5b732040d5317
+sickrage/libs/upnpclient/soap.py = b2fa5fe86bd8e6ae8697673b9b397c02
 sickrage/libs/upnpclient/const.py = 6239b8dea2367eda47279e4c5f0dfea4
 sickrage/libs/upnpclient/marshal.py = dffd6ce90b56272499164a94ba0c2184
 sickrage/libs/trakt/sphinxext.py = fda5ccce94aaa907e352d2c6cfec5905
@@ -593,4 +592,4 @@ sickrage/notification_providers/nma.py = eb175b1646649fee937962e2d5da1486
 sickrage/notification_providers/plex.py = 4d9d165ac75eaacb63e2023d5d0b6c00
 sickrage/notification_providers/freemobile.py = 33602ca8806a464a13f3138eadea75e2
 sickrage/notification_providers/prowl.py = 90fd71420ba010b7e043bcaff75636b7
-sickrage/notification_providers/alexa.py = 10473c97eb018dae3b9ab3a2ae9914b7
+sickrage/notification_providers/alexa.py = 9dd602eb7cd2444870dc773c5dae93fc
--- a/sickrage/core/__init__.py
+++ b/sickrage/core/__init__.py
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
 # ##############################################################################
+import asyncio
 import datetime
 import locale
 import logging
@@ -43,6 +44,7 @@ from dateutil import tz
 from fake_useragent import UserAgent
 from sentry_sdk.integrations.logging import LoggingIntegration, ignore_logger
 from tornado.ioloop import IOLoop, PeriodicCallback
+from tornado.platform.asyncio import AnyThreadEventLoopPolicy

 import sickrage
 from sickrage.core.amqp.consumer import AMQPConsumer
@@ -234,7 +236,10 @@ class Core(object):
 self.started = True

 # thread name
- threading.currentThread().setName('CORE')
+ threading.current_thread().name = 'CORE'
+
+ # set event loop policy
+ asyncio.set_event_loop_policy(AnyThreadEventLoopPolicy())

 # init sentry
 self.init_sentry()
@@ -651,7 +656,7 @@ class Core(object):
 )

 def load_shows(self):
- threading.currentThread().setName('CORE')
+ threading.current_thread().name = 'CORE'

 session = self.main_db.session()


--- a/sickrage/core/helpers/compat.py
+++ b/sickrage/core/helpers/compat.py
-# ##############################################################################
-# Author: echel0n <[email protected]>
-# URL: https://sickrage.ca/
-# Git: https://git.sickrage.ca/SiCKRAGE/sickrage.git
-# -
-# This file is part of SiCKRAGE.
-# -
-# SiCKRAGE is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# -
-# SiCKRAGE is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# -
-# You should have received a copy of the GNU General Public License
-# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
-# ##############################################################################
-
-
-
-
-def cmp(a, b):
- return (a > b) - (a < b)
--- a/sickrage/core/processors/auto_postprocessor.py
+++ b/sickrage/core/processors/auto_postprocessor.py
@@ -45,7 +45,7 @@ class AutoPostProcessor(object):
 self.running = True

 # set thread name
- threading.currentThread().setName(self.name)
+ threading.current_thread().name = self.name

 sickrage.app.postprocessor_queue.put(sickrage.app.config.general.tv_download_dir, force=force)