From 234d43cc01e375c3ff0bbf28690a61a14d2e3f07 Mon Sep 17 00:00:00 2001 From: 910JQK Date: Sat, 13 Aug 2016 17:20:02 +0800 Subject: [PATCH] Fix error message when invalid format is given --- danmaku2ass.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/danmaku2ass.py b/danmaku2ass.py index 2a9b78e..11300c4 100755 --- a/danmaku2ass.py +++ b/danmaku2ass.py @@ -754,10 +754,16 @@ def ReadComments(input_files, input_format, font_size=25.0, progress_callback=No str_io = io.StringIO(s) if input_format == 'autodetect': CommentProcessor = GetCommentProcessor(str_io) + if not CommentProcessor: + raise ValueError( + _('Failed to detect comment file format: %s') % i + ) else: CommentProcessor = CommentFormatMap.get(input_format) - if not CommentProcessor: - raise ValueError(_('Unknown comment file format: %s') % i) + if not CommentProcessor: + raise ValueError( + _('Unknown comment file format: %s') % input_format + ) comments.extend(CommentProcessor(FilterBadChars(str_io), font_size)) if progress_callback: progress_callback(len(input_files), len(input_files))