Fix auto-fork detection (#1839)

* Fix Fork Detection when parameters not exact match. #1838

* Fix logging of detected fork. #1838

* Fix SickGear fork detection #1838
This commit is contained in:
Clinton Hall 2021-08-10 21:32:06 +12:00 committed by GitHub
commit 4103a7dc05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions

View file

@ -166,12 +166,12 @@ class InitSickBeard(object):
fork = ['default', params]
elif fork == 'auto':
fork = self.detect_fork()
self.detect_fork()
logger.info('{section}:{category} fork set to {fork}'.format
(section=self.section, category=self.input_category, fork=fork[0]))
core.FORK_SET = fork
self.fork, self.fork_params = fork[0], fork[1]
(section=self.section, category=self.input_category, fork=self.fork[0]))
core.FORK_SET = self.fork
self.fork, self.fork_params = self.fork[0], self.fork[1]
# This will create the fork object, and attach to self.fork_obj.
self._init_fork()
return self.fork, self.fork_params
@ -297,8 +297,6 @@ class InitSickBeard(object):
(section=self.section, category=self.input_category))
self.fork = list(core.FORKS.items())[list(core.FORKS.keys()).index(core.FORK_DEFAULT)]
return fork
def _init_fork(self):
# These need to be imported here, to prevent a circular import.
from .pymedusa import PyMedusa, PyMedusaApiV1, PyMedusaApiV2