Nickiel/nicks_nextcloud_integrations
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

added logging and cleaned code up

Browse source
This commit is contained in:
Nickiel12 2023-08-26 08:30:58 -07:00
parent e4ff4eca09
commit 5681f4a285
3 changed files with 152 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
Cargo.lock generated
View file

@ -156,7 +156,7 @@ dependencies = [
"iana-time-zone",
"js-sys",
"num-traits",
"time",
"time 0.1.45",
"wasm-bindgen",
"winapi",
]
@ -224,6 +224,12 @@ version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "deranged"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
[[package]]
name = "encoding_rs"
version = "0.8.32"
@ -631,6 +637,15 @@ dependencies = [
"libc",
]
[[package]]
name = "num_threads"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
dependencies = [
"libc",
]
[[package]]
name = "object"
version = "0.31.1"
@ -887,6 +902,17 @@ dependencies = [
"serde",
]
[[package]]
name = "simplelog"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
dependencies = [
"log",
"termcolor",
"time 0.3.27",
]
[[package]]
name = "slab"
version = "0.4.8"
@ -922,9 +948,11 @@ version = "0.1.0"
dependencies = [
"chrono",
"clap",
"log",
"reqwest",
"serde",
"serde_json",
"simplelog",
"toml",
]
@ -958,6 +986,15 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "termcolor"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
dependencies = [
"winapi-util",
]
[[package]]
name = "time"
version = "0.1.45"
@ -969,6 +1006,36 @@ dependencies = [
"winapi",
]
[[package]]
name = "time"
version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
dependencies = [
"deranged",
"itoa",
"libc",
"num_threads",
"serde",
"time-core",
"time-macros",
]
[[package]]
name = "time-core"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9"
dependencies = [
"time-core",
]
[[package]]
name = "tinyvec"
version = "1.6.0"
@ -1247,6 +1314,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"

2
status_cloud/Cargo.toml
View file

@ -8,7 +8,9 @@ edition = "2021"
[dependencies]
chrono = "0.4.26"
clap = { version = "4.4.0", features = ["derive"] }
log = "0.4.20"
reqwest = { version = "0.11.18", features = ["blocking", "json"] }
serde = { version = "1.0.184", features = ["serde_derive"] }
serde_json = "1.0.105"
simplelog = "0.12.1"
toml = "0.7.6"

132
status_cloud/src/main.rs
View file

@ -1,103 +1,114 @@
use serde::{Deserialize, Serialize};
use reqwest::blocking::Client;
use toml;
use clap::Parser;
use log::{debug, error, warn};
use reqwest::blocking::Client;
use serde::{Deserialize, Serialize};
use std::process::Command;
// TODO: logging
fn main() -> Result<(), Box<dyn std::error::Error>> {
let args = CliArgs::parse();
println!("Opening Config file: {}", args.config_file);
println!("File exists: {}", std::fs::metadata(args.config_file.clone()).is_ok());
if args.debug {
let _ = simplelog::SimpleLogger::init(
simplelog::LevelFilter::Debug,
simplelog::Config::default(),
);
} else {
let _ = simplelog::SimpleLogger::init(
simplelog::LevelFilter::Info,
simplelog::Config::default(),
);
}
debug!("Opening Config file: {}", args.config_file);
debug!(
"Config file exists: {}",
std::fs::metadata(args.config_file.clone()).is_ok()
);
let file_contents = match std::fs::read_to_string(args.config_file) {
Ok(val) => val,
Err(e) => {
println!("Could not read file: {}", e.to_string());
return Ok(());
error!("Could not read config file: {}", e.to_string());
panic!("{}", e);
}
};
let cfg: Config = match toml::from_str(file_contents.as_str()) {
Ok(val) => val,
Err(e) => {
println!("Could not parse file: {}", e.to_string());
return Ok(());
error!("Could not parse config file: {}", e.to_string());
panic!("{}", e);
}
};
let mut body_content: String = format!("*Last Updated:* {} \n", chrono::Local::now().format("%D - %H:%M:%S"));
let mut drives: Vec<String> = vec![];
{
let rust_drives = match std::fs::read_dir("/dev/") {
Ok(val) => val,
Err(e) => {
println!("Error opening /dev/: {}", e.to_string());
return Ok(());
}
};
let mut body_content: String = format!(
"*Last Updated:* {} \n",
chrono::Local::now().format("%D - %H:%M:%S")
);
for path in rust_drives {
match path {
Ok(ref val) => {
let tmp = val.path().to_string_lossy().to_string();
if tmp.starts_with("/dev/sd") {
if tmp.len() == 8 {
drives.push(tmp);
}
}
},
_ => {}
let mut drives: Vec<String> = vec![];
match std::fs::read_dir("/dev/") {
Ok(paths) => {
for path in paths.flatten() {
let tmp = path.path().to_string_lossy().to_string();
if tmp.starts_with("/dev/sd") && tmp.len() == 8 {
drives.push(tmp);
}
}
}
}
Err(e) => {
error!("Error opening /dev/: {}", e.to_string());
panic!("{}", e);
}
};
{
let mut drive_temps: Vec<String> = vec![];
for drive in drives {
let output = match Command::new(args.hddtemp_executable.clone()).arg(drive.clone()).output() {
Ok(val) => val,
let output = match Command::new(args.hddtemp_executable.clone())
.arg(drive.clone())
.output()
{
Ok(val) => String::from_utf8_lossy(&val.stdout).into_owned(),
Err(e) => {
println!("Error running hddtemp: {}", e.to_string());
println!("Drive was: '{}'", drive);
return Ok(());
warn!("Error running hddtemp: {}", e.to_string());
warn!("Drive was: '{}'", drive);
"".to_string()
}
};
let tmp = String::from_utf8_lossy(&output.stdout).into_owned();
if !tmp.contains("sensor") {
drive_temps.push(tmp.replace("\n", ""));
if !output.contains("sensor") {
drive_temps.push(output.replace('\n', "?"));
} else {
drive_temps.push(tmp[0..9].to_string() + " No Sensor");
drive_temps.push(output[0..9].to_string() + " No Sensor");
}
}
body_content.push_str("## Hard Drive Temps\n");
body_content.push_str(drive_temps.join("\n").as_str());
}
Client::new()
.put(format!("https://{}/index.php/apps/notes/api/v1/notes/{}", cfg.server_url.clone(), cfg.note_id.clone()))
.put(format!(
"https://{}/index.php/apps/notes/api/v1/notes/{}",
cfg.server_url.clone(),
cfg.note_id.clone()
))
.header("Accept", "application/json")
.header("Content-Type", "application/json")
.basic_auth(cfg.user.clone(), Some(cfg.pswd.clone()))
.body(serde_json::to_string(&NoteUpdate {content: body_content}).unwrap())
.send()?;
.body(
serde_json::to_string(&NoteUpdate {
content: body_content,
})
.unwrap(),
)
.send()?;
Ok(())
Ok(())
}
#[derive(Serialize, Deserialize, Debug)]
struct Note {
id: usize,
@ -107,7 +118,7 @@ struct Note {
title: String,
category: String,
content: String,
favorite: bool
favorite: bool,
}
#[derive(Serialize, Deserialize, Debug)]
@ -120,13 +131,13 @@ struct Config {
user: String,
pswd: String,
note_id: String,
server_url: String
server_url: String,
}
impl Default for Config {
fn default() -> Self {
Self {
user: "".to_string(),
user: "".to_string(),
pswd: "".to_string(),
note_id: "".to_string(),
server_url: "".to_string(),
@ -137,10 +148,13 @@ impl Default for Config {
#[derive(Parser, Debug)]
#[command(author, version, about, long_about=None)]
struct CliArgs {
/// Path to config .toml file
/// Path to config .toml file
#[arg(short, long)]
config_file: String,
#[arg(short, long)]
hddtemp_executable: String,
#[arg(short, long)]
debug: bool,
}