Merge pull request #81 from Stremio/fix/next-video

Fix next video behavior

Author: tymmesyde

src/app/imp.rs

@@ -94,10 +94,13 @@ impl ApplicationImpl for Application {
             window,
             #[weak]
             webview,
-            move || {
+            move |reason| {
                 window.enable_idling();
 
-                let message = ipc::create_response(IpcEvent::Mpv(IpcEventMpv::Ended(None)));
+                let message = ipc::create_response(IpcEvent::Mpv(IpcEventMpv::Ended((
+                    reason.to_string(),
+                    None,
+                ))));
                 webview.send(&message);
             }
         ));

src/app/ipc/event.rs

@@ -9,7 +9,7 @@ pub enum IpcEventMpv {
     Command((String, Vec<String>)),
     Set((String, Value)),
     Change((String, Value)),
-    Ended(Option<String>),
+    Ended((String, Option<String>)),
 }
 
 #[derive(Deserialize, Debug)]

src/app/ipc/response.rs

@@ -80,14 +80,15 @@ impl TryFrom<IpcEvent> for IpcMessageResponse {
                     "data": value,
                 }])),
             }),
-            IpcEvent::Mpv(IpcEventMpv::Ended(error)) => Ok(IpcMessageResponse {
+            IpcEvent::Mpv(IpcEventMpv::Ended((reason, error))) => Ok(IpcMessageResponse {
                 id: 1,
                 r#type: 1,
                 object: TRANSPORT_NAME.to_owned(),
                 data: None,
                 args: Some(json!([
                     "mpv-event-ended",
                     {
+                        "reason": reason,
                         "error": error,
                     }
                 ])),

src/app/video/imp.rs

@@ -8,6 +8,7 @@ use gtk::{
 use libmpv2::{
     Format, Mpv, SetData,
     events::{Event, PropertyData},
+    mpv_end_file_reason,
     render::{OpenGLInitParams, RenderContext, RenderParam, RenderParamApiType},
 };
 use std::{cell::RefCell, env, os::raw::c_void, sync::OnceLock};
@@ -97,7 +98,9 @@ impl ObjectImpl for Video {
                     .param_types([str::static_type(), Variant::static_type()])
                     .build(),
                 Signal::builder("playback-started").build(),
-                Signal::builder("playback-ended").build(),
+                Signal::builder("playback-ended")
+                    .param_types([str::static_type()])
+                    .build(),
             ]
         })
     }
@@ -129,8 +132,17 @@ impl ObjectImpl for Video {
                     Event::StartFile => {
                         object.emit_by_name::<()>("playback-started", &[]);
                     }
-                    Event::EndFile(_) => {
-                        object.emit_by_name::<()>("playback-ended", &[]);
+                    Event::EndFile(reason) => {
+                        let reason = match reason {
+                            mpv_end_file_reason::Eof => "eof".to_string(),
+                            mpv_end_file_reason::Stop => "stop".to_string(),
+                            mpv_end_file_reason::Redirect => "redirect".to_string(),
+                            mpv_end_file_reason::Error => "error".to_string(),
+                            mpv_end_file_reason::Quit => "quit".to_string(),
+                            _ => "other".to_string(),
+                        };
+
+                        object.emit_by_name::<()>("playback-ended", &[&reason]);
                     }
                     _ => {}
                 });

src/app/video/mod.rs

@@ -67,12 +67,12 @@ impl Video {
         );
     }
 
-    pub fn connect_playback_ended<T: Fn() + 'static>(&self, callback: T) {
+    pub fn connect_playback_ended<T: Fn(&str) + 'static>(&self, callback: T) {
         self.connect_closure(
             "playback-ended",
             false,
-            closure_local!(move |_: Video| {
-                callback();
+            closure_local!(move |_: Video, reason: &str| {
+                callback(reason);
             }),
         );
     }