From 17361a24f7ea7c5ce77717af809a733f2000835f Mon Sep 17 00:00:00 2001
From: wlt233 <1486185683@qq.com>
Date: Mon, 19 Aug 2024 10:54:19 +0800
Subject: [PATCH] format code: import

---
 main.py                 |  8 +++-----
 sdo/model.py            |  2 +-
 sdo/v1.py               | 14 ++++++--------
 sif/api.py              |  8 +++-----
 sif/common.py           | 10 ++++------
 sif/module_template.py  |  4 ----
 sif/modules/album.py    |  4 ----
 sif/modules/costume.py  |  4 ----
 sif/modules/download.py |  5 +----
 sif/modules/live.py     |  6 +++---
 sif/modules/login.py    | 14 ++++++--------
 sif/modules/misc.py     |  6 ++----
 sif/modules/scenario.py |  4 ----
 sif/modules/unit.py     |  4 ----
 sif/modules/user.py     |  6 ++----
 utils/assets.py         |  7 ++++---
 utils/crypto.py         |  7 ++++---
 utils/logger.py         |  6 +++---
 utils/masterdata.py     |  1 +
 19 files changed, 43 insertions(+), 77 deletions(-)

diff --git a/main.py b/main.py
index f9a041d..44d2513 100644
--- a/main.py
+++ b/main.py
@@ -1,12 +1,10 @@
-from sanic import Sanic, Request, text
+from sanic import Request, Sanic, text
 from sanic.log import logger
 
-from utils.logger import setup_log, S_LOGGING_CONFIG_DEFAULTS
-from utils.assets import load_assets
 from sdo import bp_sdo
 from sif import bp_sif
-
-
+from utils.assets import load_assets
+from utils.logger import S_LOGGING_CONFIG_DEFAULTS, setup_log
 
 setup_log()
 app = Sanic("kotori", log_config=S_LOGGING_CONFIG_DEFAULTS)
diff --git a/sdo/model.py b/sdo/model.py
index 0cabb1f..ea36d53 100644
--- a/sdo/model.py
+++ b/sdo/model.py
@@ -1,4 +1,4 @@
-from peewee import SqliteDatabase, Model, IntegerField, TextField
+from peewee import IntegerField, Model, SqliteDatabase, TextField
 
 db = SqliteDatabase('./db/sdo.db', pragmas={'journal_mode': 'wal'})
 
diff --git a/sdo/v1.py b/sdo/v1.py
index 49e8a60..6dc8bfa 100644
--- a/sdo/v1.py
+++ b/sdo/v1.py
@@ -1,18 +1,16 @@
-from sanic import Blueprint, Request, json, Sanic
-from sanic.log import logger
-from sanic.exceptions import SanicException
-
 import json as jsonlib
 import time
 import urllib.parse
 import uuid
 
-from utils.crypto import rsa_decrypt, get_rsa_privkey
-from utils.crypto import des3_decrypt, des3_encrypt
-from utils.crypto import base64_decode, base64_encode, md5
-from .model import SdoUser
+from sanic import Blueprint, Request, Sanic, json
+from sanic.exceptions import SanicException
+from sanic.log import logger
 
+from utils.crypto import (base64_decode, base64_encode, des3_decrypt,
+                          des3_encrypt, get_rsa_privkey, md5, rsa_decrypt)
 
+from .model import SdoUser
 
 bp_sdo_v1 = Blueprint("sdo_v1", url_prefix="v1")
 
diff --git a/sif/api.py b/sif/api.py
index e188eb9..ae96e68 100644
--- a/sif/api.py
+++ b/sif/api.py
@@ -1,11 +1,9 @@
-from sanic import Blueprint, Request, json, Sanic
-from sanic.log import logger
-
 import time
 
-from .common import common_api
-
+from sanic import Blueprint, Request, Sanic, json
+from sanic.log import logger
 
+from .common import common_api
 
 bp_sif_api = Blueprint("sif_api")
 
diff --git a/sif/common.py b/sif/common.py
index e9f4237..da93f24 100644
--- a/sif/common.py
+++ b/sif/common.py
@@ -1,13 +1,11 @@
-from sanic import Sanic, json, SanicException
-from sanic.log import logger
-
-from decorator import decorator
 import json as jsonlib
 import urllib.parse
 
-from utils.crypto import base64_encode
-from utils.crypto import get_rsa_privkey, rsa_sha1_sign
+from decorator import decorator
+from sanic import Sanic, SanicException, json
+from sanic.log import logger
 
+from utils.crypto import base64_encode, get_rsa_privkey, rsa_sha1_sign
 
 
 @decorator
diff --git a/sif/module_template.py b/sif/module_template.py
index 481318a..a01edff 100644
--- a/sif/module_template.py
+++ b/sif/module_template.py
@@ -1,11 +1,7 @@
 from sanic import Blueprint, Request
 
-import time
-
 from .common import common_api
 
-
-
 bp_sif_name = Blueprint("sif_name", url_prefix="name")
 
 
diff --git a/sif/modules/album.py b/sif/modules/album.py
index 2dc973d..dfeee72 100644
--- a/sif/modules/album.py
+++ b/sif/modules/album.py
@@ -1,11 +1,7 @@
 from sanic import Blueprint, Request
 
-import time
-
 from ..common import common_api
 
-
-
 bp_sif_album = Blueprint("sif_album", url_prefix="album")
 
 
diff --git a/sif/modules/costume.py b/sif/modules/costume.py
index a8b241d..3e3b27a 100644
--- a/sif/modules/costume.py
+++ b/sif/modules/costume.py
@@ -1,11 +1,7 @@
 from sanic import Blueprint, Request
 
-import time
-
 from ..common import common_api
 
-
-
 bp_sif_costume = Blueprint("sif_costume", url_prefix="costume")
 
 
diff --git a/sif/modules/download.py b/sif/modules/download.py
index 884da90..3601b36 100644
--- a/sif/modules/download.py
+++ b/sif/modules/download.py
@@ -1,10 +1,7 @@
-from sanic import Sanic, Blueprint, Request
-from sanic.log import logger
+from sanic import Blueprint, Request, Sanic
 
 from ..common import common_api
 
-
-
 bp_sif_download = Blueprint("sif_download", url_prefix="download")
 
 
diff --git a/sif/modules/live.py b/sif/modules/live.py
index 69578ee..b1474ea 100644
--- a/sif/modules/live.py
+++ b/sif/modules/live.py
@@ -1,10 +1,10 @@
-from sanic import Blueprint, Request
-
 import time
 
-from ..common import common_api
+from sanic import Blueprint, Request
+
 from utils.masterdata import get_masterdata
 
+from ..common import common_api
 
 bp_sif_live = Blueprint("sif_live", url_prefix="live")
 
diff --git a/sif/modules/login.py b/sif/modules/login.py
index 563d7b5..c83378b 100644
--- a/sif/modules/login.py
+++ b/sif/modules/login.py
@@ -1,17 +1,15 @@
-from sanic import Sanic, Blueprint, Request, SanicException
-from sanic.log import logger
-
 import time
 import urllib.parse
 import uuid
 
-from utils.crypto import base64_decode, base64_encode, xor
-from utils.crypto import rsa_decrypt, get_rsa_privkey
-from utils.crypto import aes_cbc_decrypt
-from sdo.model import SdoUser
-from ..common import parse_data, pack_resp 
+from sanic import Blueprint, Request, Sanic, SanicException
+from sanic.log import logger
 
+from sdo.model import SdoUser
+from utils.crypto import (aes_cbc_decrypt, base64_decode, base64_encode,
+                          get_rsa_privkey, rsa_decrypt, xor)
 
+from ..common import pack_resp, parse_data
 
 bp_sif_login = Blueprint("sif_login", url_prefix="login")
 
diff --git a/sif/modules/misc.py b/sif/modules/misc.py
index 52e3bf7..26bbc71 100644
--- a/sif/modules/misc.py
+++ b/sif/modules/misc.py
@@ -1,10 +1,8 @@
-from sanic import Blueprint, Request
-
 import time
 
-from ..common import common_api
-
+from sanic import Blueprint, Request
 
+from ..common import common_api
 
 bp_sif_misc = Blueprint("sif_misc")
 
diff --git a/sif/modules/scenario.py b/sif/modules/scenario.py
index 6f45b36..23f07ae 100644
--- a/sif/modules/scenario.py
+++ b/sif/modules/scenario.py
@@ -1,11 +1,7 @@
 from sanic import Blueprint, Request
 
-import time
-
 from ..common import common_api
 
-
-
 bp_sif_scenario = Blueprint("sif_scenario") # , url_prefix="scenario")
 
 
diff --git a/sif/modules/unit.py b/sif/modules/unit.py
index 4a57bda..ceb9fd8 100644
--- a/sif/modules/unit.py
+++ b/sif/modules/unit.py
@@ -1,11 +1,7 @@
 from sanic import Blueprint, Request
 
-import time
-
 from ..common import common_api
 
-
-
 bp_sif_unit = Blueprint("sif_unit", url_prefix="unit")
 
 
diff --git a/sif/modules/user.py b/sif/modules/user.py
index 64869d0..51028e7 100644
--- a/sif/modules/user.py
+++ b/sif/modules/user.py
@@ -1,10 +1,8 @@
-from sanic import Blueprint, Request
-
 import time
 
-from ..common import common_api
-
+from sanic import Blueprint, Request
 
+from ..common import common_api
 
 bp_sif_user = Blueprint("sif_user", url_prefix="user")
 
diff --git a/utils/assets.py b/utils/assets.py
index fa0335c..1c29c7d 100644
--- a/utils/assets.py
+++ b/utils/assets.py
@@ -1,9 +1,10 @@
-from sanic import Sanic
-from sanic.log import logger
+import json
 import os
 import os.path
 from collections import defaultdict
-import json
+
+from sanic import Sanic
+from sanic.log import logger
 
 
 def load_assets():
diff --git a/utils/crypto.py b/utils/crypto.py
index 752160f..6a9dffd 100644
--- a/utils/crypto.py
+++ b/utils/crypto.py
@@ -1,11 +1,12 @@
 import base64
 import hashlib
-from sanic import Sanic
+
+from Crypto.Cipher import AES, DES3, PKCS1_v1_5
+from Crypto.Hash import SHA1
 from Crypto.PublicKey import RSA
-from Crypto.Cipher import PKCS1_v1_5, DES3, AES
 from Crypto.Signature import pkcs1_15
-from Crypto.Hash import SHA1
 from Crypto.Util.Padding import pad, unpad
+from sanic import Sanic
 
 
 def md5(orig: bytes) -> bytes:
diff --git a/utils/logger.py b/utils/logger.py
index cdcf4ae..ca41882 100644
--- a/utils/logger.py
+++ b/utils/logger.py
@@ -2,10 +2,10 @@
 
 import logging
 import sys
-from typing import Dict, Any
- 
+from typing import Any, Dict
+
 from loguru import logger
- 
+
 LOG_FORMAT = '{time:YYYY-MM-DD HH:mm:ss} [{level}] {module}:{name}:{line} - {message}'
 
 LOG_PATH = "./log"
diff --git a/utils/masterdata.py b/utils/masterdata.py
index 414fced..c9ce5b7 100644
--- a/utils/masterdata.py
+++ b/utils/masterdata.py
@@ -1,5 +1,6 @@
 import sqlite3
 
+
 def get_masterdata(db: str, table: str, columns: list[str]) -> list[tuple]:
     con = sqlite3.connect(f"./assets/masterdata/{db}")
     cur = con.cursor()