diff --git a/WebCrawler/__init__.py b/WebCrawler/__init__.py index 0e7ae12..9e51623 100644 --- a/WebCrawler/__init__.py +++ b/WebCrawler/__init__.py @@ -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) ): 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: if "javdb" in sources: 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"))) if "fc2club" in sources: 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 ( "rj" in lo_file_number or "vj" in lo_file_number ): diff --git a/WebCrawler/jav321.py b/WebCrawler/jav321.py index e3732c5..223e862 100644 --- a/WebCrawler/jav321.py +++ b/WebCrawler/jav321.py @@ -56,9 +56,9 @@ def parse_info(soup: BeautifulSoup) -> dict: "label": get_label(data_dic), "studio": get_studio(data_dic), "tag": get_tag(data_dic), - "number": get_number(data_dic), + "number": get_number(data_dic).upper(), "release": get_release(data_dic), - "runtime": get_runtime(data_dic), + "runtime": get_runtime(data_dic).replace(" minutes", ""), "series": get_series(data_dic), } else: diff --git a/config.ini b/config.ini index 71b3642..ef52e57 100755 --- a/config.ini +++ b/config.ini @@ -46,7 +46,7 @@ max_title_len=50 update_check=1 [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] literals=\()/