13hannes11/ics-proxy
1
0
Fork 0
mirror of https://github.com/13hannes11/ics-proxy.git synced 2024-09-06 08:01:41 +02:00
Code Issues Projects Releases Wiki Activity

fix clippy warnings

Browse Source
This commit is contained in:
Hannes Kuchelmeister
2021-09-03 15:20:53 +02:00
parent 2b53cf63cf
commit 5170cd5343
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.rs
View File

@@ -17,7 +17,7 @@ use model::Link;
const REDIRECT_TIMEOUT_S: i32 = 2; const REDIRECT_TIMEOUT_S: i32 = 2;
#[derive(Clone)] #[derive(Clone)]
struct CONFIG { struct Config {
root: String, root: String,
} }
@@ -58,7 +58,7 @@ async fn edit_page(
tmpl: web::Data<tera::Tera>, tmpl: web::Data<tera::Tera>,
query: web::Query<HashMap<String, String>>, query: web::Query<HashMap<String, String>>,
db_pool: web::Data<Pool<Sqlite>>, db_pool: web::Data<Pool<Sqlite>>,
conf: web::Data<CONFIG>, conf: web::Data<Config>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
// one uuid: 9228c1a4-8956-4f1c-8b5f-53cc575bd78 // one uuid: 9228c1a4-8956-4f1c-8b5f-53cc575bd78
if let Some(uuid_str) = query.get("uuid") { if let Some(uuid_str) = query.get("uuid") {
@@ -130,7 +130,7 @@ async fn edit_process(
tmpl: web::Data<tera::Tera>, tmpl: web::Data<tera::Tera>,
query: web::Query<HashMap<String, String>>, query: web::Query<HashMap<String, String>>,
db_pool: web::Data<Pool<Sqlite>>, db_pool: web::Data<Pool<Sqlite>>,
config: web::Data<CONFIG>, config: web::Data<Config>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
// TODO: implement handling // TODO: implement handling
if let Some(uuid_str) = query.get("uuid") { if let Some(uuid_str) = query.get("uuid") {
@@ -139,7 +139,7 @@ async fn edit_process(
return error_page(tmpl, "url cannot contain url of ics-proxy".to_string()); return error_page(tmpl, "url cannot contain url of ics-proxy".to_string());
}; };
if let Err(_) = Url::parse(destination) { if Url::parse(destination).is_err() {
return error_page(tmpl, "could not parse url".to_string()); return error_page(tmpl, "could not parse url".to_string());
} }
@@ -173,7 +173,7 @@ async fn index_process(
tmpl: web::Data<tera::Tera>, tmpl: web::Data<tera::Tera>,
query: web::Query<HashMap<String, String>>, query: web::Query<HashMap<String, String>>,
db_pool: web::Data<Pool<Sqlite>>, db_pool: web::Data<Pool<Sqlite>>,
config: web::Data<CONFIG>, config: web::Data<Config>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
if query.get("create").is_some() { if query.get("create").is_some() {
let uuid = Uuid::new_v4(); let uuid = Uuid::new_v4();
@@ -185,7 +185,7 @@ async fn index_process(
return error_page(tmpl, "url cannot contain url of ics-proxy".to_string()); return error_page(tmpl, "url cannot contain url of ics-proxy".to_string());
}; };
if let Err(_) = Url::parse(destination) { if Url::parse(destination).is_err() {
return error_page(tmpl, "could not parse url".to_string()); return error_page(tmpl, "could not parse url".to_string());
} }
@@ -220,7 +220,7 @@ async fn index_process(
match query.get("link") { match query.get("link") {
Some(link) => { Some(link) => {
// Splitting string and getting uuid, alternatively pretend whole string is uuid // Splitting string and getting uuid, alternatively pretend whole string is uuid
let vec: Vec<&str> = link.split("/").collect(); let vec: Vec<&str> = link.split('/').collect();
let mut uuid_str = link.to_string(); let mut uuid_str = link.to_string();
if vec.len() > 1 { if vec.len() > 1 {
@@ -279,7 +279,7 @@ async fn main() -> std::io::Result<()> {
let base_url = let base_url =
std::env::var("BASE_URL").expect("BASE_URL environemt variable error, make sure it is set"); std::env::var("BASE_URL").expect("BASE_URL environemt variable error, make sure it is set");
let conf = CONFIG { let conf = Config {
root: format!("{}://{}", protocol, base_url), root: format!("{}://{}", protocol, base_url),
}; };