PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-25 01:29:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 修复 metadata

Browse Source
This commit is contained in:
Karako 2022-10-07 14:39:58 +08:00
parent 0f343a0e3c
commit 151b01120a
No known key found for this signature in database
GPG Key ID: 5920831B0095D4A0
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
metadata/genshin.py
View File

@ -2,7 +2,7 @@
from __future__ import annotations from __future__ import annotations
from typing import Generic, Iterator, KeysView, TypeVar from typing import Any, Generic, ItemsView, Iterator, KeysView, TypeVar
import ujson as json import ujson as json
@ -32,20 +32,20 @@ class Data(dict, Generic[K, V]):
@property @property
def data(self) -> dict[K, V]: def data(self) -> dict[K, V]:
if not (result := _cache.get(self._file_name, None)): if (result := _cache.get(self._file_name)) not in [None, {}]:
self._dict = result self._dict = result
super(Data, self).__init__(result) else:
path = data_dir.joinpath(self._file_name).with_suffix('.json') path = data_dir.joinpath(self._file_name).with_suffix('.json')
if not path.exists(): if not path.exists():
logger.error( logger.error(
f"暂未找到名为 \"{self._file_name}.json\" 的 metadata , " f"暂未找到名为 \"{self._file_name}.json\" 的 metadata , "
"请先使用 [yellow bold]/refresh_metadata[/] 命令下载", "请先使用 [yellow bold]/refresh_metadata[/] 命令下载",
extra={'markup': True} extra={'markup': True}
) )
self._dict = {} self._dict = {}
with open(path, encoding='utf-8') as file: with open(path, encoding='utf-8') as file:
self._dict = json.load(file) self._dict = json.load(file)
_cache.update({self._file_name: self._dict}) _cache.update({self._file_name: self._dict})
return self._dict return self._dict
def __init__(self, file_name: str): def __init__(self, file_name: str):
@ -53,8 +53,8 @@ class Data(dict, Generic[K, V]):
self._dict = {} self._dict = {}
super(Data, self).__init__() super(Data, self).__init__()
def get(self, key: K) -> V | None: def get(self, key: K, value: Any = None) -> V | None:
return self.data.get(key) return self.data.get(key, value)
def __getitem__(self, key: K) -> V: def __getitem__(self, key: K) -> V:
return self.data.__getitem__(key) return self.data.__getitem__(key)
@ -71,6 +71,9 @@ class Data(dict, Generic[K, V]):
def keys(self) -> KeysView[K, V]: def keys(self) -> KeysView[K, V]:
return self.data.keys() return self.data.keys()
def items(self) -> ItemsView[K, V]:
return self.data.items()
HONEY_DATA: dict[str, dict[StrOrInt, list[str | int]]] = Data('honey') HONEY_DATA: dict[str, dict[StrOrInt, list[str | int]]] = Data('honey')