@@ -2344,7 +2344,7 @@ def ASFMKV(file: str, outfile: str = '', asslangs: list = [], asspaths: list = [
2344
2344
return mkvmr
2345
2345
2346
2346
2347
- def getFileList (inPath : str , extFilter : list [str ] = [], subdir : bool = False ) -> list [str ]:
2347
+ def getFileList (inPath : str , extFilter : list [str ] = [], subdir : bool = False ) -> list [tuple [ str , str ] ]:
2348
2348
"""
2349
2349
从输入的目录中获取文件列表
2350
2350
需要以下输入
@@ -3659,7 +3659,7 @@ def cFontSubset(font_info):
3659
3659
if not subonly :
3660
3660
medias = [[path .splitext (path .basename (cpath ))[0 ], cpath ]]
3661
3661
else :
3662
- subonlyp = [cpath ]
3662
+ subonlyp = [( path . splitext ( path . basename ( cpath ))[ 0 ], cpath ) ]
3663
3663
cpath = path .dirname (cpath )
3664
3664
else :
3665
3665
if work != 19 : medias = getFileList (cpath , extlist , v_subdir )
@@ -3739,6 +3739,7 @@ def cFontSubset(font_info):
3739
3739
showMessageSubset (newasspaths , newfont_name )
3740
3740
else :
3741
3741
break
3742
+ if fontload : del font_info2
3742
3743
else :
3743
3744
print ('\033 [1;31m[ERROR] 找不到视频对应字幕\033 [0m' )
3744
3745
elif subonly :
@@ -3750,14 +3751,15 @@ def cFontSubset(font_info):
3750
3751
if work == 19 :
3751
3752
muxer = 2
3752
3753
for subp in subonlyp :
3753
- newasspaths , newfont_name , mkvr = main (font_info2 , [subp ],
3754
+ newasspaths , newfont_name , mkvr = main (font_info2 , [subp [ 1 ] ],
3754
3755
mux = False ,
3755
3756
outdir = [assout_cache , fontout_cache , mkvout_cache ],
3756
3757
FFmuxer = muxer )
3757
3758
if mkvr != - 2 :
3758
3759
showMessageSubset (newasspaths , newfont_name )
3759
3760
else :
3760
3761
break
3762
+ if fontload : del font_info2
3761
3763
3762
3764
else :
3763
3765
leave = False
0 commit comments