Skip to content

Commit

Permalink
no log: pep8 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
morpheus65535 committed May 3, 2024
1 parent 2c4ed03 commit 0bddb5b
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 30 deletions.
1 change: 0 additions & 1 deletion bazarr/api/system/logs.py
Expand Up @@ -7,7 +7,6 @@

from app.config import settings
from app.logger import empty_log
from app.get_args import args

from utilities.central import get_log_file_path
from ..utils import authenticate
Expand Down
2 changes: 1 addition & 1 deletion bazarr/app/config.py
Expand Up @@ -58,7 +58,7 @@ class Validator(OriginalValidator):
def check_parser_binary(value):
try:
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.")
return True

Expand Down
25 changes: 12 additions & 13 deletions bazarr/app/logger.py
Expand Up @@ -11,7 +11,6 @@
from utilities.central import get_log_file_path
from pytz_deprecation_shim import PytzUsageWarning

from .get_args import args
from .config import settings


Expand Down Expand Up @@ -62,18 +61,18 @@ def filter(self, record):
if settings.general.debug:
# no filtering in debug mode
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",
[],
]

Expand Down
1 change: 0 additions & 1 deletion bazarr/app/scheduler.py
Expand Up @@ -10,7 +10,6 @@
from apscheduler.events import EVENT_JOB_SUBMITTED, EVENT_JOB_EXECUTED, EVENT_JOB_ERROR
from datetime import datetime, timedelta
from calendar import day_name
from math import floor
from random import randrange
from tzlocal import get_localzone
try:
Expand Down
4 changes: 2 additions & 2 deletions bazarr/app/server.py
Expand Up @@ -87,9 +87,9 @@ def start(self):
pass

def close_all(self):
print(f"Closing database...")
print("Closing database...")
close_database()
print(f"Closing webserver...")
print("Closing webserver...")
self.server.close()

def shutdown(self, status=EXIT_NORMAL):
Expand Down
1 change: 0 additions & 1 deletion bazarr/constants.py
@@ -1,7 +1,6 @@
# coding=utf-8

import os
import re

# set Bazarr user-agent used to make requests
HEADERS = {"User-Agent": os.environ["SZ_USER_AGENT"]}
Expand Down
3 changes: 2 additions & 1 deletion bazarr/init.py
Expand Up @@ -19,7 +19,8 @@

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

# set start time global variable as epoch
Expand Down
3 changes: 2 additions & 1 deletion bazarr/main.py
@@ -1,7 +1,6 @@
# coding=utf-8

import os
import io

from threading import Thread

Expand Down Expand Up @@ -42,6 +41,8 @@
from app.signalr_client import sonarr_signalr_client, radarr_signalr_client # noqa E402
from app.server import webserver, app # 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:
create_db_revision(app)
Expand Down
6 changes: 3 additions & 3 deletions bazarr/subtitles/sync.py
Expand Up @@ -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),
'no_fix_framerate': settings.subsync.no_fix_framerate,
'gss': settings.subsync.gss,
'reference': None, # means choose automatically within video file
'sonarr_series_id': sonarr_series_id,
'sonarr_episode_id': sonarr_episode_id,
'reference': None, # means choose automatically within video file
'sonarr_series_id': sonarr_series_id,
'sonarr_episode_id': sonarr_episode_id,
'radarr_id': radarr_id,
}
subsync.sync(**sync_kwargs)
Expand Down
4 changes: 2 additions & 2 deletions bazarr/subtitles/tools/subsyncer.py
Expand Up @@ -30,8 +30,8 @@ def __init__(self):
self.vad = 'subs_then_webrtc'
self.log_dir_path = os.path.join(args.config_dir, 'log')

def sync(self, video_path, srt_path, srt_lang,
max_offset_seconds, no_fix_framerate, gss, reference=None,
def sync(self, video_path, srt_path, srt_lang,
max_offset_seconds, no_fix_framerate, gss, reference=None,
sonarr_series_id=None, sonarr_episode_id=None, radarr_id=None):
self.reference = video_path
self.srtin = srt_path
Expand Down
15 changes: 11 additions & 4 deletions bazarr/utilities/central.py
Expand Up @@ -6,30 +6,37 @@
import logging
import os
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):
path = os.path.join(os.environ[ENV_BAZARR_ROOT_DIR], sub_dir)
return path


def make_bazarr_dir(sub_dir):
path = get_bazarr_dir(sub_dir)
if not os.path.exists(path):
os.mkdir(path)


def get_log_file_path():
path = os.path.join(get_bazarr_dir(DIR_LOG), FILE_LOG)
return path


def get_stop_file_path():
return os.environ[ENV_STOPFILE]



def get_restart_file_path():
return os.environ[ENV_RESTARTFILE]


def stop_bazarr(status_code=EXIT_NORMAL, exit_main=True):
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
file.write(f'{status_code}\n')
file.close()
Expand All @@ -39,11 +46,11 @@ def stop_bazarr(status_code=EXIT_NORMAL, exit_main=True):
if exit_main:
raise SystemExit(status_code)


def restart_bazarr():
try:
Path(get_restart_file_path()).touch()
except Exception as e:
logging.error(f'BAZARR Cannot create restart file: {repr(e)}')
logging.info('Bazarr is being restarted...')
raise SystemExit(EXIT_NORMAL)

0 comments on commit 0bddb5b

Please sign in to comment.