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

Merge branch 'master' of https://github.com/naughtyGitCat/Movie_Data_Capture

Browse Source
This commit is contained in:
FatalFurY
2022-02-23 22:15:04 +08:00
parent 377a9f308b 64c129267c
commit 0bd34f907e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ADC_function.py
View File

@@ -26,7 +26,7 @@ def getXpathSingle(htmlcode, xpath):
return result1 return result1
G_USER_AGENT = r'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36' G_USER_AGENT = r'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36'
def get_html(url, cookies: dict = None, ua: str = None, return_type: str = None, encoding: str = None): def get_html(url, cookies: dict = None, ua: str = None, return_type: str = None, encoding: str = None):

5
WebCrawler/__init__.py
View File

@@ -68,7 +68,7 @@ def get_data_from_json(file_number, oCC):
conf = config.getInstance() conf = config.getInstance()
# default fetch order list, from the beginning to the end # default fetch order list, from the beginning to the end
sources = conf.sources().split(',') sources = conf.sources().split(',')
if not len(conf.sources()) > 80: if len(sources) <= len(func_mapping):
# if the input file name matches certain rules, # if the input file name matches certain rules,
# move some web service to the beginning of the list # move some web service to the beginning of the list
lo_file_number = file_number.lower() lo_file_number = file_number.lower()
@@ -327,7 +327,8 @@ def get_data_from_json(file_number, oCC):
if i not in json_data: if i not in json_data:
naming_rule += i.strip("'").strip('"') naming_rule += i.strip("'").strip('"')
else: else:
naming_rule += json_data.get(i) item = json_data.get(i)
naming_rule += item if type(item) is not list else "&".join(item)
json_data['naming_rule'] = naming_rule json_data['naming_rule'] = naming_rule
return json_data return json_data