cleaning warnings

This commit is contained in:
grimhilt 2023-08-27 22:57:05 +02:00
parent 863e3bd68a
commit a35c7b20d8
13 changed files with 16 additions and 50 deletions

12
Cargo.lock generated
View File

@ -777,18 +777,18 @@ checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.59" version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.28" version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -1069,9 +1069,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.18" version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

View File

@ -18,7 +18,6 @@ pub struct AddArgs<'a> {
// todo match deleted files // todo match deleted files
// todo match weird reg expression // todo match weird reg expression
// todo -A == .
pub fn add(args: AddArgs) { pub fn add(args: AddArgs) {
// write all modification in the index // write all modification in the index
if args.all { if args.all {
@ -104,7 +103,6 @@ fn add_folder_content(path: PathBuf, added_files: &mut Vec<String>) {
} }
} }
} }
} }
fn write_all() { fn write_all() {
@ -114,6 +112,6 @@ fn write_all() {
.create(true) .create(true)
.open(index::path()).expect("Cannot open index file"); .open(index::path()).expect("Cannot open index file");
for obj in objs { for obj in objs {
writeln!(index_file, "{}", path_buf_to_string(obj.path.clone())); let _ = writeln!(index_file, "{}", path_buf_to_string(obj.path.clone()));
} }
} }

View File

@ -91,10 +91,10 @@ pub fn clone(args: CloneArgs) {
} }
} }
let downloader = Downloader::new() Downloader::new()
.set_api_props(api_props.clone()) .set_api_props(api_props.clone())
.set_files(files) .set_files(files)
//.should_log() .should_log()
.download(ref_path.clone(), Some(&save_blob)); .download(ref_path.clone(), Some(&save_blob));
} }

View File

@ -35,7 +35,7 @@ pub fn pull() {
} }
} }
let downloader = Downloader::new() Downloader::new()
.set_api_props(get_api_props()) .set_api_props(get_api_props())
.set_files(files) .set_files(files)
.should_log() .should_log()

View File

@ -96,7 +96,6 @@ impl PushFactory {
State::Moved => Box::new(Moved { obj }), State::Moved => Box::new(Moved { obj }),
State::Copied => Box::new(Copied { obj }), State::Copied => Box::new(Copied { obj }),
State::Default => todo!(), State::Default => todo!(),
_ => todo!(),
} }
} }

View File

@ -12,8 +12,6 @@ pub fn remote_diff() {
.unwrap() .unwrap()
.strip_prefix(path::repo_root()).unwrap().to_path_buf(); .strip_prefix(path::repo_root()).unwrap().to_path_buf();
let (folders, files) = get_diff(relative_p); let (folders, files) = get_diff(relative_p);
dbg!(files);
return;
for folder in folders { for folder in folders {
println!("should pull {}", folder.clone().relative_s.unwrap()); println!("should pull {}", folder.clone().relative_s.unwrap());

View File

@ -1,6 +1,6 @@
use std::fs::File; use std::fs::File;
use std::path::PathBuf; use std::path::PathBuf;
use std::io::{self, Lines, BufReader}; use std::io::{Lines, BufReader};
use std::collections::HashMap; use std::collections::HashMap;
use crypto::digest::Digest; use crypto::digest::Digest;
use crypto::sha1::Sha1; use crypto::sha1::Sha1;

View File

@ -41,7 +41,7 @@ impl Copy {
self.api_builder.send().await self.api_builder.send().await
} }
pub fn overwrite(&mut self, overwrite: bool) -> &mut Copy { pub fn _overwrite(&mut self, overwrite: bool) -> &mut Copy {
self.api_builder.set_header("Overwrite", HeaderValue::from_str({ self.api_builder.set_header("Overwrite", HeaderValue::from_str({
if overwrite { "T" } else { "F" } if overwrite { "T" } else { "F" }
}).unwrap()); }).unwrap());

View File

@ -42,7 +42,7 @@ impl Downloader {
self self
} }
pub fn add_file(&mut self, file: ObjProps) -> &mut Downloader { pub fn _add_file(&mut self, file: ObjProps) -> &mut Downloader {
self.files.push(file); self.files.push(file);
self self
} }

View File

@ -41,7 +41,7 @@ impl Move {
self.api_builder.send().await self.api_builder.send().await
} }
pub fn overwrite(&mut self, overwrite: bool) -> &mut Move { pub fn _overwrite(&mut self, overwrite: bool) -> &mut Move {
self.api_builder.set_header("Overwrite", HeaderValue::from_str({ self.api_builder.set_header("Overwrite", HeaderValue::from_str({
if overwrite { "T" } else { "F" } if overwrite { "T" } else { "F" }
}).unwrap()); }).unwrap());

View File

@ -223,32 +223,3 @@ fn create_obj(name: String, content: &str) -> io::Result<()> {
Ok(()) Ok(())
} }
// get the last time a blob synced with remote
pub fn get_timestamp(path_s: String) -> Option<i64> {
let mut obj_p = path::objects();
let (dir, res) = hash_obj(&path_s);
obj_p.push(dir);
obj_p.push(res);
match read::read_lines(obj_p) {
Ok(mut reader) => {
match reader.next() {
Some(Ok(line)) => {
let mut data = line.rsplit(' ');
if data.clone().count() >= 2 {
Some(data.nth_back(1).unwrap().parse::<i64>().unwrap())
} else {
None
}
},
_ => None,
}
},
Err(err) => {
eprintln!("error reading object: {}", err);
None
},
}
}

View File

@ -113,7 +113,7 @@ impl Blob {
refs_p.push(dir); refs_p.push(dir);
if !refs_p.exists() { if !refs_p.exists() {
fs::create_dir_all(refs_p.clone()); let _ = fs::create_dir_all(refs_p.clone());
} }
refs_p.push(res); refs_p.push(res);
refs_p refs_p

View File

@ -1,5 +1,5 @@
use std::path::PathBuf; use std::path::PathBuf;
use crate::{services::{req_props::{ObjProps, ReqProps}, api::ApiError}, store::object::{blob::Blob, Object}, commands::status::State}; use crate::{services::{req_props::ObjProps, api::ApiError}, store::object::{blob::Blob, Object}, commands::status::State};
use std::collections::HashMap; use std::collections::HashMap;
use super::{path::{path_buf_to_string, self}, read}; use super::{path::{path_buf_to_string, self}, read};