mirror of
https://github.com/rommapp/romm.git
synced 2026-03-03 02:27:00 +00:00
cahanges from bot review
This commit is contained in:
@@ -79,7 +79,7 @@ class Save(RomAsset):
|
||||
from handler.database import db_screenshot_handler
|
||||
|
||||
return db_screenshot_handler.get_screenshot(
|
||||
filename_no_ext=self.file_name,
|
||||
filename_no_ext=self.file_name, # Match state filename against screenshot filename stem
|
||||
rom_id=self.rom_id,
|
||||
user_id=self.user_id,
|
||||
)
|
||||
@@ -99,7 +99,7 @@ class State(RomAsset):
|
||||
from handler.database import db_screenshot_handler
|
||||
|
||||
return db_screenshot_handler.get_screenshot(
|
||||
filename_no_ext=self.file_name,
|
||||
filename_no_ext=self.file_name, # Match state filename against screenshot filename stem
|
||||
rom_id=self.rom_id,
|
||||
user_id=self.user_id,
|
||||
)
|
||||
|
||||
@@ -75,42 +75,35 @@ def test_get_states_prefers_exact_matching_screenshot_filename(
|
||||
)
|
||||
|
||||
# Ambiguous fallback screenshot stem (`test_game`) that used to be picked for both.
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_name="test_game.state.auto.png",
|
||||
file_name_no_tags="test_game",
|
||||
file_name_no_ext="test_game",
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
screenshots_data = [
|
||||
{
|
||||
"file_name": "test_game.state.auto.png",
|
||||
"file_name_no_tags": "test_game",
|
||||
"file_name_no_ext": "test_game",
|
||||
},
|
||||
{
|
||||
"file_name": "test_game.state1.png",
|
||||
"file_name_no_tags": "test_game.state1",
|
||||
"file_name_no_ext": "test_game.state1",
|
||||
},
|
||||
{
|
||||
"file_name": "test_game.state2.png",
|
||||
"file_name_no_tags": "test_game.state2",
|
||||
"file_name_no_ext": "test_game.state2",
|
||||
},
|
||||
]
|
||||
|
||||
for data in screenshots_data:
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
**data,
|
||||
)
|
||||
)
|
||||
)
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_name="test_game.state1.png",
|
||||
file_name_no_tags="test_game.state1",
|
||||
file_name_no_ext="test_game.state1",
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
)
|
||||
)
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_name="test_game.state2.png",
|
||||
file_name_no_tags="test_game.state2",
|
||||
file_name_no_ext="test_game.state2",
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
)
|
||||
)
|
||||
|
||||
response = client.get(
|
||||
"/api/states",
|
||||
@@ -213,42 +206,35 @@ def test_get_saves_prefers_exact_matching_screenshot_filename(
|
||||
)
|
||||
)
|
||||
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_name="test_game.state.auto.png",
|
||||
file_name_no_tags="test_game",
|
||||
file_name_no_ext="test_game",
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
screenshots_data = [
|
||||
{
|
||||
"file_name": "test_game.state.auto.png",
|
||||
"file_name_no_tags": "test_game",
|
||||
"file_name_no_ext": "test_game",
|
||||
},
|
||||
{
|
||||
"file_name": "test_game.state1.png",
|
||||
"file_name_no_tags": "test_game.state1",
|
||||
"file_name_no_ext": "test_game.state1",
|
||||
},
|
||||
{
|
||||
"file_name": "test_game.state2.png",
|
||||
"file_name_no_tags": "test_game.state2",
|
||||
"file_name_no_ext": "test_game.state2",
|
||||
},
|
||||
]
|
||||
|
||||
for data in screenshots_data:
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
**data,
|
||||
)
|
||||
)
|
||||
)
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_name="test_game.state1.png",
|
||||
file_name_no_tags="test_game.state1",
|
||||
file_name_no_ext="test_game.state1",
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
)
|
||||
)
|
||||
db_screenshot_handler.add_screenshot(
|
||||
Screenshot(
|
||||
rom_id=rom.id,
|
||||
user_id=admin_user.id,
|
||||
file_name="test_game.state2.png",
|
||||
file_name_no_tags="test_game.state2",
|
||||
file_name_no_ext="test_game.state2",
|
||||
file_extension="png",
|
||||
file_path=f"{platform.slug}/screenshots",
|
||||
file_size_bytes=1,
|
||||
)
|
||||
)
|
||||
|
||||
response = client.get(
|
||||
"/api/saves",
|
||||
|
||||
Reference in New Issue
Block a user