uohlhv/danmaku2ass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check isinstance(filename, bytes) in case the caller passed a bytes instead of a str

Browse Source
This commit is contained in:
Star Brilliant 2013-12-21 23:49:17 +08:00
parent 03e089ef4a
commit 84cc08f7f3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
danmaku2ass.py
View File

@ -598,6 +598,8 @@ def ConvertType2(row, height, bottomReserved):
def ConvertToFile(filename_or_file, *args, **kwargs): def ConvertToFile(filename_or_file, *args, **kwargs):
if isinstance(filename_or_file, bytes):
filename_or_file = str(bytes(filename_or_file).decode('utf-8', 'replace'))
if isinstance(filename_or_file, str): if isinstance(filename_or_file, str):
return open(filename_or_file, *args, **kwargs) return open(filename_or_file, *args, **kwargs)
else: else:
@ -644,6 +646,8 @@ def Danmaku2ASS(input_files, output_file, stage_width, stage_height, reserve_bla
@export @export
def ReadComments(input_files, font_size=25.0, progress_callback=None): def ReadComments(input_files, font_size=25.0, progress_callback=None):
if isinstance(input_files, bytes):
input_files = str(bytes(input_files).decode('utf-8', 'replace'))
if isinstance(input_files, str): if isinstance(input_files, str):
input_files = [input_files] input_files = [input_files]
else: else: