mirror of
https://github.com/283375/arcaea-offline.git
synced 2025-04-19 06:00:18 +00:00
chore(db): use cursor to run queries
This commit is contained in:
parent
eee196d0ba
commit
e874e38d3b
@ -24,8 +24,9 @@ class Database(metaclass=Singleton):
|
|||||||
return self.__conn
|
return self.__conn
|
||||||
|
|
||||||
def validate_song_id(self, song_id):
|
def validate_song_id(self, song_id):
|
||||||
with self.conn:
|
with self.conn as conn:
|
||||||
result = self.conn.execute(
|
cursor = conn.cursor()
|
||||||
|
result = cursor.execute(
|
||||||
"SELECT song_id FROM charts WHERE song_id = ?", (song_id,)
|
"SELECT song_id FROM charts WHERE song_id = ?", (song_id,)
|
||||||
).fetchall()
|
).fetchall()
|
||||||
return len(result) > 0
|
return len(result) > 0
|
||||||
@ -34,19 +35,20 @@ class Database(metaclass=Singleton):
|
|||||||
arcsong_conn = sqlite3.connect(path)
|
arcsong_conn = sqlite3.connect(path)
|
||||||
data = {}
|
data = {}
|
||||||
with arcsong_conn:
|
with arcsong_conn:
|
||||||
data["charts"] = arcsong_conn.execute(
|
arcsong_cursor = arcsong_conn.cursor()
|
||||||
|
data["charts"] = arcsong_cursor.execute(
|
||||||
"""
|
"""
|
||||||
SELECT song_id, rating_class, name_en, name_jp, artist, bpm, bpm_base, "set", time, side, world_unlock, remote_download, bg, date, version, difficulty, rating, note, chart_designer, jacket_designer, jacket_override, audio_override
|
SELECT song_id, rating_class, name_en, name_jp, artist, bpm, bpm_base, "set", time, side, world_unlock, remote_download, bg, date, version, difficulty, rating, note, chart_designer, jacket_designer, jacket_override, audio_override
|
||||||
FROM charts
|
FROM charts
|
||||||
"""
|
"""
|
||||||
).fetchall()
|
).fetchall()
|
||||||
data["aliases"] = arcsong_conn.execute(
|
data["aliases"] = arcsong_cursor.execute(
|
||||||
"""
|
"""
|
||||||
SELECT sid, alias
|
SELECT sid, alias
|
||||||
FROM alias
|
FROM alias
|
||||||
"""
|
"""
|
||||||
).fetchall()
|
).fetchall()
|
||||||
data["packages"] = arcsong_conn.execute(
|
data["packages"] = arcsong_cursor.execute(
|
||||||
"""
|
"""
|
||||||
SELECT id, name
|
SELECT id, name
|
||||||
FROM packages
|
FROM packages
|
||||||
@ -54,10 +56,11 @@ class Database(metaclass=Singleton):
|
|||||||
).fetchall()
|
).fetchall()
|
||||||
|
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
|
cursor = conn.cursor()
|
||||||
for table in data:
|
for table in data:
|
||||||
columns = [
|
columns = [
|
||||||
row[0]
|
row[0]
|
||||||
for row in conn.execute(
|
for row in cursor.execute(
|
||||||
f"SELECT * FROM {table} LIMIT 1"
|
f"SELECT * FROM {table} LIMIT 1"
|
||||||
).description
|
).description
|
||||||
]
|
]
|
||||||
@ -68,165 +71,167 @@ class Database(metaclass=Singleton):
|
|||||||
update_clauses = ", ".join(
|
update_clauses = ", ".join(
|
||||||
[f"{column} = excluded.{column}" for column in columns]
|
[f"{column} = excluded.{column}" for column in columns]
|
||||||
)
|
)
|
||||||
conn.executemany(
|
cursor.executemany(
|
||||||
f"INSERT INTO {table} ({columns_insert_str}) VALUES ({values_insert_str}) ON CONFLICT DO UPDATE SET {update_clauses}",
|
f"INSERT INTO {table} ({columns_insert_str}) VALUES ({values_insert_str}) ON CONFLICT DO UPDATE SET {update_clauses}",
|
||||||
data[table],
|
data[table],
|
||||||
)
|
)
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
def init(self):
|
def init(self):
|
||||||
|
create_sqls = [
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS charts (
|
||||||
|
song_id TEXT NOT NULL,
|
||||||
|
rating_class INTEGER NOT NULL,
|
||||||
|
name_en TEXT NOT NULL,
|
||||||
|
name_jp TEXT,
|
||||||
|
artist TEXT NOT NULL,
|
||||||
|
bpm TEXT NOT NULL,
|
||||||
|
bpm_base REAL NOT NULL,
|
||||||
|
package_id TEXT NOT NULL,
|
||||||
|
time INTEGER,
|
||||||
|
side INTEGER NOT NULL,
|
||||||
|
world_unlock BOOLEAN NOT NULL,
|
||||||
|
remote_download BOOLEAN,
|
||||||
|
bg TEXT NOT NULL,
|
||||||
|
date INTEGER NOT NULL,
|
||||||
|
version TEXT NOT NULL,
|
||||||
|
difficulty INTEGER NOT NULL,
|
||||||
|
rating INTEGER NOT NULL,
|
||||||
|
note INTEGER NOT NULL,
|
||||||
|
chart_designer TEXT,
|
||||||
|
jacket_designer TEXT,
|
||||||
|
jacket_override BOOLEAN NOT NULL,
|
||||||
|
audio_override BOOLEAN NOT NULL,
|
||||||
|
|
||||||
|
PRIMARY KEY (song_id, rating_class)
|
||||||
|
)
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS aliases (
|
||||||
|
song_id TEXT NOT NULL,
|
||||||
|
alias TEXT NOT NULL
|
||||||
|
)
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS packages (
|
||||||
|
package_id TEXT NOT NULL,
|
||||||
|
name TEXT NOT NULL
|
||||||
|
)
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS scores (
|
||||||
|
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
|
||||||
|
song_id TEXT NOT NULL,
|
||||||
|
rating_class INTEGER NOT NULL,
|
||||||
|
score INTEGER NOT NULL,
|
||||||
|
pure INTEGER NOT NULL,
|
||||||
|
far INTEGER NOT NULL,
|
||||||
|
lost INTEGER NOT NULL,
|
||||||
|
time INTEGER NOT NULL,
|
||||||
|
max_recall INTEGER,
|
||||||
|
|
||||||
|
FOREIGN KEY (song_id, rating_class) REFERENCES charts(song_id, rating_class) ON UPDATE CASCADE ON DELETE NO ACTION
|
||||||
|
)
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS properties (
|
||||||
|
key TEXT NOT NULL UNIQUE,
|
||||||
|
value TEXT NOT NULL
|
||||||
|
)
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE VIEW IF NOT EXISTS calculated AS
|
||||||
|
SELECT
|
||||||
|
scores.song_id,
|
||||||
|
scores.rating_class,
|
||||||
|
scores.score,
|
||||||
|
scores.pure,
|
||||||
|
scores.far,
|
||||||
|
scores.lost,
|
||||||
|
scores.time,
|
||||||
|
charts.rating,
|
||||||
|
charts.note,
|
||||||
|
CAST ( ROUND( score - ( pure * 10000000 / note ) - ( far * 0.5 * 10000000 / note ) ) AS INTEGER ) AS pure_small,
|
||||||
|
CASE
|
||||||
|
WHEN score >= 10000000 THEN
|
||||||
|
rating / 10.0 + 2
|
||||||
|
WHEN score >= 9800000 THEN
|
||||||
|
rating / 10.0 + 1 + ( score - 9800000 ) / 200000.0 ELSE MAX( rating / 10.0, 0 ) + ( score - 9500000 ) / 300000.0
|
||||||
|
END AS potential
|
||||||
|
FROM
|
||||||
|
scores
|
||||||
|
LEFT JOIN charts ON scores.rating_class = charts.rating_class
|
||||||
|
AND scores.song_id = charts.song_id
|
||||||
|
GROUP BY
|
||||||
|
scores.song_id,
|
||||||
|
scores.rating_class
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE VIEW IF NOT EXISTS recent_10 AS
|
||||||
|
SELECT
|
||||||
|
c.song_id,
|
||||||
|
c.rating_class,
|
||||||
|
MAX(c.potential) AS potential
|
||||||
|
FROM
|
||||||
|
calculated c
|
||||||
|
WHERE
|
||||||
|
c.time IN (
|
||||||
|
SELECT DISTINCT time
|
||||||
|
FROM calculated
|
||||||
|
ORDER BY time DESC
|
||||||
|
LIMIT 10
|
||||||
|
)
|
||||||
|
GROUP BY
|
||||||
|
c.song_id,
|
||||||
|
c.rating_class
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE VIEW IF NOT EXISTS best_30 AS
|
||||||
|
SELECT
|
||||||
|
c.song_id,
|
||||||
|
c.rating_class,
|
||||||
|
MAX(c.potential) AS potential
|
||||||
|
FROM
|
||||||
|
calculated c
|
||||||
|
GROUP BY
|
||||||
|
c.song_id,
|
||||||
|
c.rating_class
|
||||||
|
ORDER BY
|
||||||
|
potential DESC
|
||||||
|
LIMIT 30
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE VIEW IF NOT EXISTS calculated_potential AS
|
||||||
|
SELECT
|
||||||
|
r10_avg AS r10,
|
||||||
|
b30_avg AS b30,
|
||||||
|
(r10_sum + b30_sum) / (r10_count + b30_count) AS potential
|
||||||
|
FROM
|
||||||
|
(SELECT SUM(potential) AS r10_sum, AVG(potential) AS r10_avg, COUNT(*) AS r10_count FROM recent_10) r10,
|
||||||
|
(SELECT SUM(potential) AS b30_sum, AVG(potential) AS b30_avg, COUNT(*) AS b30_count FROM best_30) b30
|
||||||
|
""",
|
||||||
|
"""
|
||||||
|
CREATE VIEW IF NOT EXISTS song_id_names AS
|
||||||
|
SELECT song_id, name
|
||||||
|
FROM (
|
||||||
|
SELECT song_id, alias AS name FROM aliases
|
||||||
|
UNION ALL
|
||||||
|
SELECT song_id, song_id AS name FROM charts
|
||||||
|
UNION ALL
|
||||||
|
SELECT song_id, name_en AS name FROM charts
|
||||||
|
UNION ALL
|
||||||
|
SELECT song_id, name_jp AS name FROM charts
|
||||||
|
) AS subquery
|
||||||
|
WHERE name IS NOT NULL AND name <> ''
|
||||||
|
GROUP BY song_id, name
|
||||||
|
"""
|
||||||
|
]
|
||||||
|
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
create_sqls = [
|
cursor = conn.cursor()
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS charts (
|
|
||||||
song_id TEXT NOT NULL,
|
|
||||||
rating_class INTEGER NOT NULL,
|
|
||||||
name_en TEXT NOT NULL,
|
|
||||||
name_jp TEXT,
|
|
||||||
artist TEXT NOT NULL,
|
|
||||||
bpm TEXT NOT NULL,
|
|
||||||
bpm_base REAL NOT NULL,
|
|
||||||
package_id TEXT NOT NULL,
|
|
||||||
time INTEGER,
|
|
||||||
side INTEGER NOT NULL,
|
|
||||||
world_unlock BOOLEAN NOT NULL,
|
|
||||||
remote_download BOOLEAN,
|
|
||||||
bg TEXT NOT NULL,
|
|
||||||
date INTEGER NOT NULL,
|
|
||||||
version TEXT NOT NULL,
|
|
||||||
difficulty INTEGER NOT NULL,
|
|
||||||
rating INTEGER NOT NULL,
|
|
||||||
note INTEGER NOT NULL,
|
|
||||||
chart_designer TEXT,
|
|
||||||
jacket_designer TEXT,
|
|
||||||
jacket_override BOOLEAN NOT NULL,
|
|
||||||
audio_override BOOLEAN NOT NULL,
|
|
||||||
|
|
||||||
PRIMARY KEY (song_id, rating_class)
|
|
||||||
)
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS aliases (
|
|
||||||
song_id TEXT NOT NULL,
|
|
||||||
alias TEXT NOT NULL
|
|
||||||
)
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS packages (
|
|
||||||
package_id TEXT NOT NULL,
|
|
||||||
name TEXT NOT NULL
|
|
||||||
)
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS scores (
|
|
||||||
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
|
|
||||||
song_id TEXT NOT NULL,
|
|
||||||
rating_class INTEGER NOT NULL,
|
|
||||||
score INTEGER NOT NULL,
|
|
||||||
pure INTEGER NOT NULL,
|
|
||||||
far INTEGER NOT NULL,
|
|
||||||
lost INTEGER NOT NULL,
|
|
||||||
time INTEGER NOT NULL,
|
|
||||||
max_recall INTEGER,
|
|
||||||
|
|
||||||
FOREIGN KEY (song_id, rating_class) REFERENCES charts(song_id, rating_class) ON UPDATE CASCADE ON DELETE NO ACTION
|
|
||||||
)
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS properties (
|
|
||||||
key TEXT NOT NULL UNIQUE,
|
|
||||||
value TEXT NOT NULL
|
|
||||||
)
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE VIEW IF NOT EXISTS calculated AS
|
|
||||||
SELECT
|
|
||||||
scores.song_id,
|
|
||||||
scores.rating_class,
|
|
||||||
scores.score,
|
|
||||||
scores.pure,
|
|
||||||
scores.far,
|
|
||||||
scores.lost,
|
|
||||||
scores.time,
|
|
||||||
charts.rating,
|
|
||||||
charts.note,
|
|
||||||
CAST ( ROUND( score - ( pure * 10000000 / note ) - ( far * 0.5 * 10000000 / note ) ) AS INTEGER ) AS pure_small,
|
|
||||||
CASE
|
|
||||||
WHEN score >= 10000000 THEN
|
|
||||||
rating / 10.0 + 2
|
|
||||||
WHEN score >= 9800000 THEN
|
|
||||||
rating / 10.0 + 1 + ( score - 9800000 ) / 200000.0 ELSE MAX( rating / 10.0, 0 ) + ( score - 9500000 ) / 300000.0
|
|
||||||
END AS potential
|
|
||||||
FROM
|
|
||||||
scores
|
|
||||||
LEFT JOIN charts ON scores.rating_class = charts.rating_class
|
|
||||||
AND scores.song_id = charts.song_id
|
|
||||||
GROUP BY
|
|
||||||
scores.song_id,
|
|
||||||
scores.rating_class
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE VIEW IF NOT EXISTS recent_10 AS
|
|
||||||
SELECT
|
|
||||||
c.song_id,
|
|
||||||
c.rating_class,
|
|
||||||
MAX(c.potential) AS potential
|
|
||||||
FROM
|
|
||||||
calculated c
|
|
||||||
WHERE
|
|
||||||
c.time IN (
|
|
||||||
SELECT DISTINCT time
|
|
||||||
FROM calculated
|
|
||||||
ORDER BY time DESC
|
|
||||||
LIMIT 10
|
|
||||||
)
|
|
||||||
GROUP BY
|
|
||||||
c.song_id,
|
|
||||||
c.rating_class
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE VIEW IF NOT EXISTS best_30 AS
|
|
||||||
SELECT
|
|
||||||
c.song_id,
|
|
||||||
c.rating_class,
|
|
||||||
MAX(c.potential) AS potential
|
|
||||||
FROM
|
|
||||||
calculated c
|
|
||||||
GROUP BY
|
|
||||||
c.song_id,
|
|
||||||
c.rating_class
|
|
||||||
ORDER BY
|
|
||||||
potential DESC
|
|
||||||
LIMIT 30
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE VIEW IF NOT EXISTS calculated_potential AS
|
|
||||||
SELECT
|
|
||||||
r10_avg AS r10,
|
|
||||||
b30_avg AS b30,
|
|
||||||
(r10_sum + b30_sum) / (r10_count + b30_count) AS potential
|
|
||||||
FROM
|
|
||||||
(SELECT SUM(potential) AS r10_sum, AVG(potential) AS r10_avg, COUNT(*) AS r10_count FROM recent_10) r10,
|
|
||||||
(SELECT SUM(potential) AS b30_sum, AVG(potential) AS b30_avg, COUNT(*) AS b30_count FROM best_30) b30
|
|
||||||
""",
|
|
||||||
"""
|
|
||||||
CREATE VIEW IF NOT EXISTS song_id_names AS
|
|
||||||
SELECT song_id, name
|
|
||||||
FROM (
|
|
||||||
SELECT song_id, alias AS name FROM aliases
|
|
||||||
UNION ALL
|
|
||||||
SELECT song_id, song_id AS name FROM charts
|
|
||||||
UNION ALL
|
|
||||||
SELECT song_id, name_en AS name FROM charts
|
|
||||||
UNION ALL
|
|
||||||
SELECT song_id, name_jp AS name FROM charts
|
|
||||||
) AS subquery
|
|
||||||
WHERE name IS NOT NULL AND name <> ''
|
|
||||||
GROUP BY song_id, name
|
|
||||||
"""
|
|
||||||
]
|
|
||||||
|
|
||||||
for sql in create_sqls:
|
for sql in create_sqls:
|
||||||
conn.execute(sql)
|
cursor.execute(sql)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|
||||||
def __get_columns_from_dataclass(self, dataclass) -> List[str]:
|
def __get_columns_from_dataclass(self, dataclass) -> List[str]:
|
||||||
@ -243,9 +248,10 @@ class Database(metaclass=Singleton):
|
|||||||
columns_clause = self.__get_columns_clause(
|
columns_clause = self.__get_columns_clause(
|
||||||
self.__get_columns_from_dataclass(DbPackageRow)
|
self.__get_columns_from_dataclass(DbPackageRow)
|
||||||
)
|
)
|
||||||
|
cursor = conn.cursor()
|
||||||
return [
|
return [
|
||||||
DbPackageRow(*row)
|
DbPackageRow(*row)
|
||||||
for row in conn.execute(
|
for row in cursor.execute(
|
||||||
f"SELECT {columns_clause} FROM packages"
|
f"SELECT {columns_clause} FROM packages"
|
||||||
).fetchall()
|
).fetchall()
|
||||||
]
|
]
|
||||||
@ -255,9 +261,10 @@ class Database(metaclass=Singleton):
|
|||||||
columns_clause = self.__get_columns_clause(
|
columns_clause = self.__get_columns_clause(
|
||||||
self.__get_columns_from_dataclass(DbAliasRow)
|
self.__get_columns_from_dataclass(DbAliasRow)
|
||||||
)
|
)
|
||||||
|
cursor = conn.cursor()
|
||||||
return [
|
return [
|
||||||
DbAliasRow(*row)
|
DbAliasRow(*row)
|
||||||
for row in conn.execute(
|
for row in cursor.execute(
|
||||||
f"SELECT {columns_clause} FROM aliases"
|
f"SELECT {columns_clause} FROM aliases"
|
||||||
).fetchall()
|
).fetchall()
|
||||||
]
|
]
|
||||||
@ -267,10 +274,11 @@ class Database(metaclass=Singleton):
|
|||||||
columns_clause = self.__get_columns_clause(
|
columns_clause = self.__get_columns_clause(
|
||||||
self.__get_columns_from_dataclass(DbAliasRow)
|
self.__get_columns_from_dataclass(DbAliasRow)
|
||||||
)
|
)
|
||||||
|
cursor = conn.cursor()
|
||||||
return [
|
return [
|
||||||
DbAliasRow(*row)
|
DbAliasRow(*row)
|
||||||
for row in (
|
for row in (
|
||||||
conn.execute(
|
cursor.execute(
|
||||||
f"SELECT {columns_clause} FROM aliases WHERE song_id = ?",
|
f"SELECT {columns_clause} FROM aliases WHERE song_id = ?",
|
||||||
(song_id,),
|
(song_id,),
|
||||||
).fetchall()
|
).fetchall()
|
||||||
@ -282,9 +290,10 @@ class Database(metaclass=Singleton):
|
|||||||
columns_clause = self.__get_columns_clause(
|
columns_clause = self.__get_columns_clause(
|
||||||
self.__get_columns_from_dataclass(DbChartRow)
|
self.__get_columns_from_dataclass(DbChartRow)
|
||||||
)
|
)
|
||||||
|
cursor = conn.cursor()
|
||||||
return [
|
return [
|
||||||
DbChartRow(*row)
|
DbChartRow(*row)
|
||||||
for row in conn.execute(
|
for row in cursor.execute(
|
||||||
f"SELECT {columns_clause} FROM charts"
|
f"SELECT {columns_clause} FROM charts"
|
||||||
).fetchall()
|
).fetchall()
|
||||||
]
|
]
|
||||||
@ -294,10 +303,11 @@ class Database(metaclass=Singleton):
|
|||||||
columns_clause = self.__get_columns_clause(
|
columns_clause = self.__get_columns_clause(
|
||||||
self.__get_columns_from_dataclass(DbChartRow)
|
self.__get_columns_from_dataclass(DbChartRow)
|
||||||
)
|
)
|
||||||
|
cursor = conn.cursor()
|
||||||
return [
|
return [
|
||||||
DbChartRow(*row)
|
DbChartRow(*row)
|
||||||
for row in (
|
for row in (
|
||||||
conn.execute(
|
cursor.execute(
|
||||||
f"SELECT {columns_clause} FROM charts WHERE song_id = ?",
|
f"SELECT {columns_clause} FROM charts WHERE song_id = ?",
|
||||||
(song_id,),
|
(song_id,),
|
||||||
).fetchall()
|
).fetchall()
|
||||||
@ -309,9 +319,10 @@ class Database(metaclass=Singleton):
|
|||||||
columns_clause = self.__get_columns_clause(
|
columns_clause = self.__get_columns_clause(
|
||||||
self.__get_columns_from_dataclass(DbChartRow)
|
self.__get_columns_from_dataclass(DbChartRow)
|
||||||
)
|
)
|
||||||
|
cursor = conn.cursor()
|
||||||
return [
|
return [
|
||||||
DbChartRow(*row)
|
DbChartRow(*row)
|
||||||
for row in conn.execute(
|
for row in cursor.execute(
|
||||||
f"SELECT {columns_clause} FROM charts WHERE package_id = ?",
|
f"SELECT {columns_clause} FROM charts WHERE package_id = ?",
|
||||||
(package_id,),
|
(package_id,),
|
||||||
).fetchall()
|
).fetchall()
|
||||||
@ -323,7 +334,8 @@ class Database(metaclass=Singleton):
|
|||||||
|
|
||||||
def fuzzy_search_song_id(self, input_str: str, limit: int= 5) -> List[FuzzySearchSongIdResult]:
|
def fuzzy_search_song_id(self, input_str: str, limit: int= 5) -> List[FuzzySearchSongIdResult]:
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
db_results = conn.execute("SELECT song_id, name FROM song_id_names").fetchall()
|
cursor = conn.cursor()
|
||||||
|
db_results = cursor.execute("SELECT song_id, name FROM song_id_names").fetchall()
|
||||||
name_song_id_map = {r[1]: r[0] for r in db_results}
|
name_song_id_map = {r[1]: r[0] for r in db_results}
|
||||||
names = name_song_id_map.keys()
|
names = name_song_id_map.keys()
|
||||||
fuzzy_results = fuzz_process.extractBests(input_str, names, scorer=fuzz.partial_ratio, limit=limit) # type: ignore
|
fuzzy_results = fuzz_process.extractBests(input_str, names, scorer=fuzz.partial_ratio, limit=limit) # type: ignore
|
||||||
@ -343,24 +355,25 @@ class Database(metaclass=Singleton):
|
|||||||
song_id: Optional[List[str]] = None,
|
song_id: Optional[List[str]] = None,
|
||||||
rating_class: Optional[List[int]] = None,
|
rating_class: Optional[List[int]] = None,
|
||||||
):
|
):
|
||||||
|
columns = ",".join([f"[{field.name}]" for field in fields(DbScoreRow)])
|
||||||
|
where_clauses = []
|
||||||
|
params = []
|
||||||
|
if song_id:
|
||||||
|
where_clauses.append(f"song_id IN ({','.join('?'*len(song_id))})")
|
||||||
|
params.extend(song_id)
|
||||||
|
if rating_class:
|
||||||
|
where_clauses.append(
|
||||||
|
f"rating_class IN ({','.join('?'*len(rating_class))})"
|
||||||
|
)
|
||||||
|
params.extend(rating_class)
|
||||||
|
final_sql = f"SELECT {columns} FROM scores"
|
||||||
|
if where_clauses:
|
||||||
|
final_sql += " WHERE "
|
||||||
|
final_sql += " AND ".join(where_clauses)
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
columns = ",".join([f"[{field.name}]" for field in fields(DbScoreRow)])
|
cursor = conn.cursor()
|
||||||
where_clauses = []
|
|
||||||
params = []
|
|
||||||
if song_id:
|
|
||||||
where_clauses.append(f"song_id IN ({','.join('?'*len(song_id))})")
|
|
||||||
params.extend(song_id)
|
|
||||||
if rating_class:
|
|
||||||
where_clauses.append(
|
|
||||||
f"rating_class IN ({','.join('?'*len(rating_class))})"
|
|
||||||
)
|
|
||||||
params.extend(rating_class)
|
|
||||||
final_sql = f"SELECT {columns} FROM scores"
|
|
||||||
if where_clauses:
|
|
||||||
final_sql += " WHERE "
|
|
||||||
final_sql += " AND ".join(where_clauses)
|
|
||||||
return [
|
return [
|
||||||
DbScoreRow(*row) for row in conn.execute(final_sql, params).fetchall()
|
DbScoreRow(*row) for row in cursor.execute(final_sql, params).fetchall()
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_calculated(
|
def get_calculated(
|
||||||
@ -369,45 +382,50 @@ class Database(metaclass=Singleton):
|
|||||||
song_id: Optional[List[str]] = None,
|
song_id: Optional[List[str]] = None,
|
||||||
rating_class: Optional[List[int]] = None,
|
rating_class: Optional[List[int]] = None,
|
||||||
):
|
):
|
||||||
|
columns = ",".join([f"[{field.name}]" for field in fields(DbCalculatedRow)])
|
||||||
|
where_clauses = []
|
||||||
|
params = []
|
||||||
|
if song_id:
|
||||||
|
where_clauses.append(f"song_id IN ({','.join('?'*len(song_id))})")
|
||||||
|
params.extend(song_id)
|
||||||
|
if rating_class:
|
||||||
|
where_clauses.append(
|
||||||
|
f"rating_class IN ({','.join('?'*len(rating_class))})"
|
||||||
|
)
|
||||||
|
params.extend(rating_class)
|
||||||
|
final_sql = f"SELECT {columns} FROM calculated"
|
||||||
|
if where_clauses:
|
||||||
|
final_sql += " WHERE "
|
||||||
|
final_sql += " AND ".join(where_clauses)
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
columns = ",".join([f"[{field.name}]" for field in fields(DbCalculatedRow)])
|
cursor = conn.cursor()
|
||||||
where_clauses = []
|
|
||||||
params = []
|
|
||||||
if song_id:
|
|
||||||
where_clauses.append(f"song_id IN ({','.join('?'*len(song_id))})")
|
|
||||||
params.extend(song_id)
|
|
||||||
if rating_class:
|
|
||||||
where_clauses.append(
|
|
||||||
f"rating_class IN ({','.join('?'*len(rating_class))})"
|
|
||||||
)
|
|
||||||
params.extend(rating_class)
|
|
||||||
final_sql = f"SELECT {columns} FROM calculated"
|
|
||||||
if where_clauses:
|
|
||||||
final_sql += " WHERE "
|
|
||||||
final_sql += " AND ".join(where_clauses)
|
|
||||||
return [
|
return [
|
||||||
DbCalculatedRow(*row)
|
DbCalculatedRow(*row)
|
||||||
for row in conn.execute(final_sql, params).fetchall()
|
for row in cursor.execute(final_sql, params).fetchall()
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_b30(self) -> float:
|
def get_b30(self) -> float:
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
return conn.execute("SELECT b30 FROM calculated_potential").fetchone()[0]
|
cursor = conn.cursor()
|
||||||
|
return cursor.execute("SELECT b30 FROM calculated_potential").fetchone()[0]
|
||||||
|
|
||||||
def get_r10(self) -> float:
|
def get_r10(self) -> float:
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
return conn.execute("SELECT r10 FROM calculated_potential").fetchone()[0]
|
cursor = conn.cursor()
|
||||||
|
return cursor.execute("SELECT r10 FROM calculated_potential").fetchone()[0]
|
||||||
|
|
||||||
def get_potential(self) -> float:
|
def get_potential(self) -> float:
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
return conn.execute("SELECT potential FROM calculated_potential").fetchone()[0]
|
cursor = conn.cursor()
|
||||||
|
return cursor.execute("SELECT potential FROM calculated_potential").fetchone()[0]
|
||||||
|
|
||||||
def insert_score(self, score: DbScoreRow):
|
def insert_score(self, score: DbScoreRow):
|
||||||
columns = self.__get_columns_from_dataclass(DbScoreRow)
|
columns = self.__get_columns_from_dataclass(DbScoreRow)
|
||||||
columns_clause = self.__get_columns_clause(columns)
|
columns_clause = self.__get_columns_clause(columns)
|
||||||
params = [score.__getattribute__(column) for column in columns]
|
params = [score.__getattribute__(column) for column in columns]
|
||||||
with self.conn as conn:
|
with self.conn as conn:
|
||||||
conn.execute(
|
cursor = conn.cursor()
|
||||||
|
cursor.execute(
|
||||||
f"INSERT INTO scores({columns_clause}) VALUES ({', '.join('?' * len(params))})",
|
f"INSERT INTO scores({columns_clause}) VALUES ({', '.join('?' * len(params))})",
|
||||||
params,
|
params,
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user