From cab81ce2b160f3dfc37bba88e30566ce8156cb2b Mon Sep 17 00:00:00 2001
From: yoshiko2 <yoshiko2.dev@gmail.com>
Date: Sat, 23 Apr 2022 21:27:20 +0800
Subject: [PATCH 1/3] Fix `is_uncensored()`` return `None`

---
 number_parser.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/number_parser.py b/number_parser.py
index 8ab9d4b..3a6deda 100755
--- a/number_parser.py
+++ b/number_parser.py
@@ -129,7 +129,8 @@ def is_uncensored(number):
     ):
         return True
     if G_cache_uncensored_conf.is_empty():
-        G_cache_uncensored_conf.set(config.getInstance().get_uncensored().split(','))
+        if G_cache_uncensored_conf.set(config.getInstance().get_uncensored().split(',')) == None:
+            return False
     return G_cache_uncensored_conf.check(number)
 
 

From 634e32e6545e2478adce45c13504d57db3903142 Mon Sep 17 00:00:00 2001
From: yoshiko2 <yoshiko2.dev@gmail.com>
Date: Sat, 23 Apr 2022 21:28:09 +0800
Subject: [PATCH 2/3] 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
         ):

From 0590166439ba9693db5956daafcf4f0304881a2c Mon Sep 17 00:00:00 2001
From: yoshiko2 <yoshiko2.dev@gmail.com>
Date: Sat, 23 Apr 2022 21:32:38 +0800
Subject: [PATCH 3/3] Add source jav321

---
 WebCrawler/jav321.py | 4 ++--
 config.ini           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 c17acc7..e824977 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=\()/