summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyomotoi <[email protected]>2023-05-09 17:02:58 +0800
committerKyomotoi <[email protected]>2023-05-09 17:02:58 +0800
commitee7654a790f00184145e4470adc5be025f406d3b (patch)
tree889632e9ede305a93a26e5f8c7be1f45cc376748
parent477df2dccc15f2763490cf55fa51dabf5bd8143b (diff)
downloadATRI-ee7654a790f00184145e4470adc5be025f406d3b.tar.gz
ATRI-ee7654a790f00184145e4470adc5be025f406d3b.tar.bz2
ATRI-ee7654a790f00184145e4470adc5be025f406d3b.zip
🎨 优化代码
-rw-r--r--ATRI/plugins/console/data_source.py5
-rw-r--r--ATRI/service.py6
2 files changed, 5 insertions, 6 deletions
diff --git a/ATRI/plugins/console/data_source.py b/ATRI/plugins/console/data_source.py
index 751757e..cab951d 100644
--- a/ATRI/plugins/console/data_source.py
+++ b/ATRI/plugins/console/data_source.py
@@ -1,7 +1,6 @@
import json
import socket
import string
-import zipfile
import hashlib
from pathlib import Path
from random import sample
@@ -35,7 +34,7 @@ class AuthDealer:
async def store(self) -> AuthData:
dead_time = (datetime.now() + timedelta(minutes=15)).timestamp()
data = AuthData(token=self.token, md5=self.get_md5(), dead_time=int(dead_time))
- await FileDealer(self.AUTH_FILE_PATH).write(data.dict())
+ await FileDealer(self.AUTH_FILE_PATH).write_json(data.dict())
return data
@classmethod
@@ -49,7 +48,7 @@ class AuthDealer:
@classmethod
async def clear(cls):
- await FileDealer(cls.AUTH_FILE_PATH).write(dict())
+ await FileDealer(cls.AUTH_FILE_PATH).write_json(dict())
async def get_host_ip(is_pub: bool):
diff --git a/ATRI/service.py b/ATRI/service.py
index d8b2223..3c6604b 100644
--- a/ATRI/service.py
+++ b/ATRI/service.py
@@ -382,7 +382,7 @@ class ServiceTools:
def __init__(self, service: str):
self.service = service
- def save_service(self, service_data: dict):
+ def save_service(self, service_data: ServiceInfo):
path = SERVICES_DIR / f"{self.service}.json"
if not path.is_file():
raise ReadFileError(
@@ -392,7 +392,7 @@ class ServiceTools:
)
with open(path, "w", encoding="utf-8") as w:
- w.write(json.dumps(service_data, indent=4))
+ w.write(json.dumps(service_data.dict(), indent=4))
def load_service(self) -> ServiceInfo:
path = SERVICES_DIR / f"{self.service}.json"
@@ -428,7 +428,7 @@ class ServiceTools:
def service_controller(self, is_enabled: bool):
data = self.load_service()
data.enabled = is_enabled
- self.save_service(data.dict())
+ self.save_service(data)
def is_in_service(service: str) -> Rule: