mirror of
https://github.com/Stremio/stremio-shell-ng.git
synced 2026-05-06 03:29:04 +00:00
Commit 0b882f3 synthesized an Event::EndFile(Error) whenever
event_context.wait_event returned libmpv2::Error::Raw and forwarded it
to the web layer. MPV is fully able to continue playback after such
transient errors (its demuxer cache is intact), so fabricating an
end-of-file caused long-running HTTP streams (e.g. RealDebrid) to flip
to a blocking "Loading failed" overlay mid-playback. Revert that branch
to the prior log-and-continue behavior.
Also downgrade PlayerEnded errors from critical:true to critical:false
so genuine mpv_end_file_reason::Error surfaces as a 3s toast in
stremio-web (Player.js), letting the user retry, instead of an
unrecoverable full-screen overlay.
183 lines
4.8 KiB
Rust
183 lines
4.8 KiB
Rust
use crate::stremio_app::stremio_player::communication::{
|
|
BoolProp, CmdVal, InMsg, InMsgArgs, InMsgFn, MpvCmd, PlayerEnded, PlayerProprChange, PropKey,
|
|
PropVal,
|
|
};
|
|
use libmpv2::{events::PropertyData, mpv_end_file_reason};
|
|
|
|
use serde_test::{assert_tokens, Token};
|
|
|
|
#[test]
|
|
fn propr_change_tokens() {
|
|
let prop = "test-prop";
|
|
let tokens: [Token; 6] = [
|
|
Token::Struct {
|
|
name: "PlayerProprChange",
|
|
len: 2,
|
|
},
|
|
Token::Str("name"),
|
|
Token::None,
|
|
Token::Str("data"),
|
|
Token::None,
|
|
Token::StructEnd,
|
|
];
|
|
|
|
fn tokens_by_type(tokens: &[Token; 6], name: &'static str, val: PropertyData, token: Token) {
|
|
let mut typed_tokens = tokens.clone();
|
|
typed_tokens[2] = Token::Str(name);
|
|
typed_tokens[4] = token;
|
|
assert_tokens(
|
|
&PlayerProprChange::from_name_value(name.to_string(), val),
|
|
&typed_tokens,
|
|
);
|
|
}
|
|
tokens_by_type(&tokens, prop, PropertyData::Flag(true), Token::Bool(true));
|
|
tokens_by_type(&tokens, prop, PropertyData::Int64(1), Token::F64(1.0));
|
|
tokens_by_type(&tokens, prop, PropertyData::Double(1.0), Token::F64(1.0));
|
|
tokens_by_type(&tokens, prop, PropertyData::OsdStr("ok"), Token::Str("ok"));
|
|
tokens_by_type(&tokens, prop, PropertyData::Str("ok"), Token::Str("ok"));
|
|
|
|
// JSON response
|
|
tokens_by_type(
|
|
&tokens,
|
|
"track-list",
|
|
PropertyData::Str(r#""ok""#),
|
|
Token::Str("ok"),
|
|
);
|
|
tokens_by_type(
|
|
&tokens,
|
|
"video-params",
|
|
PropertyData::Str(r#""ok""#),
|
|
Token::Str("ok"),
|
|
);
|
|
tokens_by_type(
|
|
&tokens,
|
|
"metadata",
|
|
PropertyData::Str(r#""ok""#),
|
|
Token::Str("ok"),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn ended_tokens() {
|
|
let error_tokens: [Token; 12] = [
|
|
Token::Struct {
|
|
name: "PlayerEnded",
|
|
len: 2,
|
|
},
|
|
Token::Str("reason"),
|
|
Token::Str("error"),
|
|
Token::Str("error"),
|
|
Token::Some,
|
|
Token::Struct {
|
|
name: "PlayerEndedError",
|
|
len: 2,
|
|
},
|
|
Token::Str("message"),
|
|
Token::Str("Unknown error"),
|
|
Token::Str("critical"),
|
|
Token::Bool(false),
|
|
Token::StructEnd,
|
|
Token::StructEnd,
|
|
];
|
|
let tokens: [Token; 4] = [
|
|
Token::Struct {
|
|
name: "PlayerEnded",
|
|
len: 1,
|
|
},
|
|
Token::Str("reason"),
|
|
Token::Str("quit"),
|
|
Token::StructEnd,
|
|
];
|
|
assert_tokens(
|
|
&PlayerEnded::from_end_reason(mpv_end_file_reason::Error),
|
|
&error_tokens,
|
|
);
|
|
assert_tokens(
|
|
&PlayerEnded::from_end_reason(mpv_end_file_reason::Quit),
|
|
&tokens,
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn ob_propr_tokens() {
|
|
assert_tokens(
|
|
&InMsg(
|
|
InMsgFn::MpvObserveProp,
|
|
InMsgArgs::ObProp(PropKey::Bool(BoolProp::Pause)),
|
|
),
|
|
&[
|
|
Token::TupleStruct {
|
|
name: "InMsg",
|
|
len: 2,
|
|
},
|
|
Token::Str("mpv-observe-prop"),
|
|
Token::Str("pause"),
|
|
Token::TupleStructEnd,
|
|
],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn set_propr_tokens() {
|
|
assert_tokens(
|
|
&InMsg(
|
|
InMsgFn::MpvSetProp,
|
|
InMsgArgs::StProp(PropKey::Bool(BoolProp::Pause), PropVal::Bool(true)),
|
|
),
|
|
&[
|
|
Token::TupleStruct {
|
|
name: "InMsg",
|
|
len: 2,
|
|
},
|
|
Token::Str("mpv-set-prop"),
|
|
Token::Tuple { len: 2 },
|
|
Token::Str("pause"),
|
|
Token::Bool(true),
|
|
Token::TupleEnd,
|
|
Token::TupleStructEnd,
|
|
],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn command_stop_tokens() {
|
|
assert_tokens(
|
|
&InMsg(
|
|
InMsgFn::MpvCommand,
|
|
InMsgArgs::Cmd(CmdVal::Single((MpvCmd::Stop,))),
|
|
),
|
|
&[
|
|
Token::TupleStruct {
|
|
name: "InMsg",
|
|
len: 2,
|
|
},
|
|
Token::Str("mpv-command"),
|
|
Token::Tuple { len: 1 },
|
|
Token::Str("stop"),
|
|
Token::TupleEnd,
|
|
Token::TupleStructEnd,
|
|
],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn command_loadfile_tokens() {
|
|
assert_tokens(
|
|
&InMsg(
|
|
InMsgFn::MpvCommand,
|
|
InMsgArgs::Cmd(CmdVal::Double(MpvCmd::Loadfile, "some_file".to_string())),
|
|
),
|
|
&[
|
|
Token::TupleStruct {
|
|
name: "InMsg",
|
|
len: 2,
|
|
},
|
|
Token::Str("mpv-command"),
|
|
Token::Tuple { len: 2 },
|
|
Token::Str("loadfile"),
|
|
Token::Str("some_file"),
|
|
Token::TupleEnd,
|
|
Token::TupleStructEnd,
|
|
],
|
|
);
|
|
}
|