open-source-mirrors
/
syncarr
mirror of https://github.com/syncarr/syncarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix path imports

Browse Source
pull/42/head 1.9.2
Junkbite 4 years ago
parent 18963f3523
commit 181748b0c1
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File

11
config.py
Unescape View File

@ -61,9 +61,9 @@ def get_config_value(env_key, config_key, config_section):
BASE_CONFIG = 'config.conf' BASE_CONFIG = 'config.conf'
if DEV: if DEV:
settingsFilename = os.path.join(os.getcwd(), 'dev-{}'.format(BASE_CONFIG)) settingsFilename = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'dev-{}'.format(BASE_CONFIG))
else: else:
settingsFilename = os.path.join(os.getcwd(), BASE_CONFIG) settingsFilename = os.path.join(os.path.abspath(os.path.dirname(__file__)), BASE_CONFIG)
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(settingsFilename) config.read(settingsFilename)
@ -376,6 +376,7 @@ elif sonarrA_url and sonarrB_url:
######################################################################################################################## ########################################################################################################################
# path generators # path generators
def get_path(instance_url, api_path, key, changed_api_version=False): def get_path(instance_url, api_path, key, changed_api_version=False):
global api_version, api_profile_path global api_version, api_profile_path
@ -400,26 +401,31 @@ def get_path(instance_url, api_path, key, changed_api_version=False):
url = f"{instance_url}/api/{api_version}{api_path}?apikey={key}" url = f"{instance_url}/api/{api_version}{api_path}?apikey={key}"
return url return url
def get_status_path(instance_url, key, changed_api_version): def get_status_path(instance_url, key, changed_api_version):
url = get_path(instance_url, api_status_path, key, changed_api_version) url = get_path(instance_url, api_status_path, key, changed_api_version)
logger.debug('get_status_path: {}'.format(url)) logger.debug('get_status_path: {}'.format(url))
return url return url
def get_content_path(instance_url, key): def get_content_path(instance_url, key):
url = get_path(instance_url, api_content_path, key) url = get_path(instance_url, api_content_path, key)
logger.debug('get_content_path: {}'.format(url)) logger.debug('get_content_path: {}'.format(url))
return url return url
def get_language_path(instance_url, key): def get_language_path(instance_url, key):
url = get_path(instance_url, api_language_path, key) url = get_path(instance_url, api_language_path, key)
logger.debug('get_language_path: {}'.format(url)) logger.debug('get_language_path: {}'.format(url))
return url return url
def get_profile_path(instance_url, key): def get_profile_path(instance_url, key):
url = get_path(instance_url, api_profile_path, key) url = get_path(instance_url, api_profile_path, key)
logger.debug('get_profile_path: {}'.format(url)) logger.debug('get_profile_path: {}'.format(url))
return url return url
def get_tag_path(instance_url, key): def get_tag_path(instance_url, key):
url = get_path(instance_url, api_tag_path, key) url = get_path(instance_url, api_tag_path, key)
logger.debug('get_tag_path: {}'.format(url)) logger.debug('get_tag_path: {}'.format(url))
@ -428,6 +434,7 @@ def get_tag_path(instance_url, key):
######################################################################################################################## ########################################################################################################################
# check for required fields # check for required fields
logger.debug({ logger.debug({
'instanceA_url': instanceA_url, 'instanceA_url': instanceA_url,
'instanceA_key': instanceA_key, 'instanceA_key': instanceA_key,

60
index.py
Unescape View File

@ -24,7 +24,7 @@ from config import (
content_id_key, logger, is_sonarr, is_radarr, is_lidarr, content_id_key, logger, is_sonarr, is_radarr, is_lidarr,
get_status_path, get_content_path, get_profile_path, get_language_path, get_tag_path, get_status_path, get_content_path, get_profile_path, get_language_path, get_tag_path,
is_in_docker, instance_sync_interval_seconds, is_in_docker, instance_sync_interval_seconds,
sync_bidirectionally, auto_search, monitor_new_content, sync_bidirectionally, auto_search, monitor_new_content,
tested_api_version, api_version, V3_API_PATH, is_test_run, tested_api_version, api_version, V3_API_PATH, is_test_run,
) )
@ -74,8 +74,8 @@ def get_new_content_payload(content, instance_path, instance_profile_id, instanc
payload['year'] = content.get('year') payload['year'] = content.get('year')
payload['tmdbId'] = content.get('tmdbId') payload['tmdbId'] = content.get('tmdbId')
payload['titleSlug'] = content.get('titleSlug') payload['titleSlug'] = content.get('titleSlug')
payload['addOptions'] = { payload['addOptions'] = {
**add_options, **add_options,
**{'searchForMovie': search_missing} **{'searchForMovie': search_missing}
} }
@ -94,6 +94,7 @@ def get_new_content_payload(content, instance_path, instance_profile_id, instanc
logger.debug(payload) logger.debug(payload)
return payload return payload
def get_quality_profiles(instance_session, instance_url, instance_key): def get_quality_profiles(instance_session, instance_url, instance_key):
instance_profile_url = get_profile_path(instance_url, instance_key) instance_profile_url = get_profile_path(instance_url, instance_key)
profiles_response = instance_session.get(instance_profile_url) profiles_response = instance_session.get(instance_profile_url)
@ -143,7 +144,7 @@ def get_tag_from_id(instance_session, instance_url, instance_key, instance_tag,
for instance_item in instance_tag: for instance_item in instance_tag:
if item.get('label').lower() == instance_item.lower(): if item.get('label').lower() == instance_item.lower():
tag_ids.append(item) tag_ids.append(item)
if not tag_ids: if not tag_ids:
logger.error(f'Could not find tag_id for instance {instance_name} and tag {instance_tags}') logger.error(f'Could not find tag_id for instance {instance_name} and tag {instance_tags}')
sys.exit(0) sys.exit(0)
@ -181,7 +182,7 @@ def get_language_from_id(instance_session, instance_url, instance_key, instance_
instance_language_id = language.get('language', {}).get('id') instance_language_id = language.get('language', {}).get('id')
logger.debug(f'found id "{instance_language_id}" from language "{instance_language}" for instance {instance_name}') logger.debug(f'found id "{instance_language_id}" from language "{instance_language}" for instance {instance_name}')
if instance_language_id is None: if instance_language_id is None:
logger.error(f'language_id is None for instance {instance_name} and language {instance_language}') logger.error(f'language_id is None for instance {instance_name} and language {instance_language}')
sys.exit(0) sys.exit(0)
@ -212,7 +213,7 @@ def sync_servers(instanceA_contents, instanceB_language_id, instanceB_contentIds
if instanceA_profile_filter_id != quality_profile_id: if instanceA_profile_filter_id != quality_profile_id:
logging.debug(f'Skipping content {title} - mismatched quality_profile_id {quality_profile_id} with instanceA_profile_filter_id {instanceA_profile_filter_id}') logging.debug(f'Skipping content {title} - mismatched quality_profile_id {quality_profile_id} with instanceA_profile_filter_id {instanceA_profile_filter_id}')
continue continue
# if given quality filter we want to filter if quality from instanceA isnt high enough yet # if given quality filter we want to filter if quality from instanceA isnt high enough yet
if is_radarr and instanceA_quality_match: if is_radarr and instanceA_quality_match:
content_quality = content.get('movieFile', {}).get('quality', {}).get('quality', {}).get('name', '') content_quality = content.get('movieFile', {}).get('quality', {}).get('quality', {}).get('name', '')
@ -253,7 +254,7 @@ def sync_servers(instanceA_contents, instanceB_language_id, instanceB_contentIds
except: except:
logger.error(f'Could not decode sync response from {instanceB_content_url}') logger.error(f'Could not decode sync response from {instanceB_content_url}')
logging.info('content title "{0}" synced successfully'.format(title)) logging.info('content title "{0}" synced successfully'.format(title))
logging.info(f'{len(search_ids)} contents synced successfully') logging.info(f'{len(search_ids)} contents synced successfully')
@ -322,7 +323,7 @@ def check_status(instance_session, instance_url, instance_key, instance_name='',
sys.exit(0) sys.exit(0)
logger.debug(f"{instance_status_url} version {status_response.get('version')}") logger.debug(f"{instance_status_url} version {status_response.get('version')}")
return status_response return status_response
@ -340,7 +341,7 @@ def sync_content():
check_status(instanceA_session, instanceA_url, instanceA_key, instance_name='A') check_status(instanceA_session, instanceA_url, instanceA_key, instance_name='A')
check_status(instanceB_session, instanceB_url, instanceB_key, instance_name='B') check_status(instanceB_session, instanceB_url, instanceB_key, instance_name='B')
tested_api_version = True tested_api_version = True
# if given a profile instead of a profile id then try to find the profile id # if given a profile instead of a profile id then try to find the profile id
if not instanceA_profile_id and instanceA_profile: if not instanceA_profile_id and instanceA_profile:
instanceA_profile_id = get_profile_from_id(instanceA_session, instanceA_url, instanceA_key, instanceA_profile, 'A') instanceA_profile_id = get_profile_from_id(instanceA_session, instanceA_url, instanceA_key, instanceA_profile, 'A')
@ -382,19 +383,19 @@ def sync_content():
if is_sonarr: if is_sonarr:
if not instanceA_language_id and instanceA_language: if not instanceA_language_id and instanceA_language:
instanceA_language_id = get_language_from_id( instanceA_language_id = get_language_from_id(
instance_session=instanceA_session, instance_session=instanceA_session,
instance_url=instanceA_url, instance_url=instanceA_url,
instance_key=instanceA_key, instance_key=instanceA_key,
instance_language=instanceA_language, instance_language=instanceA_language,
instance_name='A' instance_name='A'
) )
if not instanceB_language_id and instanceB_language: if not instanceB_language_id and instanceB_language:
instanceB_language_id = get_language_from_id( instanceB_language_id = get_language_from_id(
instance_session=instanceB_session, instance_session=instanceB_session,
instance_url=instanceB_url, instance_url=instanceB_url,
instance_key=instanceB_key, instance_key=instanceB_key,
instance_language=instanceB_language, instance_language=instanceB_language,
instance_name='B' instance_name='B'
) )
logger.debug({ logger.debug({
@ -412,13 +413,13 @@ def sync_content():
logger.info('syncing content from instance A to instance B') logger.info('syncing content from instance A to instance B')
sync_servers( sync_servers(
instanceA_contents=instanceA_contents, instanceA_contents=instanceA_contents,
instanceB_contentIds=instanceB_contentIds, instanceB_contentIds=instanceB_contentIds,
instanceB_language_id=instanceB_language_id, instanceB_language_id=instanceB_language_id,
instanceB_path=instanceB_path, instanceB_path=instanceB_path,
instanceB_profile_id=instanceB_profile_id, instanceB_profile_id=instanceB_profile_id,
instanceB_session=instanceB_session, instanceB_session=instanceB_session,
instanceB_url=instanceB_url, instanceB_url=instanceB_url,
instanceA_profile_filter_id=instanceA_profile_filter_id, instanceA_profile_filter_id=instanceA_profile_filter_id,
instanceB_key=instanceB_key, instanceB_key=instanceB_key,
instanceA_quality_match=instanceA_quality_match, instanceA_quality_match=instanceA_quality_match,
@ -430,13 +431,13 @@ def sync_content():
logger.info('syncing content from instance B to instance A') logger.info('syncing content from instance B to instance A')
sync_servers( sync_servers(
instanceA_contents=instanceB_contents, instanceA_contents=instanceB_contents,
instanceB_contentIds=instanceA_contentIds, instanceB_contentIds=instanceA_contentIds,
instanceB_language_id=instanceA_language_id, instanceB_language_id=instanceA_language_id,
instanceB_path=instanceA_path, instanceB_path=instanceA_path,
instanceB_profile_id=instanceA_profile_id, instanceB_profile_id=instanceA_profile_id,
instanceB_session=instanceA_session, instanceB_session=instanceA_session,
instanceB_url=instanceA_url, instanceB_url=instanceA_url,
instanceA_profile_filter_id=instanceB_profile_filter_id, instanceA_profile_filter_id=instanceB_profile_filter_id,
instanceB_key=instanceA_key, instanceB_key=instanceA_key,
instanceA_quality_match=instanceB_quality_match, instanceA_quality_match=instanceB_quality_match,
@ -445,6 +446,7 @@ def sync_content():
######################################################################################################################## ########################################################################################################################
if is_in_docker: if is_in_docker:
logger.info('syncing every {} seconds'.format(instance_sync_interval_seconds)) logger.info('syncing every {} seconds'.format(instance_sync_interval_seconds))

Write Preview
Loading…
Cancel
Save