Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
filters: |
rust:
- 'src-tauri/**'
- 'crates/**'
- 'Cargo.toml'
- 'scripts/**'
- 'package.json'
- 'package-lock.json'
Expand Down Expand Up @@ -85,7 +87,11 @@ jobs:
- name: Rust cache
uses: Swatinem/rust-cache@v2
with:
workspaces: src-tauri
workspaces: |
.
src-tauri
crates/dropslim-core
crates/dropslim-cli

- name: Cache Homebrew
if: runner.os == 'macOS'
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
node_modules/
dist/
dist-ui/
target/
src-tauri/target/
src-tauri/resources/
src-tauri/dav1d.dll
Expand Down Expand Up @@ -29,6 +30,7 @@ src-tauri/icons/icon.ico
.DS_Store
.vscode/
roadmap.md
cli-roadmap.md
*.swp
*.swo
*~
Expand Down
155 changes: 146 additions & 9 deletions src-tauri/Cargo.lock → Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[workspace]
members = ["crates/dropslim-core", "crates/dropslim-cli", "src-tauri"]
resolver = "2"

[workspace.package]
version = "1.6.2"
edition = "2021"
authors = ["Martin Farkas"]
license = "MIT"
24 changes: 24 additions & 0 deletions crates/dropslim-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[package]
name = "dropslim-cli"
version = "1.6.3-feature-cli.1"
description = "DropSlim command-line image optimizer"
authors = ["Martin Farkas"]
edition = "2021"
license = "MIT"

[[bin]]
name = "dropslim"
path = "src/main.rs"

[dependencies]
clap = { version = "4", features = ["derive"] }
dropslim-core = { path = "../dropslim-core" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal", "sync"] }

[dev-dependencies]
assert_cmd = "2"
predicates = "3"
tempfile = "3.27.0"
image = { version = "0.25.10", features = ["png", "jpeg"] }
26 changes: 26 additions & 0 deletions crates/dropslim-cli/src/exit.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum RunOutcome {
Ok,
Failed,
Cancelled,
}

pub fn exit_code(outcome: RunOutcome) -> u8 {
match outcome {
RunOutcome::Ok => 0,
RunOutcome::Failed => 1,
RunOutcome::Cancelled => 130,
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn maps_outcomes_to_exit_codes() {
assert_eq!(exit_code(RunOutcome::Ok), 0);
assert_eq!(exit_code(RunOutcome::Failed), 1);
assert_eq!(exit_code(RunOutcome::Cancelled), 130);
}
}
Loading
Loading