csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

fix

Browse Source
This commit is contained in:
jr-k 2024-07-18 18:14:54 +02:00
parent 309a8d8365
commit 7818ac870b
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/www/css/compiled/main-dark-mode.css
View File

File diff suppressed because one or more lines are too long

2
data/www/css/compiled/main-light-mode.css
View File

File diff suppressed because one or more lines are too long

11
data/www/scss/components/_tiles.scss
View File

@ -65,6 +65,17 @@
} }
} }
&.starred {
.tile-tail {
.head-icon {
i {
font-size: 8px;
color: $other;
}
}
}
}
&.disabled { &.disabled {
.tile-body { .tile-body {
opacity: .3; opacity: .3;

21
src/controller/PlayerController.py
View File

@ -102,29 +102,18 @@ class PlayerController(ObController):
return request.remote_addr return request.remote_addr
def _get_playlist(self, playlist_id: Optional[int] = 0, preview_content_id: Optional[int] = None) -> dict: def _get_playlist(self, playlist_id: Optional[int] = 0, preview_content_id: Optional[int] = None) -> dict:
preview_content = self._model_store.content().get(preview_content_id) if preview_content_id else None
preview_mode = preview_content is not None
if playlist_id == 0 or not playlist_id: if playlist_id == 0 or not playlist_id:
playlist = self._model_store.playlist().get_one_by(query="fallback = 1") playlist = self._model_store.playlist().get_one_by(query="fallback = 1")
if playlist: if playlist:
playlist_id = playlist.id playlist_id = playlist.id
else: elif not preview_mode:
raise NoFallbackPlaylistException() raise NoFallbackPlaylistException()
enabled_slides = [] enabled_slides = [Slide(content_id=preview_content.id, duration=1000000)] if preview_mode else self._model_store.slide().get_slides(enabled=True, playlist_id=playlist_id)
preview_mode = False
if preview_content_id:
content = self._model_store.content().get(preview_content_id)
if content:
enabled_slides = [Slide(
content_id=content.id,
duration=1000000,
)]
preview_mode = True
else:
enabled_slides = self._model_store.slide().get_slides(enabled=True, playlist_id=playlist_id)
slides = self._model_store.slide().to_dict(enabled_slides) slides = self._model_store.slide().to_dict(enabled_slides)
contents = self._model_store.content().get_all_indexed() contents = self._model_store.content().get_all_indexed()
playlist = self._model_store.playlist().get(playlist_id) playlist = self._model_store.playlist().get(playlist_id)

2
src/controller/SlideController.py
View File

@ -44,7 +44,7 @@ class SlideController(ObController):
content_id=content.id if content else request.form['content_id'], content_id=content.id if content else request.form['content_id'],
duration=request.form['duration'], duration=request.form['duration'],
enabled='enabled' in request.form and request.form['enabled'], enabled='enabled' in request.form and request.form['enabled'],
is_notification=True if 'is_notification' in request.form else False, is_notification=True if 'is_notification' in request.form and request.form['is_notification'] == '1' else False,
playlist_id=request.form['playlist_id'] if 'playlist_id' in request.form and request.form['playlist_id'] else None, playlist_id=request.form['playlist_id'] if 'playlist_id' in request.form and request.form['playlist_id'] else None,
cron_schedule=get_optional_string(request.form['cron_schedule']), cron_schedule=get_optional_string(request.form['cron_schedule']),
cron_schedule_end=get_optional_string(request.form['cron_schedule_end']), cron_schedule_end=get_optional_string(request.form['cron_schedule_end']),