Simon/romm
1
0
Fork 0
mirror of https://github.com/rommapp/romm.git synced 2026-06-28 06:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into save-sync

Browse Source
This commit is contained in:
Georges-Antoine Assi
2026-04-05 21:47:53 -04:00
parent 2f695dd4d0 ea63639317
commit f2e8e337b2
103 changed files with 1903 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/handler/database/collections_handler.py
View File

@@ -130,13 +130,19 @@ class DBCollectionsHandler(DBBaseHandler):
)
# Insert new CollectionRom entries for this collection
if rom_ids:
session.execute(
insert(CollectionRom),
[
{"collection_id": id, "rom_id": rom_id}
for rom_id in set(rom_ids)
],
# Filter out rom_ids that no longer exist in the roms table to
# avoid foreign key constraint violations (e.g. after a rescan)
valid_rom_ids = set(
session.scalars(select(Rom.id).where(Rom.id.in_(rom_ids))).all()
)
if valid_rom_ids:
session.execute(
insert(CollectionRom),
[
{"collection_id": id, "rom_id": rom_id}
for rom_id in valid_rom_ids
],
)
return session.scalar(query.filter_by(id=id).limit(1))

6
backend/handler/database/roms_handler.py
View File

@@ -641,7 +641,6 @@ class DBRomsHandler(DBBaseHandler):
.with_only_columns(
base_subquery.c.id,
base_subquery.c.fs_name_no_ext,
base_subquery.c.fs_name_no_tags,
base_subquery.c.platform_id,
base_subquery.c.igdb_id,
base_subquery.c.ss_id,
@@ -702,11 +701,6 @@ class DBRomsHandler(DBBaseHandler):
base_subquery.c.flashpoint_id,
base_subquery.c.platform_id,
),
_create_metadata_id_case(
"fs",
func.nullif(base_subquery.c.fs_name_no_tags, ""),
base_subquery.c.platform_id,
),
_create_metadata_id_case(
"romm",
base_subquery.c.id,