From 6f5bd41eb0db4fa6b5ec823a6aa1161d56754544 Mon Sep 17 00:00:00 2001 From: newQian Date: Sun, 6 Dec 2020 17:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81iso=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core.py | 4 ++-- py_to_exe.ps1 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core.py b/core.py index fd55148..a43bbf7 100755 --- a/core.py +++ b/core.py @@ -427,7 +427,7 @@ def cutImage(imagecut, path, number, c_word): def paste_file_to_folder(filepath, path, number, c_word, conf: config.Config): # 文件路径，番号，后缀，要移动至的位置 - houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm)$', filepath).group()) + houzhui = str(re.search('[.](iso|ISO|AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm)$', filepath).group()) try: # 如果soft_link=1 使用软链接 @@ -456,7 +456,7 @@ def paste_file_to_folder(filepath, path, number, c_word, conf: config.Config): def paste_file_to_folder_mode2(filepath, path, multi_part, number, part, c_word, conf): # 文件路径，番号，后缀，要移动至的位置 if multi_part == 1: number += part # 这时number会被附加上CD1后缀 - houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm)$', filepath).group()) + houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|WEBM|avi|rmvb|wmv|mov|mp4|mkv|flv|ts|webm|iso|ISO)$', filepath).group()) try: if conf.soft_link(): diff --git a/py_to_exe.ps1 b/py_to_exe.ps1 index 9c919ca..34802fb 100644 --- a/py_to_exe.ps1 +++ b/py_to_exe.ps1 @@ -3,6 +3,9 @@ $CLOUDSCRAPER_PATH=$(python -c 'import cloudscraper as _; print(_.__path__[0])' | select -Last 1) +mkdir build +mkdir __pycache__ + pyinstaller --onefile AV_Data_Capture.py ` --hidden-import ADC_function.py ` --hidden-import core.py `