Skip to content

Commit

Permalink
better print && remove MT for tokio async
Browse files Browse the repository at this point in the history
  • Loading branch information
CatAnnaDev committed Jun 24, 2024
1 parent 9075215 commit 8103d73
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "neko_dl"
version = "0.14.0"
version = "0.14.1"
edition = "2021"
homepage = "https://github.com/CatAnnaDev/neko_sama_downloader"
repository = "https://github.com/CatAnnaDev/neko_sama_downloader"
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ async fn start(url_test: &str, driver: WebDriver, main_arg: &MainArg)
if good >= 2 && main_arg.new_args.vlc_playlist {
process::build_vlc_playlist(vec_save_path_vlc)?;
}

//mp.clear().unwrap();
process::end_print(before, &main_arg.path, good, error);

Ok(())
Expand Down
13 changes: 5 additions & 8 deletions src/web_client/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,28 @@ pub async fn download_build_video(path: &str, name: &str, _ffmpeg: &PathBuf, mp:
let mut file = std::fs::File::open(&path).unwrap();
let mut bytes: Vec<u8> = Vec::new();
file.read_to_end(&mut bytes).unwrap();

let parsed = m3u8_rs::parse_media_playlist_res(&bytes).unwrap();

let size = match parsed {
MediaPlaylist { segments, .. } => segments.len()
};

let progress_bar = ProgressBar::new(size as u64);
mp.add(progress_bar.clone());
mp.set_alignment(MultiProgressAlignment::Bottom);
progress_bar.set_message(name.split("/").last().unwrap().to_string());
let progress_bar = mp.add(ProgressBar::new(size as u64));
progress_bar.enable_steady_tick(Duration::from_secs(1));

progress_bar.set_message(name.split("/").last().unwrap().to_string());
progress_bar.set_style(
ProgressStyle::default_bar().template("[{elapsed_precise}] {bar:60.cyan/blue} {pos}/{len} ({eta}) ({msg})").unwrap().progress_chars("$>-"),
ProgressStyle::default_bar().template("[{elapsed_precise}] |{wide_bar:.cyan/blue}| {pos}/{len} ({eta}) ({msg})").unwrap().progress_chars("=> "),
);

let s = tokio::io::BufReader::new(process.stderr.take().unwrap());
let mut lines = s.lines();
while let Ok(Some(l)) = lines.next_line().await {
if l.contains(".ts") {
if l.contains(".ts") && l.contains("Opening") {
progress_bar.inc(1);
}
}


if process.wait().await.unwrap().success() {
} else {
}
Expand Down

0 comments on commit 8103d73

Please sign in to comment.