Made logging statements use consistent string formats and some minor related fixes
This commit is contained in:
parent
96f1e55286
commit
7a2736300b
@ -80,7 +80,7 @@ class Collector(QueueThread):
|
||||
raise Exception(f"Job {jobid} not found in tracker")
|
||||
pending = self.trackers[jobid]
|
||||
if pending.failed:
|
||||
self.logger.info("%s - job has been marked as failed,"
|
||||
self.logger.info("%s - job has been marked as failed, "
|
||||
"will not apply %s",
|
||||
jobid,
|
||||
pformat(item.handler))
|
||||
|
@ -28,7 +28,7 @@ def _do_whisper_transcribe(inpath,
|
||||
logger = logging.getLogger(
|
||||
'play-daemon.SubtitlesWhisperHandler._do_transcribe')
|
||||
logger.setLevel(loglevel)
|
||||
logger.info(f'Starting whisper transcription job for {inpath}.')
|
||||
logger.info('Starting whisper transcription job for %s.', inpath)
|
||||
try:
|
||||
whisperModel = whisper.load_model(
|
||||
modelname,
|
||||
@ -42,13 +42,13 @@ def _do_whisper_transcribe(inpath,
|
||||
end = time.time()
|
||||
if language is None:
|
||||
out_language = result['language']
|
||||
logger.info(f"Detected language '{out_language}' in {inpath}.")
|
||||
logger.info("Detected language '%s' in %s.", out_language, inpath)
|
||||
else:
|
||||
out_language = language
|
||||
vttWriter = whisper.utils.WriteVTT(str(outpath.parent))
|
||||
vttWriter.always_include_hours = True
|
||||
except Exception as e:
|
||||
logger.error(f'Transcription of {inpath} failed.', exc_info=e)
|
||||
logger.error('Transcription of %s failed.', inpath, exc_info=e)
|
||||
raise e
|
||||
|
||||
with open(outpath, 'w') as f:
|
||||
@ -57,8 +57,8 @@ def _do_whisper_transcribe(inpath,
|
||||
'max_words_per_line': 15,
|
||||
'highlight_words': False})
|
||||
elapsed = time.strftime('%H:%M:%S', time.gmtime(end - start))
|
||||
logger.info('Finished whisper transcription job '
|
||||
f'for {inpath} in {elapsed}.')
|
||||
logger.info('Finished whisper transcription job for %s in %s.',
|
||||
inpath, elapsed)
|
||||
return (outpath, out_language)
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ class SubtitlesWhisperHandler(Handler):
|
||||
self.whispermodel = config['whispermodel']
|
||||
self.modeldir = config['modeldir']
|
||||
self.device = device
|
||||
self.logger.debug(f'Created SubtitlesWhisperHandler on {device}')
|
||||
self.logger.debug('Created SubtitlesWhisperHandler on %s', device)
|
||||
|
||||
@classmethod
|
||||
def instantiate(cls,
|
||||
|
@ -30,7 +30,7 @@ def _whisper_processor(inqueue,
|
||||
logger = logging.getLogger(
|
||||
'play-daemon.SubtitlesWhisperHandler._whisper_processor')
|
||||
logger.setLevel(loglevel)
|
||||
logger.debug(f'Starting _whisper_processor on {device}')
|
||||
logger.debug('Starting _whisper_processor on %s', device)
|
||||
|
||||
rundevice = 'cpu'
|
||||
if device != 'cpu':
|
||||
@ -47,7 +47,7 @@ def _whisper_processor(inqueue,
|
||||
sleep(1)
|
||||
continue
|
||||
|
||||
logger.info(f'Starting whisper transcription job for {inpath}.')
|
||||
logger.info('Starting whisper transcription job for %s.', inpath)
|
||||
start = time.time()
|
||||
try:
|
||||
result = whisper.transcribe(whisperModel,
|
||||
@ -58,7 +58,7 @@ def _whisper_processor(inqueue,
|
||||
if language is None:
|
||||
out_language = result['language']
|
||||
logger.info(
|
||||
f"Detected language '{out_language}' in {inpath}.")
|
||||
f"Detected language '%s' in %s.", out_language, inpath)
|
||||
else:
|
||||
out_language = language
|
||||
|
||||
@ -70,8 +70,8 @@ def _whisper_processor(inqueue,
|
||||
'max_words_per_line': 15,
|
||||
'highlight_words': False})
|
||||
elapsed = time.strftime('%H:%M:%S', time.gmtime(end - start))
|
||||
logger.info('Finished whisper transcription job '
|
||||
f'for {inpath} in {elapsed}.')
|
||||
logger.info('Finished whisper transcription job for %s in %s.',
|
||||
inpath, elapsed)
|
||||
except Exception as e:
|
||||
outqueue.put(('Failure', (trackname, e)))
|
||||
else:
|
||||
@ -265,8 +265,8 @@ class SubtitlesWhisperHandler(Handler):
|
||||
else:
|
||||
trackname, e = contents
|
||||
transcribes[trackname] = 'failed'
|
||||
self.logger.error(f'Generation of {trackname} failed.',
|
||||
exc_info=e)
|
||||
self.logger.error('Generation of %s failed.',
|
||||
trackname, exc_info=e)
|
||||
self.logger.info("Done, making apply_func")
|
||||
|
||||
def apply_func(package):
|
||||
|
@ -24,7 +24,7 @@ def _whisper_processor(inqueue,
|
||||
logger = logging.getLogger(
|
||||
'play-daemon.SubtitlesWhisperHandler._whisper_processor')
|
||||
logger.setLevel(loglevel)
|
||||
logger.debug(f'Starting _whisper_processor on {device}')
|
||||
logger.debug('Starting _whisper_processor on %s', device)
|
||||
whisperModel = whisper.load_model(modelname,
|
||||
download_root=modeldir,
|
||||
device=device)
|
||||
@ -35,7 +35,7 @@ def _whisper_processor(inqueue,
|
||||
sleep(1)
|
||||
continue
|
||||
|
||||
logger.info(f'Starting whisper transcription job for {inpath}.')
|
||||
logger.info('Starting whisper transcription job for %s.', inpath)
|
||||
start = time.time()
|
||||
try:
|
||||
result = whisper.transcribe(whisperModel,
|
||||
@ -45,8 +45,8 @@ def _whisper_processor(inqueue,
|
||||
end = time.time()
|
||||
if language is None:
|
||||
out_language = result['language']
|
||||
logger.info(
|
||||
f"Detected language '{out_language}' in {inpath}.")
|
||||
logger.info("Detected language '%s' in %s.",
|
||||
out_language, inpath)
|
||||
else:
|
||||
out_language = language
|
||||
|
||||
@ -58,8 +58,8 @@ def _whisper_processor(inqueue,
|
||||
'max_words_per_line': 15,
|
||||
'highlight_words': False})
|
||||
elapsed = time.strftime('%H:%M:%S', time.gmtime(end - start))
|
||||
logger.info('Finished whisper transcription job '
|
||||
f'for {inpath} in {elapsed}.')
|
||||
logger.info('Finished whisper transcription job for %s in %s.',
|
||||
inpath, elapsed)
|
||||
except Exception as e:
|
||||
outqueue.put(('Failure', (trackname, e)))
|
||||
else:
|
||||
@ -264,8 +264,8 @@ class SubtitlesWhisperHandler(Handler):
|
||||
else:
|
||||
trackname, e = contents
|
||||
transcribes[trackname] = 'failed'
|
||||
self.logger.error(f'Generation of {trackname} failed.',
|
||||
exc_info=e)
|
||||
self.logger.error('Generation of %s failed.',
|
||||
trackname, exc_info=e)
|
||||
self.logger.info("Done, making apply_func")
|
||||
|
||||
def apply_func(package):
|
||||
|
@ -116,13 +116,15 @@ def _do_transcode(inpath, outpath, maxheight, encoder='software'):
|
||||
videosettings_out['vf'] = s
|
||||
|
||||
logger = logging.getLogger('play-daemon.TranscodeHandler._do_transcode')
|
||||
logger.info(f"Starting ffmpeg transcode job for {inpath}")
|
||||
logger.info('Starting ffmpeg transcode job for %s', inpath)
|
||||
try:
|
||||
initial = ffmpeg.input(inpath, **videosettings_in)
|
||||
result = initial.output(outpath,
|
||||
**videosettings_out,
|
||||
**audiosettings)
|
||||
logger.info(f"FFmpeg commandline: {' '.join(result.compile())}")
|
||||
if logger.getEffectiveLevel() <= logging.INFO:
|
||||
cmdline = ' '.join(result.compile())
|
||||
logger.info('FFmpeg commandline: %s', cmdline)
|
||||
|
||||
# Need to pass an input string to not break terminal
|
||||
return result.run(input='', quiet=True)
|
||||
|
Loading…
x
Reference in New Issue
Block a user