1 parent
f8dd564296
commit
7ef2b85fea
2 files changed
+51
-9
No files matched your search
@@ -1,7 +1,43 @@
|
||||
#[cfg(windows)]
|
||||
fn main() {
|
||||
use std::env;
|
||||
use std::env;
|
||||
use std::process::Command;
|
||||
|
||||
fn main() {
|
||||
build_ver();
|
||||
platform_cfg();
|
||||
}
|
||||
|
||||
fn build_ver() {
|
||||
let cargo_ver = env::var("CARGO_PKG_VERSION").unwrap();
|
||||
let version = git_ver().unwrap_or(format!("{} (unknown commit)", cargo_ver));
|
||||
|
||||
println!("cargo:rustc-env=NEOLINK_VERSION={}", version);
|
||||
println!(
|
||||
"cargo:rustc-env=NEOLINK_PROFILE={}",
|
||||
env::var("PROFILE").unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
fn git_ver() -> Option<String> {
|
||||
let mut git_cmd = Command::new("git");
|
||||
git_cmd.args(&["describe", "--tags"]);
|
||||
|
||||
if let Some(true) = git_cmd
|
||||
.status()
|
||||
.ok()
|
||||
.map(|exit| exit.success())
|
||||
{
|
||||
println!("cargo:rerun-if-changed=.git/HEAD");
|
||||
git_cmd
|
||||
.output()
|
||||
.ok()
|
||||
.map(|o| String::from_utf8(o.stdout).unwrap())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn platform_cfg() {
|
||||
let gstreamer_dir = env::var_os("GSTREAMER_1_0_ROOT_X86_64")
|
||||
.and_then(|x| x.into_string().ok())
|
||||
.unwrap_or_else(|| r#"C:\gstreamer\1.0\x86_64\"#.to_string());
|
||||
@@ -10,4 +46,4 @@ fn main() {
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn main() {}
|
||||
fn platform_cfg() {}
|
||||
+11
-5
@@ -26,6 +26,13 @@ pub enum Error {
|
||||
|
||||
fn main() -> Result<(), Error> {
|
||||
env_logger::init();
|
||||
|
||||
info!(
|
||||
"Neolink {} {}",
|
||||
env!("NEOLINK_VERSION"),
|
||||
env!("NEOLINK_PROFILE")
|
||||
);
|
||||
|
||||
let opt = Opt::from_args();
|
||||
let config: Config = toml::from_str(&fs::read_to_string(opt.config)?)?;
|
||||
|
||||
@@ -87,8 +94,7 @@ struct CameraErr {
|
||||
fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<Never, CameraErr> {
|
||||
let mut connected = false;
|
||||
(|| {
|
||||
let mut camera =
|
||||
BcCamera::new_with_addr(camera_config.camera_addr)?;
|
||||
let mut camera = BcCamera::new_with_addr(camera_config.camera_addr)?;
|
||||
if let Some(timeout) = camera_config.timeout {
|
||||
camera.set_rx_timeout(timeout);
|
||||
}
|
||||
@@ -101,13 +107,13 @@ fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<N
|
||||
|
||||
connected = true;
|
||||
|
||||
camera
|
||||
.login(&camera_config.username, camera_config.password.as_deref())?;
|
||||
camera.login(&camera_config.username, camera_config.password.as_deref())?;
|
||||
|
||||
println!(
|
||||
"{}: Connected to camera, starting video stream",
|
||||
camera_config.name
|
||||
);
|
||||
camera.start_video(output)
|
||||
})().map_err(|err| CameraErr { connected, err })
|
||||
})()
|
||||
.map_err(|err| CameraErr { connected, err })
|
||||
}
|
||||
Reference in new issue
Block a user