diff --git a/config.ini b/config.ini index e5d6169ff..9168c1984 100755 --- a/config.ini +++ b/config.ini @@ -63,7 +63,7 @@ number_regexs = update_check = 1 [priority] -website = javbus,airav,jav321,fanza,xcity,mgstage,fc2,avsox,dlsite,carib,madou,getchu,javdb,gcolle,javday,javmenu,pcolle,caribpr,msin +website = javbus,airav,fanza,xcity,mgstage,avsox,jav321,madou,javday,javmenu,javdb [escape] literals = \()/ diff --git a/scrapinglib/api.py b/scrapinglib/api.py index cf51ea445..333b7ce67 100644 --- a/scrapinglib/api.py +++ b/scrapinglib/api.py @@ -207,23 +207,22 @@ def insert(sources, source): # move some web service to the beginning of the list lo_file_number = file_number.lower() if "carib" in sources and (re.search(r"^\d{6}-\d{3}", file_number) - ): - sources = insert(sources, "carib") - elif "caribpr" in sources and (re.search(r"^\d{6}-\d{3}", file_number) ): sources = insert(sources, "caribpr") + sources = insert(sources, "carib") elif "item" in file_number or "GETCHU" in file_number.upper(): sources = ["getchu"] - elif "rj" in lo_file_number or "vj" in lo_file_number or re.search(r"[\u3040-\u309F\u30A0-\u30FF]+", - file_number): + elif "rj" in lo_file_number or "vj" in lo_file_number: + sources = ["dlsite"] + elif re.search(r"[\u3040-\u309F\u30A0-\u30FF]+", file_number): sources = ["dlsite", "getchu"] elif "pcolle" in sources and "pcolle" in lo_file_number: sources = ["pcolle"] elif "fc2" in lo_file_number: sources = ["fc2", "msin"] - elif "mgstage" in sources and \ - (re.search(r"\d+\D+", file_number) or "siro" in lo_file_number): - sources = insert(sources, "mgstage") + elif (re.search(r"\d+\D+", file_number) or "siro" in lo_file_number): + if "mgstage" in sources: + sources = insert(sources, "mgstage") elif "gcolle" in sources and (re.search("\d{6}", file_number)): sources = insert(sources, "gcolle") elif re.search(r"^\d{5,}", file_number) or "heyzo" in lo_file_number: