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

fix: program will crash when the update checker function is failed.

Browse Source
This commit is contained in:
benjamin
2020-12-23 14:44:35 +08:00
parent 7183041cbe
commit 2a00cc5a48
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
AV_Data_Capture.py
View File

@@ -5,8 +5,15 @@ import sys
from number_parser import get_number from number_parser import get_number
from core import * from core import *
def check_update(local_version): def check_update(local_version):
try:
data = json.loads(get_html("https://api.github.com/repos/yoshiko2/AV_Data_Capture/releases/latest")) data = json.loads(get_html("https://api.github.com/repos/yoshiko2/AV_Data_Capture/releases/latest"))
except Exception as e:
print("[-] Failed to update! Please check new version manually:")
print("[-] https://github.com/yoshiko2/AV_Data_Capture/releases")
print("[*]======================================================")
return
remote = data["tag_name"] remote = data["tag_name"]
local = local_version local = local_version
@@ -23,19 +30,22 @@ def argparse_function(ver: str) -> [str, str, bool]:
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("file", default='', nargs='?', help="Single Movie file path.") parser.add_argument("file", default='', nargs='?', help="Single Movie file path.")
parser.add_argument("-c", "--config", default='config.ini', nargs='?', help="The config file Path.") parser.add_argument("-c", "--config", default='config.ini', nargs='?', help="The config file Path.")
parser.add_argument("-n", "--number", default='', nargs='?',help="Custom file number") parser.add_argument("-n", "--number", default='', nargs='?', help="Custom file number")
parser.add_argument("-a", "--auto-exit", dest='autoexit', action="store_true", help="Auto exit after program complete") parser.add_argument("-a", "--auto-exit", dest='autoexit', action="store_true",
help="Auto exit after program complete")
parser.add_argument("-v", "--version", action="version", version=ver) parser.add_argument("-v", "--version", action="version", version=ver)
args = parser.parse_args() args = parser.parse_args()
return args.file, args.config, args.number, args.autoexit return args.file, args.config, args.number, args.autoexit
def movie_lists(root, escape_folder): def movie_lists(root, escape_folder):
for folder in escape_folder: for folder in escape_folder:
if folder in root: if folder in root:
return [] return []
total = [] total = []
file_type = ['.mp4', '.avi', '.rmvb', '.wmv', '.mov', '.mkv', '.flv', '.ts', '.webm', '.MP4', '.AVI', '.RMVB', '.WMV','.MOV', '.MKV', '.FLV', '.TS', '.WEBM', '.iso','.ISO'] file_type = ['.mp4', '.avi', '.rmvb', '.wmv', '.mov', '.mkv', '.flv', '.ts', '.webm', '.MP4', '.AVI', '.RMVB',
'.WMV', '.MOV', '.MKV', '.FLV', '.TS', '.WEBM', '.iso', '.ISO']
dirs = os.listdir(root) dirs = os.listdir(root)
for entry in dirs: for entry in dirs:
f = os.path.join(root, entry) f = os.path.join(root, entry)
@@ -65,9 +75,9 @@ def rm_empty_folder(path):
a = '' a = ''
def create_data_and_move(file_path: str, c: config.Config,debug): def create_data_and_move(file_path: str, c: config.Config, debug):
# Normalized number, eg: 111xxx-222.mp4 -> xxx-222.mp4 # Normalized number, eg: 111xxx-222.mp4 -> xxx-222.mp4
n_number = get_number(debug,file_path) n_number = get_number(debug, file_path)
if debug == True: if debug == True:
print("[!]Making Data for [{}], the number is [{}]".format(file_path, n_number)) print("[!]Making Data for [{}], the number is [{}]".format(file_path, n_number))
@@ -98,6 +108,7 @@ def create_data_and_move(file_path: str, c: config.Config,debug):
except Exception as err: except Exception as err:
print('[!]', err) print('[!]', err)
def create_data_and_move_with_custom_number(file_path: str, c: config.Config, custom_number=None): def create_data_and_move_with_custom_number(file_path: str, c: config.Config, custom_number=None):
try: try:
print("[!]Making Data for [{}], the number is [{}]".format(file_path, custom_number)) print("[!]Making Data for [{}], the number is [{}]".format(file_path, custom_number))
@@ -141,7 +152,7 @@ if __name__ == '__main__':
# ========== Single File ========== # ========== Single File ==========
if not single_file_path == '': if not single_file_path == '':
print('[+]==================== Single File =====================') print('[+]==================== Single File =====================')
create_data_and_move_with_custom_number(single_file_path, conf,custom_number) create_data_and_move_with_custom_number(single_file_path, conf, custom_number)
rm_empty_folder(conf.success_folder()) rm_empty_folder(conf.success_folder())
rm_empty_folder(conf.failed_folder()) rm_empty_folder(conf.failed_folder())
print("[+]All finished!!!") print("[+]All finished!!!")
@@ -155,7 +166,7 @@ if __name__ == '__main__':
count_all = str(len(movie_list)) count_all = str(len(movie_list))
print('[+]Find', count_all, 'movies') print('[+]Find', count_all, 'movies')
if conf.debug() == True: if conf.debug() == True:
print('[+]'+' DEBUG MODE ON '.center(54, '-')) print('[+]' + ' DEBUG MODE ON '.center(54, '-'))
if conf.soft_link(): if conf.soft_link():
print('[!] --- Soft link mode is ENABLE! ----') print('[!] --- Soft link mode is ENABLE! ----')
for movie_path in movie_list: # 遍历电影列表 交给core处理 for movie_path in movie_list: # 遍历电影列表 交给core处理