Update 0.3.5

romanin-rf · May 17, 2023 · 4cbac78 · 4cbac78
1 parent bd628b8
commit 4cbac78
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 119 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SeaPlayer"
-version = "0.3.4"
+version = "0.3.5"
 description = "SeaPlayer is a player that works in the terminal."
 repository = "https://github.com/romanin-rf/SeaPlayer"
 authors = ["Romanin <semina054@gmail.com>"]

diff --git a/seaplayer/objects.py b/seaplayer/objects.py
@@ -1,5 +1,10 @@
 from PIL import Image
-from playsoundsimple import Sound
+# > Sound Works
+try:
+    from playsoundsimple import Sound
+    SOUND_IMPORTED = True
+except:
+    SOUND_IMPORTED = False
 # > Graphics
 from PIL.Image import Resampling
 from ripix import AsyncPixels, Pixels
@@ -15,129 +20,130 @@
 T = TypeVar('T')
 
 # ! Music List
-class MusicListViewItem(ListItem):
-    def __init__(
-        self,
-        title: str="",
-        first_subtitle: str="",
-        second_subtitle: str="",
-        sound_uuid: Optional[str]=None
-    ) -> None:
-        super().__init__(classes="music-list-view-item")
-        self.title_label = Label(title, classes="music-list-view-item-title-label")
-        self.first_subtitle_label = Label(f" {first_subtitle}", classes="music-list-view-item-subtitle-label")
-        self.second_subtitle_label = Label(f" {second_subtitle}", classes="music-list-view-item-subtitle-label")
-        self.sound_uuid = sound_uuid
+if SOUND_IMPORTED:
+    class MusicListViewItem(ListItem):
+        def __init__(
+            self,
+            title: str="",
+            first_subtitle: str="",
+            second_subtitle: str="",
+            sound_uuid: Optional[str]=None
+        ) -> None:
+            super().__init__(classes="music-list-view-item")
+            self.title_label = Label(title, classes="music-list-view-item-title-label")
+            self.first_subtitle_label = Label(f" {first_subtitle}", classes="music-list-view-item-subtitle-label")
+            self.second_subtitle_label = Label(f" {second_subtitle}", classes="music-list-view-item-subtitle-label")
+            self.sound_uuid = sound_uuid
+
+            self.compose_add_child(self.title_label)
+            self.compose_add_child(self.first_subtitle_label)
+            self.compose_add_child(self.second_subtitle_label)
 
-        self.compose_add_child(self.title_label)
-        self.compose_add_child(self.first_subtitle_label)
-        self.compose_add_child(self.second_subtitle_label)
-
-    async def update_labels(
-        self,
-        title: Optional[str]=None,
-        first_subtitle: Optional[str]=None,
-        second_subtitle: Optional[str]=None,
-    ) -> None:
-        if title is not None: self.title_label.update(title)
-        if first_subtitle is not None: self.first_subtitle_label.update(title)
-        if second_subtitle is not None: self.second_subtitle_label.update(title)
+        async def update_labels(
+            self,
+            title: Optional[str]=None,
+            first_subtitle: Optional[str]=None,
+            second_subtitle: Optional[str]=None,
+        ) -> None:
+            if title is not None: self.title_label.update(title)
+            if first_subtitle is not None: self.first_subtitle_label.update(title)
+            if second_subtitle is not None: self.second_subtitle_label.update(title)
 
-class MusicListView(ListView):
-    def __init__(self, **kwargs) -> None:
-        kwargs["classes"] = "music-list-view"
-        super().__init__(**kwargs)
-        self.music_list: MusicList = MusicList()
-
-    def add_sound(self, sound: Sound) -> str:
-        sound_uuid = self.music_list.add(sound)
-        self.append(
-            MusicListViewItem(
-                f"{get_sound_basename(sound)}",
-                "{duration} sec, {channel_mode}, {samplerate} Hz, {bitrate} kbps".format(
-                    duration=round(sound.duration),
-                    channel_mode="Mono" if sound.channels <= 1 else "Stereo",
-                    samplerate=round(sound.samplerate),
-                    bitrate=round(sound.bitrate / 1000)
-                ),
-                os.path.abspath(sound.name),
-                sound_uuid
-            )
-        )
-        return sound_uuid
-
-    def get_sound(self, sound_uuid: str) -> Optional[Sound]: return self.music_list.get(sound_uuid)
-
-    async def aio_add_sound(self, sound: Sound):
-        sound_uuid = await self.music_list.aio_add(sound)
-        await self.append(
-            MusicListViewItem(
-                f"{get_sound_basename(sound)}",
-                "{duration} sec, {channel_mode}, {samplerate} Hz, {bitrate} kbps".format(
-                    duration=round(sound.duration),
-                    channel_mode="Mono" if sound.channels <= 1 else "Stereo",
-                    samplerate=round(sound.samplerate),
-                    bitrate=round(sound.bitrate / 1000)
-                ),
-                os.path.abspath(sound.name),
-                sound_uuid
+    class MusicListView(ListView):
+        def __init__(self, **kwargs) -> None:
+            kwargs["classes"] = "music-list-view"
+            super().__init__(**kwargs)
+            self.music_list: MusicList = MusicList()
+
+        def add_sound(self, sound: Sound) -> str:
+            sound_uuid = self.music_list.add(sound)
+            self.append(
+                MusicListViewItem(
+                    f"{get_sound_basename(sound)}",
+                    "{duration} sec, {channel_mode}, {samplerate} Hz, {bitrate} kbps".format(
+                        duration=round(sound.duration),
+                        channel_mode="Mono" if sound.channels <= 1 else "Stereo",
+                        samplerate=round(sound.samplerate),
+                        bitrate=round(sound.bitrate / 1000)
+                    ),
+                    os.path.abspath(sound.name),
+                    sound_uuid
+                )
             )
-        )
-        return sound_uuid
-
-    def get_items_count(self) -> int: return len(self.children)
-    def exists_item_index(self, index: int) -> bool: return 0 >= index < self.get_items_count()
-    def get_item_index_from_sound_uuid(self, sound_uuid: str) -> Optional[int]:
-        item: MusicListViewItem
-        for idx, item in enumerate(self.children):
-            if item.sound_uuid == sound_uuid:
-                return idx
-
-    def get_item_from_index(self, index: int) -> Optional[MusicListViewItem]:
-        try: return self.children[index]
-        except:
-            try: return self.children[0]
-            except: pass
-
-    def get_next_sound_uuid(self, sound_uuid: str) -> Optional[str]:
-        if (index:=self.get_item_index_from_sound_uuid(sound_uuid)) is not None:
-            if (mli:=self.get_item_from_index(index+1)) is not None:
-                return mli.sound_uuid
-
-    def select_list_item_from_sound_uuid(self, sound_uuid: str) -> None:
-        try:
-            super()._on_list_item__child_clicked(
-                ListItem._ChildClicked(
-                    self.children[self.get_item_index_from_sound_uuid(sound_uuid)]
+            return sound_uuid
+
+        def get_sound(self, sound_uuid: str) -> Optional[Sound]: return self.music_list.get(sound_uuid)
+
+        async def aio_add_sound(self, sound: Sound):
+            sound_uuid = await self.music_list.aio_add(sound)
+            await self.append(
+                MusicListViewItem(
+                    f"{get_sound_basename(sound)}",
+                    "{duration} sec, {channel_mode}, {samplerate} Hz, {bitrate} kbps".format(
+                        duration=round(sound.duration),
+                        channel_mode="Mono" if sound.channels <= 1 else "Stereo",
+                        samplerate=round(sound.samplerate),
+                        bitrate=round(sound.bitrate / 1000)
+                    ),
+                    os.path.abspath(sound.name),
+                    sound_uuid
                 )
             )
-        except: pass
-
-    async def aio_get_item_from_index(self, index: int) -> Optional[MusicListViewItem]:
-        try: return self.children[index]
-        except:
-            try: return self.children[0]
+            return sound_uuid
+
+        def get_items_count(self) -> int: return len(self.children)
+        def exists_item_index(self, index: int) -> bool: return 0 >= index < self.get_items_count()
+        def get_item_index_from_sound_uuid(self, sound_uuid: str) -> Optional[int]:
+            item: MusicListViewItem
+            for idx, item in enumerate(self.children):
+                if item.sound_uuid == sound_uuid:
+                    return idx
+
+        def get_item_from_index(self, index: int) -> Optional[MusicListViewItem]:
+            try: return self.children[index]
+            except:
+                try: return self.children[0]
+                except: pass
+
+        def get_next_sound_uuid(self, sound_uuid: str) -> Optional[str]:
+            if (index:=self.get_item_index_from_sound_uuid(sound_uuid)) is not None:
+                if (mli:=self.get_item_from_index(index+1)) is not None:
+                    return mli.sound_uuid
+
+        def select_list_item_from_sound_uuid(self, sound_uuid: str) -> None:
+            try:
+                super()._on_list_item__child_clicked(
+                    ListItem._ChildClicked(
+                        self.children[self.get_item_index_from_sound_uuid(sound_uuid)]
+                    )
+                )
             except: pass
-
-    async def aio_get_item_index_from_sound_uuid(self, sound_uuid: str) -> Optional[int]:
-        item: MusicListViewItem
-        async for idx, item in aiter(enumerate(self.children)):
-            if item.sound_uuid == sound_uuid:
-                return idx
-
-    async def aio_get_next_sound_uuid(self, sound_uuid: str) -> Optional[str]:
-        if (index:=await self.aio_get_item_index_from_sound_uuid(sound_uuid)) is not None:
-            if (mli:=await self.aio_get_item_from_index(index+1)) is not None:
-                return mli.sound_uuid
-
-    async def aio_select_list_item_from_sound_uuid(self, sound_uuid: str) -> None:
-        try:
-            super()._on_list_item__child_clicked(
-                ListItem._ChildClicked(
-                    self.children[await self.aio_get_item_index_from_sound_uuid(sound_uuid)]
+
+        async def aio_get_item_from_index(self, index: int) -> Optional[MusicListViewItem]:
+            try: return self.children[index]
+            except:
+                try: return self.children[0]
+                except: pass
+
+        async def aio_get_item_index_from_sound_uuid(self, sound_uuid: str) -> Optional[int]:
+            item: MusicListViewItem
+            async for idx, item in aiter(enumerate(self.children)):
+                if item.sound_uuid == sound_uuid:
+                    return idx
+
+        async def aio_get_next_sound_uuid(self, sound_uuid: str) -> Optional[str]:
+            if (index:=await self.aio_get_item_index_from_sound_uuid(sound_uuid)) is not None:
+                if (mli:=await self.aio_get_item_from_index(index+1)) is not None:
+                    return mli.sound_uuid
+
+        async def aio_select_list_item_from_sound_uuid(self, sound_uuid: str) -> None:
+            try:
+                super()._on_list_item__child_clicked(
+                    ListItem._ChildClicked(
+                        self.children[await self.aio_get_item_index_from_sound_uuid(sound_uuid)]
+                    )
                 )
-            )
-        except: pass
+            except: pass
 
 # ! ProgressBar
 class IndeterminateProgress(Static):

diff --git a/seaplayer/seaplayer.py b/seaplayer/seaplayer.py
@@ -23,7 +23,7 @@
 
 # ! Metadata
 __title__ = "SeaPlayer"
-__version__ = "0.3.4"
+__version__ = "0.3.5"
 __author__ = "Romanin"
 __email__ = "semina054@gmail.com"
 __url__ = "https://github.com/romanin-rf/SeaPlayer"