Compare commits
	
		
			1 Commits
		
	
	
		
			master
			...
			0db2415ddf
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0db2415ddf | 
							
								
								
									
										103
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										103
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							| @@ -130,7 +130,7 @@ dependencies = [ | ||||
|  "futures-core", | ||||
|  "futures-util", | ||||
|  "mio", | ||||
|  "socket2 0.5.9", | ||||
|  "socket2", | ||||
|  "tokio", | ||||
|  "tracing", | ||||
| ] | ||||
| @@ -192,7 +192,7 @@ dependencies = [ | ||||
|  "serde_json", | ||||
|  "serde_urlencoded", | ||||
|  "smallvec", | ||||
|  "socket2 0.5.9", | ||||
|  "socket2", | ||||
|  "time", | ||||
|  "tracing", | ||||
|  "url", | ||||
| @@ -236,6 +236,15 @@ dependencies = [ | ||||
|  "syn", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "addr2line" | ||||
| version = "0.24.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" | ||||
| dependencies = [ | ||||
|  "gimli", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "adler2" | ||||
| version = "2.0.0" | ||||
| @@ -364,6 +373,21 @@ version = "1.4.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" | ||||
|  | ||||
| [[package]] | ||||
| name = "backtrace" | ||||
| version = "0.3.74" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" | ||||
| dependencies = [ | ||||
|  "addr2line", | ||||
|  "cfg-if", | ||||
|  "libc", | ||||
|  "miniz_oxide", | ||||
|  "object", | ||||
|  "rustc-demangle", | ||||
|  "windows-targets", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "base64" | ||||
| version = "0.22.1" | ||||
| @@ -449,9 +473,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | ||||
|  | ||||
| [[package]] | ||||
| name = "clap" | ||||
| version = "4.5.50" | ||||
| version = "4.5.39" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" | ||||
| checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" | ||||
| dependencies = [ | ||||
|  "clap_builder", | ||||
|  "clap_derive", | ||||
| @@ -459,9 +483,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "clap_builder" | ||||
| version = "4.5.50" | ||||
| version = "4.5.39" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" | ||||
| checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" | ||||
| dependencies = [ | ||||
|  "anstream", | ||||
|  "anstyle", | ||||
| @@ -471,9 +495,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "clap_derive" | ||||
| version = "4.5.49" | ||||
| version = "4.5.32" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" | ||||
| checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" | ||||
| dependencies = [ | ||||
|  "heck", | ||||
|  "proc-macro2", | ||||
| @@ -742,6 +766,12 @@ dependencies = [ | ||||
|  "wasi 0.14.2+wasi-0.2.4", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "gimli" | ||||
| version = "0.31.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" | ||||
|  | ||||
| [[package]] | ||||
| name = "h2" | ||||
| version = "0.3.26" | ||||
| @@ -1026,9 +1056,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" | ||||
|  | ||||
| [[package]] | ||||
| name = "libc" | ||||
| version = "0.2.174" | ||||
| version = "0.2.171" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" | ||||
| checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" | ||||
|  | ||||
| [[package]] | ||||
| name = "libredox" | ||||
| @@ -1082,9 +1112,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "log" | ||||
| version = "0.4.28" | ||||
| version = "0.4.27" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" | ||||
| checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" | ||||
|  | ||||
| [[package]] | ||||
| name = "memchr" | ||||
| @@ -1125,6 +1155,15 @@ version = "0.1.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" | ||||
|  | ||||
| [[package]] | ||||
| name = "object" | ||||
| version = "0.36.7" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" | ||||
| dependencies = [ | ||||
|  "memchr", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "once_cell" | ||||
| version = "1.21.3" | ||||
| @@ -1306,6 +1345,12 @@ version = "0.8.5" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" | ||||
|  | ||||
| [[package]] | ||||
| name = "rustc-demangle" | ||||
| version = "0.1.24" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" | ||||
|  | ||||
| [[package]] | ||||
| name = "rustc-hash" | ||||
| version = "2.1.1" | ||||
| @@ -1432,16 +1477,6 @@ dependencies = [ | ||||
|  "windows-sys 0.52.0", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "socket2" | ||||
| version = "0.6.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" | ||||
| dependencies = [ | ||||
|  "libc", | ||||
|  "windows-sys 0.59.0", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "stable_deref_trait" | ||||
| version = "1.2.0" | ||||
| @@ -1530,18 +1565,19 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "tokio" | ||||
| version = "1.48.0" | ||||
| version = "1.45.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" | ||||
| checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" | ||||
| dependencies = [ | ||||
|  "backtrace", | ||||
|  "bytes", | ||||
|  "libc", | ||||
|  "mio", | ||||
|  "parking_lot", | ||||
|  "pin-project-lite", | ||||
|  "signal-hook-registry", | ||||
|  "socket2 0.6.0", | ||||
|  "windows-sys 0.61.2", | ||||
|  "socket2", | ||||
|  "windows-sys 0.52.0", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| @@ -1657,12 +1693,6 @@ dependencies = [ | ||||
|  "wit-bindgen-rt", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "windows-link" | ||||
| version = "0.2.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" | ||||
|  | ||||
| [[package]] | ||||
| name = "windows-sys" | ||||
| version = "0.52.0" | ||||
| @@ -1681,15 +1711,6 @@ dependencies = [ | ||||
|  "windows-targets", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "windows-sys" | ||||
| version = "0.61.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" | ||||
| dependencies = [ | ||||
|  "windows-link", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "windows-targets" | ||||
| version = "0.52.6" | ||||
|   | ||||
| @@ -6,13 +6,13 @@ edition = "2024" | ||||
| # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html | ||||
|  | ||||
| [dependencies] | ||||
| clap = { version = "4.5.50", features = ["derive", "env"] } | ||||
| clap = { version = "4.5.39", features = ["derive", "env"] } | ||||
| tar = "0.4.44" | ||||
| actix-web = "4.11.0" | ||||
| actix = "0.13.5" | ||||
| lazy_static = "1.5.0" | ||||
| log = "0.4.28" | ||||
| log = "0.4.27" | ||||
| env_logger = "0.11.8" | ||||
| actix-web-httpauth = "0.8.2" | ||||
| askama = "0.14.0" | ||||
| tokio = "1.48.0" | ||||
| tokio = "1.45.0" | ||||
|   | ||||
							
								
								
									
										11
									
								
								src/main.rs
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								src/main.rs
									
									
									
									
									
								
							| @@ -1,5 +1,5 @@ | ||||
| use std::fs::File; | ||||
| use std::io::Write; | ||||
| use std::io::{ErrorKind, Write}; | ||||
| use std::path::{Path, PathBuf}; | ||||
| use std::pin::Pin; | ||||
| use std::sync::mpsc; | ||||
| @@ -102,8 +102,9 @@ struct SendWrapper(mpsc::SyncSender<Vec<u8>>); | ||||
| impl Write for SendWrapper { | ||||
|     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> { | ||||
|         if let Err(e) = self.0.send(buf.to_vec()) { | ||||
|             log::error!("Failed to send a chunk of data! {e}"); | ||||
|             return Err(std::io::Error::other( | ||||
|             log::error!("Failed to send a chunk of data! {}", e); | ||||
|             return Err(std::io::Error::new( | ||||
|                 ErrorKind::Other, | ||||
|                 "Failed to send a chunk of data!", | ||||
|             )); | ||||
|         } | ||||
| @@ -127,7 +128,7 @@ impl FileStreamer { | ||||
|  | ||||
|             for file in files_list() { | ||||
|                 let file_path = &file.to_str().unwrap().replace(&ARGS.target_dir, "")[1..]; | ||||
|                 log::debug!("Add {file_path} to archive"); | ||||
|                 log::debug!("Add {} to archive", file_path); | ||||
|                 tar.append_file( | ||||
|                     file_path, | ||||
|                     &mut File::open(&file).expect("Failed to open file"), | ||||
| @@ -149,7 +150,7 @@ impl Stream for FileStreamer { | ||||
|         match self.receive.recv() { | ||||
|             Ok(d) => Poll::Ready(Some(Ok(Bytes::copy_from_slice(&d)))), | ||||
|             Err(e) => { | ||||
|                 log::error!("Recv error: {e}"); | ||||
|                 log::error!("Recv error: {}", e); | ||||
|                 Poll::Ready(None) | ||||
|             } | ||||
|         } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user