Cool_Tools/bemaniutils
1
0
Fork 0
mirror of synced 2024-12-01 00:57:18 +01:00
Code Releases Activity

Unify config loading for remaining utilities that read the same server.yaml.

Browse Source
This commit is contained in:
Jennifer Taylor 2021-08-20 04:43:36 +00:00
parent b940e3143f
commit 628828ed12
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bemani/utils/dbutils.py
View File

@ -1,10 +1,10 @@
import argparse
import getpass
import sys
import yaml
from typing import Any, Dict, Optional
from bemani.data import Data, DBCreateException
from bemani.utils.config import load_config
def create(config: Dict[str, Any]) -> None:
@ -96,8 +96,9 @@ def main() -> None:
parser.add_argument("-c", "--config", help="Core configuration. Defaults to server.yaml", type=str, default="server.yaml")
args = parser.parse_args()
config = yaml.safe_load(open(args.config))
config['database']['engine'] = Data.create_engine(config)
config: Dict[str, Any] = {}
load_config(args.config, config)
try:
if args.operation == "create":
create(config)

9
bemani/utils/read.py
View File

@ -8,9 +8,7 @@ import jaconv # type: ignore
import json
import os
import struct
import yaml
import xml.etree.ElementTree as ET
from sqlalchemy import create_engine # type: ignore
from sqlalchemy.engine import CursorResult # type: ignore
from sqlalchemy.orm import sessionmaker # type: ignore
from sqlalchemy.sql import text # type: ignore
@ -25,6 +23,7 @@ from bemani.data.api.music import GlobalMusicData
from bemani.data.api.game import GlobalGameData
from bemani.data.mysql.music import MusicData
from bemani.data.mysql.user import UserData
from bemani.utils.config import load_config
class ReadAPI(APIProviderInterface):
@ -60,8 +59,7 @@ class ImportBase:
self.update = update
self.no_combine = no_combine
self.__config = config
self.__url = f"mysql://{config['database']['user']}:{config['database']['password']}@{config['database']['address']}/{config['database']['database']}?charset=utf8mb4"
self.__engine = create_engine(self.__url)
self.__engine = self.__config['database']['engine']
self.__sessionmanager = sessionmaker(self.__engine)
self.__conn = self.__engine.connect()
self.__session = self.__sessionmanager(bind=self.__conn)
@ -3654,7 +3652,8 @@ if __name__ == "__main__":
raise Exception("Cannot specify both a remote server and a local file to read from!")
# Load the config so we can talk to the server
config = yaml.safe_load(open(args.config))
config: Dict[str, Any] = {}
load_config(args.config, config)
series = None
try: