Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-04-21 20:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix clippy warnings and tests

Browse source
This commit is contained in:
Martin Kavík 2022-04-01 23:25:25 +02:00
parent 8d5a098307
commit 55ea78721f
2 changed files with 168 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/stremio_app/app.rs
View file

@ -132,7 +132,7 @@ impl MainWindow {
hide_splash_sender.notice();
if let Some(arg) = msg.get_params() {
// TODO: Make this modal dialog
eprintln!("Web App Error: {}", arg.to_string());
eprintln!("Web App Error: {}", arg);
}
}
Some("open-external") => {

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

@ -2,6 +2,7 @@ use crate::stremio_app::stremio_player::communication::{
BoolProp, CmdVal, InMsg, InMsgArgs, InMsgFn, MpvCmd, PlayerEnded, PlayerProprChange, PropKey,
PropVal,
};
use libmpv::{events::PropertyData, mpv_end_file_reason};
use serde_test::{assert_tokens, Token};
@ -20,7 +21,7 @@ fn propr_change_tokens() {
Token::StructEnd,
];
fn tokens_by_type(tokens: &[Token; 6], name: &'static str, val: mpv::Format, token: Token) {
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;
@ -29,29 +30,29 @@ fn propr_change_tokens() {
&typed_tokens,
);
}
tokens_by_type(&tokens, prop, mpv::Format::Flag(true), Token::Bool(true));
tokens_by_type(&tokens, prop, mpv::Format::Int(1), Token::F64(1.0));
tokens_by_type(&tokens, prop, mpv::Format::Double(1.0), Token::F64(1.0));
tokens_by_type(&tokens, prop, mpv::Format::OsdStr("ok"), Token::Str("ok"));
tokens_by_type(&tokens, prop, mpv::Format::Str("ok"), Token::Str("ok"));
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",
mpv::Format::Str(r#""ok""#),
PropertyData::Str(r#""ok""#),
Token::Str("ok"),
);
tokens_by_type(
&tokens,
"video-params",
mpv::Format::Str(r#""ok""#),
PropertyData::Str(r#""ok""#),
Token::Str("ok"),
);
tokens_by_type(
&tokens,
"metadata",
mpv::Format::Str(r#""ok""#),
PropertyData::Str(r#""ok""#),
Token::Str("ok"),
);
}
@ -70,13 +71,13 @@ fn ended_tokens() {
let mut typed_tokens = tokens.clone();
typed_tokens[2] = Token::Str("error");
assert_tokens(
&PlayerEnded::from_end_reason(mpv::EndFileReason::MPV_END_FILE_REASON_ERROR),
&PlayerEnded::from_end_reason(mpv_end_file_reason::Error),
&typed_tokens,
);
let mut typed_tokens = tokens.clone();
typed_tokens[2] = Token::Str("quit");
assert_tokens(
&PlayerEnded::from_end_reason(mpv::EndFileReason::MPV_END_FILE_REASON_QUIT),
&PlayerEnded::from_end_reason(mpv_end_file_reason::Quit),
&typed_tokens,
);
}