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-21 20:05:04 +02:00
parent 7c7838967d
commit 21c7dd841d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/controller/PlayerController.py
View File

@ -138,8 +138,6 @@ class PlayerController(ObController):
slide['location'] = content.location slide['location'] = content.location
slide['type'] = content.type.value slide['type'] = content.type.value
if slide['type'] == ContentType.EXTERNAL_STORAGE.value: if slide['type'] == ContentType.EXTERNAL_STORAGE.value:
mount_point_dir = Path(self.get_external_storage_server().get_directory(), slide['location']) mount_point_dir = Path(self.get_external_storage_server().get_directory(), slide['location'])
if mount_point_dir.is_dir(): if mount_point_dir.is_dir():
@ -154,10 +152,10 @@ class PlayerController(ObController):
) )
slide['name'] = file.stem slide['name'] = file.stem
logging.info(slide) logging.info(slide)
self._feed_playlist(playlist_loop, playlist_notifications, slide) self._check_slide_enablement(playlist_loop, playlist_notifications, slide)
position = position + 1 position = position + 1
else: else:
self._feed_playlist(playlist_loop, playlist_notifications, slide) self._check_slide_enablement(playlist_loop, playlist_notifications, slide)
playlists = { playlists = {
@ -169,9 +167,11 @@ class PlayerController(ObController):
'hard_refresh_request': self._model_store.variable().get_one_by_name("refresh_player_request").as_int() 'hard_refresh_request': self._model_store.variable().get_one_by_name("refresh_player_request").as_int()
} }
print(playlists['loop'])
return playlists return playlists
def _feed_playlist(self, loop: List, notifications: List, slide: Dict) -> None: def _check_slide_enablement(self, loop: List, notifications: List, slide: Dict) -> None:
has_valid_start_date = 'cron_schedule' in slide and slide['cron_schedule'] and get_safe_cron_descriptor(slide['cron_schedule']) and is_cron_calendar_moment(slide['cron_schedule']) has_valid_start_date = 'cron_schedule' in slide and slide['cron_schedule'] and get_safe_cron_descriptor(slide['cron_schedule']) and is_cron_calendar_moment(slide['cron_schedule'])
has_valid_end_date = 'cron_schedule_end' in slide and slide['cron_schedule_end'] and get_safe_cron_descriptor(slide['cron_schedule_end']) and is_cron_calendar_moment(slide['cron_schedule_end']) has_valid_end_date = 'cron_schedule_end' in slide and slide['cron_schedule_end'] and get_safe_cron_descriptor(slide['cron_schedule_end']) and is_cron_calendar_moment(slide['cron_schedule_end'])