Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
dfd5577cbc | |
|
|
cbbea4dcd8 |
|
|
@ -25,3 +25,5 @@ tarpaulin-report.html
|
|||
test/
|
||||
.ignore
|
||||
*.json
|
||||
config/
|
||||
vp/
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ enum-map = { version = "2.7.3", features = ["serde"] }
|
|||
colog = "1.3.0"
|
||||
env_logger = "0.11.5"
|
||||
log = { version = "0.4.22", features = ["serde", "std", "release_max_level_debug", "max_level_debug"] }
|
||||
rand = { version = "0.8.5", features = ["small_rng"] }
|
||||
mockall = "0.13.1"
|
||||
|
||||
[[bin]]
|
||||
name = "rusty_midicommander"
|
||||
|
|
|
|||
20
src/cli.rs
20
src/cli.rs
|
|
@ -48,24 +48,21 @@ pub struct CLIArgs {
|
|||
/// Create a config file from all the given arguments
|
||||
#[arg(short, long)]
|
||||
pub save: Option<String>,
|
||||
//
|
||||
// /// Connect to a VP
|
||||
// pub vp: Option<Vec<VPType>>,
|
||||
|
||||
/// Connect to a VP
|
||||
pub vp: Vec<VPType>,
|
||||
}
|
||||
|
||||
/// All arguments for creating a VP configuration
|
||||
#[derive(Debug, Parser, Serialize, Deserialize)]
|
||||
pub struct CreateArgs {
|
||||
/// Create a projector config file of a specific type
|
||||
#[command(subcommand)]
|
||||
pub create: Option<VPType>,
|
||||
}
|
||||
pub create: VPType,
|
||||
|
||||
// impl From<OsStr> for VPType {
|
||||
// fn from(value: OsStr) -> Self {
|
||||
// todo!()
|
||||
// }
|
||||
// }
|
||||
/// The name to save it under
|
||||
#[arg(short, long)]
|
||||
pub name: Option<String>,
|
||||
}
|
||||
|
||||
/// Get a parsed Args from the Cli, this function will also perform the basic (save/load) and printing needed
|
||||
pub fn get_arguments_from_cli() -> Result<RMCArgs, RustyMidiError> {
|
||||
|
|
@ -137,6 +134,7 @@ impl RMCArgs {
|
|||
midi_interface: _,
|
||||
config: _,
|
||||
save: Some(save_path),
|
||||
vp: _,
|
||||
},
|
||||
),
|
||||
} = &self
|
||||
|
|
|
|||
|
|
@ -3,10 +3,13 @@
|
|||
//! Contains all functionnalities the CLI expects
|
||||
|
||||
use std::{
|
||||
fs::create_dir,
|
||||
process::exit,
|
||||
sync::{Arc, Mutex},
|
||||
};
|
||||
|
||||
use rand::{rngs::SmallRng, Rng, SeedableRng};
|
||||
|
||||
use crate::{
|
||||
cli::{self, CreateArgs},
|
||||
midi::{self, cleanup, connect_loop_with_callback, create_output_interface},
|
||||
|
|
@ -16,24 +19,28 @@ use crate::{
|
|||
|
||||
/// Execute all config creation action
|
||||
pub fn create_config(create_args: CreateArgs) -> Result<(), RustyMidiError> {
|
||||
create_args.create.into_iter().for_each(|vp| {
|
||||
let _ = new_default_projector_of_type(&vp)
|
||||
.inspect_err(|e| println!("Couldn't save the projector {:?} {}", vp, e));
|
||||
});
|
||||
let mut small_rng = SmallRng::from_entropy();
|
||||
let _ = create_dir("vp");
|
||||
let vp = create_args.create;
|
||||
let name = create_args.name.unwrap_or(format!(
|
||||
"vp/{:?}_new_{}.json",
|
||||
vp,
|
||||
small_rng.gen_range(255..2048),
|
||||
));
|
||||
let _ = new_default_projector_of_type(&vp, &name)
|
||||
.inspect_err(|e| println!("Couldn't save the projector {:?} {}", vp, e));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// TODO: Upgrade
|
||||
/// Launch the program as a cli
|
||||
pub fn cli_launch(cliargs: cli::CLIArgs) -> Result<(), RustyMidiError> {
|
||||
println!("{:?}", cliargs);
|
||||
// TODO: Cleanup all the following
|
||||
if cliargs.midi_interface.is_none() {
|
||||
midi::print_midi_interfaces();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
println!("{:?}", cliargs);
|
||||
let proj = Arc::new(Mutex::new(projector::panasonic::PanasonicProjector::new(
|
||||
"127.0.0.1:8080",
|
||||
"admin1",
|
||||
|
|
|
|||
|
|
@ -3,24 +3,26 @@
|
|||
pub mod panasonic;
|
||||
pub mod proj_traits;
|
||||
|
||||
use clap::Parser;
|
||||
use clap::ValueEnum;
|
||||
use panasonic::PanasonicProjector;
|
||||
pub use proj_traits::{AdvancedCommands, GenericProjector};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// Enumerate all the VP types
|
||||
#[derive(Parser, Serialize, Deserialize, Clone, Debug)]
|
||||
#[derive(ValueEnum, Serialize, Deserialize, Clone, Debug)]
|
||||
pub enum VPType {
|
||||
/// A panasonic VideoProjector
|
||||
Panasonic,
|
||||
}
|
||||
|
||||
/// Create a new empty projector of the given type
|
||||
///
|
||||
/// While inelegant, this is the most straightforward way of having a generic projector
|
||||
pub fn new_default_projector_of_type(vptype: &VPType) -> Result<(), crate::RustyMidiError> {
|
||||
pub fn new_default_projector_of_type(
|
||||
vptype: &VPType,
|
||||
name: &str,
|
||||
) -> Result<(), crate::RustyMidiError> {
|
||||
match vptype {
|
||||
VPType::Panasonic => {
|
||||
PanasonicProjector::default().create_default_config_file("new_panasonic.json")
|
||||
}
|
||||
VPType::Panasonic => PanasonicProjector::default().create_default_config_file(name),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in New Issue