Skip to content

Commit

Permalink
chore(fmt): Use proper end line format
Browse files Browse the repository at this point in the history
  • Loading branch information
gaku-sei committed Dec 29, 2023
1 parent db073dc commit 87cbc5f
Show file tree
Hide file tree
Showing 32 changed files with 2,300 additions and 2,300 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/cargo_clippy.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
on: push
name: Clippy

env:
RUSTFLAGS: "-Dwarnings"

jobs:
clippy:
runs-on: ubuntu-latest
steps:
- name: Install dependencies
run: sudo apt-get install -y libgtk-3-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev webkit2gtk-4.1-dev
- uses: actions/checkout@v4
- run: cargo clippy --all-targets --all-features
on: push
name: Clippy

env:
RUSTFLAGS: "-Dwarnings"

jobs:
clippy:
runs-on: ubuntu-latest
steps:
- name: Install dependencies
run: sudo apt-get install -y libgtk-3-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev webkit2gtk-4.1-dev
- uses: actions/checkout@v4
- run: cargo clippy --all-targets --all-features
18 changes: 9 additions & 9 deletions .github/workflows/rustfmt.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
on: push
name: Rust fmt

jobs:
clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: cargo fmt --check
on: push
name: Rust fmt

jobs:
clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: cargo fmt --check
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/.vscode
/target
*.cbz
*.epub
*.jpg
*.pdf
/.vscode
/target
*.cbz
*.epub
*.jpg
*.pdf
102 changes: 51 additions & 51 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
[workspace]
resolver = "2"
members = ["eco-cbz", "eco-converter", "eco-merge", "eco-pack", "eco-viewer"]

[workspace.package]
rust-version = "1.73.0"
edition = "2021"

[workspace.dependencies]
anyhow = "1.0.71"
async-recursion = "1.0.4"
async-trait = "0.1.68"
base64 = "0.21.2"
camino = "1.1.4"
clap = { version = "4.3.5", features = ["derive"] }
cli-table = "0.4.7"
chrono = "0.4.31"
dark-light = "1.0.0"
dialoguer = "0.10.4"
dioxus = "0.4.0"
dioxus-desktop = "0.4.0"
dunce = "1.0.4"
eco-cbz = { path = "./eco-cbz" }
eco-pack = { path = "./eco-pack" }
epub = "2.1.1"
futures = "0.3.28"
glob = "0.3.1"
home = "0.5.5"
html5ever = "0.26.0"
iced = "0.10.0"
image = "0.24.7"
indicatif = "0.17.5"
isolang = "2.0"
markup5ever_rcdom = "0.2.0"
mime = "0.3.17"
mobi = "0.8.0"
pdf = "0.8.1"
reqwest = "0.11.18"
reqwest-middleware = "0.2.2"
reqwest-retry = "0.2.2"
sanitize-filename = "0.4.0"
serde = "1.0.164"
serde_json = "1.0.107"
serde_repr = "0.1.16"
tl = "0.7.7"
thiserror = "1.0.40"
tokio = { version = "1.28.2", features = ["full"] }
tracing = "0.1.37"
tracing-subscriber = "0.3.17"
url = "2.4.0"
zip = "0.6.6"
[workspace]
resolver = "2"
members = ["eco-cbz", "eco-converter", "eco-merge", "eco-pack", "eco-viewer"]

[workspace.package]
rust-version = "1.73.0"
edition = "2021"

[workspace.dependencies]
anyhow = "1.0.71"
async-recursion = "1.0.4"
async-trait = "0.1.68"
base64 = "0.21.2"
camino = "1.1.4"
clap = { version = "4.3.5", features = ["derive"] }
cli-table = "0.4.7"
chrono = "0.4.31"
dark-light = "1.0.0"
dialoguer = "0.10.4"
dioxus = "0.4.0"
dioxus-desktop = "0.4.0"
dunce = "1.0.4"
eco-cbz = { path = "./eco-cbz" }
eco-pack = { path = "./eco-pack" }
epub = "2.1.1"
futures = "0.3.28"
glob = "0.3.1"
home = "0.5.5"
html5ever = "0.26.0"
iced = "0.10.0"
image = "0.24.7"
indicatif = "0.17.5"
isolang = "2.0"
markup5ever_rcdom = "0.2.0"
mime = "0.3.17"
mobi = "0.8.0"
pdf = "0.8.1"
reqwest = "0.11.18"
reqwest-middleware = "0.2.2"
reqwest-retry = "0.2.2"
sanitize-filename = "0.4.0"
serde = "1.0.164"
serde_json = "1.0.107"
serde_repr = "0.1.16"
tl = "0.7.7"
thiserror = "1.0.40"
tokio = { version = "1.28.2", features = ["full"] }
tracing = "0.1.37"
tracing-subscriber = "0.3.17"
url = "2.4.0"
zip = "0.6.6"
96 changes: 48 additions & 48 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
# Eco, an e-book toolbox

The repository host multiple cli and gui that allows you to edit, convert, merge, and more, e-book files (cbz, epub, pdf, etc...).

## Tools (with supported format):

- `eco-converter` - cli - Convert e-books to any format (from pdf, mobi, and DRM-free azw3, to cbz only for now)
- `eco-merge` - cli - Merge e-books together when it makes sense (cbz)
- `eco-pack` - cli - pack images into an e-book file (cbz)
- `eco-viewer` - gui - A dead simple e-book reader (cbz)

## Eco Converter

Converts e-books from \* to \* (only pdf, mobi, and DRM-free azw3 to cbz supported for the moment):

```bash
eco-converter "archive.azw3" --from azw3 --outdir out
```

## Eco Merge (cbz only for now)

This will look for all the e-books in `path` and which file name contains `something` and merge them into `output/merged_archive.cbz`:

```bash
eco-merge --archives-glob "path/**/*something*" --outdir "output" --name "merged_archive"
```

## Eco Pack (cbz only for now)

Takes all the `png` files under `source` and pack them into the `archive.cbz` file:

```bash
eco-pack "source/*.png" --name archive --autosplit
```

Options include:

- `--autosplit`: split in 2 landscape images
- `--contrast`: change contrast
- `--brightness`: change brightness

## Eco Viewer (cbz only for now)

View any e-book file with this simple gui:

```bash
eco-viewer "my_archive.cbz"
```
# Eco, an e-book toolbox

The repository host multiple cli and gui that allows you to edit, convert, merge, and more, e-book files (cbz, epub, pdf, etc...).

## Tools (with supported format):

- `eco-converter` - cli - Convert e-books to any format (from pdf, mobi, and DRM-free azw3, to cbz only for now)
- `eco-merge` - cli - Merge e-books together when it makes sense (cbz)
- `eco-pack` - cli - pack images into an e-book file (cbz)
- `eco-viewer` - gui - A dead simple e-book reader (cbz)

## Eco Converter

Converts e-books from \* to \* (only pdf, mobi, and DRM-free azw3 to cbz supported for the moment):

```bash
eco-converter "archive.azw3" --from azw3 --outdir out
```

## Eco Merge (cbz only for now)

This will look for all the e-books in `path` and which file name contains `something` and merge them into `output/merged_archive.cbz`:

```bash
eco-merge --archives-glob "path/**/*something*" --outdir "output" --name "merged_archive"
```

## Eco Pack (cbz only for now)

Takes all the `png` files under `source` and pack them into the `archive.cbz` file:

```bash
eco-pack "source/*.png" --name archive --autosplit
```

Options include:

- `--autosplit`: split in 2 landscape images
- `--contrast`: change contrast
- `--brightness`: change brightness

## Eco Viewer (cbz only for now)

View any e-book file with this simple gui:

```bash
eco-viewer "my_archive.cbz"
```
46 changes: 23 additions & 23 deletions eco-cbz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[package]
name = "eco-cbz"
version = "0.1.0"
edition.workspace = true
rust-version.workspace = true

[dependencies]
clap = { workspace = true, optional = true }
camino.workspace = true
chrono = { workspace = true, features = ["serde"], optional = true }
image = { workspace = true, features = ["webp-encoder"] }
sanitize-filename.workspace = true
serde = { workspace = true, features = ["derive"], optional = true }
serde_json = { workspace = true, optional = true }
serde_repr = { workspace = true, optional = true }
thiserror.workspace = true
tracing.workspace = true
zip.workspace = true

[features]
default = []
clap = ["dep:clap"]
metadata = ["dep:chrono", "dep:serde", "dep:serde_json", "dep:serde_repr"]
[package]
name = "eco-cbz"
version = "0.1.0"
edition.workspace = true
rust-version.workspace = true

[dependencies]
clap = { workspace = true, optional = true }
camino.workspace = true
chrono = { workspace = true, features = ["serde"], optional = true }
image = { workspace = true, features = ["webp-encoder"] }
sanitize-filename.workspace = true
serde = { workspace = true, features = ["derive"], optional = true }
serde_json = { workspace = true, optional = true }
serde_repr = { workspace = true, optional = true }
thiserror.workspace = true
tracing.workspace = true
zip.workspace = true

[features]
default = []
clap = ["dep:clap"]
metadata = ["dep:chrono", "dep:serde", "dep:serde_json", "dep:serde_repr"]
Loading

0 comments on commit 87cbc5f

Please sign in to comment.