Zynh0722
/
nyazoom
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moving

main
Zynh0722 2023-04-09 10:26:39 -07:00
parent 09af81274b
commit 92a8330cbf
6 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
dist/css/link.css vendored Normal file
View File

0
dist/css/style.css → dist/css/main.css vendored
View File

1
dist/hello.txt vendored
View File

@ -1 +0,0 @@
uwu mchelloface

2
dist/index.html vendored
View File

@ -5,7 +5,7 @@
<title>NyaZoom</title> <title>NyaZoom</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="css/style.css" rel="stylesheet"> <link href="css/main.css" rel="stylesheet">
<script> <script>
fetch("https://catfact.ninja/fact") fetch("https://catfact.ninja/fact")
.then(data => data.json()) .then(data => data.json())

12
dist/link.html vendored Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="css/link.css" rel="stylesheet">
</head>
<body>
</body>
</html>

25
src/main.rs
View File

@ -145,8 +145,6 @@ where
)); ));
}; };
// let mut file = File::create(file_name).await.unwrap();
let file_name = Path::new(".cache/serve").join(format!("{file_name}.zip")); let file_name = Path::new(".cache/serve").join(format!("{file_name}.zip"));
let file = spawn_blocking(move || std::fs::File::create(&file_name)).await??; let file = spawn_blocking(move || std::fs::File::create(&file_name)).await??;
@ -158,7 +156,6 @@ where
let zip_handles: Vec<JoinHandle<_>> = directories let zip_handles: Vec<JoinHandle<_>> = directories
.map(|entry| entry.unwrap()) .map(|entry| entry.unwrap())
// .map(|file_name| ZipEntryBuilder::new(file_name, Compression::Deflate))
.map(|entry| { .map(|entry| {
let writer = writer.clone(); let writer = writer.clone();
let path = entry.path(); let path = entry.path();
@ -169,7 +166,15 @@ where
let options = zip::write::FileOptions::default() let options = zip::write::FileOptions::default()
.compression_method(zip::CompressionMethod::DEFLATE); .compression_method(zip::CompressionMethod::DEFLATE);
writer.start_file(entry.file_name().to_str().unwrap().to_owned(), options)?; writer.start_file(
entry.file_name().to_str().ok_or_else(|| {
io::Error::new(
io::ErrorKind::Other,
"Filename not valid unicode".to_owned(),
)
})?,
options,
)?;
std::io::copy(&mut file, &mut *writer) std::io::copy(&mut file, &mut *writer)
}) })
@ -235,6 +240,14 @@ fn get_random_name(len: usize) -> String {
Alphanumeric.sample_string(&mut rng, len) Alphanumeric.sample_string(&mut rng, len)
} }
static UNITS: [&str; 6] = ["KiB", "MiB", "GiB", "TiB", "PiB", "EiB"];
// This function is actually rather interesting to me, I understand that rust is
// very powerful, and its very safe, but i find it rather amusing that the [] operator
// doesn't check bounds, meaning it can panic at runtime. Usually rust is very
// very careful about possible panics
//
// although this function shouldn't be able to panic at runtime due to known bounds
// being listened to
#[inline] #[inline]
fn bytes_to_human_readable(bytes: u64) -> String { fn bytes_to_human_readable(bytes: u64) -> String {
let mut running = bytes as f64; let mut running = bytes as f64;
@ -244,7 +257,5 @@ fn bytes_to_human_readable(bytes: u64) -> String {
count += 1; count += 1;
} }
let prefixes = ["K", "M", "G", "T", "P", "E"]; format!("{:.2} {}", running, UNITS[count - 1])
format!("{:.2} {}iB", running, prefixes[count - 1])
} }