Update Pre-release 3.7

This commit is contained in:
root
2020-08-12 18:24:46 +08:00
parent e7a7e17e52
commit 72a9790858
12 changed files with 1623 additions and 2 deletions

View File

@@ -17,6 +17,7 @@ import javdb
import mgstage
import xcity
import javlib
import dlsite
def escape_path(path, escape_literals: str): # Remove escape literals
@@ -56,6 +57,7 @@ def get_data_from_json(file_number, filepath, conf: config.Config): # 从JSON
"jav321": jav321.main,
"xcity": xcity.main,
"javlib": javlib.main,
"dlsite": dlsite.main,
}
# default fetch order list, from the beginning to the end
@@ -74,6 +76,9 @@ def get_data_from_json(file_number, filepath, conf: config.Config): # 从JSON
elif "fc2" in file_number or "FC2" in file_number:
sources.insert(0, sources.pop(sources.index("fc2")))
elif "RJ" in file_number or "rj" or "VJ" or "vj" in file_number:
sources.insert(0, sources.pop(sources.index("dlsite")))
json_data = {}
for source in sources:
json_data = json.loads(func_mapping[source](file_number))