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

Merge branch 'master' into un-i

Browse Source
This commit is contained in:
Yoshiko2
2022-04-30 19:05:50 +08:00
committed by GitHub
parent 2fd0a7a02b 1655d5ff3e
commit 6bfee6acf1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebCrawler/__init__.py
View File

@@ -77,8 +77,6 @@ def get_data_from_json(file_number, oCC):
if "carib" in sources and (re.match(r"^\d{6}-\d{3}", file_number) if "carib" in sources and (re.match(r"^\d{6}-\d{3}", file_number)
): ):
sources.insert(0, sources.pop(sources.index("carib"))) sources.insert(0, sources.pop(sources.index("carib")))
elif "gcolle" in sources and (re.search("\d{6}", file_number)):
sources.insert(0, sources.pop(sources.index("gcolle")))
elif re.match(r"^\d{5,}", file_number) or "heyzo" in lo_file_number: elif re.match(r"^\d{5,}", file_number) or "heyzo" in lo_file_number:
if "javdb" in sources: if "javdb" in sources:
sources.insert(0, sources.pop(sources.index("javdb"))) sources.insert(0, sources.pop(sources.index("javdb")))
@@ -95,6 +93,8 @@ def get_data_from_json(file_number, oCC):
sources.insert(0, sources.pop(sources.index("fc2"))) sources.insert(0, sources.pop(sources.index("fc2")))
if "fc2club" in sources: if "fc2club" in sources:
sources.insert(0, sources.pop(sources.index("fc2club"))) sources.insert(0, sources.pop(sources.index("fc2club")))
elif "gcolle" in sources and (re.search("\d{6}", file_number)):
sources.insert(0, sources.pop(sources.index("gcolle")))
elif "dlsite" in sources and ( elif "dlsite" in sources and (
"rj" in lo_file_number or "vj" in lo_file_number "rj" in lo_file_number or "vj" in lo_file_number
): ):

4
WebCrawler/jav321.py
View File

@@ -56,9 +56,9 @@ def parse_info(soup: BeautifulSoup) -> dict:
"label": get_label(data_dic), "label": get_label(data_dic),
"studio": get_studio(data_dic), "studio": get_studio(data_dic),
"tag": get_tag(data_dic), "tag": get_tag(data_dic),
"number": get_number(data_dic), "number": get_number(data_dic).upper(),
"release": get_release(data_dic), "release": get_release(data_dic),
"runtime": get_runtime(data_dic), "runtime": get_runtime(data_dic).replace(" minutes", ""),
"series": get_series(data_dic), "series": get_series(data_dic),
} }
else: else:

2
config.ini
View File

@@ -46,7 +46,7 @@ max_title_len=50
update_check=1 update_check=1
[priority] [priority]
website=javbus,airav,fanza,xcity,mgstage,fc2,avsox,dlsite,carib,fc2club,madou,mv91,javdb,gcolle website=javbus,airav,jav321,fanza,xcity,mgstage,fc2,avsox,dlsite,carib,fc2club,madou,mv91,javdb,gcolle
[escape] [escape]
literals=\()/ literals=\()/