diff --git a/ADC_function.py b/ADC_function.py index 1ea36cb..4bc9797 100755 --- a/ADC_function.py +++ b/ADC_function.py @@ -77,11 +77,15 @@ def get_network_settings(): raise ValueError("[-]Proxy config error! Please check the config.") return proxy, timeout, retry_count -def getDataState(json_data): # 元数据获取失败检测 - if json_data['title'] == '' or json_data['title'] == 'None' or json_data['title'] == 'null': - return 0 - else: - return 1 + +def get_data_state(data: dict) -> bool: # 元数据获取失败检测 + if data["title"] is None or data["title"] == "" or data["title"] == "null": + return False + + if data["number"] is None or data["number"] == "" or data["number"] == "null": + return False + + return True def ReadMediaWarehouse(): return config['media']['media_warehouse'] diff --git a/core.py b/core.py index a599ac5..34af08f 100755 --- a/core.py +++ b/core.py @@ -81,7 +81,7 @@ def getDataFromJSON(file_number, filepath, failed_folder): # 从JSON返回元 for source in sources: json_data = json.loads(func_mapping[source](file_number)) # if any service return a valid return, break - if getDataState(json_data) != 0: + if get_data_state(json_data): break # ================================================网站规则添加结束================================================