From 634e32e6545e2478adce45c13504d57db3903142 Mon Sep 17 00:00:00 2001 From: yoshiko2 Date: Sat, 23 Apr 2022 21:28:09 +0800 Subject: [PATCH] Fix sources sort --- WebCrawler/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ):