Update regex for Python 3.10 on Windows.

Change deprecated anon redirect service.

CHANGES.md

@@ -1,6 +1,8 @@
-### 0.25.9 (2021-10-10 21:00:00 UTC)
+### 0.25.9 (2021-10-11 13:45:00 UTC)
 
 * Update zoneinfo fallback to 2021c
+* Update regex for Python 3.10 on Windows
+* Change deprecated anon redirect service
 
 
 ### 0.25.8 (2021-10-10 21:00:00 UTC)

recommended.txt

@@ -20,10 +20,8 @@ python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/pack
 python-Levenshtein == 0.12.0; '3.0' > python_version
 python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.0-cp27-cp27m-win_amd64.whl ; '2.7' == python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
 python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.0-cp27-cp27m-win32.whl ; '2.7' == python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
-regex >= 2021.8.28; '3.7' <= python_version
+regex >= 2021.10.8; '3.7' <= python_version
 regex <= 2020.10.28; '3.0' > python_version
-regex@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/regex-2021.8.28-cp310-cp310-win_amd64.whl ; '3.10' <= python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
-regex@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/regex-2021.8.28-cp310-cp310-win32.whl ; '3.10' <= python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
 scandir >= 1.10.0; '3.0' > python_version
 setuptools >= 57.4.0; '3.7' <= python_version
 setuptools <= 44.1.1; '3.0' > python_version

sickbeard/config.py

@@ -503,6 +503,7 @@ class ConfigMigrator(object):
                                 19: 'Change (mis)use of Anonymous redirect dereferer.org service to nullrefer.com',
                                 20: 'Change Growl',
                                 21: 'Rename vars misusing frequency',
+                                22: 'Change Anonymous redirect',
                                 }
 
     def migrate_config(self):
@@ -540,6 +541,14 @@ class ConfigMigrator(object):
             logger.log(u'Saving config file to disk')
             sickbeard.save_config()
 
+    @staticmethod
+    def deprecate_anon_service():
+        """
+        Change deprecated anon redirect service URLs
+        """
+        if re.search(r'https?://(?:nullrefer.com|dereferer.org)', sickbeard.ANON_REDIRECT):
+            sickbeard.ANON_REDIRECT = r'https://anonymz.com/?'
+
     # Migration v1: Custom naming
     def _migrate_v1(self):
         """
@@ -818,11 +827,8 @@ class ConfigMigrator(object):
                         'nordic', 'norwegian', 'portuguese', 'spanish', 'turkish']
         self.add_ignore_words(words_to_add)
 
-    @staticmethod
+    def _migrate_v13(self):
-    def _migrate_v13():
+        self.deprecate_anon_service()
-        # change dereferrer.org urls to blank, but leave any other url untouched
-        if 'http://dereferer.org/?' == sickbeard.ANON_REDIRECT:
-            sickbeard.ANON_REDIRECT = ''
 
     def _migrate_v14(self):
         old_token = check_setting_str(self.config_obj, 'Trakt', 'trakt_token', '')
@@ -903,17 +909,14 @@ class ConfigMigrator(object):
 
         self.add_ignore_words([r'regex:^(?=.*?\bspanish\b)((?!spanish.?princess).)*$'], ['spanish'])
 
-    @staticmethod
+    def _migrate_v19(self):
-    def _migrate_v19():
+        self.deprecate_anon_service()
-        # change misuse of dereferrer.org to the nullrefer.com service, but leave any other url untouched
-        if re.search(r'https?://dereferer.org', sickbeard.ANON_REDIRECT):
-            sickbeard.ANON_REDIRECT = 'https://nullrefer.com/?'
 
     def _migrate_v20(self):
-        GROWL_HOST = check_setting_str(self.config_obj, 'Growl', 'growl_host', '')
+        growl_host = check_setting_str(self.config_obj, 'Growl', 'growl_host', '')
-        GROWL_PASSWORD = check_setting_str(self.config_obj, 'Growl', 'growl_password', '')
+        growl_password = check_setting_str(self.config_obj, 'Growl', 'growl_password', '')
-        if GROWL_PASSWORD:
+        if growl_password:
-            sickbeard.GROWL_HOST = '%s@%s' % (GROWL_PASSWORD, GROWL_HOST)
+            sickbeard.GROWL_HOST = '%s@%s' % (growl_password, growl_host)
 
     def _migrate_v21(self):
         sickbeard.MEDIAPROCESS_INTERVAL = check_setting_int(
@@ -937,3 +940,6 @@ class ConfigMigrator(object):
 
         sickbeard.SUBTITLES_FINDER_INTERVAL = check_setting_int(
             self.config_obj, 'Subtitles', 'subtitles_finder_frequency', 1)
+
+    def _migrate_v22(self):
+        self.deprecate_anon_service()