minor fix

5rahim · Sep 7, 2024 · 06d09df · 06d09df
1 parent 8efcf5b
commit 06d09df
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 9 deletions.
diff --git a/internal/mediaplayers/mpv/mpv.go b/internal/mediaplayers/mpv/mpv.go
@@ -73,13 +73,16 @@ func New(logger *zerolog.Logger, socketName string, appPath string) *Mpv {
 func (m *Mpv) launchPlayer(idle bool, filePath string, args ...string) error {
 	var err error
 
+	m.Logger.Trace().Msg("mpv: Launching player")
+
 	// Cancel previous goroutine context
 	if m.cancel != nil {
 		m.Logger.Trace().Msg("mpv: Cancelling previous context")
 		m.cancel()
 	}
 	// Cancel previous command context
 	if cmdCancel != nil {
+		m.Logger.Trace().Msg("mpv: Cancelling previous command context")
 		cmdCancel()
 	}
 	cmdCtx, cmdCancel = context.WithCancel(context.Background())
@@ -147,6 +150,8 @@ func (m *Mpv) launchPlayer(idle bool, filePath string, args ...string) error {
 	wg.Wait()
 	time.Sleep(1 * time.Second)
 
+	m.Logger.Debug().Msg("mpv: Player started")
+
 	return nil
 }
 

diff --git a/internal/torrentstream/client.go b/internal/torrentstream/client.go
@@ -30,8 +30,8 @@ type (
 		currentTorrentStatus TorrentStatus
 		cancelFunc           context.CancelFunc
 
-		mu sync.Mutex
-		//stopCh                      chan struct{}                    // Closed when the media player stops
+		mu                          sync.Mutex
+		stopCh                      chan struct{}                    // Closed when the media player stops
 		mediaPlayerPlaybackStatusCh chan *mediaplayer.PlaybackStatus // Continuously receives playback status
 		timeSinceLoggedSeeding      time.Time
 	}
@@ -53,11 +53,11 @@ type (
 
 func NewClient(repository *Repository) *Client {
 	ret := &Client{
-		repository:     repository,
-		torrentClient:  mo.None[*torrent.Client](),
-		currentFile:    mo.None[*torrent.File](),
-		currentTorrent: mo.None[*torrent.Torrent](),
-		//stopCh:                      make(chan struct{}),
+		repository:                  repository,
+		torrentClient:               mo.None[*torrent.Client](),
+		currentFile:                 mo.None[*torrent.File](),
+		currentTorrent:              mo.None[*torrent.Torrent](),
+		stopCh:                      make(chan struct{}),
 		mediaPlayerPlaybackStatusCh: make(chan *mediaplayer.PlaybackStatus, 1),
 	}
 

diff --git a/internal/torrentstream/playback.go b/internal/torrentstream/playback.go
@@ -47,7 +47,11 @@ func (r *Repository) listenToMediaPlayerEvents() {
 					}()
 					r.logger.Debug().Msg("torrentstream: Media player stopped event received")
 					// Stop the stream
-					r.StopStream()
+					_ = r.StopStream()
+					// Stop the server
+					//r.serverManager.stopServer()
+					//// Signal to client.go that the media player has stopped
+					//close(r.client.stopCh)
 				}()
 			case status := <-r.mediaPlayerRepositorySubscriber.StreamingPlaybackStatusCh:
 				go func() {

diff --git a/internal/torrentstream/stream.go b/internal/torrentstream/stream.go
@@ -189,6 +189,23 @@ func (r *Repository) StopStream() error {
 	return nil
 }
 
+//func (r *Repository) StopStream() error {
+//	defer func() {
+//		if r := recover(); r != nil {
+//		}
+//	}()
+//	r.logger.Info().Msg("torrentstream: Stopping stream")
+//
+//	// Stop the client
+//	// This will stop the stream and close the server
+//	// This also sends the eventTorrentStopped event
+//	close(r.client.stopCh)
+//
+//	r.logger.Info().Msg("torrentstream: Stream stopped")
+//
+//	return nil
+//}
+
 func (r *Repository) DropTorrent() error {
 	r.logger.Info().Msg("torrentstream: Dropping last torrent")
 

diff --git a/seanime-web/src/app/(main)/entry/_containers/torrent-stream/torrent-stream-overlay.tsx b/seanime-web/src/app/(main)/entry/_containers/torrent-stream/torrent-stream-overlay.tsx
@@ -127,7 +127,7 @@ export function TorrentStreamOverlay() {
         return (
             <>
                 {!mediaPlayerStartedPlaying && <div className="w-full bg-gray-900 fixed top-0 left-0 z-[100]">
-                    <ProgressBar isIndeterminate />
+                    <ProgressBar size="sm" isIndeterminate />
                 </div>}
                 <div className="fixed left-0 top-8 w-full flex justify-center z-[100]">
                     <div className="bg-gray-900 rounded-full border lg:max-w-[50%] w-fit py-3 px-6 flex gap-2 items-center text-sm lg:text-base">