mirror of
https://github.com/studio-neptune/yuuki.git
synced 2024-09-20 16:35:56 +08:00
v6.5.2_RC1
This commit is contained in:
parent
720259d27f
commit
e63ded0b96
14
libs/data.py
14
libs/data.py
|
@ -156,18 +156,14 @@ class Yuuki_Data:
|
|||
def _local_query(self, query_data):
|
||||
if type(query_data) is list:
|
||||
result = self.Data
|
||||
query_len = len(query_data)
|
||||
source_data = self.Data
|
||||
query_len = len(query_data) - 1
|
||||
for count, key in enumerate(query_data):
|
||||
if key in source_data:
|
||||
if count < (query_len - 1):
|
||||
if type(source_data.get(key)) is dict:
|
||||
source_data = source_data.get(key)
|
||||
else:
|
||||
if key in result:
|
||||
if count < query_len:
|
||||
if type(result.get(key)) is not dict:
|
||||
result = 1
|
||||
break
|
||||
else:
|
||||
result = source_data.get(key)
|
||||
result = result.get(key)
|
||||
else:
|
||||
result = 2
|
||||
break
|
||||
|
|
|
@ -50,18 +50,14 @@ def query(query_data, null=None):
|
|||
try:
|
||||
if type(switch_data) is dict and type(query_data) is list:
|
||||
result = switch_data
|
||||
query_len = len(query_data)
|
||||
source_data = switch_data
|
||||
query_len = len(query_data) - 1
|
||||
for count, key in enumerate(query_data):
|
||||
if key in source_data:
|
||||
if count < (query_len - 1):
|
||||
if type(source_data.get(key)) is dict:
|
||||
source_data = source_data.get(key)
|
||||
else:
|
||||
if key in result:
|
||||
if count < query_len:
|
||||
if type(result.get(key)) is not dict:
|
||||
result = 1 #"unknown_type" + type(source_data.get(key))
|
||||
break
|
||||
else:
|
||||
result = source_data.get(key)
|
||||
result = result.get(key)
|
||||
else:
|
||||
result = 2 #"unknown_key"
|
||||
break
|
||||
|
|
|
@ -27,7 +27,7 @@ class Yuuki_Settings:
|
|||
|
||||
config = {
|
||||
"name": "Yuuki",
|
||||
"version": "v6.5.2",
|
||||
"version": "v6.5.2_RC1",
|
||||
"version_check": True,
|
||||
"project_url": "https://tinyurl.com/syb-yuuki",
|
||||
"man_page": "https://tinyurl.com/yuuki-manual",
|
||||
|
|
Loading…
Reference in a new issue