Compare commits

...

11 commits
0.1.6 ... main

Author SHA1 Message Date
Yuhki
118b4f5fe0
Update README.md 2025-05-30 23:20:09 +02:00
Yuhki
29bd052ef4 chore: add package.sh script and apply code formatting 2025-05-30 23:18:05 +02:00
Yuhki
bece26c433 Add support for resuming partial downloads using HTTP Range requests
- Modified `download_single_file` to check for an existing partially downloaded file
- If present, uses HTTP Range headers to resume the download from the last byte
- Opens file in append mode rather than overwriting it
- Handles HTTP 206 Partial Content and 416 Range Not Satisfiable responses
- Updates progress bar and download state accordingly during resumed downloads
2025-05-27 18:27:30 +02:00
Yuhki
cc837ec0cf Add support to fetch and display game versions in selection menu 2025-05-26 07:13:10 +02:00
Yuhki
f6477359e9 Fix unused import warnings for windows 2025-05-24 03:00:33 +02:00
Yuhki
8c0ee23828 Enhance download progress tracking 2025-05-24 02:50:10 +02:00
Yuhki
278b7a5794 Update util.rs 2025-05-23 16:53:11 +02:00
Yuhki
808f929e62 Add URL logging to urls.txt during size calculation phase 2025-05-23 16:50:28 +02:00
Yuhki
7bd0b77bd0 add text hints for wheelchair users 2025-05-16 14:40:11 +02:00
Yuhki
9d1c7143ec
Update README.md 2025-05-15 23:23:41 +02:00
Yuhki
1ba74834fd
Update README.md 2025-05-15 23:23:17 +02:00
17 changed files with 510 additions and 176 deletions

48
.gitignore vendored
View file

@ -1,22 +1,26 @@
# Generated by Cargo # Generated by Cargo
# will have compiled files and executables # will have compiled files and executables
debug/ debug/
target/ target/
.idea/ .idea/
# These are backup files generated by rustfmt # packaging
**/*.rs.bk dist/
# Error / Debug Logging # These are backup files generated by rustfmt
*.log **/*.rs.bk
# MSVC Windows builds of rustc generate these, which store debugging information # Error / Debug Logging
*.pdb *.log
*.txt
# RustRover # MSVC Windows builds of rustc generate these, which store debugging information
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can *.pdb
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder. # RustRover
#.idea/ # JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

73
Cargo.lock generated
View file

@ -113,6 +113,19 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "console"
version = "0.15.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
dependencies = [
"encode_unicode",
"libc",
"once_cell",
"unicode-width",
"windows-sys 0.59.0",
]
[[package]] [[package]]
name = "core-foundation" name = "core-foundation"
version = "0.9.4" version = "0.9.4"
@ -150,9 +163,9 @@ dependencies = [
[[package]] [[package]]
name = "ctrlc" name = "ctrlc"
version = "3.4.6" version = "3.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "697b5419f348fd5ae2478e8018cb016c00a5881c7f46c717de98ffd135a5651c" checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
dependencies = [ dependencies = [
"nix", "nix",
"windows-sys 0.59.0", "windows-sys 0.59.0",
@ -200,6 +213,12 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "encode_unicode"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
[[package]] [[package]]
name = "encoding_rs" name = "encoding_rs"
version = "0.8.35" version = "0.8.35"
@ -647,6 +666,19 @@ dependencies = [
"hashbrown", "hashbrown",
] ]
[[package]]
name = "indicatif"
version = "0.17.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
dependencies = [
"console",
"number_prefix",
"portable-atomic",
"unicode-width",
"web-time",
]
[[package]] [[package]]
name = "ipnet" name = "ipnet"
version = "2.11.0" version = "2.11.0"
@ -770,9 +802,9 @@ dependencies = [
[[package]] [[package]]
name = "nix" name = "nix"
version = "0.29.0" version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg-if", "cfg-if",
@ -780,6 +812,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "number_prefix"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]] [[package]]
name = "object" name = "object"
version = "0.36.7" version = "0.36.7"
@ -869,6 +907,12 @@ version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "portable-atomic"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.94" version = "1.0.94"
@ -1120,9 +1164,9 @@ dependencies = [
[[package]] [[package]]
name = "shellexpand" name = "shellexpand"
version = "3.1.0" version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
dependencies = [ dependencies = [
"dirs", "dirs",
] ]
@ -1386,6 +1430,12 @@ version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "unicode-width"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.9.0" version = "0.9.0"
@ -1532,6 +1582,16 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "web-time"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.3.9" version = "0.3.9"
@ -1849,6 +1909,7 @@ dependencies = [
"colored", "colored",
"ctrlc", "ctrlc",
"flate2", "flate2",
"indicatif",
"md-5", "md-5",
"reqwest", "reqwest",
"serde", "serde",

View file

@ -10,9 +10,10 @@ md-5 = "0.10.6"
reqwest = { version = "0.12.15", features = ["blocking", "json"] } reqwest = { version = "0.12.15", features = ["blocking", "json"] }
serde_json = "1.0.140" serde_json = "1.0.140"
serde = "1.0.219" serde = "1.0.219"
ctrlc = "3.4.6" ctrlc = "3.4.7"
shellexpand = "3.1.0" shellexpand = "3.1.1"
flate2 = "1.1.1" flate2 = "1.1.1"
indicatif = "0.17.11"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winconsole = "0.11.1" winconsole = "0.11.1"

42
LICENSE
View file

@ -1,21 +1,21 @@
MIT License MIT License
Copyright (c) 2025 Yuhki Copyright (c) 2025 Yuhki
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software. copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.

155
README.md
View file

@ -1,77 +1,78 @@
# 🌊 Wuthering Waves Downloader # 🌊 Wuthering Waves Downloader
*A high-performance, reliable downloader for Wuthering Waves with multi-CDN support and verification* *A high-performance, reliable downloader for Wuthering Waves with multi-CDN support and verification*
> Feel free to open Pull requests if you want to contribute with improvements! > Feel free to open Pull requests if you want to contribute with improvements!
[![Rust](https://img.shields.io/badge/Rust-1.87.0--nightly-orange?logo=rust)](https://www.rust-lang.org/) [![Rust](https://img.shields.io/badge/Rust-1.87.0--nightly-orange?logo=rust)](https://www.rust-lang.org/)
[![License](https://img.shields.io/badge/License-MIT-blue)](LICENSE) [![License](https://img.shields.io/badge/License-MIT-blue)](LICENSE)
## 📦 Requirements ## 📦 Requirements
- **Rust nightly toolchain** - 1.87.0-nightly or newer - **Rust nightly toolchain** - 1.87.0-nightly or newer
- **Windows** - for full console feature support - **Windows** - for full console feature support
- **Linux** - for simply being better
### 🛠️ Installation & Usage
- **Install the nightly toolchain:** ### 🛠️ Installation & Usage
```bash - **Install the nightly toolchain:**
rustup toolchain install nightly ```bash
rustup default nightly rustup toolchain install nightly
``` rustup default nightly
```
- **Clone the repository:**
```bash - **Clone the repository:**
git clone https://github.com/yourusername/wuthering-waves-downloader.git ```bash
cd wuthering-waves-downloader git clone https://github.com/yuhkix/wuwa-downloader.git
``` cd wuwa-downloader
```
- **Build the project:**
```bash - **Build the project:**
cargo build --release ```bash
``` cargo build --release
```
## 🌟 Key Features
## 🌟 Key Features
### 🚀 Download Management
- **Multi-CDN Fallback** - Automatically tries all available CDN mirrors ### 🚀 Download Management
- **Multi-CDN Fallback** - Automatically tries all available CDN mirrors
- **Version Selection** - Interactive menu for Live/Beta versions
- **Version Selection** - Interactive menu for Live/Beta versions
- **Verified Downloads** - MD5 checksum validation for every file
- **Verified Downloads** - MD5 checksum validation for every file
- **Smart Retry Logic** - 3 retry attempts per CDN with timeout protection
- **Smart Retry Logic** - 3 retry attempts per CDN with timeout protection
- **GZIP Support** - Handles compressed responses efficiently
- **GZIP Support** - Handles compressed responses efficiently
### 🛡️ Reliability
- **Atomic Operations** - Thread-safe progress tracking ### 🛡️ Reliability
- **Atomic Operations** - Thread-safe progress tracking
- **Graceful Interrupt** - CTRL-C handling with summary display
- **Graceful Interrupt** - CTRL-C handling with summary display
- **Comprehensive Logging** - Detailed error logging with timestamps
- **Comprehensive Logging** - Detailed error logging with timestamps
- **Validation Failures** - Auto-removes files with checksum mismatches
- **Validation Failures** - Auto-removes files with checksum mismatches
### 📂 File Management
- **Smart Path Handling** - Cross-platform path support ### 📂 File Management
- **Smart Path Handling** - Cross-platform path support
- **Auto-directory Creation** - Builds full directory trees as needed
- **Auto-directory Creation** - Builds full directory trees as needed
- **Clean Failed Downloads** - Removes corrupted files automatically
- **Clean Failed Downloads** - Removes corrupted files automatically
### 💻 User Interface
- **Color-coded Output** - Clear visual feedback (success/warning/error) ### 💻 User Interface
- **Color-coded Output** - Clear visual feedback (success/warning/error)
- **Dynamic Title Updates** - Real-time progress in window title
- **Dynamic Title Updates** - Real-time progress in window title
- **Clean Progress Display** - Simplified download status without clutter
- **Clean Progress Display** - Simplified download status without clutter
- **Formatted Duration** - Clear elapsed time display (HH:MM:SS)
- **Formatted Duration** - Clear elapsed time display (HH:MM:SS)
### ⚙️ Technical Details
- **Streaming Downloads** - Memory-efficient chunked transfers ### ⚙️ Technical Details
- **Streaming Downloads** - Memory-efficient chunked transfers
- **HEAD Request Verification** - Pre-checks file availability
- **HEAD Request Verification** - Pre-checks file availability
- **Multi-threaded** - Safe concurrent progress tracking
- **Multi-threaded** - Safe concurrent progress tracking
- **Configurable Timeouts** - 30s for metadata, 300s for downloads
- **Configurable Timeouts** - 30s for metadata, 10000s for downloads

View file

@ -1,8 +1,8 @@
fn main() { fn main() {
#[cfg(windows)] #[cfg(windows)]
{ {
let mut res = winres::WindowsResource::new(); let mut res = winres::WindowsResource::new();
res.set_icon("cartethyia.ico"); res.set_icon("cartethyia.ico");
res.compile().unwrap(); res.compile().unwrap();
} }
} }

113
package.sh Normal file
View file

@ -0,0 +1,113 @@
#!/bin/bash
set -e
BIN_NAME="wuwa-downloader"
DIST_DIR="dist"
# Colors
RED='\033[0;31m'
GREEN='\033[0;32m'
CYAN='\033[0;36m'
YELLOW='\033[1;33m'
NC='\033[0m' # No Color
function info() {
echo -e "${CYAN}==> $1${NC}"
}
function success() {
echo -e "${GREEN}$1${NC}"
}
function warn() {
echo -e "${YELLOW}$1${NC}"
}
function error() {
echo -e "${RED}$1${NC}"
}
function build_linux() {
local OUT_DIR="target/release"
local PACKAGE_NAME="${BIN_NAME}-linux-x86_64"
local PACKAGE_DIR="${DIST_DIR}/${PACKAGE_NAME}"
local ARCHIVE_NAME="${PACKAGE_NAME}.tar.gz"
clear
info "Cleaning binaries to rebuild..."
cargo clean
info "Building release binary for Linux..."
cargo build --release
clear
success "Linux build finished"
info "Creating package directory..."
rm -rf "$PACKAGE_DIR"
mkdir -p "$PACKAGE_DIR"
success "Package directory ready: $PACKAGE_DIR"
info "Copying binary..."
cp "$OUT_DIR/$BIN_NAME" "$PACKAGE_DIR/"
success "Copied binary to package directory"
info "Creating archive..."
cd "$DIST_DIR"
tar -czf "$ARCHIVE_NAME" "$PACKAGE_NAME"
cd -
success "Archive created: ${DIST_DIR}/${ARCHIVE_NAME}"
}
function build_windows() {
local TARGET="x86_64-pc-windows-gnu"
local OUT_DIR="target/${TARGET}/release"
local PACKAGE_NAME="${BIN_NAME}-windows-x86_64"
local PACKAGE_DIR="${DIST_DIR}/${PACKAGE_NAME}"
local ARCHIVE_NAME="${PACKAGE_NAME}.zip"
clear
info "Cleaning binaries to rebuild..."
cargo clean
info "Building release binary for Windows..."
cargo build --release --target "$TARGET"
clear
success "Windows build finished"
info "Creating package directory..."
rm -rf "$PACKAGE_DIR"
mkdir -p "$PACKAGE_DIR"
success "Package directory ready: $PACKAGE_DIR"
info "Copying binary..."
cp "$OUT_DIR/${BIN_NAME}.exe" "$PACKAGE_DIR/"
success "Copied binary to package directory"
info "Creating archive..."
cd "$DIST_DIR"
zip -r "$ARCHIVE_NAME" "$PACKAGE_NAME"
cd -
success "Archive created: ${DIST_DIR}/${ARCHIVE_NAME}"
}
if [[ $# -ne 1 ]]; then
error "Usage: $0 [linux|windows]"
exit 1
fi
case "$1" in
linux)
build_linux
;;
windows)
build_windows
;;
*)
error "Unknown target: $1"
error "Usage: $0 [linux|windows]"
exit 1
;;
esac

View file

@ -2,4 +2,4 @@
pub struct Config { pub struct Config {
pub index_url: String, pub index_url: String,
pub zip_bases: Vec<String>, pub zip_bases: Vec<String>,
} }

View file

@ -4,11 +4,25 @@ use colored::*;
pub struct Status; pub struct Status;
impl Status { impl Status {
pub fn info() -> ColoredString { "[*]".cyan() } pub fn info() -> ColoredString {
pub fn success() -> ColoredString { "[+]".green() } "[*]".cyan()
pub fn warning() -> ColoredString { "[!]".yellow() } }
pub fn error() -> ColoredString { "[-]".red() } pub fn success() -> ColoredString {
pub fn question() -> ColoredString { "[?]".blue() } "[+]".green()
pub fn progress() -> ColoredString { "[→]".purple() } }
pub fn matched() -> ColoredString { "[↓]".bright_purple() } pub fn warning() -> ColoredString {
} "[!]".yellow()
}
pub fn error() -> ColoredString {
"[-]".red()
}
pub fn question() -> ColoredString {
"[?]".blue()
}
pub fn progress() -> ColoredString {
"[→]".purple()
}
pub fn matched() -> ColoredString {
"[↓]".bright_purple()
}
}

View file

@ -1,6 +1,6 @@
use std::{io, path::Path};
use colored::Colorize;
use crate::config::status::Status; use crate::config::status::Status;
use colored::Colorize;
use std::{io, path::Path};
pub fn print_results(success: usize, total: usize, folder: &Path) { pub fn print_results(success: usize, total: usize, folder: &Path) {
let title = if success == total { let title = if success == total {

View file

@ -1,5 +1,9 @@
use std::{fs, io, io::Write, path::{Path, PathBuf}};
use md5::{Digest, Md5}; use md5::{Digest, Md5};
use std::{
fs, io,
io::Write,
path::{Path, PathBuf},
};
use crate::config::status::Status; use crate::config::status::Status;
@ -10,7 +14,11 @@ pub fn calculate_md5(path: &Path) -> String {
format!("{:x}", hasher.finalize()) format!("{:x}", hasher.finalize())
} }
pub fn check_existing_file(path: &Path, expected_md5: Option<&str>, expected_size: Option<u64>) -> bool { pub fn check_existing_file(
path: &Path,
expected_md5: Option<&str>,
expected_size: Option<u64>,
) -> bool {
if !path.exists() { if !path.exists() {
return false; return false;
} }
@ -41,7 +49,7 @@ pub fn get_filename(path: &str) -> String {
pub fn get_dir() -> PathBuf { pub fn get_dir() -> PathBuf {
loop { loop {
print!( print!(
"{} Enter download directory (Enter for current): ", "{} Please specify the directory where the game should be downloaded (press Enter to use the current directory): ",
Status::question() Status::question()
); );
io::stdout().flush().unwrap(); io::stdout().flush().unwrap();
@ -74,4 +82,4 @@ pub fn get_dir() -> PathBuf {
return path; return path;
} }
} }
} }

View file

@ -1,5 +1,8 @@
use std::{fs::{self, OpenOptions}, io::Write, time::SystemTime}; use std::{
fs::{self, OpenOptions},
io::Write,
time::SystemTime,
};
pub fn setup_logging() -> fs::File { pub fn setup_logging() -> fs::File {
OpenOptions::new() OpenOptions::new()

View file

@ -1,4 +1,4 @@
pub mod console; pub mod console;
pub mod file; pub mod file;
pub mod logging; pub mod logging;
pub mod util; pub mod util;

View file

@ -2,12 +2,16 @@ use colored::Colorize;
use reqwest::blocking::Client; use reqwest::blocking::Client;
use serde_json::Value; use serde_json::Value;
use std::{ use std::{
fs::File, fs::{self, File},
io, io::{self, Write},
sync::Arc, sync::Arc,
thread, thread,
time::{Duration, Instant}, time::{Duration, Instant},
}; };
#[cfg(not(target_os = "windows"))]
use std::process::Command;
#[cfg(windows)] #[cfg(windows)]
use winconsole::console::{clear, set_title}; use winconsole::console::{clear, set_title};
@ -37,6 +41,23 @@ pub fn bytes_to_human(bytes: u64) -> String {
} }
} }
fn log_url(url: &str) {
let sanitized_url = if let Some(index) = url.find("://") {
let (scheme, rest) = url.split_at(index + 3);
format!("{}{}", scheme, rest.replace("//", "/"))
} else {
url.replace("//", "/")
};
if let Ok(mut url_log) = fs::OpenOptions::new()
.create(true)
.append(true)
.open("urls.txt")
{
let _ = writeln!(url_log, "{}", sanitized_url);
}
}
pub fn calculate_total_size(resources: &[Value], client: &Client, config: &Config) -> u64 { pub fn calculate_total_size(resources: &[Value], client: &Client, config: &Config) -> u64 {
let mut total_size = 0; let mut total_size = 0;
let mut failed_urls = 0; let mut failed_urls = 0;
@ -50,6 +71,7 @@ pub fn calculate_total_size(resources: &[Value], client: &Client, config: &Confi
for base_url in &config.zip_bases { for base_url in &config.zip_bases {
let url = format!("{}/{}", base_url, dest); let url = format!("{}/{}", base_url, dest);
log_url(&url);
match client.head(&url).send() { match client.head(&url).send() {
Ok(response) => { Ok(response) => {
if let Some(len) = response.headers().get("content-length") { if let Some(len) = response.headers().get("content-length") {
@ -104,6 +126,9 @@ pub fn calculate_total_size(resources: &[Value], client: &Client, config: &Confi
bytes_to_human(total_size).cyan() bytes_to_human(total_size).cyan()
); );
#[cfg(not(target_os = "windows"))]
Command::new("clear").status().unwrap();
total_size total_size
} }

View file

@ -1,6 +1,10 @@
use colored::*; use colored::*;
use reqwest::blocking::Client; use reqwest::blocking::Client;
use serde_json::Value; use serde_json::Value;
#[cfg(not(target_os = "windows"))]
use std::process::Command;
#[cfg(windows)] #[cfg(windows)]
use winconsole::console::{clear, set_title}; use winconsole::console::{clear, set_title};
@ -9,10 +13,11 @@ use wuwa_downloader::{
io::{ io::{
console::print_results, console::print_results,
file::get_dir, file::get_dir,
util::{
calculate_total_size, download_resources, exit_with_error, setup_ctrlc, track_progress, start_title_thread
},
logging::setup_logging, logging::setup_logging,
util::{
calculate_total_size, download_resources, exit_with_error, setup_ctrlc,
start_title_thread, track_progress,
},
}, },
network::client::{fetch_index, get_config}, network::client::{fetch_index, get_config},
}; };
@ -33,6 +38,9 @@ fn main() {
#[cfg(windows)] #[cfg(windows)]
clear().unwrap(); clear().unwrap();
#[cfg(not(target_os = "windows"))]
Command::new("clear").status().unwrap();
println!( println!(
"\n{} Download folder: {}\n", "\n{} Download folder: {}\n",
Status::info(), Status::info(),
@ -83,7 +91,7 @@ fn main() {
#[cfg(windows)] #[cfg(windows)]
clear().unwrap(); clear().unwrap();
print_results( print_results(
success.load(std::sync::atomic::Ordering::SeqCst), success.load(std::sync::atomic::Ordering::SeqCst),
resources.len(), resources.len(),

View file

@ -1,14 +1,18 @@
use colored::Colorize; use colored::Colorize;
use flate2::read::GzDecoder; use flate2::read::GzDecoder;
use indicatif::{ProgressBar, ProgressStyle};
use reqwest::blocking::Client; use reqwest::blocking::Client;
use serde_json::{Value, from_reader, from_str}; use serde_json::{from_reader, from_str, Value};
#[cfg(not(target_os = "windows"))]
use std::process::Command;
use std::{ use std::{
fs, fs::{self, OpenOptions},
io::{self, Read, Write}, io::{self, Read, Write},
path::Path, path::Path,
time::Duration, time::Duration,
u64, u64,
}; };
#[cfg(windows)] #[cfg(windows)]
use winconsole::console::clear; use winconsole::console::clear;
@ -234,16 +238,23 @@ pub fn download_file(
println!("{} Downloading: {}", Status::progress(), filename.purple()); println!("{} Downloading: {}", Status::progress(), filename.purple());
let pb = ProgressBar::new(expected_size.unwrap_or(0));
pb.set_style(ProgressStyle::default_bar()
.template("{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {bytes}/{total_bytes} ({eta}, {binary_bytes_per_sec})")
.unwrap()
.progress_chars("#>-"));
let mut retries = MAX_RETRIES; let mut retries = MAX_RETRIES;
let mut last_error = None; let mut last_error = None;
while retries > 0 { while retries > 0 {
let result = download_single_file(&client, &url, &path, should_stop, progress); let result = download_single_file(&client, &url, &path, should_stop, progress, &pb);
match result { match result {
Ok(_) => break, Ok(_) => break,
Err(e) => { Err(e) => {
if should_stop.load(std::sync::atomic::Ordering::SeqCst) { if should_stop.load(std::sync::atomic::Ordering::SeqCst) {
pb.finish_and_clear();
return false; return false;
} }
@ -263,6 +274,8 @@ pub fn download_file(
} }
} }
pb.finish_and_clear();
if should_stop.load(std::sync::atomic::Ordering::SeqCst) { if should_stop.load(std::sync::atomic::Ordering::SeqCst) {
return false; return false;
} }
@ -315,18 +328,46 @@ fn download_single_file(
path: &Path, path: &Path,
should_stop: &std::sync::atomic::AtomicBool, should_stop: &std::sync::atomic::AtomicBool,
progress: &DownloadProgress, progress: &DownloadProgress,
pb: &ProgressBar,
) -> Result<(), String> { ) -> Result<(), String> {
let mut response = client let mut downloaded: u64 = 0;
.get(url) if path.exists() {
.timeout(DOWNLOAD_TIMEOUT) downloaded = fs::metadata(path)
.map_err(|e| format!("Metadata error: {}", e))?
.len();
}
let request = client.get(url).timeout(DOWNLOAD_TIMEOUT);
let request = if downloaded > 0 {
request.header("Range", format!("bytes={}-", downloaded))
} else {
request
};
let mut response = request
.send() .send()
.map_err(|e| format!("Network error: {}", e))?; .map_err(|e| format!("Network error: {}", e))?;
if !response.status().is_success() { if response.status() == reqwest::StatusCode::RANGE_NOT_SATISFIABLE {
return Err("Range not satisfiable. File may already be fully downloaded.".into());
}
if !response.status().is_success() && response.status() != reqwest::StatusCode::PARTIAL_CONTENT
{
return Err(format!("HTTP error: {}", response.status())); return Err(format!("HTTP error: {}", response.status()));
} }
let mut file = fs::File::create(path).map_err(|e| format!("File error: {}", e))?; let mut file = OpenOptions::new()
.create(true)
.append(true)
.open(path)
.map_err(|e| format!("File error: {}", e))?;
pb.set_position(downloaded);
progress
.downloaded_bytes
.store(downloaded, std::sync::atomic::Ordering::SeqCst);
let mut buffer = [0; BUFFER_SIZE]; let mut buffer = [0; BUFFER_SIZE];
loop { loop {
@ -345,9 +386,11 @@ fn download_single_file(
file.write_all(&buffer[..bytes_read]) file.write_all(&buffer[..bytes_read])
.map_err(|e| format!("Write error: {}", e))?; .map_err(|e| format!("Write error: {}", e))?;
downloaded += bytes_read as u64;
pb.set_position(downloaded);
progress progress
.downloaded_bytes .downloaded_bytes
.fetch_add(bytes_read as u64, std::sync::atomic::Ordering::SeqCst); .store(downloaded, std::sync::atomic::Ordering::SeqCst);
} }
Ok(()) Ok(())
@ -508,22 +551,75 @@ pub fn fetch_gist(client: &Client) -> Result<String, String> {
response response
.copy_to(&mut buffer) .copy_to(&mut buffer)
.map_err(|e| format!("Error reading response: {}", e))?; .map_err(|e| format!("Error reading response: {}", e))?;
let mut gz = GzDecoder::new(&buffer[..]); let mut gz = GzDecoder::new(&buffer[..]);
let mut decompressed = String::new(); let mut decompressed = String::new();
gz.read_to_string(&mut decompressed) gz.read_to_string(&mut decompressed)
.map_err(|e| format!("Error decompressing: {}", e))?; .map_err(|e| format!("Error decompressing: {}", e))?;
from_str(&decompressed).map_err(|e| format!("Invalid JSON: {}", e))? from_str(&decompressed).map_err(|e| format!("Invalid JSON: {}", e))?
} else { } else {
from_reader(response).map_err(|e| format!("Invalid JSON: {}", e))? from_reader(response).map_err(|e| format!("Invalid JSON: {}", e))?
}; };
#[cfg(not(target_os = "windows"))]
Command::new("clear").status().unwrap();
let entries = [
("live", "os", "Live - OS"),
("live", "cn", "Live - CN"),
("beta", "os", "Beta - OS"),
("beta", "cn", "Beta - CN"),
];
println!("{} Available versions:", Status::info()); println!("{} Available versions:", Status::info());
println!("1. Live - OS");
println!("2. Live - CN"); for (i, (cat, ver, label)) in entries.iter().enumerate() {
println!("3. Beta - OS"); let index_url = get_version(&gist_data, cat, ver)?;
println!("4. Beta - CN");
let mut resp = client
.get(&index_url)
.send()
.map_err(|e| format!("Error fetching index.json: {}", e))
.unwrap();
let version_json: Value = {
let content_encoding = resp
.headers()
.get("content-encoding")
.and_then(|v| v.to_str().ok())
.unwrap_or("");
if content_encoding.contains("gzip") {
let mut buffer = Vec::new();
resp.copy_to(&mut buffer)
.map_err(|e| format!("Error reading response: {}", e))
.unwrap();
let mut gz = GzDecoder::new(&buffer[..]);
let mut decompressed = String::new();
gz.read_to_string(&mut decompressed)
.map_err(|e| format!("Error decompressing: {}", e))
.unwrap();
from_str(&decompressed)
.map_err(|e| format!("Invalid JSON: {}", e))
.unwrap()
} else {
from_reader(resp)
.map_err(|e| format!("Invalid JSON: {}", e))
.unwrap()
}
};
let version = version_json
.get("default")
.and_then(|d| d.get("config"))
.and_then(|c| c.get("version"))
.or_else(|| version_json.get("default").and_then(|d| d.get("version")))
.and_then(|v| v.as_str())
.unwrap_or("unknown");
println!("{}. {} ({})", i + 1, label, version);
}
loop { loop {
print!("{} Select version: ", Status::question()); print!("{} Select version: ", Status::question());

View file

@ -1 +1 @@
pub mod client; pub mod client;