Config get_body_args

sickchill/adba/aniDBAbstracter.py

@@ -2,11 +2,11 @@
 import string
 from pathlib import Path
 
-from . import aniDBfileInfo as fileInfo
-from .aniDBerrors import AniDBIncorrectParameterError
-from .aniDBfileInfo import read_anidb_xml
-from .aniDBmapper import AniDBMapper
-from .aniDBtvDBmaper import TvDBMap
+from sickchill.adba import aniDBfileInfo as fileInfo
+from sickchill.adba.aniDBerrors import AniDBIncorrectParameterError
+from sickchill.adba.aniDBfileInfo import read_anidb_xml
+from sickchill.adba.aniDBmapper import AniDBMapper
+from sickchill.adba.aniDBtvDBmaper import TvDBMap
 
 
 class AniDBabstractObject(object):

sickchill/adba/aniDBfileInfo.py

@@ -32,8 +32,8 @@ def md4_hash(data):
         hashes = [md4_hash(data).digest() for data in a]
         if len(hashes) == 1:
             return hashes[0].hex()
-        else:
-            return md4_hash(reduce(lambda b, c: b + c, hashes, b"")).hexdigest()
+
+        return md4_hash(reduce(lambda b, c: b + c, hashes, b"")).hexdigest()
 
 
 def download_file(url, filename: Path):

sickchill/adba/aniDBlink.py

@@ -181,8 +181,8 @@ def _cmd_queue(self, command):
     def _cmd_dequeue(self, resp) -> Command:
         if not resp.restag:
             return None
-        else:
-            return self.cmd_queue.pop(resp.restag)
+
+        return self.cmd_queue.pop(resp.restag)
 
     def _delay(self):
         return self.delay < 2.1 and 2.1 or self.delay

sickchill/adba/aniDBtvDBmaper.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from . import aniDBfileInfo as fileInfo
+from sickchill.adba import aniDBfileInfo as fileInfo
 
 
 class TvDBMap(object):
@@ -20,7 +20,7 @@ def _get_x_for_y(self, xValue, x, y):
             try:
                 if anime.get(x, False) == xValue:
                     return int(anime.get(y, 0))
-            except ValueError as error:
+            except ValueError:
                 continue
         return 0
 

sickchill/gui/slick/js/core.js

@@ -3391,6 +3391,7 @@ const SICKCHILL = {
                     columnSelector_columns: { // eslint-disable-line camelcase
                         12: false,
                     },
+                    stickyHeaders_offset: 50, // eslint-disable-line camelcase
                     filter_cssFilter: 'text-center text-capitalize', // eslint-disable-line camelcase
                     filter_hideFilters: false, // eslint-disable-line camelcase
                     filter_ignoreCase: true, // eslint-disable-line camelcase

sickchill/helper/common.py

@@ -8,6 +8,7 @@
 
 import appdirs
 import rarfile
+import validators
 
 from sickchill import settings
 from sickchill.init_helpers import get_current_version
@@ -344,9 +345,9 @@ def replace_extension(filename: Union[Path, PathLike, str], new_extension: str)
         return filename
     if not path.suffix:
         return filename
-    else:
-        if new_extension and not new_extension.startswith("."):
-            new_extension = f".{new_extension}"
+
+    if new_extension and not new_extension.startswith("."):
+        new_extension = f".{new_extension}"
 
     return type(filename)(path.with_suffix(new_extension))
 
@@ -372,7 +373,19 @@ def sanitize_filename(filename):
     return ""
 
 
-def try_int(candidate, default_value=0):
+def valid_url(url):
+    try:
+        valid = validators.url(url)
+    except validators.utils.ValidationError:
+        valid = False  # ValidationError isn't an exception so doesn't actually get here
+
+    if not valid:
+        valid = False  # if ValidationError in response set to False
+
+    return valid
+
+
+def try_int(candidate, default_value=0) -> int:
     """
     Try to convert ``candidate`` to int, or return the ``default_value``.
     :param candidate: The value to convert to int
@@ -386,7 +399,7 @@ def try_int(candidate, default_value=0):
         return default_value
 
 
-def try_float(candidate, default_value=0):
+def try_float(candidate, default_value=0) -> float:
     """
     Try to convert ``candidate`` to int, or return the ``default_value``.
     :param candidate: The value to convert to int

sickchill/helper/media_info.py

@@ -1,6 +1,9 @@
 import binascii
+import warnings
 
-from enzyme import MKV
+with warnings.catch_warnings():
+    warnings.filterwarnings("ignore", category=DeprecationWarning)
+    from enzyme import MKV
 
 from sickchill.helper.common import is_media_file
 

sickchill/helper/rootdirs.py

@@ -14,7 +14,7 @@ def __init__(self, root_directories_string: str = "", root_directories_list: Uni
         if self.default:
             logger.debug(f"default root directory: {self[self.default]}")
         else:
-            logger.debug(f"no default root directory set")
+            logger.debug("no default root directory set")
 
     def parse(self, root_directories_string: str = "", root_directories_list: Union[list, None] = None) -> None:
         split_setting = root_directories_list or root_directories_string.split("|")

sickchill/movies.py

@@ -10,9 +10,9 @@
 from sqlalchemy.orm import Session
 from tmdbsimple import movies, search
 
-from . import settings
-from .oldbeard.databases import movie
-from .oldbeard.db import db_cons, db_full_path, db_locks
+from sickchill import settings
+from sickchill.oldbeard.databases import movie
+from sickchill.oldbeard.db import db_cons, db_full_path, db_locks
 
 logger = logging.getLogger("sickchill.movie")
 

sickchill/oldbeard/blackandwhitelist.py

@@ -1,7 +1,6 @@
 from sickchill import logger, settings
 from sickchill.adba.aniDBerrors import AniDBCommandTimeoutError
-
-from . import db, helpers
+from sickchill.oldbeard import db, helpers
 
 
 class BlackAndWhiteList(object):
@@ -129,9 +128,10 @@ def short_group_names(groups):
     Find AniDB short group names for release groups
 
     :param groups: list of groups to find short group names for
+        remove any leading and trailing commas
     :return: list of shortened group names
     """
-    groups = groups.split(",")
+    groups = groups.strip(",").split(",")
     short_group_list = []
     if helpers.set_up_anidb_connection():
         for groupName in groups:

sickchill/oldbeard/classes.py

@@ -5,8 +5,7 @@
 
 import sickchill
 from sickchill.helper.common import dateTimeFormat
-
-from .common import Quality
+from sickchill.oldbeard.common import Quality
 
 if TYPE_CHECKING:
     from ..providers.GenericProvider import GenericProvider

sickchill/oldbeard/common.py

@@ -6,11 +6,10 @@
 
 from sickchill.helper import video_screen_size
 from sickchill.init_helpers import setup_gettext
+from sickchill.oldbeard.numdict import NumDict
 from sickchill.recompiled import tags
 from sickchill.tagger.episode import EpisodeTags
 
-from .numdict import NumDict
-
 setup_gettext()
 
 cpu_presets = {"HIGH": 5, "NORMAL": 2, "LOW": 1}

sickchill/oldbeard/config.py

@@ -10,8 +10,7 @@
 import sickchill.start
 from sickchill import logger, settings
 from sickchill.helper.common import try_int
-
-from . import db, helpers, naming
+from sickchill.oldbeard import db, helpers, naming
 
 # Address poor support for scgi over unix domain sockets
 # this is not nicely handled by python currently

sickchill/oldbeard/dailysearcher.py

@@ -4,10 +4,9 @@
 import sickchill.oldbeard.search_queue
 from sickchill import logger, settings
 from sickchill.helper.exceptions import MultipleShowObjectsException
+from sickchill.oldbeard import common, db, network_timezones
 from sickchill.show.Show import Show
 
-from . import common, db, network_timezones
-
 
 class DailySearcher(object):
     def __init__(self):

sickchill/oldbeard/databases/main.py

@@ -299,7 +299,7 @@ def execute(self):
 
 
 class AddCustomNameToShow(AddPreferWords):
-    """Adding column rls_prefer_words to tv_shows"""
+    """Adding column custom_name to tv_shows"""
 
     def test(self):
         return self.has_column("tv_shows", "custom_name")

sickchill/oldbeard/event_queue.py

@@ -2,7 +2,7 @@
 import traceback
 from queue import Empty, Queue
 
-from .. import logger
+from sickchill import logger
 
 
 class Event(object):

sickchill/oldbeard/failedProcessor.py

@@ -1,8 +1,7 @@
 import logging
 
-import validators
-
 from sickchill import logger, settings
+from sickchill.helper.common import valid_url
 from sickchill.helper.exceptions import FailedPostProcessingFailedException
 from sickchill.oldbeard import search_queue, show_name_helpers
 from sickchill.oldbeard.db import DBConnection
@@ -30,7 +29,7 @@ def process(self):
         """
         self._log(_("Failed download detected: ({release_name}, {directory})").format(release_name=self.release_name, directory=self.directory))
 
-        if self.release_name and validators.url(self.release_name) is True:
+        if self.release_name and valid_url(self.release_name) is True:
             cache_db_con = DBConnection("cache.db")
             cache_result = cache_db_con.select_one("SELECT name FROM results WHERE url = ?", [self.release_name])
             if cache_result:

sickchill/oldbeard/generic_queue.py

@@ -1,7 +1,7 @@
 import datetime
 import threading
 
-from .. import logger
+from sickchill import logger
 
 
 class QueuePriorities(object):

sickchill/oldbeard/helpers.py

@@ -37,10 +37,9 @@
 from sickchill import adba, logger, settings
 from sickchill.helper import episode_num, pretty_file_size, SUBTITLE_EXTENSIONS
 from sickchill.helper.common import is_media_file, replace_extension, USER_AGENT
+from sickchill.oldbeard import db
 from sickchill.show.Show import Show
 
-from . import db
-
 # Add some missing languages
 LOCALE_NAMES.update(
     {
@@ -792,7 +791,7 @@ def check_url(url):
     We only check the URL header.
     """
     try:
-        requests.head(url, verify=False).raise_for_status()
+        requests.head(url, verify=False, timeout=10).raise_for_status()
     except Exception as error:
         # noinspection PyTypeChecker
         handle_requests_exception(error)
@@ -1725,7 +1724,7 @@ def manage_torrents_url(reset=False):
 
     def test_exists(url):
         try:
-            h = requests.head(url)
+            h = requests.head(url, timeout=10)
             return h.status_code != 404
         except requests.exceptions.RequestException:
             return False

sickchill/oldbeard/image_cache.py

@@ -6,11 +6,10 @@
 import sickchill
 from sickchill import logger, settings
 from sickchill.helper.exceptions import ShowDirectoryNotFoundException
+from sickchill.oldbeard import helpers
 from sickchill.providers.metadata.generic import GenericMetadata
 from sickchill.providers.metadata.helpers import getShowImage
 
-from . import helpers
-
 
 class ImageCache(object):
     def __init__(self):
@@ -87,7 +86,7 @@ def has_poster(self, indexer_id):
         Returns true if a cached poster exists for the given Indexer ID
         """
         poster_path = self.poster_path(indexer_id)
-        logger.debug(f"Checking if file poster_path exists")
+        logger.debug(f"Checking if file poster_path exists; {poster_path}")
         return os.path.isfile(poster_path)
 
     def has_banner(self, indexer_id):

sickchill/oldbeard/name_cache.py

@@ -1,12 +1,9 @@
 import threading
 
-from sickchill import settings
-from sickchill.oldbeard import helpers, scene_exceptions
+from sickchill import logger, settings
+from sickchill.oldbeard import db, helpers, scene_exceptions
 from sickchill.show.Show import Show
 
-from .. import logger
-from . import db
-
 name_cache = {}
 name_cache_lock = threading.Lock()
 

sickchill/oldbeard/naming.py

@@ -2,12 +2,11 @@
 import os
 
 from sickchill import logger, settings
+from sickchill.oldbeard import common
+from sickchill.oldbeard.common import DOWNLOADED, Quality
+from sickchill.oldbeard.name_parser.parser import InvalidNameException, InvalidShowException, NameParser
 from sickchill.tv import TVEpisode
 
-from . import common
-from .common import DOWNLOADED, Quality
-from .name_parser.parser import InvalidNameException, InvalidShowException, NameParser
-
 name_presets = ("%SN - %Sx%0E", "%SN - %Sx%0E - %EN", "%S.N.S%0SE%0E.%E.N", "%Sx%0E - %EN", "S%0SE%0E - %EN", "Season %0S/%S.N.S%0SE%0E.%Q.N-%RG")
 
 name_anime_presets = name_presets

sickchill/oldbeard/network_timezones.py

@@ -3,10 +3,9 @@
 
 from dateutil import tz
 
+from sickchill import logger
 from sickchill.helper.common import try_int
-
-from .. import logger
-from . import db, helpers
+from sickchill.oldbeard import db, helpers
 
 # regex to parse time (12/24-hour format)
 time_regex = re.compile(r"(?P<hour>\d{1,2})(?:[:.](?P<minute>\d{2})?)? ?(?P<meridiem>[PA]\.? ?M?)?\b", re.I)

sickchill/oldbeard/notifications_queue.py

@@ -6,8 +6,7 @@
 from requests.structures import CaseInsensitiveDict
 
 from sickchill import logger, settings
-
-from . import common, generic_queue
+from sickchill.oldbeard import common, generic_queue
 
 DISCORD = 600
 

sickchill/oldbeard/nzbSplitter.py

@@ -1,9 +1,9 @@
 import re
 from xml.etree import ElementTree
 
-from .. import logger
-from . import classes, helpers
-from .name_parser.parser import InvalidNameException, InvalidShowException, NameParser
+from sickchill import logger
+from sickchill.oldbeard import classes, helpers
+from sickchill.oldbeard.name_parser.parser import InvalidNameException, InvalidShowException, NameParser
 
 
 def get_season_nzbs(name, url_data, season):

sickchill/oldbeard/nzbget.py

@@ -6,10 +6,9 @@
 
 from sickchill import logger, settings
 from sickchill.helper.common import try_int
+from sickchill.oldbeard.common import Quality
 from sickchill.oldbeard.helpers import make_context
 
-from .common import Quality
-
 if TYPE_CHECKING:
     from .classes import SearchResult