Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-05-17 14:12:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #40 from Stremio/claude/fix-player-error-handling-pMLQG

Browse source 
fix(Player): stop fabricating end-file on transient mpv event errors
This commit is contained in:
Владимир Борисов 2026-04-23 11:12:34 +03:00 committed by GitHub
commit 8be5a2cfca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/stremio_app/stremio_player/communication.rs
View file

@ -61,21 +61,14 @@ impl PlayerEnded {
_ => "other".to_string(), _ => "other".to_string(),
} }
} }
pub fn from_end_reason(data: EndFileReason, error: &str) -> Self { pub fn from_end_reason(data: EndFileReason) -> Self {
Self { Self {
reason: Self::string_from_end_reason(data), reason: Self::string_from_end_reason(data),
error: if data == mpv_end_file_reason::Error { error: if data == mpv_end_file_reason::Error {
if error.is_empty() { Some(PlayerEndedError {
Some(PlayerEndedError { message: "Unknown error".to_string(),
message: "Unknown error".to_string(), critical: false,
critical: true, })
})
} else {
Some(PlayerEndedError {
message: error.to_string(),
critical: true,
})
}
} else { } else {
None None
}, },

6
src/stremio_app/stremio_player/communication_tests.rs
View file

@ -75,7 +75,7 @@ fn ended_tokens() {
Token::Str("message"), Token::Str("message"),
Token::Str("Unknown error"), Token::Str("Unknown error"),
Token::Str("critical"), Token::Str("critical"),
Token::Bool(true), Token::Bool(false),
Token::StructEnd, Token::StructEnd,
Token::StructEnd, Token::StructEnd,
]; ];
@ -89,11 +89,11 @@ fn ended_tokens() {
Token::StructEnd, Token::StructEnd,
]; ];
assert_tokens( assert_tokens(
&PlayerEnded::from_end_reason(mpv_end_file_reason::Error, ""), &PlayerEnded::from_end_reason(mpv_end_file_reason::Error),
&error_tokens, &error_tokens,
); );
assert_tokens( assert_tokens(
&PlayerEnded::from_end_reason(mpv_end_file_reason::Quit, ""), &PlayerEnded::from_end_reason(mpv_end_file_reason::Quit),
&tokens, &tokens,
); );
} }

19
src/stremio_app/stremio_player/player.rs
View file

@ -103,20 +103,11 @@ fn create_event_thread(
} }
// -1.0 means to block and wait for an event. // -1.0 means to block and wait for an event.
let (event, error) = match event_context.wait_event(-1.) { let event = match event_context.wait_event(-1.) {
Some(Ok(event)) => (event, ""), Some(Ok(event)) => event,
Some(Err(error)) => { Some(Err(error)) => {
if let libmpv2::Error::Raw(e) = error { eprintln!("Event errored: {error:?}");
( continue;
Event::EndFile(
libmpv2_sys::mpv_end_file_reason_MPV_END_FILE_REASON_ERROR,
),
libmpv2_sys::mpv_error_str(e),
)
} else {
eprintln!("Unhandled event error: {error:?}");
continue;
}
} }
// dummy event received (may be created on a wake up call or on timeout) // dummy event received (may be created on a wake up call or on timeout)
None => continue, None => continue,
@ -133,7 +124,7 @@ fn create_event_thread(
), ),
Event::EndFile(reason) => PlayerResponse( Event::EndFile(reason) => PlayerResponse(
"mpv-event-ended", "mpv-event-ended",
PlayerEvent::End(PlayerEnded::from_end_reason(reason, error)), PlayerEvent::End(PlayerEnded::from_end_reason(reason)),
), ),
Event::Shutdown => { Event::Shutdown => {
break; break;