rzerres/advotrackerd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update copyright and year

Browse Source 
Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2021-05-23 14:38:58 +02:00
parent f9eeb4b6bc
commit f690959f0d
5 changed files with 118 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database.rs
View File

@@ -1,8 +1,8 @@
// SPDX-License-Identifier: 0BSD, MIT
/* /*
* advotracker - Hotline tackingtool for Advocats * advotracker - Hotline tackingtool for Advocats
* *
* Copyright 2019 Ralf Zerres <ralf.zerres@networkx.de> * Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
* SPDX-License-Identifier: (0BSD or MIT)
*/ */
// module: db // module: db

6
src/lib.rs
View File

@@ -1,8 +1,8 @@
// SPDX-License-Identifier: 0BSD, MIT
/* /*
* advotracker - Hotline tackingtool for Advocats * advotracker - Hotline tackingtool for Advocats
* *
* Copyright 2020 Ralf Zerres <ralf.zerres@networkx.de> * Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
* SPDX-License-Identifier: 0BSD, MIT
*/ */
#![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)] #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
@@ -38,6 +38,6 @@ mod tests {
#[test] #[test]
fn internal_test() { fn internal_test() {
assert_eq!(8, internal_adder(4, 4)); assert_eq!(8, internal_adder(4, 4));
} }
} }

203
src/main.rs
View File

@@ -1,7 +1,8 @@
/* advotracker infrastructure. // SPDX-License-Identifier: 0BSD, MIT
/*
* advotracker - Hotline tackingtool for Advocats
* *
* Copyright 2020 Ralf Zerres <ralf.zerres@networkx.de> * Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
* SPDX-License-Identifier: (0BSD or MIT)
*/ */
// Rust nightly supports procedural macros! // Rust nightly supports procedural macros!
@@ -51,9 +52,9 @@ impl AdvoTrackerSubscriber {
fn run_subcommand(matches: &ArgMatches) -> Result<(), String> { fn run_subcommand(matches: &ArgMatches) -> Result<(), String> {
//info!("inside run_subcommand"); //info!("inside run_subcommand");
match matches.subcommand() { match matches.subcommand() {
("config", Some(cmd)) => run_config(cmd), ("config", Some(cmd)) => run_config(cmd),
("test", Some(cmd)) => run_test(cmd), ("test", Some(cmd)) => run_test(cmd),
_ => Ok(()), _ => Ok(()),
} }
} }
@@ -68,11 +69,11 @@ fn run_test(matches: &ArgMatches) -> Result<(), String> {
//info!("inside run_test"); //info!("inside run_test");
if let Some(matches) = matches.subcommand_matches("test") { if let Some(matches) = matches.subcommand_matches("test") {
if matches.is_present("debug") { if matches.is_present("debug") {
println!("test: Printing debug info..."); println!("test: Printing debug info...");
} else { } else {
println!("test: Printing normally..."); println!("test: Printing normally...");
} }
} }
Ok(()) Ok(())
} }
@@ -95,8 +96,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let span = tracing::span!(Level::TRACE, "advotracker_main"); let span = tracing::span!(Level::TRACE, "advotracker_main");
let _enter = span.enter(); let _enter = span.enter();
let subscriber = fmt::Subscriber::builder() let subscriber = fmt::Subscriber::builder()
.with_env_filter("advotracker=trace") .with_env_filter("advotracker=trace")
.finish(); .finish();
// initialize logger // initialize logger
// TODO: exchange with tracing! // TODO: exchange with tracing!
@@ -104,109 +105,109 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
//info!("Commencing the proxy!"); //info!("Commencing the proxy!");
tracing::subscriber::with_default(subscriber, || { tracing::subscriber::with_default(subscriber, || {
// get system environment // get system environment
let mut lang = env::var("LANG").unwrap_or("en".to_string()); let mut lang = env::var("LANG").unwrap_or("en".to_string());
let mut res = t!("parse.environment", lang); let mut res = t!("parse.environment", lang);
let mut state = t!("state.started", lang); let mut state = t!("state.started", lang);
trace!(target: "advotracker", message = ?res, state = ?state); trace!(target: "advotracker", message = ?res, state = ?state);
//debug!(message = ?res, state = ?state); //debug!(message = ?res, state = ?state);
trace!(target: "advotracker", environment = "system", lang = ?lang); trace!(target: "advotracker", environment = "system", lang = ?lang);
// get testing environment (.env) // get testing environment (.env)
dotenv().ok(); dotenv().ok();
match envy::from_env::<Environment>() { match envy::from_env::<Environment>() {
Ok(environment) => { Ok(environment) => {
if environment.test_lang != lang { lang = environment.test_lang; } if environment.test_lang != lang { lang = environment.test_lang; }
}, },
Err(e) => { debug!(target: "advotracker", "{}", e); } Err(e) => { debug!(target: "advotracker", "{}", e); }
} }
res = t!("parse.environment", lang); res = t!("parse.environment", lang);
trace!(target: "advotracker", environment = "envy", lang = ?lang); trace!(target: "advotracker", environment = "envy", lang = ?lang);
state = t!("state.finished", lang); state = t!("state.finished", lang);
trace!(target: "advotracker", message = ?res, state = ?state); trace!(target: "advotracker", message = ?res, state = ?state);
//debug!(message = ?res, state = ?state); //debug!(message = ?res, state = ?state);
// initialize viperus structure // initialize viperus structure
let mut v = Viperus::new(); let mut v = Viperus::new();
// parse commandline arguments // parse commandline arguments
res = t!("parse.arguments", lang); res = t!("parse.arguments", lang);
state = t!("state.started", lang); state = t!("state.started", lang);
trace!(target: "advotracker", process = ?res, state = ?state); trace!(target: "advotracker", process = ?res, state = ?state);
//info!(target: "advotracker", "{}", res); //info!(target: "advotracker", "{}", res);
//debug!(message = ?res, state = ?state); //debug!(message = ?res, state = ?state);
//info!(target: "advotracker", "parsing commandline args"); //info!(target: "advotracker", "parsing commandline args");
let _ = parse_args(&mut v); let _ = parse_args(&mut v);
state = t!("state.finished", lang); state = t!("state.finished", lang);
trace!(target: "advotracker", process = ?res, state = ?state); trace!(target: "advotracker", process = ?res, state = ?state);
//trace!(target: "Viperus", "Config results: {:?}", v); //trace!(target: "Viperus", "Config results: {:?}", v);
/* /*
if verbose > 1 { if verbose > 1 {
for (key, value) in env::vars() { for (key, value) in env::vars() {
println!("{}={}", key, value); println!("{}={}", key, value);
} }
} }
*/ */
//state = t!("state.finished", lang); //state = t!("state.finished", lang);
//trace!(target: "advotracker", process = ?res, state = ?state); //trace!(target: "advotracker", process = ?res, state = ?state);
//debug!(message = ?res, state = ?state); //debug!(message = ?res, state = ?state);
/* /*
// handle subcommands // handle subcommands
if let Err(e) = run_subcommand(&matches) { if let Err(e) = run_subcommand(&matches) {
println!("Subcommand error: {}", e); println!("Subcommand error: {}", e);
process::exit(1); process::exit(1);
} }
*/ */
// Starting the program logic // Starting the program logic
res = t!("main.started", lang); res = t!("main.started", lang);
state = t!("state.started", lang); state = t!("state.started", lang);
//info!(target: "advotracker", "{}", res); //info!(target: "advotracker", "{}", res);
trace!(target: "advotracker", process = ?res, state = ?state); trace!(target: "advotracker", process = ?res, state = ?state);
//use advotracker_backend::*; //use advotracker_backend::*;
//use advotracker_backend::schema::users::dsl::*; //use advotracker_backend::schema::users::dsl::*;
/* /*
let connection = establish_connection(); let connection = establish_connection();
trace!( trace!(
target: "advotracker", target: "advotracker",
process = "Sqlite3", process = "Sqlite3",
status = "connected", status = "connected",
); );
*/ */
/* /*
//User::table.load(&connection); //User::table.load(&connection);
//user::belonging_to(users).load(&connection); //user::belonging_to(users).load(&connection);
use advotracker_backend::models::*; use advotracker_backend::models::*;
let results = users let results = users
//.filter(published.eq(true)) //.filter(published.eq(true))
.limit(5) .limit(5)
.load::<User>(&connection) .load::<User>(&connection)
.expect("Error loading users"); .expect("Error loading users");
println!("Displaying {} users", results.len()); println!("Displaying {} users", results.len());
for user in results { for user in results {
println!("{}", user.user_id); println!("{}", user.user_id);
println!("----------\n"); println!("----------\n");
println!("{}", user.first_name); println!("{}", user.first_name);
println!("{}", user.last_name); println!("{}", user.last_name);
println!("{}", user.alias); println!("{}", user.alias);
println!("{}", user.email); println!("{}", user.email);
} }
*/ */
state = t!("state.finished", lang); state = t!("state.finished", lang);
res = t!("main.finished", lang); res = t!("main.finished", lang);
//info!(target: "advotracker", "{}", res); //info!(target: "advotracker", "{}", res);
trace!(target: "advotracker", process = ?res, state = ?state); trace!(target: "advotracker", process = ?res, state = ?state);
}); });
Ok(()) Ok(())

7
src/parse_args.rs
View File

@@ -1,7 +1,8 @@
/* advotracker infrastructure. // SPDX-License-Identifier: 0BSD, MIT
/*
* advotracker - Hotline tackingtool for Advocats
* *
* Copyright 2020 Ralf Zerres <ralf.zerres@networkx.de> * Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
* SPDX-License-Identifier: (0BSD or MIT)
*/ */
use viperus::Viperus; use viperus::Viperus;

8
tests/integration_test.rs
View File

@@ -1,7 +1,13 @@
// SPDX-License-Identifier: 0BSD, MIT
/*
* advotracker - Hotline tackingtool for Advocats
*
* Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
*/
//use advotracker; //use advotracker;
#[test] #[test]
fn integration_add_two() { fn integration_add_two() {
assert_eq!(4, advotracker_backend::add_two(2)); assert_eq!(4, advotracker_backend::add_two(2));
} }