Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor platform config #308

Merged
merged 1 commit into from
Feb 3, 2024
Merged

refactor platform config #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
218 changes: 181 additions & 37 deletions chimera_app/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@
from chimera_app.mangohud_config import MangoHudConfig


def merge_single_level(src1, src2):
keys = src1.keys() | src2.keys()

result = {}
for key in keys:
if key in src1 and key in src2:
result[key] = src1[key] | src2[key]
elif key in src1:
result[key] = src1[key]
else:
result[key] = src2[key]

return result


RESOURCE_DIR = os.getcwd()
if not os.path.isfile(os.path.join(RESOURCE_DIR, 'views/base.tpl')):
RESOURCE_DIR = "/usr/share/chimera"
Expand All @@ -28,41 +43,6 @@
UPLOADS_DIR = os.path.join(context.CACHE_HOME, 'chimera', 'uploads')
MANGOHUD_DIR = context.CONFIG_HOME + "/MangoHud"

PLATFORMS = {
"32x": "32X",
"3do": "3DO",
"appimage": "AppImage",
"arcade": "Arcade",
"atari-2600": "Atari 2600",
"atari-7800": "Atari 7800",
"dreamcast": "Dreamcast",
"epic-store": "Epic Games Store",
"flathub": "Flathub",
"gb": "Game Boy",
"gba": "Game Boy Advance",
"gbc": "Game Boy Color",
"ngc": "GameCube",
"sgg": "Game Gear",
"genesis": "Genesis",
"gog": "GOG",
"jaguar": "Jaguar",
"sms": "Master System",
"nds": "Nintendo DS",
"neo-geo": "Neo Geo",
"nes": "Nintendo",
"n64": "Nintendo 64",
"ps1": "PlayStation",
"ps2": "PlayStation 2",
"spsp": "PlayStation Portable",
"saturn": "Saturn",
"sega-cd": "Sega CD",
"sgb": "Super Game Boy",
"snes": "Super Nintendo",
"snesmsu1": "Super Nintendo MSU1",
"tg-16": "TurboGrafx-16",
"wii": "Wii"
}

SETTINGS_DEFAULT = {
"enable_ftp_server": False,
"ftp_username": "gamer",
Expand Down Expand Up @@ -102,8 +82,172 @@

STORAGE_HANDLER = StorageConfig()

if SETTINGS_HANDLER.get_setting('platforms'):
PLATFORMS = SETTINGS_HANDLER.get_setting('platforms')
PLATFORMS_DEFAULT = {
"32x": {
"name": "32X",
"enabled": True,
},
"3do": {
"name": "3DO",
"enabled": True,
},
"appimage": {
"name": "AppImage",
"enabled": False,
},
"arcade": {
"name": "Arcade",
"enabled": True,
},
"atari-2600": {
"name": "Atari 2600",
"enabled": True,
},
"atari-7800": {
"name": "Atari 7800",
"enabled": True,
},
"dreamcast": {
"name": "Dreamcast",
"enabled": True,
},
"epic-store": {
"name": "Epic Games Store",
"enabled": True,
},
"flathub": {
"name": "Flathub",
"enabled": True,
},
"gb": {
"name": "Game Boy",
"enabled": True,
},
"gba": {
"name": "Game Boy Advance",
"enabled": True,
},
"gbc": {
"name": "Game Boy Color",
"enabled": True,
},
"ngc": {
"name": "GameCube",
"enabled": True,
},
"sgg": {
"name": "Game Gear",
"enabled": True,
},
"genesis": {
"name": "Genesis",
"enabled": True,
},
"gog": {
"name": "GOG",
"enabled": True,
},
"jaguar": {
"name": "Jaguar",
"enabled": True,
},
"sms": {
"name": "Master System",
"enabled": True,
},
"msdos": {
"name": "MS DOS",
"enabled": False,
},
"neo-geo": {
"name": "Neo Geo",
"enabled": True,
},
"n3ds": {
"name": "Nintendo 3DS",
"enabled": False,
},
"nds": {
"name": "Nintendo DS",
"enabled": True,
},
"nes": {
"name": "Nintendo",
"enabled": True,
},
"n64": {
"name": "Nintendo 64",
"enabled": True,
},
"ps1": {
"name": "PlayStation",
"enabled": True,
},
"ps2": {
"name": "PlayStation 2",
"enabled": True,
},
"spsp": {
"name": "PlayStation Portable",
"enabled": True,
},
"saturn": {
"name": "Saturn",
"enabled": True,
},
"sega-cd": {
"name": "Sega CD",
"enabled": True,
},
"sgb": {
"name": "Super Game Boy",
"enabled": False,
},
"snes": {
"name": "Super Nintendo",
"enabled": True,
},
"snesmsu1": {
"name": "Super Nintendo MSU1",
"enabled": False,
},
"tg-16": {
"name": "TurboGrafx-16",
"enabled": True,
},
"wii": {
"name": "Wii",
"enabled": True,
},
"switch": {
"name": "Switch",
"enabled": False,
},
}

# set a default cmd property on all default platforms
for platform_id in PLATFORMS_DEFAULT:
PLATFORMS_DEFAULT[platform_id]['cmd'] = platform_id

# merge user settings with default platforms
PLATFORMS = PLATFORMS_DEFAULT
PLATFORM_SETTINGS = SETTINGS_HANDLER.get_setting('platforms')
if PLATFORM_SETTINGS:
PLATFORMS = merge_single_level(PLATFORMS_DEFAULT, PLATFORM_SETTINGS)

# set id property on all platforms
for platform_id in PLATFORMS:
PLATFORMS[platform_id]['id'] = platform_id

# drop disabled and invalid platforms
FILTERED_PLATFORMS = {}
for key, value in PLATFORMS.items():
if 'enabled' not in value or not value['enabled'] or 'name' not in value or 'cmd' not in value:
continue

FILTERED_PLATFORMS[key] = value

PLATFORMS = dict(sorted(FILTERED_PLATFORMS.items(), key=lambda item: item[1]['name']))


GAMEDB = {
Expand Down
18 changes: 9 additions & 9 deletions chimera_app/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ def platform_page(platform):
showAll=False,
isInstalledOverview=True,
platform=platform,
platformName=PLATFORMS[platform]
platformName=PLATFORMS[platform]['name']
)
else:
return template('custom_login',
platform=platform,
platformName=PLATFORMS[platform])
platformName=PLATFORMS[platform]['name'])

shortcut_file = PlatformShortcutsFile(platform)
shortcuts = sorted(shortcut_file.get_shortcuts_data(),
Expand All @@ -144,7 +144,7 @@ def platform_page(platform):
return template('platform.tpl',
shortcuts=data,
platform=platform,
platformName=PLATFORMS[platform])
platformName=PLATFORMS[platform]['name'])


@route('/library/<platform>/authenticate', method='POST')
Expand Down Expand Up @@ -182,13 +182,13 @@ def new(platform):
isInstalledOverview=False,
isNew=True,
platform=platform,
platformName=PLATFORMS[platform]
platformName=PLATFORMS[platform]['name']
)
return template('new.tpl',
isNew=True,
isEditing=False,
platform=platform,
platformName=PLATFORMS[platform],
platformName=PLATFORMS[platform]['name'],
name='',
hidden=''
)
Expand All @@ -206,7 +206,7 @@ def edit(platform, name):
if content:
return template(
'custom_edit', app=content, platform=platform,
platformName=PLATFORMS[platform], name=content_id
platformName=PLATFORMS[platform]['name'], name=content_id
)
else:
abort(404, 'Content not found')
Expand All @@ -217,7 +217,7 @@ def edit(platform, name):
return template('new.tpl',
isEditing=True,
platform=platform,
platformName=PLATFORMS[platform],
platformName=PLATFORMS[platform]['name'],
name=name,
hidden=shortcut['hidden']
)
Expand Down Expand Up @@ -291,9 +291,9 @@ def shortcut_create():

shortcut = {
'name': name,
'cmd': platform,
'cmd': PLATFORMS[platform]['cmd'],
'hidden': hidden == 'on',
'tags': [PLATFORMS[platform]]
'tags': [PLATFORMS[platform]['name']]
}

for img_type in [ 'banner', 'poster', 'background', 'logo', 'icon' ]:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_endpoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ def mock_launch(self):

def test_platform_images():
app = TestApp(server)
for platform, name in PLATFORMS.items():
for platform in PLATFORMS:
assert app.get('/images/{}.png'.format(platform)).status == '200 OK'
4 changes: 2 additions & 2 deletions views/platforms.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% rebase('base.tpl')

% for shortName, displayName in platforms.items():
% for platform in platforms.values():
<div class="img-container">
<a href="/library/{{shortName}}"><img src="images/{{shortName}}.png" alt="{{displayName}}"></a>
<a href="/library/{{platform['id']}}"><img src="images/{{platform['id']}}.png" alt="{{platform['name']}}"></a>
</div>
% end
Loading