fully drop synchronous download system

FerrahWolfeh · Aug 29, 2023 · af0ac86 · af0ac86
1 parent b305981
commit af0ac86
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 1,244 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -205,35 +205,5 @@
             ],
             "cwd": "${workspaceFolder}"
         },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Test Danbooru async download",
-            "cargo": {
-                "args": [
-                    "build",
-                    "--bin=imageboard_downloader",
-                    "--package=imageboard_downloader"
-                ],
-                "filter": {
-                    "name": "imageboard_downloader",
-                    "kind": "bin"
-                }
-            },
-            "args": [
-                "--async",
-                "-e",
-                "lowres",
-                "--id",
-                "--ignore-unknown",
-                "--no-animated",
-                "-O",
-                "/mnt/ram/tst",
-                "folinic_(arknights)",
-                "solo",
-                "--annotate"
-            ],
-            "cwd": "${workspaceFolder}"
-        }
     ]
 }
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = ["ibdl-common", "ibdl-core", "ibdl-extractors"]
 [package]
 name = "imageboard_downloader"
 authors = ["Ferrah Aiko Wolf <[email protected]>"]
-version = "1.3.2"
+version = "1.4.0"
 edition = "2021"
 description = "Cli utility to bulk download images from popular imageboard sites (Boorus) using their APIs"
 license = "MIT"

diff --git a/ibdl-core/Cargo.toml b/ibdl-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ibdl-core"
-version = "1.3.2"
+version = "1.4.0"
 edition = "2021"
 description = "Main download infrastructure for imageboard_downloader"
 license = "MIT"

diff --git a/ibdl-core/src/async_queue/mod.rs b/ibdl-core/src/async_queue/mod.rs
@@ -84,8 +84,7 @@ use zip::ZipWriter;
 
 use crate::progress_bars::ProgressCounter;
 
-use crate::queue::error::QueueError;
-use crate::queue::summary::{SummaryFile, SummaryType};
+use crate::error::QueueError;
 
 static PROGRESS_COUNTERS: OnceCell<ProgressCounter> = OnceCell::new();
 

diff --git a/ibdl-core/src/async_queue/summary.rs b/ibdl-core/src/async_queue/summary.rs
diff --git a/ibdl-core/src/cli.rs b/ibdl-core/src/cli.rs
@@ -86,15 +86,6 @@ pub struct Cli {
     #[clap(short, long, value_parser, help_heading = "DOWNLOAD")]
     pub limit: Option<u16>,
 
-    /// Enable experimental async downloader (currently only available for Danbooru)
-    #[clap(
-        long = "async",
-        value_parser,
-        default_value_t = false,
-        help_heading = "DOWNLOAD"
-    )]
-    pub async_download: bool,
-
     /// Disable blacklist filtering
     #[clap(long, value_parser, default_value_t = false, help_heading = "GENERAL")]
     pub disable_blacklist: bool,
@@ -117,18 +108,6 @@ pub struct Cli {
     )]
     pub start_page: Option<u16>,
 
-    /// Download only the latest images for tag selection.
-    ///
-    /// Will not re-download already present or deleted images from destination directory
-    #[clap(
-        short,
-        long,
-        value_parser,
-        default_value_t = false,
-        help_heading = "SAVE"
-    )]
-    pub update: bool,
-
     /// Download posts with the selected rating. Can be used multiple times to download posts with other ratings
     #[clap(
         short,

diff --git a/ibdl-core/src/queue/error.rs → ibdl-core/src/error.rs b/ibdl-core/src/queue/error.rs → ibdl-core/src/error.rs
diff --git a/ibdl-core/src/lib.rs b/ibdl-core/src/lib.rs
@@ -7,8 +7,8 @@ use std::path::{Path, PathBuf};
 
 pub mod async_queue;
 pub mod cli;
+pub mod error;
 pub mod progress_bars;
-pub mod queue;
 
 #[derive(Debug, Clone, Copy)]
 #[repr(transparent)]