OOPing it more: Removed gui_communication/track_control.py and the complete gui_communication directory.

wobuzz/ui/main_window.py

@@ -24,7 +24,7 @@ class MainWindow(QMainWindow):
 
         self.settings_action = self.edit_menu.addAction("&Settings")
 
-        self.track_control = TrackControl()
+        self.track_control = TrackControl(app)
         self.addToolBar(self.track_control)
 
         self.settings = Settings(app)

wobuzz/ui/track_control.py

@@ -1,20 +1,23 @@
 #!/usr/bin/python3
 
-from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QIcon
 from PyQt6.QtWidgets import QToolBar, QLabel
 from .track_progress_slider import TrackProgressSlider
 
 
 class TrackControl(QToolBar):
-    def __init__(self, parent=None):
+    def __init__(self, app, parent=None):
         super().__init__(parent)
 
+        self.app = app
+
+        self.play_icon = QIcon.fromTheme(QIcon.ThemeIcon.MediaPlaybackStart)
+        self.pause_icon = QIcon.fromTheme(QIcon.ThemeIcon.MediaPlaybackPause)
+
         icon = QIcon.fromTheme(QIcon.ThemeIcon.MediaSkipBackward)
         self.previous_button = self.addAction(icon, "Previous")
 
-        icon = QIcon.fromTheme(QIcon.ThemeIcon.MediaPlaybackStart)
-        self.toggle_play_button = self.addAction(icon, "Play/Pause")
+        self.toggle_play_button = self.addAction(self.play_icon, "Play/Pause")
 
         icon = QIcon.fromTheme(QIcon.ThemeIcon.MediaPlaybackStop)
         self.stop_button = self.addAction(icon, "Stop")
@@ -25,9 +28,67 @@ class TrackControl(QToolBar):
         self.progress_indicator = QLabel("0:00")
         self.addWidget(self.progress_indicator)
 
-        self.track_progress_slider = TrackProgressSlider(Qt.Orientation.Horizontal, self)
+        self.track_progress_slider = TrackProgressSlider(app, self)
         self.addWidget(self.track_progress_slider)
 
         self.track_length_indicator = QLabel("0:00")
         self.addWidget(self.track_length_indicator)
 
+        self.connect()
+        self.on_track_change(None, None)
+
+    def connect(self):
+        self.previous_button.triggered.connect(self.previous_track)
+        self.toggle_play_button.triggered.connect(self.toggle_playing)
+        self.stop_button.triggered.connect(self.stop)
+        self.next_button.triggered.connect(self.next_track)
+
+    def previous_track(self):
+        if self.app.player.current_playlist.has_tracks():
+            self.app.player.previous_track()
+
+    def stop(self):
+        if self.app.player.current_playlist.has_tracks():
+            self.app.player.stop()
+
+    def next_track(self):
+        if self.app.player.current_playlist.has_tracks():
+            self.app.player.next_track()
+
+    def on_track_change(self, previous_track, track):
+        if self.app.player.playing:
+            duration = 0
+
+            if track:
+                duration = track.duration
+
+            self.track_progress_slider.setRange(
+                0,
+                duration
+            )
+
+            self.track_length_indicator.setText(self.app.utils.format_time(duration))
+
+            self.track_progress_slider.update_progress()
+
+    def toggle_playing(self):
+        if self.app.player.playing and self.app.player.paused:  # paused
+            self.app.player.unpause()
+
+        elif self.app.player.playing:  # playing
+            self.app.player.pause()
+
+        elif self.app.player.current_playlist.has_tracks():  # stopped but tracks in the current playlist
+            self.app.player.start_playing()
+
+    def on_playstate_update(self):
+        if self.app.player.playing:
+            if self.app.player.paused:
+                self.toggle_play_button.setIcon(self.play_icon)
+
+            else:
+                self.toggle_play_button.setIcon(self.pause_icon)
+
+        else:
+            self.toggle_play_button.setIcon(self.play_icon)
+

wobuzz/ui/track_progress_slider.py

@@ -1,16 +1,26 @@
 #!/usr/bin/python3
 
-from PyQt6.QtCore import Qt
+from PyQt6.QtCore import Qt, QTimer
 from PyQt6.QtGui import QMouseEvent
 from PyQt6.QtWidgets import QSlider, QStyle, QStyleOptionSlider
 
+PROGRESS_UPDATE_RATE = 60
+PROGRESS_UPDATE_INTERVAL = 1000 // PROGRESS_UPDATE_RATE
+
 
 class TrackProgressSlider(QSlider):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, app, parent=None):
+        super().__init__(Qt.Orientation.Horizontal, parent)
+
+        self.app = app
+        self.track_control = None
 
         self.dragged = False
 
+        self.progress_update_timer = QTimer()
+        self.progress_update_timer.timeout.connect(self.update_progress)
+        self.progress_update_timer.start(PROGRESS_UPDATE_INTERVAL)
+
         option = QStyleOptionSlider()
         style = self.style()
 
@@ -19,6 +29,9 @@ class TrackProgressSlider(QSlider):
         self.sliderPressed.connect(self.on_press)
         self.sliderReleased.connect(self.on_release)
 
+    def post_init(self):
+        self.track_control = self.app.gui.track_control
+
     def mousePressEvent(self, event: QMouseEvent):
         # we need a custom press event bc. PyQt doesn't set the slider position when clicked
         if event.button() == Qt.MouseButton.LeftButton:
@@ -44,3 +57,27 @@ class TrackProgressSlider(QSlider):
     def on_release(self):
         self.dragged = False
 
+        if self.app.player.current_playlist.has_tracks():
+            self.app.player.seek(self.value())
+
+    def update_progress(self):
+        if not self.dragged:
+            if self.app.player.playing:
+                remaining = self.app.player.track_progress.timer.remainingTime()
+
+                if remaining == -1:
+                    remaining = self.app.player.track_progress.remaining_time
+
+                track_duration = self.app.player.current_playlist.current_track.duration
+
+                progress = track_duration - remaining
+
+                self.track_control.progress_indicator.setText(self.app.utils.format_time(progress))
+
+                self.track_control.track_progress_slider.setValue(progress)
+
+            else:
+                self.track_control.progress_indicator.setText(self.app.utils.format_time(0))
+
+                self.track_control.track_progress_slider.setValue(0)
+