Some refactoring
This commit is contained in:
@@ -175,6 +175,7 @@ impl CommitManager {
|
|||||||
|
|
||||||
let api = prsr.retrieve_api();
|
let api = prsr.retrieve_api();
|
||||||
let token = self.parse_token(&api);
|
let token = self.parse_token(&api);
|
||||||
|
println!("Message: {}", token.message.clone().unwrap());
|
||||||
|
|
||||||
let mut dwn_loader = syncers::download::Download { api: api.clone() };
|
let mut dwn_loader = syncers::download::Download { api: api.clone() };
|
||||||
let mut song = models::song::Song::default();
|
let mut song = models::song::Song::default();
|
||||||
@@ -248,6 +249,7 @@ impl CommitManager {
|
|||||||
// new_usr.password = usr_mgr.user.password.clone();
|
// new_usr.password = usr_mgr.user.password.clone();
|
||||||
|
|
||||||
println!("Username: {}", usr_mgr.user.username);
|
println!("Username: {}", usr_mgr.user.username);
|
||||||
|
println!("Other: {}", usr_mgr.user.id);
|
||||||
|
|
||||||
let usr = usr_mgr.retrieve_user();
|
let usr = usr_mgr.retrieve_user();
|
||||||
let mut tok_mgr = managers::token_manager::TokenManager {
|
let mut tok_mgr = managers::token_manager::TokenManager {
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ impl TokenManager {
|
|||||||
let api = &self.api;
|
let api = &self.api;
|
||||||
let mut url = String::from(&api.url);
|
let mut url = String::from(&api.url);
|
||||||
url += &String::from(&api.endpoint);
|
url += &String::from(&api.endpoint);
|
||||||
url += &String::from("/");
|
// url += &String::from("/");
|
||||||
|
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -3,5 +3,4 @@ pub mod flags;
|
|||||||
pub mod icarus_action;
|
pub mod icarus_action;
|
||||||
pub mod song;
|
pub mod song;
|
||||||
pub mod token;
|
pub mod token;
|
||||||
pub mod upload_form;
|
pub mod upload_form;
|
||||||
pub mod user;
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
/*
|
|
||||||
use std::default::Default;
|
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
||||||
pub struct User {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for User {
|
|
||||||
fn default() -> Self {
|
|
||||||
User {
|
|
||||||
username: String::new(),
|
|
||||||
password: String::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl User {
|
|
||||||
pub fn _to_json(&self) -> Result<String, serde_json::Error> {
|
|
||||||
return serde_json::to_string_pretty(&self);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
Reference in New Issue
Block a user