Merge pull request #160 from infstellar/dev

Dev

requirements.txt

@@ -7,7 +7,6 @@ torchvision
 tabulate
 
 paddleocr
-paddlepaddle
 
 thop
 

setup.py

@@ -10,19 +10,19 @@
             subprocess.check_call([sys.executable, '-m', 'pip', 'install', '-r', 'requirements.txt', '-i',
                                    'https://pypi.tuna.tsinghua.edu.cn/simple'])
             open('DTISTREQ', 'x')
-        import installer_setup
+        # import installer_setup
 
-        installer_setup.auto_setup()
+        # installer_setup.auto_setup()
 
     elif sys.argv[0] == 'update':
         subprocess.check_call(['git', 'pull'])
         subprocess.check_call([sys.executable, '-m', 'pip', 'install', '-r', 'requirements.txt', '-i',
                                'https://pypi.tuna.tsinghua.edu.cn/simple'])
         if not os.path.exists('DTISTREQ'):
             open('DTISTREQ', 'x')
-        import installer_setup
+        # import installer_setup
 
-        installer_setup.auto_setup()
+        # installer_setup.auto_setup()
 
     elif sys.argv[0] == 'build':
         import source.config.config_updater

source/funclib/collector_lib.py

@@ -130,10 +130,10 @@ def get_item_id(item_name:str, area_id:list, match_mode = 0) -> list:
         if int(i["areaId"]) in area_id:
             if match_mode == 0:
                 if i["name"] == item_name:
-                    ret_id.append(i["itemId"])
+                    ret_id.append(i["id"])
             elif match_mode == 1:
                 if i["name"] in item_name:
-                    ret_id.append(i["itemId"])
+                    ret_id.append(i["id"])
     ret_id = list(set(ret_id))
     return ret_id
     if len(ret_id) == 1:
@@ -176,7 +176,7 @@ def load_items_position(marker_title:str, mode=0, area_id=None, blacklist_id=Non
     if match_mode == 0:
         id_index = load_json("ID_INDEX.json", f"assets\\POI_JSON_API\\{GLOBAL_LANG}")[marker_title]
     elif match_mode == 1:
-        id_index = list(range(1,14))
+        id_index = list(range(1,27))
     ita = []
     for i in id_index:
         ita += load_json(str(i)+".json", f"assets\\POI_JSON_API\\{GLOBAL_LANG}\\dataset")
@@ -188,7 +188,7 @@ def load_items_position(marker_title:str, mode=0, area_id=None, blacklist_id=Non
         item_id = get_item_id(marker_title, area_id, match_mode=match_mode)
         for i in ita:
             if len(i["itemList"])>0:
-                if i["itemList"][0]["itemId"] in item_id:
+                if i["itemList"][0]["id"] in item_id:
                     common_name.append(i)
     if mode == 1:
         for i in ita:
@@ -226,7 +226,7 @@ def load_items_position(marker_title:str, mode=0, area_id=None, blacklist_id=Non
     return ret_dict  
 
 def load_all_dict():
-    id_index = list(range(1,14))
+    id_index = list(range(1,27))
     ita = []
     for i in id_index:
         ita += load_json(str(i)+".json", f"assets\\POI_JSON_API\\{GLOBAL_LANG}\\dataset")

source/i18n.py

@@ -27,6 +27,9 @@ def load_json(json_name='General.json', default_path='config\\settings') -> dict
 def get_local_lang():
     lang = locale.getdefaultlocale()[0]
     print(lang)
+    # 反正英文也用不了，摆！
+    # TODO: Remove it in due course
+    return "zh_CN"
     if lang in ["zh_CN", "zh_SG", "zh_MO", "zh_HK", "zh_TW"]:
         return "zh_CN"
     else:

source/test/test238.py

@@ -1,5 +1,5 @@
 from source.util import *
-
+MAX_INDEX = 27
 
 # save_json(load_json(json_name="icon.json", default_path="assets\\POI_JSON_API"),json_name="icon.json", default_path="assets\\POI_JSON_API")
 LANG = 'en_US'
@@ -30,15 +30,15 @@ def replace_str(d):
         return d
 
 def reshape_json():
-    for i in list(range(1,15))+["area", "icon", "id_stamp", "item", "type"]:
+    for i in list(range(1,MAX_INDEX))+["area", "icon", "id_stamp", "item", "type"]:
         s = load_json(json_name=str(i)+".json", folder_path=f"assets\\POI_JSON_API\\{LANG}\\dataset")
         s = replace_str(s)
         save_json(s,json_name=str(i)+".json", default_path=f"assets\\POI_JSON_API\\{LANG}\\dataset")
         logger.info(f"{i} succ")
 
 def create_indexes():
     s = {}
-    for ii in range(1,15):
+    for ii in range(1,MAX_INDEX):
         j = load_json(json_name=str(ii)+".json", folder_path=f"assets\\POI_JSON_API\\{LANG}\\dataset")
         for i in j:
             s.setdefault(i["markerTitle"], []).append(str(ii))
@@ -52,7 +52,7 @@ def create_indexes():
 
 def create_name():
     s = []
-    for ii in range(1,15):
+    for ii in range(1,MAX_INDEX):
         j = load_json(json_name=str(ii)+".json", folder_path=f"assets\\POI_JSON_API\\{LANG}\\dataset")
         for i in j:
             s.append(i["markerTitle"])
@@ -62,7 +62,7 @@ def create_name():
 
 def create_refreshTime():
     s = {}
-    for ii in range(1,15):
+    for ii in range(1,MAX_INDEX):
         j = load_json(json_name=str(ii)+".json", folder_path=f"assets\\POI_JSON_API\\{LANG}\\dataset")
         for i in j:
             if int(i["refreshTime"]) not in [-1,0]:
@@ -72,7 +72,7 @@ def create_refreshTime():
 
 def get_all_position():
     rl = []
-    for ii in range(1,15):
+    for ii in range(1,MAX_INDEX):
         j = load_json(json_name=str(ii)+".json", folder_path=f"assets\\POI_JSON_API\\{LANG}\\dataset")
         for i in j:
             rl.append(list(map(float,i['position'].split(',') )))