tanpengsccd/AV_Data_Capture
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #134 from vicnoah/master

Browse Source 
修复webm文件后缀匹配不上的问题
This commit is contained in:
Yoshiko 2020-02-25 21:37:49 +08:00 committed by GitHub
commit 88075d7dd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core.py
View File

@ -544,7 +544,7 @@ def cutImage(option, imagecut, path, number, c_word):
def pasteFileToFolder(filepath, path, number, c_word): # 文件路径，番号，后缀，要移动至的位置 def pasteFileToFolder(filepath, path, number, c_word): # 文件路径，番号，后缀，要移动至的位置
houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|avi|rmvb|wmv|mov|mp4|mkv|flv|ts)$', filepath).group()) houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm)$', filepath).group())
try: try:
if config['common']['soft_link'] == '1': # 如果soft_link=1 使用软链接 if config['common']['soft_link'] == '1': # 如果soft_link=1 使用软链接
os.symlink(filepath, path + '/' + number + c_word + houzhui) os.symlink(filepath, path + '/' + number + c_word + houzhui)
@ -571,7 +571,7 @@ def pasteFileToFolder(filepath, path, number, c_word): # 文件路径，番号
def pasteFileToFolder_mode2(filepath, path, multi_part, number, part, c_word): # 文件路径，番号，后缀，要移动至的位置 def pasteFileToFolder_mode2(filepath, path, multi_part, number, part, c_word): # 文件路径，番号，后缀，要移动至的位置
if multi_part == 1: if multi_part == 1:
number += part # 这时number会被附加上CD1后缀 number += part # 这时number会被附加上CD1后缀
houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|avi|rmvb|wmv|mov|mp4|mkv|flv|ts)$', filepath).group()) houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm)$', filepath).group())
try: try:
if config['common']['soft_link'] == '1': if config['common']['soft_link'] == '1':
os.symlink(filepath, path + '/' + number + part + c_word + houzhui) os.symlink(filepath, path + '/' + number + part + c_word + houzhui)