mirror of https://github.com/morpheus65535/bazarr
no log: pep8 fixes
This commit is contained in:
parent
2c4ed03817
commit
0bddb5ba55
|
@ -7,7 +7,6 @@ from flask_restx import Resource, Namespace, fields, marshal
|
||||||
|
|
||||||
from app.config import settings
|
from app.config import settings
|
||||||
from app.logger import empty_log
|
from app.logger import empty_log
|
||||||
from app.get_args import args
|
|
||||||
|
|
||||||
from utilities.central import get_log_file_path
|
from utilities.central import get_log_file_path
|
||||||
from ..utils import authenticate
|
from ..utils import authenticate
|
||||||
|
|
|
@ -58,7 +58,7 @@ class Validator(OriginalValidator):
|
||||||
def check_parser_binary(value):
|
def check_parser_binary(value):
|
||||||
try:
|
try:
|
||||||
get_binary(value)
|
get_binary(value)
|
||||||
except BinaryNotFound as e:
|
except BinaryNotFound:
|
||||||
raise ValidationError(f"Executable '{value}' not found in search path. Please install before making this selection.")
|
raise ValidationError(f"Executable '{value}' not found in search path. Please install before making this selection.")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,6 @@ from logging.handlers import TimedRotatingFileHandler
|
||||||
from utilities.central import get_log_file_path
|
from utilities.central import get_log_file_path
|
||||||
from pytz_deprecation_shim import PytzUsageWarning
|
from pytz_deprecation_shim import PytzUsageWarning
|
||||||
|
|
||||||
from .get_args import args
|
|
||||||
from .config import settings
|
from .config import settings
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,18 +61,18 @@ class UnwantedWaitressMessageFilter(logging.Filter):
|
||||||
if settings.general.debug:
|
if settings.general.debug:
|
||||||
# no filtering in debug mode
|
# no filtering in debug mode
|
||||||
return True
|
return True
|
||||||
|
|
||||||
unwantedMessages = [
|
|
||||||
"Exception while serving /api/socket.io/",
|
|
||||||
['Session is disconnected', 'Session not found' ],
|
|
||||||
|
|
||||||
"Exception while serving /api/socket.io/",
|
|
||||||
["'Session is disconnected'", "'Session not found'" ],
|
|
||||||
|
|
||||||
"Exception while serving /api/socket.io/",
|
|
||||||
['"Session is disconnected"', '"Session not found"' ],
|
|
||||||
|
|
||||||
"Exception when servicing %r",
|
unwantedMessages = [
|
||||||
|
"Exception while serving /api/socket.io/",
|
||||||
|
['Session is disconnected', 'Session not found'],
|
||||||
|
|
||||||
|
"Exception while serving /api/socket.io/",
|
||||||
|
["'Session is disconnected'", "'Session not found'"],
|
||||||
|
|
||||||
|
"Exception while serving /api/socket.io/",
|
||||||
|
['"Session is disconnected"', '"Session not found"'],
|
||||||
|
|
||||||
|
"Exception when servicing %r",
|
||||||
[],
|
[],
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ from apscheduler.triggers.date import DateTrigger
|
||||||
from apscheduler.events import EVENT_JOB_SUBMITTED, EVENT_JOB_EXECUTED, EVENT_JOB_ERROR
|
from apscheduler.events import EVENT_JOB_SUBMITTED, EVENT_JOB_EXECUTED, EVENT_JOB_ERROR
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from calendar import day_name
|
from calendar import day_name
|
||||||
from math import floor
|
|
||||||
from random import randrange
|
from random import randrange
|
||||||
from tzlocal import get_localzone
|
from tzlocal import get_localzone
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -87,9 +87,9 @@ class Server:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def close_all(self):
|
def close_all(self):
|
||||||
print(f"Closing database...")
|
print("Closing database...")
|
||||||
close_database()
|
close_database()
|
||||||
print(f"Closing webserver...")
|
print("Closing webserver...")
|
||||||
self.server.close()
|
self.server.close()
|
||||||
|
|
||||||
def shutdown(self, status=EXIT_NORMAL):
|
def shutdown(self, status=EXIT_NORMAL):
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# coding=utf-8
|
# coding=utf-8
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import re
|
|
||||||
|
|
||||||
# set Bazarr user-agent used to make requests
|
# set Bazarr user-agent used to make requests
|
||||||
HEADERS = {"User-Agent": os.environ["SZ_USER_AGENT"]}
|
HEADERS = {"User-Agent": os.environ["SZ_USER_AGENT"]}
|
||||||
|
|
|
@ -19,7 +19,8 @@ from utilities.backup import restore_from_backup
|
||||||
|
|
||||||
from app.database import init_db
|
from app.database import init_db
|
||||||
|
|
||||||
from literals import *
|
from literals import (EXIT_CONFIG_CREATE_ERROR, ENV_BAZARR_ROOT_DIR, DIR_BACKUP, DIR_CACHE, DIR_CONFIG, DIR_DB, DIR_LOG,
|
||||||
|
DIR_RESTORE, EXIT_REQUIREMENTS_ERROR)
|
||||||
from utilities.central import make_bazarr_dir, restart_bazarr, stop_bazarr
|
from utilities.central import make_bazarr_dir, restart_bazarr, stop_bazarr
|
||||||
|
|
||||||
# set start time global variable as epoch
|
# set start time global variable as epoch
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# coding=utf-8
|
# coding=utf-8
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import io
|
|
||||||
|
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
|
|
||||||
|
@ -42,6 +41,8 @@ from languages.get_languages import load_language_in_db # noqa E402
|
||||||
from app.signalr_client import sonarr_signalr_client, radarr_signalr_client # noqa E402
|
from app.signalr_client import sonarr_signalr_client, radarr_signalr_client # noqa E402
|
||||||
from app.server import webserver, app # noqa E402
|
from app.server import webserver, app # noqa E402
|
||||||
from app.announcements import get_announcements_to_file # noqa E402
|
from app.announcements import get_announcements_to_file # noqa E402
|
||||||
|
from utilities.central import stop_bazarr # noqa E402
|
||||||
|
from literals import EXIT_NORMAL # noqa E402
|
||||||
|
|
||||||
if args.create_db_revision:
|
if args.create_db_revision:
|
||||||
create_db_revision(app)
|
create_db_revision(app)
|
||||||
|
|
|
@ -33,9 +33,9 @@ def sync_subtitles(video_path, srt_path, srt_lang, forced, percent_score, sonarr
|
||||||
'max_offset_seconds': str(settings.subsync.max_offset_seconds),
|
'max_offset_seconds': str(settings.subsync.max_offset_seconds),
|
||||||
'no_fix_framerate': settings.subsync.no_fix_framerate,
|
'no_fix_framerate': settings.subsync.no_fix_framerate,
|
||||||
'gss': settings.subsync.gss,
|
'gss': settings.subsync.gss,
|
||||||
'reference': None, # means choose automatically within video file
|
'reference': None, # means choose automatically within video file
|
||||||
'sonarr_series_id': sonarr_series_id,
|
'sonarr_series_id': sonarr_series_id,
|
||||||
'sonarr_episode_id': sonarr_episode_id,
|
'sonarr_episode_id': sonarr_episode_id,
|
||||||
'radarr_id': radarr_id,
|
'radarr_id': radarr_id,
|
||||||
}
|
}
|
||||||
subsync.sync(**sync_kwargs)
|
subsync.sync(**sync_kwargs)
|
||||||
|
|
|
@ -30,8 +30,8 @@ class SubSyncer:
|
||||||
self.vad = 'subs_then_webrtc'
|
self.vad = 'subs_then_webrtc'
|
||||||
self.log_dir_path = os.path.join(args.config_dir, 'log')
|
self.log_dir_path = os.path.join(args.config_dir, 'log')
|
||||||
|
|
||||||
def sync(self, video_path, srt_path, srt_lang,
|
def sync(self, video_path, srt_path, srt_lang,
|
||||||
max_offset_seconds, no_fix_framerate, gss, reference=None,
|
max_offset_seconds, no_fix_framerate, gss, reference=None,
|
||||||
sonarr_series_id=None, sonarr_episode_id=None, radarr_id=None):
|
sonarr_series_id=None, sonarr_episode_id=None, radarr_id=None):
|
||||||
self.reference = video_path
|
self.reference = video_path
|
||||||
self.srtin = srt_path
|
self.srtin = srt_path
|
||||||
|
|
|
@ -6,30 +6,37 @@
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from literals import *
|
|
||||||
|
from literals import ENV_BAZARR_ROOT_DIR, DIR_LOG, ENV_STOPFILE, ENV_RESTARTFILE, EXIT_NORMAL, FILE_LOG
|
||||||
|
|
||||||
|
|
||||||
def get_bazarr_dir(sub_dir):
|
def get_bazarr_dir(sub_dir):
|
||||||
path = os.path.join(os.environ[ENV_BAZARR_ROOT_DIR], sub_dir)
|
path = os.path.join(os.environ[ENV_BAZARR_ROOT_DIR], sub_dir)
|
||||||
return path
|
return path
|
||||||
|
|
||||||
|
|
||||||
def make_bazarr_dir(sub_dir):
|
def make_bazarr_dir(sub_dir):
|
||||||
path = get_bazarr_dir(sub_dir)
|
path = get_bazarr_dir(sub_dir)
|
||||||
if not os.path.exists(path):
|
if not os.path.exists(path):
|
||||||
os.mkdir(path)
|
os.mkdir(path)
|
||||||
|
|
||||||
|
|
||||||
def get_log_file_path():
|
def get_log_file_path():
|
||||||
path = os.path.join(get_bazarr_dir(DIR_LOG), FILE_LOG)
|
path = os.path.join(get_bazarr_dir(DIR_LOG), FILE_LOG)
|
||||||
return path
|
return path
|
||||||
|
|
||||||
|
|
||||||
def get_stop_file_path():
|
def get_stop_file_path():
|
||||||
return os.environ[ENV_STOPFILE]
|
return os.environ[ENV_STOPFILE]
|
||||||
|
|
||||||
|
|
||||||
def get_restart_file_path():
|
def get_restart_file_path():
|
||||||
return os.environ[ENV_RESTARTFILE]
|
return os.environ[ENV_RESTARTFILE]
|
||||||
|
|
||||||
|
|
||||||
def stop_bazarr(status_code=EXIT_NORMAL, exit_main=True):
|
def stop_bazarr(status_code=EXIT_NORMAL, exit_main=True):
|
||||||
try:
|
try:
|
||||||
with open(get_stop_file_path(),'w', encoding='UTF-8') as file:
|
with open(get_stop_file_path(), 'w', encoding='UTF-8') as file:
|
||||||
# write out status code for final exit
|
# write out status code for final exit
|
||||||
file.write(f'{status_code}\n')
|
file.write(f'{status_code}\n')
|
||||||
file.close()
|
file.close()
|
||||||
|
@ -39,6 +46,7 @@ def stop_bazarr(status_code=EXIT_NORMAL, exit_main=True):
|
||||||
if exit_main:
|
if exit_main:
|
||||||
raise SystemExit(status_code)
|
raise SystemExit(status_code)
|
||||||
|
|
||||||
|
|
||||||
def restart_bazarr():
|
def restart_bazarr():
|
||||||
try:
|
try:
|
||||||
Path(get_restart_file_path()).touch()
|
Path(get_restart_file_path()).touch()
|
||||||
|
@ -46,4 +54,3 @@ def restart_bazarr():
|
||||||
logging.error(f'BAZARR Cannot create restart file: {repr(e)}')
|
logging.error(f'BAZARR Cannot create restart file: {repr(e)}')
|
||||||
logging.info('Bazarr is being restarted...')
|
logging.info('Bazarr is being restarted...')
|
||||||
raise SystemExit(EXIT_NORMAL)
|
raise SystemExit(EXIT_NORMAL)
|
||||||
|
|
Loading…
Reference in New Issue