From d0f33b1391f5e29415bfcb8735bf02e7d6365f62 Mon Sep 17 00:00:00 2001 From: Ferrah Aiko Wolf Date: Mon, 4 Sep 2023 08:49:46 -0300 Subject: [PATCH] remove constraint now that stuff works --- .vscode/launch.json | 28 +++++++++++++++++++++++++++- Cargo.toml | 4 ++-- ibdl-core/Cargo.toml | 2 +- ibdl-core/src/cli.rs | 1 - 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index d502b70..8c8c80e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -208,7 +208,7 @@ { "type": "lldb", "request": "launch", - "name": "CBZ pool same dir", + "name": "CBZ pool same dir (precise)", "cargo": { "args": [ "build", @@ -231,5 +231,31 @@ ], "cwd": "${workspaceFolder}" }, + { + "type": "lldb", + "request": "launch", + "name": "CBZ pool same dir", + "cargo": { + "args": [ + "build", + "--bin=imageboard_downloader", + "--package=imageboard_downloader" + ], + "filter": { + "name": "imageboard_downloader", + "kind": "bin" + } + }, + "args": [ + "-i", + "e621", + "--cbz", + "--pool", + "6837", + "-o", + "." + ], + "cwd": "${workspaceFolder}" + }, ] } \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index f3f6f6a..9df5b5f 100644 --- 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 "] -version = "1.5.3" +version = "1.5.4" edition = "2021" description = "Cli utility to bulk download images from popular imageboard sites (Boorus) using their APIs" license = "MIT" @@ -20,7 +20,7 @@ include = ["**/*.rs", "Cargo.toml"] [dependencies] env_logger = "0.10.0" spinoff = "0.8.0" -ibdl-core = { version = "1.5.2", path = "./ibdl-core" } +ibdl-core = { version = "1.5.4", path = "./ibdl-core" } ibdl-extractors = { version = "1.5.0", path = "./ibdl-extractors" } ibdl-common = { version = "1.4.0", path = "./ibdl-common" } color-eyre = "0.6.2" diff --git a/ibdl-core/Cargo.toml b/ibdl-core/Cargo.toml index 84e079e..d9d22e0 100644 --- a/ibdl-core/Cargo.toml +++ b/ibdl-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ibdl-core" -version = "1.5.3" +version = "1.5.4" edition = "2021" description = "Main download infrastructure for imageboard_downloader" license = "MIT" diff --git a/ibdl-core/src/cli.rs b/ibdl-core/src/cli.rs index e937ccc..b553c67 100644 --- a/ibdl-core/src/cli.rs +++ b/ibdl-core/src/cli.rs @@ -143,7 +143,6 @@ pub struct Cli { value_name = "ID", conflicts_with("tags"), conflicts_with("save_file_as_id"), - conflicts_with("output"), requires("precise_output") )] pub pool_id: Option,