From ca32c6e491a4bc332e71ac98d0ff0fccf1a26e82 Mon Sep 17 00:00:00 2001 From: jr-k Date: Sun, 21 Jul 2024 02:27:03 +0200 Subject: [PATCH] ok --- src/controller/ContentController.py | 1 + src/controller/PlayerController.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/controller/ContentController.py b/src/controller/ContentController.py index 83ca0eb..8c75358 100644 --- a/src/controller/ContentController.py +++ b/src/controller/ContentController.py @@ -49,6 +49,7 @@ class ContentController(ObController): working_folder_path, working_folder = self.get_working_folder() slides_with_content = self._model_store.slide().get_all_indexed(attribute='content_id', multiple=True) external_storages = self._model_store.external_storage().list_usb_storage_devices() + print(external_storages[0] if len(external_storages) > 0 else 'none') return render_template( 'slideshow/contents/list.jinja.html', diff --git a/src/controller/PlayerController.py b/src/controller/PlayerController.py index e1a72b9..cced6bf 100644 --- a/src/controller/PlayerController.py +++ b/src/controller/PlayerController.py @@ -136,18 +136,20 @@ class PlayerController(ObController): slide['location'] = content['location'] slide['type'] = content['type'] + if slide['type'] == ContentType.EXTERNAL_STORAGE.value: mount_point_dir = Path(slide['location']) - if mount_point_dir.is_dir(): - for file in mount_point_dir.iterdir(): - if file.is_file() and not file.stem.startswith('.'): - slide['type'] = ContentType.guess_content_type_file(str(file.resolve())).value - slide['location'] = "file://{}".format(str(file.resolve())) - slide['name'] = file.stem - self._feed_playlist(playlist_loop, playlist_notifications, slide) + if True: #mount_point_dir.is_dir(): + for file in [Path('/Volumes/ESD-USB/obscreen/test/autumn.jpg'), Path('/Volumes/ESD-USB/obscreen/test/soundonly.jpg')]: #mount_point_dir.iterdir(): + # if file.is_file() and not file.stem.startswith('.'): + slide['type'] = ContentType.guess_content_type_file(str(file.resolve())).value + slide['location'] = "file://{}".format(str(file.resolve())) + slide['name'] = file.stem + self._feed_playlist(playlist_loop, playlist_notifications, slide) else: self._feed_playlist(playlist_loop, playlist_notifications, slide) + playlists = { 'playlist_id': playlist.id if playlist else None, 'time_sync': playlist.time_sync if playlist else False,