ryze/ff2mpv-rust
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Respect options passed by ff2mpv extension

Browse source 
The upstream ff2mpv extension started passing `options`. Respect
those by passing them after our `config.player_args`.
This commit is contained in:
eNV25 2024-02-15 15:22:13 +01:00
parent a971c7c35b
commit f8ce7b5ef8
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/browser.rs
View file

@ -8,6 +8,7 @@ use crate::error::FF2MpvError;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct FF2MpvMessage { pub struct FF2MpvMessage {
pub url: String, pub url: String,
pub options: Vec<String>,
} }
pub fn send_reply() -> Result<(), io::Error> { pub fn send_reply() -> Result<(), io::Error> {

15
src/command.rs
View file

@ -1,7 +1,7 @@
use serde_json::{self, json};
use std::env; use std::env;
use std::io; use std::io;
use std::process; use std::process;
use serde_json::{self, json};
use crate::browser; use crate::browser;
use crate::config::Config; use crate::config::Config;
@ -12,10 +12,9 @@ pub enum Command {
ShowManifest, ShowManifest,
ShowManifestChromium, ShowManifestChromium,
ValidateConfig, ValidateConfig,
FF2Mpv FF2Mpv,
} }
impl Command { impl Command {
pub fn execute(&self) -> Result<(), FF2MpvError> { pub fn execute(&self) -> Result<(), FF2MpvError> {
match self { match self {
@ -23,7 +22,7 @@ impl Command {
Command::ShowManifest => Self::show_manifest(false), Command::ShowManifest => Self::show_manifest(false),
Command::ShowManifestChromium => Self::show_manifest(true), Command::ShowManifestChromium => Self::show_manifest(true),
Command::ValidateConfig => Self::validate_config(), Command::ValidateConfig => Self::validate_config(),
Command::FF2Mpv => Self::ff2mpv() Command::FF2Mpv => Self::ff2mpv(),
} }
} }
@ -43,7 +42,10 @@ impl Command {
fn show_manifest(chromium: bool) -> Result<(), FF2MpvError> { fn show_manifest(chromium: bool) -> Result<(), FF2MpvError> {
let executable_path = env::current_exe()?; let executable_path = env::current_exe()?;
let allowed_keyvalue = if chromium { let allowed_keyvalue = if chromium {
("allowed_origins", "chrome-extension://ephjcajbkgplkjmelpglennepbpmdpjg") (
"allowed_origins",
"chrome-extension://ephjcajbkgplkjmelpglennepbpmdpjg",
)
} else { } else {
("allowed_extensions", "ff2mpv@yossarian.net") ("allowed_extensions", "ff2mpv@yossarian.net")
}; };
@ -72,7 +74,8 @@ impl Command {
fn ff2mpv() -> Result<(), FF2MpvError> { fn ff2mpv() -> Result<(), FF2MpvError> {
let config = Config::build(); let config = Config::build();
let ff2mpv_message = browser::get_mpv_message()?; let ff2mpv_message = browser::get_mpv_message()?;
Command::launch_mpv(config.player_command, config.player_args, &ff2mpv_message.url)?; let args = [config.player_args, ff2mpv_message.options].concat();
Command::launch_mpv(config.player_command, args, &ff2mpv_message.url)?;
browser::send_reply()?; browser::send_reply()?;
Ok(()) Ok(())