grimhilt/nextsync-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(config): create a proper config file with proper settings manipulation

Browse Source
This commit is contained in:
grimhilt
2024-02-20 21:25:21 +01:00
parent 6a11bb494b
commit 287953c086
13 changed files with 328 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/services/api.rs
View File

@@ -42,12 +42,19 @@ impl ApiBuilder {
}
pub fn set_url(&mut self, method: Method, url: &str) -> &mut ApiBuilder {
self.request = Some(self.client.request(method, url));
let mut new_url = url.to_owned();
if let Some(active) = config::get_core("force_insecure") {
if active == "true" {
new_url = url.replace("https", "http");
}
}
self.request = Some(self.client.request(method, new_url));
self
}
pub fn build_request(&mut self, method: Method, path: &str) -> &mut ApiBuilder {
let remote = match config::get("remote") {
let remote = match config::get_remote("origin") {
Some(r) => r,
None => {
eprintln!("fatal: unable to find a remote");
@@ -64,8 +71,8 @@ impl ApiBuilder {
if path != "/" {
url.push_str(path);
}
self.request = Some(self.client.request(method, url));
self
self.set_url(method, &url)
}
pub fn set_req(&mut self, meth: Method, p: &str, api_props: &ApiProps) -> &mut ApiBuilder {
@@ -79,8 +86,8 @@ impl ApiBuilder {
if p != "/" {
url.push_str(p);
}
self.request = Some(self.client.request(meth, url));
self
self.set_url(meth, &url)
}
pub fn set_basic_auth(&mut self, login: String, pwd: String) -> &mut ApiBuilder {

2
src/services/copy.rs
View File

@@ -24,7 +24,7 @@ impl Copy {
pub fn set_url_copy(&mut self, url: &str, destination: &str) -> &mut Copy {
self.api_builder.build_request(Method::from_bytes(b"COPY").unwrap(), url);
let remote = match config::get("remote") {
let remote = match config::get_remote("origin") {
Some(r) => r,
None => {
eprintln!("fatal: unable to find a remote");

2
src/services/move.rs
View File

@@ -25,7 +25,7 @@ impl Move {
pub fn set_url_move(&mut self, url: &str, destination: &str) -> &mut Move {
self.api_builder.build_request(Method::from_bytes(b"MOVE").unwrap(), url);
let remote = match config::get("remote") {
let remote = match config::get_remote("origin") {
Some(r) => r,
None => {
eprintln!("fatal: unable to find a remote");

2
src/services/req_props.rs
View File

@@ -67,7 +67,7 @@ impl ApiCall for ReqProps {
}
fn set_url(&mut self, url: &str) -> &mut ReqProps {
let remote = match config::get("remote") {
let remote = match config::get_remote("origin") {
Some(r) => r,
None => {
eprintln!("fatal: unable to find a remote");

2
src/services/request_manager.rs
View File

@@ -39,7 +39,7 @@ impl RequestManager {
{
if self.host.is_none()
{
let remote = match config::get("remote") {
let remote = match config::get_remote("origin") {
Some(r) => r,
None => {
// todo ask user instead