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

Compare commits

base: ryze:main
Branches Tags
ryze:main
ryze:1.1.5
ryze:1.1.4
ryze:1.1.3
ryze:1.1.2
ryze:1.1.2.rev01
ryze:1.1.1
ryze:1.1.0
ryze:1.0.0
..
compare: ryze:1.1.4
Branches Tags
ryze:main
ryze:1.1.5
ryze:1.1.4
ryze:1.1.3
ryze:1.1.2
ryze:1.1.2.rev01
ryze:1.1.1
ryze:1.1.0
ryze:1.0.0

No commits in common. "main" and "1.1.4" have entirely different histories.
main ... 1.1.4

6 changed files with 17 additions and 147 deletions
Show stats Expand all files Collapse all files

2
.cargo/config.toml
View file

@ -1,2 +1,2 @@
[build]
target = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "aarch64-unknown-linux-gnu"]
target = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu"]

118
Cargo.lock generated
View file

@ -14,7 +14,6 @@ version = "1.1.4"
dependencies = [
"serde",
"serde_json",
"windows",
]
[[package]]
@ -111,120 +110,3 @@ name = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "windows"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
dependencies = [
"windows-core",
"windows-targets",
]
[[package]]
name = "windows-core"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
dependencies = [
"windows-implement",
"windows-interface",
"windows-result",
"windows-targets",
]
[[package]]
name = "windows-implement"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "windows-interface"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "windows-result"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
[[package]]
name = "windows_i686_gnu"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
[[package]]
name = "windows_i686_msvc"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"

5
Cargo.toml
View file

@ -1,15 +1,12 @@
[package]
name = "ff2mpv-rust"
version = "1.1.5"
version = "1.1.4"
edition = "2021"
[dependencies]
serde = { version = "1.0.*", features = ["derive"] }
serde_json = { version = "1.0.*", features = ["preserve_order"] }
[target.'cfg(windows)'.dependencies]
windows = { version = "0.56", features = ["Win32_System_Threading"] }
[profile.dev-optimized]
inherits = "dev"
opt-level = 3

30
src/command.rs
View file

@ -1,8 +1,7 @@
use std::env;
use std::io;
use std::process;
use serde_json::json;
use serde_json::{self, json};
use crate::browser;
use crate::config::Config;
@ -92,26 +91,19 @@ impl Command {
command.arg("--");
command.arg(url);
Command::detach_mpv(&mut command);
// NOTE: On Windows, browser spawns process into a Job object.
// NOTE: We need to detach player from the job, so it won't get killed after we're done,
// NOTE: See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging#closing_the_native_app
#[cfg(target_family = "windows")]
{
use std::os::windows::process::CommandExt;
const CREATE_BREAKAWAY_FROM_JOB: u32 = 0x01000000;
command.creation_flags(CREATE_BREAKAWAY_FROM_JOB);
}
command.spawn()?;
Ok(())
}
// NOTE: Make sure the subprocess is not killed.
// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging#closing_the_native_app
#[cfg(unix)]
fn detach_mpv(command: &mut process::Command) {
use std::os::unix::process::CommandExt;
command.process_group(0);
}
#[cfg(windows)]
fn detach_mpv(command: &mut process::Command) {
use std::os::windows::process::CommandExt;
use windows::Win32::System::Threading::CREATE_BREAKAWAY_FROM_JOB;
command.creation_flags(CREATE_BREAKAWAY_FROM_JOB.0);
}
}

7
src/config.rs
View file

@ -1,7 +1,6 @@
use std::env;
use std::fs;
use std::path::PathBuf;
use serde::Deserialize;
use crate::error::FF2MpvError;
@ -17,7 +16,7 @@ impl Default for Config {
fn default() -> Self {
Self {
player_command: "mpv".to_owned(),
player_args: vec![],
player_args: vec![]
}
}
}
@ -41,7 +40,7 @@ impl Config {
Ok(config)
}
#[cfg(unix)]
#[cfg(target_family = "unix")]
fn get_config_location() -> PathBuf {
let mut path = PathBuf::new();
@ -58,7 +57,7 @@ impl Config {
path
}
#[cfg(windows)]
#[cfg(target_family = "windows")]
fn get_config_location() -> PathBuf {
let mut path = PathBuf::new();
let appdata = env::var("APPDATA").unwrap();

2
src/error.rs
View file

@ -1,6 +1,6 @@
use std::io;
use std::fmt;
use std::fmt::Display;
use std::io;
pub enum FF2MpvError {
NoConfig,