mirror of
https://github.com/MedzikUser/imgurs
synced 2024-08-15 00:03:19 +00:00
Compare commits
165 commits
Author | SHA1 | Date | |
---|---|---|---|
|
b6ef4241ca | ||
|
6d6cbbd4b0 | ||
|
723bf26dbd | ||
|
56cbd96053 | ||
|
af0864d272 | ||
|
e782617f08 | ||
|
7062046679 | ||
|
9ba2233734 | ||
|
044fa6525d | ||
|
f6d8e906fb | ||
|
47b6225280 | ||
|
e9a7108f90 | ||
|
0398f7f675 | ||
|
300fa61a65 | ||
|
0ad55015ac | ||
|
965c4407f1 | ||
|
80292730f3 | ||
|
304034f037 | ||
|
b6e715accf | ||
|
d29b299a4b | ||
|
c08e640421 | ||
|
60119be30b | ||
|
986a3b365c | ||
|
25cc96774c | ||
|
111fef82d1 | ||
|
5d5beaecd8 | ||
|
89a7969353 | ||
|
25190ba5c1 | ||
|
012784a352 | ||
|
1bd632e906 | ||
|
a66fea840a | ||
|
dd44c5f041 | ||
|
30a79bc8bb | ||
|
2ac3424338 | ||
|
ecb5855e75 | ||
|
31c737689c | ||
|
8ddfeb3c19 | ||
|
f5c70e4f4f | ||
|
c6b6bd1af7 | ||
|
312d9cce19 | ||
|
ad117bf3ec | ||
|
be73023511 | ||
|
0a8d4afb42 | ||
|
bd91fb330c | ||
|
066cda0539 | ||
|
b0c4dab74d | ||
|
ac1cfc9535 | ||
f26170bc12 | |||
71d124f435 | |||
|
c75cad024f | ||
|
0eea52da89 | ||
|
54eea0f968 | ||
|
69211e9720 | ||
|
1d6aa51df6 | ||
|
cfa28a2660 | ||
|
ba494c594a | ||
7081367bae | |||
|
cc2dde74cd | ||
|
78dcb79b97 | ||
|
78c1c27332 | ||
|
13d9c82fcd | ||
3c5507adaa | |||
0bc00599e9 | |||
2d1f1a4001 | |||
|
66551e77ad | ||
|
d0e5367414 | ||
|
7446b0b420 | ||
|
a1ca4dad9c | ||
|
7567d26b5b | ||
|
feea8f8f2e | ||
3f2af4f6f9 | |||
b396ccce19 | |||
80dcd27bc1 | |||
8bbee811d2 | |||
831f816447 | |||
|
6da2dc252f | ||
|
f935a3dddc | ||
|
15aa471d4f | ||
9538ca5be8 | |||
|
5d3f5ed27b | ||
aac9819bc5 | |||
fb72dc1112 | |||
f4e0044678 | |||
6f9559c6d8 | |||
9b7705ed26 | |||
58acb3df50 | |||
70ffc05fee | |||
cca523f2b5 | |||
18dfdb88a4 | |||
aabbea4182 | |||
|
20f0039d08 | ||
|
4e985ac39b | ||
|
8eeaa4dde6 | ||
|
b7be76debf | ||
|
771d4e8dcc | ||
|
415e6c5735 | ||
|
d73dc16909 | ||
|
e5f91d7261 | ||
|
424175ed21 | ||
|
848767763e | ||
|
be4c05a4da | ||
|
4fde33bad8 | ||
|
c2adcc1f32 | ||
|
24d91f6151 | ||
|
1916df1bc0 | ||
|
931929dacb | ||
|
d46a52d906 | ||
|
6c13b844ca | ||
|
ccc120433a | ||
|
56cc3e30a1 | ||
|
b024a5056e | ||
|
fc154fe83d | ||
|
250a216b94 | ||
|
7966fb5553 | ||
|
939d267c28 | ||
|
b9186a31c5 | ||
|
4b224d1331 | ||
8b1f394575 | |||
1048ea298f | |||
8cd1a31b72 | |||
c3718579db | |||
b0e871cbf6 | |||
d98208f677 | |||
08c25212ae | |||
b1bfe52a4c | |||
|
b83847ff20 | ||
|
91746ad99c | ||
|
b4cc9d5940 | ||
|
a5f25caac2 | ||
|
89da666def | ||
|
dbeefd9430 | ||
|
5477bd2ef6 | ||
506aad97dc | |||
aa59201da7 | |||
|
03f57025e8 | ||
09e7418658 | |||
2451f47fa8 | |||
9f22754fc3 | |||
60b0dc0d84 | |||
9b813457e7 | |||
0cf1ad449e | |||
dba1dbae01 | |||
|
f4f92b2713 | ||
52cceb1ec1 | |||
8a25a33110 | |||
a1c29a08c1 | |||
6f29b8682e | |||
bf796f3358 | |||
b9c0daab88 | |||
ef1f9342ee | |||
06a908ff36 | |||
160c3b0b2f | |||
|
94d80c25af | ||
6abb99d50a | |||
572899509f | |||
6ec952b60f | |||
e1164e1147 | |||
6c7c334ede | |||
adc52ba207 | |||
22bde2819e | |||
ee66bc93c4 | |||
a591d427f3 | |||
4ad662e35e | |||
|
a29ca66e0d | ||
|
a177602edd |
50 changed files with 2713 additions and 1541 deletions
|
@ -1,20 +0,0 @@
|
|||
# EditorConfig is awesome: https://EditorConfig.org
|
||||
|
||||
# top-most EditorConfig file
|
||||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = false
|
||||
|
||||
[*.yml]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = false
|
31
.github/workflows/build-release-binaries.yml
vendored
31
.github/workflows/build-release-binaries.yml
vendored
|
@ -5,7 +5,10 @@ on:
|
|||
paths-ignore:
|
||||
- '*.md'
|
||||
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
binaries:
|
||||
|
@ -83,7 +86,7 @@ jobs:
|
|||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: build
|
||||
args: --release --target=${{ matrix.target }} ${{ matrix.cargo_flags }}
|
||||
args: --all --release --target=${{ matrix.target }} ${{ matrix.cargo_flags }}
|
||||
use-cross: ${{ matrix.cross }}
|
||||
|
||||
- name: Compress binaries
|
||||
|
@ -95,7 +98,7 @@ jobs:
|
|||
if: ${{ matrix.compress }}
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ${{ matrix.target }}
|
||||
path: ${{ matrix.artifact_name }}
|
||||
|
@ -128,25 +131,3 @@ jobs:
|
|||
asset_name: imgurs-$tag-${{ matrix.release_name }}
|
||||
body: ${{ steps.changelog_reader.outputs.log_entry }}
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
|
||||
crates:
|
||||
name: Publish to crates.io
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: stable
|
||||
target: ${{ matrix.target }}
|
||||
|
||||
- name: Publish to crates.io
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: publish
|
||||
args: --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
|
||||
|
|
14
.github/workflows/build.yml
vendored
14
.github/workflows/build.yml
vendored
|
@ -8,6 +8,8 @@ on:
|
|||
paths-ignore:
|
||||
- '*.md'
|
||||
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
|
@ -23,7 +25,8 @@ jobs:
|
|||
runs-on: ${{ matrix.os }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rs/toolchain@v1
|
||||
|
@ -37,9 +40,16 @@ jobs:
|
|||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: build
|
||||
args: --all
|
||||
|
||||
- name: cargo test
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: test
|
||||
args: --all-features
|
||||
|
||||
- name: cargo clippy
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: clippy
|
||||
args: -- -D warnings
|
||||
args: -- -D warnings --no-deps
|
||||
|
|
33
.github/workflows/fmt.yml
vendored
33
.github/workflows/fmt.yml
vendored
|
@ -1,33 +0,0 @@
|
|||
name: Rust fmt
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths-ignore:
|
||||
- '*.md'
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
fmt:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
profile: minimal
|
||||
toolchain: stable
|
||||
override: true
|
||||
components: rustfmt, clippy
|
||||
|
||||
- name: Check cargo fmt
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: fmt
|
||||
args: --all --check
|
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -1,4 +1,7 @@
|
|||
# Generated by Cargo
|
||||
# will have compiled files and executables
|
||||
/debug
|
||||
/target
|
||||
|
||||
# IDE configs
|
||||
.vscode
|
||||
.idea
|
||||
|
|
118
CHANGELOG.md
118
CHANGELOG.md
|
@ -9,6 +9,104 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
|
|||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.11.3] - 2024-04-11
|
||||
- Updated dependencies
|
||||
- Replaced url validation with url crate in imgurs-cli
|
||||
|
||||
## [0.11.2] - 2023-06-22
|
||||
- Updated dependencies
|
||||
- Fix deprecation warning of base64 crate.
|
||||
|
||||
## [0.11.1] - 2022-12-11
|
||||
### Fixed
|
||||
- `album_title` can be null, `account_id` can be null, string or number #92, thanks to @NotNorom
|
||||
|
||||
### Changed
|
||||
- Updated dependencies
|
||||
|
||||
## [0.11.0] - 2022-11-07
|
||||
### Added
|
||||
- Added `with_http_client` method to ImgurClient #87, thanks to @NotNorom
|
||||
|
||||
### Changed
|
||||
- Updated crate arboard to v3
|
||||
- Updated crate simple_logger to v4
|
||||
|
||||
## [0.10.0] - 2022-10-01
|
||||
- add configuration for tls (rustls-tls or native-tls)
|
||||
|
||||
## [0.9.1] - 2022-09-22
|
||||
- delete debug info from cli in release build
|
||||
|
||||
## [0.9.0] - 2022-09-05
|
||||
- moved cli to other crate
|
||||
- added get_album function
|
||||
|
||||
## [0.8.1] - 2022-06-18
|
||||
- fix tests
|
||||
- add missing doc
|
||||
- use `serde` instead of `serde_derive`
|
||||
|
||||
## [0.8.0] - 2022-06-13
|
||||
- add custom `Error` type
|
||||
- move api requests to `requests/` mod
|
||||
- comment code
|
||||
|
||||
## [0.7.4] - 2022-05-18
|
||||
### HOTFIX
|
||||
- fixed built on macos and windows
|
||||
|
||||
## [0.7.3] - 2022-05-18
|
||||
### Library
|
||||
- add code comments and tests
|
||||
- change `String` to `&str` in ImgurClient functions
|
||||
|
||||
### Other
|
||||
- bump deps
|
||||
- use `anyhow::Result<...>` instead `Result<..., Error>`
|
||||
|
||||
## [0.7.2] - 2022-04-05
|
||||
### HotFix
|
||||
- fix upload image from file
|
||||
|
||||
## [0.7.1] - 2022-04-04
|
||||
- fix build on what is not linux
|
||||
|
||||
## [0.7.0] - 2022-04-03
|
||||
### CLI
|
||||
- completions: changed type from String to Shell
|
||||
- removed `&` from `cli.commands` (line 54 in [parse.rs](./src/cli/parse.rs))
|
||||
|
||||
### Library
|
||||
- removed `.map_err(anyhow::Error::new)` when function returns error
|
||||
|
||||
### Added
|
||||
- commands in the code
|
||||
- api functions to `impl` in `ImgurClient`
|
||||
- documentation (example usage)
|
||||
|
||||
### Breaking Changes
|
||||
- lib: moved everything to the main package with api submodules (before `imgurs::api::ImgurClient`, after `imgurs::api::ImgurClient`)
|
||||
|
||||
## [0.6.0] - 2022-03-14
|
||||
### CLI
|
||||
- webhook: added url in title
|
||||
- cli: change image domain to your own (set in config)
|
||||
- if the configuration file cannot be open, ask the user whether to overwrite the file instead of overwriting it without asking
|
||||
- logger: set `max_level_debug` in debug binary
|
||||
|
||||
## [0.5.1] - 2022-03-08
|
||||
### Cli
|
||||
- change webhook to discord-webhook (to use rustls)
|
||||
|
||||
## [0.5.0] - 2022-03-07
|
||||
### CLI
|
||||
- clipboard: add support for xclip and termux
|
||||
- webhook: send webhook to discord if image uploaded ([example](https://i.imgur.com/CPpHEec.png))
|
||||
|
||||
### Library
|
||||
- if body length is greater than 30, return message `body is too length`
|
||||
|
||||
## [0.4.0] - 2022-02-27
|
||||
### CLI
|
||||
- update logger
|
||||
|
@ -19,6 +117,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
|
|||
|
||||
### Library
|
||||
- added Clone derive
|
||||
- if body length is > 30 return body is too length
|
||||
|
||||
## [0.3.0] - 2022-01-28
|
||||
### CLI
|
||||
|
@ -63,7 +162,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
|
|||
- upload image
|
||||
|
||||
<!-- next-url -->
|
||||
[Unreleased]: https://github.com/MedzikUser/imgurs/compare/v0.4.0...HEAD
|
||||
[Unreleased]: https://github.com/MedzikUser/imgurs/compare/v0.11.3...HEAD
|
||||
[0.11.3]: https://github.com/MedzikUser/imgurs/commits/v0.11.3
|
||||
[0.11.2]: https://github.com/MedzikUser/imgurs/commits/v0.11.2
|
||||
[0.11.1]: https://github.com/MedzikUser/imgurs/commits/v0.11.1
|
||||
[0.11.0]: https://github.com/MedzikUser/imgurs/commits/v0.11.0
|
||||
[0.10.0]: https://github.com/MedzikUser/imgurs/commits/v0.10.0
|
||||
[0.9.1]: https://github.com/MedzikUser/imgurs/commits/v0.9.1
|
||||
[0.9.0]: https://github.com/MedzikUser/imgurs/commits/v0.9.0
|
||||
[0.8.1]: https://github.com/MedzikUser/imgurs/commits/v0.8.1
|
||||
[0.8.0]: https://github.com/MedzikUser/imgurs/commits/v0.8.0
|
||||
[0.7.4]: https://github.com/MedzikUser/imgurs/commits/v0.7.4
|
||||
[0.7.3]: https://github.com/MedzikUser/imgurs/commits/v0.7.3
|
||||
[0.7.2]: https://github.com/MedzikUser/imgurs/commits/v0.7.2
|
||||
[0.7.1]: https://github.com/MedzikUser/imgurs/commits/v0.7.1
|
||||
[0.7.0]: https://github.com/MedzikUser/imgurs/commits/v0.7.0
|
||||
[0.6.0]: https://github.com/MedzikUser/imgurs/commits/v0.6.0
|
||||
[0.5.1]: https://github.com/MedzikUser/imgurs/commits/v0.5.1
|
||||
[0.5.0]: https://github.com/MedzikUser/imgurs/commits/v0.5.0
|
||||
[0.4.0]: https://github.com/MedzikUser/imgurs/commits/v0.4.0
|
||||
[0.3.0]: https://github.com/MedzikUser/imgurs/commits/v0.3.0
|
||||
[0.2.0]: https://github.com/MedzikUser/imgurs/commits/v0.2.0
|
||||
|
|
2380
Cargo.lock
generated
2380
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
75
Cargo.toml
75
Cargo.toml
|
@ -1,60 +1,43 @@
|
|||
[workspace]
|
||||
members = ["imgurs-cli"]
|
||||
resolver = "2"
|
||||
|
||||
[package]
|
||||
name = "imgurs"
|
||||
description = "API and CLI for Imgur"
|
||||
version = "0.11.3"
|
||||
description = "API for Imgur"
|
||||
license = "BSD-3-Clause"
|
||||
readme = "README.md"
|
||||
authors = ["MedzikUser <nivua1fn@duck.com>"]
|
||||
homepage = "https://github.com/MedzikUser/imgurs"
|
||||
repository = "https://github.com/MedzikUser/imgurs.git"
|
||||
authors = ["M3DZIK <me@medzik.dev>"]
|
||||
homepage = "https://github.com/M3DZIK/imgurs"
|
||||
repository = "https://github.com/M3DZIK/imgurs.git"
|
||||
keywords = ["imgur", "imgur-api", "image", "image-upload"]
|
||||
categories = ["command-line-utilities"]
|
||||
rust-version = "1.58"
|
||||
version = "0.4.0"
|
||||
edition = "2021"
|
||||
|
||||
[features]
|
||||
default = ["imgur", "rustls-tls"]
|
||||
full = ["imgur"]
|
||||
rustls-tls = ["reqwest/rustls-tls"]
|
||||
native-tls = ["reqwest/native-tls"]
|
||||
imgur = []
|
||||
|
||||
[profile.release]
|
||||
lto = true
|
||||
panic = 'abort'
|
||||
opt-level = 'z'
|
||||
codegen-units = 1
|
||||
|
||||
[dependencies]
|
||||
dirs = "4.0.0"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.136"
|
||||
toml = "0.5.8"
|
||||
serde_json = "1.0.79"
|
||||
chrono = "0.4.19"
|
||||
base64 = "0.13.0"
|
||||
notify-rust = "4.5.6"
|
||||
clap_complete = "3.1.0"
|
||||
anyhow = "1.0.55"
|
||||
better-panic = "0.3.0"
|
||||
validator = "0.14.0"
|
||||
colored = "2.0.0"
|
||||
clap_mangen = "0.1.2"
|
||||
# HTTP
|
||||
reqwest = { version = "0.12", default-features = false, features = ["json", "multipart"] }
|
||||
# Request
|
||||
base64 = "0.22"
|
||||
url = "2.5.0" # validate url address
|
||||
# Response
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
||||
[target.'cfg(not(all(unix, not(any(target_os="macos", target_os="android", target_os="emscripten")))))'.dependencies]
|
||||
arboard = "2.0.1"
|
||||
# Errors
|
||||
thiserror = "1.0"
|
||||
|
||||
[dependencies.clap]
|
||||
version = "3.1.2"
|
||||
features = ["derive", "cargo", "std"]
|
||||
|
||||
[dependencies.log]
|
||||
version = "0.4.14"
|
||||
features = ["release_max_level_info"]
|
||||
|
||||
[dependencies.simple_logger]
|
||||
version = "2.1.0"
|
||||
default-features = false
|
||||
features = ["colors"]
|
||||
|
||||
[dependencies.reqwest]
|
||||
version = "0.11.9"
|
||||
default-features = false
|
||||
features = ["json", "rustls-tls"]
|
||||
|
||||
[dependencies.tokio]
|
||||
version = "1.17.0"
|
||||
features = ["macros", "rt-multi-thread"]
|
||||
[dev-dependencies]
|
||||
# Async tests
|
||||
tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] }
|
||||
|
|
25
README.md
25
README.md
|
@ -1,10 +1,16 @@
|
|||
[crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
|
||||
[docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs
|
||||
|
||||
# Imgurs - CLI and Library for Imgur API
|
||||
|
||||
[![crates-io]](https://crates.io/crates/imgurs)
|
||||
[![docs-rs]](https://docs.rs/imgurs)
|
||||
|
||||
## Screenshots
|
||||
|
||||
![upload](https://cdn.magicuser.cf/7eMaL5d.png)
|
||||
![](https://i.imgur.com/MG35kvf.png)
|
||||
|
||||
![delete](https://cdn.magicuser.cf/TSxBrhO.png)
|
||||
![](https://i.imgur.com/TSxBrhO.png)
|
||||
|
||||
## Shell completions
|
||||
|
||||
|
@ -18,8 +24,17 @@ imgurs completions zsh > /usr/local/share/zsh/site-functions/_imgurs
|
|||
imgurs completions fish > ~/.config/fish/completions/imgurs.fish
|
||||
```
|
||||
|
||||
## Man page
|
||||
|
||||
Generate manpage
|
||||
|
||||
imgurs manpage | gzip > /usr/share/man/man1/imgurs.1.gz
|
||||
|
||||
## Dependencies
|
||||
- **xsel** - support clipboard on Linux
|
||||
- support clipboard on Linux
|
||||
- **xsel**
|
||||
- **xclip** - alternative to **xsel**
|
||||
- **termux-api** - on **Termux**
|
||||
- **libnotify** - support notification on Linux
|
||||
|
||||
## How to install Imgurs CLI?
|
||||
|
@ -35,7 +50,7 @@ Using yay ([AUR](https://aur.archlinux.org/packages/imgurs))
|
|||
|
||||
yay -S imgurs
|
||||
|
||||
If you are using arch linux you can add [this repo](https://github.com/archlinux-pkg/packages) and run
|
||||
or can add [this repo](https://github.com/archlinux-pkg/packages) and run
|
||||
|
||||
sudo pacman -Sy imgurs
|
||||
|
||||
|
@ -53,4 +68,4 @@ Download imgurs-windows.exe from [the releases page](https://github.com/MedzikUs
|
|||
### **Compile with Cargo**
|
||||
Make sure you have a recent version of Rust. Then you can run
|
||||
|
||||
cargo install imgurs
|
||||
cargo install imgurs-cli
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[imgur]
|
||||
id = '3e3ce0d7ac14d56'
|
||||
image_cdn = 'i.imgur.com'
|
||||
|
||||
[notification]
|
||||
enabled = true
|
||||
|
|
46
imgurs-cli/Cargo.toml
Normal file
46
imgurs-cli/Cargo.toml
Normal file
|
@ -0,0 +1,46 @@
|
|||
[package]
|
||||
name = "imgurs-cli"
|
||||
version = "0.11.3"
|
||||
description = "CLI for Imgur"
|
||||
license = "BSD-3-Clause"
|
||||
authors = ["M3DZIK <me@medzik.dev>"]
|
||||
homepage = "https://github.com/M3DZIK/imgurs"
|
||||
repository = "https://github.com/M3DZIK/imgurs.git"
|
||||
keywords = ["imgur", "imgur-api", "image", "image-upload"]
|
||||
categories = ["command-line-utilities"]
|
||||
edition = "2021"
|
||||
|
||||
[[bin]]
|
||||
name = "imgurs"
|
||||
path = "src/main.rs"
|
||||
|
||||
[dependencies]
|
||||
# Async runtime
|
||||
tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] }
|
||||
|
||||
# CLI
|
||||
clap = { version = "4.5", features = ["derive"] }
|
||||
clap_complete = "4.5"
|
||||
clap_mangen = "0.2"
|
||||
|
||||
# Errors
|
||||
anyhow = "1.0"
|
||||
|
||||
# Logger
|
||||
log = { version = "0.4", features = ["release_max_level_info"] }
|
||||
simple_logger = "4.3"
|
||||
colored = "2.1"
|
||||
|
||||
# Config
|
||||
toml = "0.8"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
||||
# Other
|
||||
chrono = "0.4" # parse upload date
|
||||
notify-rust = "4.11" # send notification after upload
|
||||
dirs = "5.0" # get system configuration directory
|
||||
|
||||
imgurs = { path = "..", version = "0.11.0", features = ["full"] }
|
||||
|
||||
[target.'cfg(not(all(unix, not(any(target_os="macos", target_os="android", target_os="emscripten")))))'.dependencies]
|
||||
arboard = "3.3" # copy url to clipboard
|
1
imgurs-cli/config.toml
Symbolic link
1
imgurs-cli/config.toml
Symbolic link
|
@ -0,0 +1 @@
|
|||
../config.toml
|
37
imgurs-cli/src/config/mod.rs
Normal file
37
imgurs-cli/src/config/mod.rs
Normal file
|
@ -0,0 +1,37 @@
|
|||
use serde::{Deserialize, Serialize};
|
||||
|
||||
pub mod toml;
|
||||
|
||||
/// Configuration schema
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct Config {
|
||||
/// Imgur API configuration options
|
||||
pub imgur: ConfigImgur,
|
||||
/// Notification options
|
||||
pub notification: ConfigNotification,
|
||||
/// Clipboard options
|
||||
pub clipboard: ConfigClipboard,
|
||||
}
|
||||
|
||||
/// Imgur API configuration options
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct ConfigImgur {
|
||||
/// Imgur Client ID
|
||||
pub id: String,
|
||||
/// Imgur Domain (e.g. if you have a imgur proxy)
|
||||
pub image_cdn: String,
|
||||
}
|
||||
|
||||
/// Notification options
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct ConfigNotification {
|
||||
/// Send notification
|
||||
pub enabled: bool,
|
||||
}
|
||||
|
||||
/// Clipboard options
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct ConfigClipboard {
|
||||
/// Copy image url to clipboard
|
||||
pub enabled: bool,
|
||||
}
|
63
imgurs-cli/src/config/toml.rs
Normal file
63
imgurs-cli/src/config/toml.rs
Normal file
|
@ -0,0 +1,63 @@
|
|||
use std::{
|
||||
fs::{create_dir_all, read_to_string, File},
|
||||
io::{self, Write as _},
|
||||
path::Path,
|
||||
};
|
||||
|
||||
use colored::Colorize;
|
||||
use dirs::config_dir;
|
||||
use log::warn;
|
||||
use toml::from_str as toml_from_str;
|
||||
|
||||
use super::Config;
|
||||
|
||||
/// Configuration file path (in system config directory).
|
||||
const CONFIG_DIR: &str = "/imgurs/config.toml";
|
||||
|
||||
/// Parse configuration file
|
||||
pub fn parse() -> Config {
|
||||
// parse config or use default
|
||||
toml().unwrap_or_else(|err| {
|
||||
let mut stdout = std::io::stdout();
|
||||
|
||||
write!(stdout, "{}", "The configuration file could not be opened. Do you want to create/overwrite with DEFAULT values? (Y/n): ".yellow()).unwrap();
|
||||
stdout.flush().unwrap();
|
||||
|
||||
let mut value = String::new();
|
||||
io::stdin()
|
||||
.read_line(&mut value)
|
||||
.expect("failed to read line");
|
||||
|
||||
if value.to_lowercase() != "n\n" {
|
||||
warn!("Parse toml config error: {err}! Creating config file...");
|
||||
|
||||
let default_config = include_str!(concat!("../../config.toml"));
|
||||
|
||||
let sys_config_dir = config_dir().expect("find config dir");
|
||||
let config_dir = format!("{}{CONFIG_DIR}", sys_config_dir.to_string_lossy());
|
||||
let config_path = Path::new(&config_dir);
|
||||
|
||||
let prefix = config_path.parent().unwrap();
|
||||
create_dir_all(prefix).expect("create config dir");
|
||||
|
||||
let mut file_ref = File::create(config_path).expect("create failed");
|
||||
|
||||
file_ref
|
||||
.write_all(default_config.as_bytes())
|
||||
.expect("failed write default config to file");
|
||||
|
||||
toml().expect("parse toml config")
|
||||
} else {
|
||||
panic!("Configuration file creation cancelled!")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fn toml() -> anyhow::Result<Config> {
|
||||
let config_dir = config_dir().unwrap();
|
||||
let file_dir = format!("{}{CONFIG_DIR}", config_dir.to_string_lossy());
|
||||
let toml_str = read_to_string(file_dir)?;
|
||||
let decode = toml_from_str(&toml_str)?;
|
||||
|
||||
Ok(decode)
|
||||
}
|
85
imgurs-cli/src/imgur/clipboard.rs
Normal file
85
imgurs-cli/src/imgur/clipboard.rs
Normal file
|
@ -0,0 +1,85 @@
|
|||
#[cfg(all(
|
||||
unix,
|
||||
not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
|
||||
))]
|
||||
// use xclip (or a similar program that is installed) because the kernel deletes the clipboard after the process ends
|
||||
pub fn set_clipboard(content: &str) {
|
||||
fn is_program_in_path(program: &str) -> bool {
|
||||
if let Ok(path) = std::env::var("PATH") {
|
||||
for p in path.split(':') {
|
||||
let p_str = format!("{}/{}", p, program);
|
||||
if std::fs::metadata(p_str).is_ok() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
use std::{
|
||||
io::Write,
|
||||
process::{Command, Stdio},
|
||||
};
|
||||
|
||||
use colored::Colorize;
|
||||
|
||||
let mut child;
|
||||
|
||||
// xsel
|
||||
if is_program_in_path("xsel") {
|
||||
child = Command::new("xsel")
|
||||
.arg("--input")
|
||||
.arg("--clipboard")
|
||||
.stdin(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("execute command xsel")
|
||||
|
||||
// xclip
|
||||
} else if is_program_in_path("xclip") {
|
||||
child = Command::new("xclip")
|
||||
.arg("-in")
|
||||
.arg("-selection")
|
||||
.arg("clipboard")
|
||||
.stdin(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("execute command xclip")
|
||||
|
||||
// termux
|
||||
} else if is_program_in_path("termux-clipboard-set") {
|
||||
child = Command::new("termux-clipboard-set")
|
||||
.stdin(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("execute command termux-clipboard-set")
|
||||
|
||||
// the above programs responsible for the clipboard were not found
|
||||
} else {
|
||||
println!(
|
||||
"{} {}",
|
||||
"WARN".yellow(),
|
||||
"command for clipboard not found".magenta()
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// copy the content (send it to stdin command)
|
||||
child
|
||||
.stdin
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.write_all(content.as_bytes())
|
||||
.expect("execute command");
|
||||
|
||||
child
|
||||
.wait_with_output()
|
||||
.expect("wait for clipboard command output");
|
||||
}
|
||||
|
||||
#[cfg(not(all(
|
||||
unix,
|
||||
not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
|
||||
)))]
|
||||
pub fn set_clipboard(content: &str) {
|
||||
let mut clipboard = arboard::Clipboard::new().unwrap();
|
||||
clipboard.set_text(content.to_string()).unwrap();
|
||||
}
|
|
@ -1,11 +1,17 @@
|
|||
use chrono::{prelude::DateTime, Utc};
|
||||
use colored::Colorize;
|
||||
use imgurs::api::{rate_limit::rate_limit, ImgurClient};
|
||||
use std::time::{Duration, UNIX_EPOCH};
|
||||
|
||||
pub async fn credits(client: ImgurClient) {
|
||||
let i = rate_limit(client).await.expect("send api request");
|
||||
use chrono::{prelude::DateTime, Utc};
|
||||
use colored::Colorize;
|
||||
use imgurs::ImgurClient;
|
||||
|
||||
pub async fn credits(client: ImgurClient) {
|
||||
// get client ratelimit from imgur api
|
||||
let i = client
|
||||
.rate_limit()
|
||||
.await
|
||||
.expect("send request to imgur api");
|
||||
|
||||
// format image upload date
|
||||
let date = UNIX_EPOCH + Duration::from_secs(i.data.user_reset.try_into().unwrap());
|
||||
let datetime = DateTime::<Utc>::from(date);
|
||||
let timestamp_str = datetime.format("%Y-%m-%d %H:%M:%S").to_string();
|
15
imgurs-cli/src/imgur/delete_image.rs
Normal file
15
imgurs-cli/src/imgur/delete_image.rs
Normal file
|
@ -0,0 +1,15 @@
|
|||
use colored::Colorize;
|
||||
use imgurs::ImgurClient;
|
||||
|
||||
pub async fn delete_image(client: ImgurClient, delete_hash: String) {
|
||||
// delete image from imgur
|
||||
client
|
||||
.delete_image(&delete_hash)
|
||||
.await
|
||||
.expect("send api request");
|
||||
|
||||
println!(
|
||||
"{}",
|
||||
"If Delete Hash was correct the image was deleted!".magenta()
|
||||
);
|
||||
}
|
14
imgurs-cli/src/imgur/info_image.rs
Normal file
14
imgurs-cli/src/imgur/info_image.rs
Normal file
|
@ -0,0 +1,14 @@
|
|||
use imgurs::ImgurClient;
|
||||
|
||||
use super::print_image_info;
|
||||
|
||||
pub async fn image_info(client: ImgurClient, id: String) {
|
||||
// get a image info from imgur
|
||||
let info = client
|
||||
.image_info(&id)
|
||||
.await
|
||||
.expect("send request to imfur api");
|
||||
|
||||
// print image information from imgur
|
||||
print_image_info(&info);
|
||||
}
|
|
@ -1,48 +1,54 @@
|
|||
pub mod clipboard;
|
||||
pub mod credits;
|
||||
pub mod delete_image;
|
||||
pub mod info_image;
|
||||
pub mod parse;
|
||||
pub mod upload_image;
|
||||
mod clipboard;
|
||||
mod credits;
|
||||
mod delete_image;
|
||||
mod info_image;
|
||||
mod upload_image;
|
||||
|
||||
use std::time::{Duration, UNIX_EPOCH};
|
||||
|
||||
use chrono::{prelude::DateTime, Utc};
|
||||
use colored::Colorize;
|
||||
use imgurs::api::ImageInfo;
|
||||
use std::time::{Duration, UNIX_EPOCH};
|
||||
use imgurs::ImageInfo;
|
||||
|
||||
pub fn print_image_info(i: ImageInfo) {
|
||||
pub use self::{clipboard::*, credits::*, delete_image::*, info_image::*, upload_image::*};
|
||||
|
||||
// print image information from imgur
|
||||
pub fn print_image_info(i: &ImageInfo) {
|
||||
// format image upload date
|
||||
let d = UNIX_EPOCH + Duration::from_secs(i.data.datetime.try_into().unwrap());
|
||||
let datetime = DateTime::<Utc>::from(d);
|
||||
let timestamp_str = datetime.format("%Y-%m-%d %H:%M:%S").to_string();
|
||||
|
||||
// image title
|
||||
if i.data.title != None {
|
||||
let title = i.data.title.clone();
|
||||
|
||||
println!(
|
||||
"{} {}",
|
||||
"title".green(),
|
||||
i.data
|
||||
.title
|
||||
.unwrap_or_else(|| "unknown".to_string())
|
||||
.magenta()
|
||||
title.unwrap_or_else(|| "unknown".to_string()).magenta()
|
||||
);
|
||||
}
|
||||
|
||||
// image description
|
||||
if i.data.description != None {
|
||||
let desc = i.data.description.clone();
|
||||
|
||||
println!(
|
||||
"{} {}",
|
||||
"description".green(),
|
||||
i.data
|
||||
.description
|
||||
.unwrap_or_else(|| "unknown".to_string())
|
||||
.magenta()
|
||||
desc.unwrap_or_else(|| "unknown".to_string()).magenta()
|
||||
);
|
||||
}
|
||||
|
||||
// image deletehas
|
||||
if i.data.deletehash != None {
|
||||
let delhash = i.data.deletehash.clone();
|
||||
|
||||
println!(
|
||||
"{} {}",
|
||||
"deletehash".green(),
|
||||
i.data
|
||||
.deletehash
|
||||
.unwrap_or_else(|| "unknown".to_string())
|
||||
.magenta()
|
||||
delhash.unwrap_or_else(|| "unknown".to_string()).magenta()
|
||||
);
|
||||
}
|
||||
|
49
imgurs-cli/src/imgur/upload_image.rs
Normal file
49
imgurs-cli/src/imgur/upload_image.rs
Normal file
|
@ -0,0 +1,49 @@
|
|||
use imgurs::ImgurClient;
|
||||
use notify_rust::Notification;
|
||||
|
||||
use crate::{
|
||||
config::toml,
|
||||
imgur::{clipboard::set_clipboard, print_image_info},
|
||||
};
|
||||
|
||||
// show notification
|
||||
macro_rules! notify (
|
||||
($notification: expr) => (
|
||||
if toml::parse().notification.enabled {
|
||||
$notification.show().expect("send notification");
|
||||
}
|
||||
);
|
||||
);
|
||||
|
||||
pub async fn upload_image(client: ImgurClient, path: String) {
|
||||
// parse configuration file
|
||||
let config = toml::parse();
|
||||
|
||||
// upload a image to imgur
|
||||
let mut i = client.upload_image(&path).await.unwrap_or_else(|err| {
|
||||
notify!(Notification::new()
|
||||
.summary("Error!")
|
||||
.body(&format!("Error: {}", err))
|
||||
.appname("Imgurs")); // I don't think you can set it to error
|
||||
|
||||
panic!("send request to imgur api: {}", err)
|
||||
});
|
||||
|
||||
// change domain to proxy (to be set in config)
|
||||
if config.imgur.image_cdn != "i.imgur.com" {
|
||||
i.data.link = i.data.link.replace("i.imgur.com", &config.imgur.image_cdn)
|
||||
}
|
||||
|
||||
// print image information from imgur
|
||||
print_image_info(&i);
|
||||
|
||||
// send notification that the image has been uploaded
|
||||
notify!(Notification::new()
|
||||
.summary("Imgurs")
|
||||
.body(&format!("Uploaded {}", i.data.link)));
|
||||
|
||||
// if enabled copy link to clipboard
|
||||
if config.clipboard.enabled {
|
||||
set_clipboard(&i.data.link)
|
||||
}
|
||||
}
|
82
imgurs-cli/src/main.rs
Normal file
82
imgurs-cli/src/main.rs
Normal file
|
@ -0,0 +1,82 @@
|
|||
use std::io::stdout;
|
||||
|
||||
use clap::{Command, CommandFactory, Parser};
|
||||
use clap_complete::{generate, Generator, Shell};
|
||||
use imgurs::ImgurClient;
|
||||
use simple_logger::SimpleLogger;
|
||||
|
||||
use crate::imgur::*;
|
||||
|
||||
mod config;
|
||||
mod imgur;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[clap(
|
||||
name = "imgurs",
|
||||
about = "Imgur API CLI",
|
||||
long_about = env!("CARGO_PKG_DESCRIPTION"),
|
||||
version = env!("CARGO_PKG_VERSION"),
|
||||
)]
|
||||
enum Cli {
|
||||
#[clap(about = "Print Client Rate Limit", display_order = 1)]
|
||||
Credits,
|
||||
|
||||
#[clap(about = "Upload image to Imgur", display_order = 2)]
|
||||
Upload { path: String },
|
||||
|
||||
#[clap(about = "Delete image from Imgur", display_order = 3)]
|
||||
Delete { delete_hash: String },
|
||||
|
||||
#[clap(about = "Print image info", display_order = 4)]
|
||||
Info { id: String },
|
||||
|
||||
#[clap(
|
||||
about = "Generate completion file for a shell [bash, elvish, fish, powershell, zsh]",
|
||||
display_order = 5
|
||||
)]
|
||||
Completions { shell: Shell },
|
||||
|
||||
#[clap(about = "Generate man page", display_order = 6)]
|
||||
Manpage,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
SimpleLogger::new().init().unwrap();
|
||||
|
||||
// parse config file
|
||||
let config = config::toml::parse();
|
||||
|
||||
// create imgur client
|
||||
let client = ImgurClient::new(&config.imgur.id);
|
||||
|
||||
let args = Cli::parse();
|
||||
|
||||
match args {
|
||||
Cli::Credits => credits(client).await,
|
||||
|
||||
Cli::Upload { path } => upload_image(client, path).await,
|
||||
|
||||
Cli::Delete { delete_hash } => delete_image(client, delete_hash.to_string()).await,
|
||||
|
||||
Cli::Info { id } => image_info(client, id.to_string()).await,
|
||||
|
||||
Cli::Completions { shell } => {
|
||||
let mut app = Cli::command();
|
||||
|
||||
fn print_completions<G: Generator>(gen: G, app: &mut Command) {
|
||||
generate(gen, app, app.get_name().to_string(), &mut stdout())
|
||||
}
|
||||
|
||||
print_completions(shell, &mut app)
|
||||
},
|
||||
|
||||
Cli::Manpage => {
|
||||
let clap_app = Cli::command();
|
||||
let man = clap_mangen::Man::new(clap_app);
|
||||
|
||||
man.render(&mut stdout())
|
||||
.expect("Failed to generate man page");
|
||||
},
|
||||
}
|
||||
}
|
|
@ -1,8 +1,14 @@
|
|||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:base"
|
||||
"config:base",
|
||||
"schedule:weekly",
|
||||
"group:allNonMajor",
|
||||
":semanticCommits"
|
||||
],
|
||||
"labels": [
|
||||
"dependencies"
|
||||
],
|
||||
"prHourlyLimit": 0,
|
||||
"automergeType": "pr",
|
||||
"prCreation": "immediate",
|
||||
"packageRules": [
|
||||
|
|
11
rustfmt.toml
Normal file
11
rustfmt.toml
Normal file
|
@ -0,0 +1,11 @@
|
|||
# https://rust-lang.github.io/rustfmt
|
||||
|
||||
# stable
|
||||
edition = "2021"
|
||||
newline_style = "Unix"
|
||||
match_block_trailing_comma = true
|
||||
|
||||
# nightly
|
||||
group_imports = "StdExternalCrate"
|
||||
imports_granularity = "Crate"
|
||||
format_code_in_doc_comments = true
|
|
@ -1,26 +0,0 @@
|
|||
use crate::api::configuration::{api_url, ImgurClient};
|
||||
|
||||
use super::send_api_request;
|
||||
|
||||
use anyhow::Error as anyhow_err;
|
||||
use reqwest::Method;
|
||||
use std::io::{Error, ErrorKind};
|
||||
|
||||
pub async fn delete_image(c: ImgurClient, delete_hash: String) -> Result<String, anyhow_err> {
|
||||
let uri = api_url!(format!("image/{delete_hash}"));
|
||||
let res = send_api_request(&c, Method::DELETE, uri, None).await?;
|
||||
|
||||
let status = res.status();
|
||||
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await.map_err(anyhow_err::new)?;
|
||||
let err = Error::new(
|
||||
ErrorKind::Other,
|
||||
format!("server returned non-successful status code = {status}, body = {body}"),
|
||||
);
|
||||
|
||||
Err(anyhow_err::from(err))
|
||||
} else {
|
||||
Ok("If the delete hash was correct the image was deleted!".to_string())
|
||||
}
|
||||
}
|
|
@ -1,27 +0,0 @@
|
|||
use crate::api::configuration::{api_url, ImgurClient};
|
||||
use crate::api::ImageInfo;
|
||||
|
||||
use super::send_api_request;
|
||||
|
||||
use anyhow::Error as anyhow_err;
|
||||
use reqwest::Method;
|
||||
use std::io::{Error, ErrorKind};
|
||||
|
||||
pub async fn get_image(c: ImgurClient, image: &str) -> Result<ImageInfo, anyhow_err> {
|
||||
let uri = api_url!(format!("image/{image}"));
|
||||
let res = send_api_request(&c, Method::GET, uri, None).await?;
|
||||
|
||||
let status = res.status();
|
||||
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let err = Error::new(
|
||||
ErrorKind::Other,
|
||||
format!("server returned non-successful status code = {status}"),
|
||||
);
|
||||
|
||||
Err(anyhow_err::from(err))
|
||||
} else {
|
||||
let content: ImageInfo = res.json().await.map_err(anyhow_err::new)?;
|
||||
Ok(content)
|
||||
}
|
||||
}
|
|
@ -1,27 +0,0 @@
|
|||
use serde_derive::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct ImageInfo {
|
||||
pub data: ImageInfoData,
|
||||
pub success: bool,
|
||||
pub status: i32,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct ImageInfoData {
|
||||
pub id: String,
|
||||
pub title: Option<String>,
|
||||
pub description: Option<String>,
|
||||
pub datetime: i32,
|
||||
#[serde(rename = "type")]
|
||||
pub img_type: String,
|
||||
pub animated: bool,
|
||||
pub width: i32,
|
||||
pub height: i32,
|
||||
pub size: i32,
|
||||
pub views: i32,
|
||||
pub bandwidth: i64,
|
||||
pub favorite: bool,
|
||||
pub deletehash: Option<String>,
|
||||
pub link: String,
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
mod image_type;
|
||||
mod send_request;
|
||||
|
||||
pub mod configuration;
|
||||
pub mod delete_image;
|
||||
pub mod get_image;
|
||||
pub mod rate_limit;
|
||||
pub mod upload_image;
|
||||
|
||||
pub use configuration::ImgurClient;
|
||||
pub use image_type::*;
|
||||
pub use send_request::send_api_request;
|
|
@ -1,49 +0,0 @@
|
|||
use crate::api::configuration::{api_url, ImgurClient};
|
||||
|
||||
use super::send_api_request;
|
||||
|
||||
use anyhow::Error as anyhow_err;
|
||||
use reqwest::Method;
|
||||
use serde_derive::{Deserialize, Serialize};
|
||||
use std::io::{Error, ErrorKind};
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct RateLimitInfo {
|
||||
pub data: RateLimitData,
|
||||
pub success: bool,
|
||||
pub status: i32,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct RateLimitData {
|
||||
#[serde(rename = "UserLimit")]
|
||||
pub user_limit: i32,
|
||||
#[serde(rename = "UserRemaining")]
|
||||
pub user_remaining: i32,
|
||||
#[serde(rename = "UserReset")]
|
||||
pub user_reset: i32,
|
||||
#[serde(rename = "ClientLimit")]
|
||||
pub client_limit: i32,
|
||||
#[serde(rename = "ClientRemaining")]
|
||||
pub client_remaining: i32,
|
||||
}
|
||||
|
||||
pub async fn rate_limit(c: ImgurClient) -> Result<RateLimitInfo, anyhow_err> {
|
||||
let uri = api_url!("credits");
|
||||
let res = send_api_request(&c, Method::GET, uri, None).await?;
|
||||
|
||||
let status = res.status();
|
||||
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await.map_err(anyhow_err::new)?;
|
||||
let err = Error::new(
|
||||
ErrorKind::Other,
|
||||
format!("server returned non-successful status code = {status}, body = {body}"),
|
||||
);
|
||||
|
||||
Err(anyhow_err::from(err))
|
||||
} else {
|
||||
let content: RateLimitInfo = res.json().await.map_err(anyhow_err::new)?;
|
||||
Ok(content)
|
||||
}
|
||||
}
|
|
@ -1,37 +0,0 @@
|
|||
use crate::api::{
|
||||
configuration::{api_url, ImgurClient},
|
||||
ImageInfo,
|
||||
};
|
||||
|
||||
use super::send_api_request;
|
||||
|
||||
use anyhow::Error as anyhow_err;
|
||||
use reqwest::Method;
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
io::{Error, ErrorKind},
|
||||
};
|
||||
|
||||
pub async fn upload_image(c: ImgurClient, image: &str) -> Result<ImageInfo, anyhow_err> {
|
||||
let mut form = HashMap::new();
|
||||
|
||||
form.insert("image", image.to_string());
|
||||
|
||||
let uri = api_url!("image");
|
||||
let res = send_api_request(&c, Method::POST, uri, Some(form)).await?;
|
||||
|
||||
let status = res.status();
|
||||
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await.map_err(anyhow_err::new)?;
|
||||
let err = Error::new(
|
||||
ErrorKind::Other,
|
||||
format!("server returned non-successful status code = {status}, body = {body}"),
|
||||
);
|
||||
|
||||
Err(anyhow_err::from(err))
|
||||
} else {
|
||||
let content: ImageInfo = res.json().await.map_err(anyhow_err::new)?;
|
||||
Ok(content)
|
||||
}
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
#[cfg(all(
|
||||
unix,
|
||||
not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
|
||||
))]
|
||||
pub fn set_clipboard(content: String) {
|
||||
use std::{
|
||||
io::Write,
|
||||
process::{Command, Stdio},
|
||||
};
|
||||
|
||||
let mut child = Command::new("xsel")
|
||||
.arg("--input")
|
||||
.arg("--clipboard")
|
||||
.stdin(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("execute command xsel");
|
||||
|
||||
child
|
||||
.stdin
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.write_all(content.as_bytes())
|
||||
.expect("execute command");
|
||||
child.wait_with_output().unwrap();
|
||||
}
|
||||
|
||||
#[cfg(not(all(
|
||||
unix,
|
||||
not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
|
||||
)))]
|
||||
use arboard::Clipboard;
|
||||
|
||||
#[cfg(not(all(
|
||||
unix,
|
||||
not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
|
||||
)))]
|
||||
pub fn set_clipboard(content: String) {
|
||||
let mut clipboard = Clipboard::new().unwrap();
|
||||
clipboard.set_text(content).unwrap();
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
use colored::Colorize;
|
||||
|
||||
use imgurs::api::{delete_image::delete_image as del_img, ImgurClient};
|
||||
|
||||
pub async fn delete_image(client: ImgurClient, delete_hash: String) {
|
||||
let i = del_img(client, delete_hash)
|
||||
.await
|
||||
.expect("send api request");
|
||||
|
||||
println!("{}", i.magenta());
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
use imgurs::api::{get_image::get_image, ImgurClient};
|
||||
|
||||
use super::print_image_info;
|
||||
|
||||
pub async fn image_info(client: ImgurClient, id: &str) {
|
||||
let info = get_image(client, id).await.expect("send api request");
|
||||
print_image_info(info);
|
||||
}
|
|
@ -1,90 +0,0 @@
|
|||
use clap::{Command, IntoApp, Parser, Subcommand};
|
||||
use clap_complete::{generate, Generator, Shell};
|
||||
use imgurs::api::ImgurClient;
|
||||
use std::io::{self, stdout};
|
||||
|
||||
use crate::cli::{credits::*, delete_image::*, info_image::*, upload_image::*};
|
||||
|
||||
const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
|
||||
const NAME: Option<&str> = option_env!("CARGO_PKG_NAME");
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[clap(
|
||||
name = NAME.unwrap_or("unknown"),
|
||||
about = "Imgur API CLI", long_about = None,
|
||||
version = VERSION.unwrap_or("unknown")
|
||||
)]
|
||||
struct Cli {
|
||||
#[clap(subcommand)]
|
||||
command: Commands,
|
||||
}
|
||||
|
||||
#[derive(Subcommand, Debug)]
|
||||
enum Commands {
|
||||
#[clap(about = "Print API Rate Limit", display_order = 1)]
|
||||
Credits,
|
||||
|
||||
#[clap(about = "Upload image to Imgur", display_order = 2)]
|
||||
Upload { path: String },
|
||||
|
||||
#[clap(about = "Delete image from Imgur", display_order = 3)]
|
||||
Delete { delete_hash: String },
|
||||
|
||||
#[clap(about = "Print image info", display_order = 4)]
|
||||
Info { id: String },
|
||||
|
||||
#[clap(
|
||||
about = "Generate completion file for a shell [bash, elvish, fish, powershell, zsh]",
|
||||
display_order = 5
|
||||
)]
|
||||
Completions { shell: String },
|
||||
|
||||
#[clap(about = "Generate man page", display_order = 6)]
|
||||
Manpage,
|
||||
}
|
||||
|
||||
fn print_completions<G: Generator>(gen: G, app: &mut Command) {
|
||||
generate(gen, app, app.get_name().to_string(), &mut stdout())
|
||||
}
|
||||
|
||||
pub async fn parse(client: ImgurClient) {
|
||||
let args = Cli::parse();
|
||||
|
||||
match &args.command {
|
||||
Commands::Credits => {
|
||||
credits(client).await;
|
||||
}
|
||||
|
||||
Commands::Upload { path } => {
|
||||
upload_image(client, path).await;
|
||||
}
|
||||
|
||||
Commands::Delete { delete_hash } => {
|
||||
delete_image(client, delete_hash.to_string()).await;
|
||||
}
|
||||
|
||||
Commands::Info { id } => {
|
||||
image_info(client, id).await;
|
||||
}
|
||||
|
||||
Commands::Completions { shell } => {
|
||||
let mut app = Cli::command();
|
||||
|
||||
match shell.as_str() {
|
||||
"bash" => print_completions(Shell::Bash, &mut app),
|
||||
"elvish" => print_completions(Shell::Elvish, &mut app),
|
||||
"fish" => print_completions(Shell::Fish, &mut app),
|
||||
"powershell" => print_completions(Shell::PowerShell, &mut app),
|
||||
"zsh" => print_completions(Shell::Zsh, &mut app),
|
||||
|
||||
_ => panic!("Completions to shell `{shell}`, not found!"),
|
||||
}
|
||||
}
|
||||
|
||||
Commands::Manpage => {
|
||||
let clap_app = Cli::command();
|
||||
let man = clap_mangen::Man::new(clap_app);
|
||||
man.render(&mut io::stdout()).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,48 +0,0 @@
|
|||
use super::clipboard::set_clipboard;
|
||||
use imgurs::api::{upload_image::upload_image as upload_img, ImgurClient};
|
||||
use notify_rust::Notification;
|
||||
|
||||
use crate::config::toml::parse as parse_config;
|
||||
|
||||
use super::print_image_info;
|
||||
|
||||
use base64::encode as base64_encode;
|
||||
use std::{fs::read as fs_read, path::Path};
|
||||
|
||||
macro_rules! notify (
|
||||
($notification: expr) => (
|
||||
if parse_config().notification.enabled {
|
||||
$notification.show().expect("send notification");
|
||||
}
|
||||
);
|
||||
);
|
||||
|
||||
pub async fn upload_image(client: ImgurClient, path: &str) {
|
||||
let mut image: String = path.to_string();
|
||||
|
||||
if Path::new(path).exists() {
|
||||
let bytes = fs_read(path)
|
||||
.map_err(|err| err.to_string())
|
||||
.expect("read file");
|
||||
image = base64_encode(bytes);
|
||||
} else if !validator::validate_url(path) {
|
||||
panic!("{path} is not a url")
|
||||
}
|
||||
|
||||
let i = upload_img(client, &image).await.unwrap_or_else(|err| {
|
||||
notify!(Notification::new()
|
||||
.summary("Error!")
|
||||
.body(&format!("Error: {}", &err.to_string()))
|
||||
.appname("Imgurs")); // I don't think you can set it to error
|
||||
panic!("{}", err)
|
||||
});
|
||||
print_image_info(i.clone());
|
||||
|
||||
let body = format!("Uploaded {}", i.data.link);
|
||||
|
||||
notify!(Notification::new().summary("Imgurs").body(&body));
|
||||
|
||||
if parse_config().clipboard.enabled {
|
||||
set_clipboard(i.data.link)
|
||||
}
|
||||
}
|
|
@ -1,25 +0,0 @@
|
|||
use serde_derive::Deserialize;
|
||||
|
||||
pub mod toml;
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct Config {
|
||||
pub imgur: ConfigImgur,
|
||||
pub notification: ConfigNotification,
|
||||
pub clipboard: ConfigClipboard,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct ConfigImgur {
|
||||
pub id: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct ConfigNotification {
|
||||
pub enabled: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct ConfigClipboard {
|
||||
pub enabled: bool,
|
||||
}
|
|
@ -1,45 +0,0 @@
|
|||
use super::Config;
|
||||
|
||||
use anyhow::Error;
|
||||
use dirs::config_dir;
|
||||
use log::warn;
|
||||
use std::{
|
||||
fs::{create_dir_all, read_to_string, File},
|
||||
io::Write as _,
|
||||
path::Path,
|
||||
};
|
||||
use toml::from_str as toml_from_str;
|
||||
|
||||
const CONFIG_DIR: &str = "/imgurs/config.toml";
|
||||
|
||||
pub fn parse() -> Config {
|
||||
toml().unwrap_or_else(|e| {
|
||||
warn!("Parse toml config: {e}! Creating config file...");
|
||||
|
||||
let default_config = include_str!(concat!("../../config.toml"));
|
||||
|
||||
let sys_config_dir = config_dir().expect("find config dir");
|
||||
let config_dir = format!("{}{CONFIG_DIR}", sys_config_dir.to_string_lossy());
|
||||
let config_path = Path::new(&config_dir);
|
||||
|
||||
let prefix = config_path.parent().unwrap();
|
||||
create_dir_all(prefix).expect("create config dir");
|
||||
|
||||
let mut file_ref = File::create(config_path).expect("create failed");
|
||||
|
||||
file_ref
|
||||
.write_all(default_config.as_bytes())
|
||||
.expect("failed write default config to file");
|
||||
|
||||
toml().expect("parse toml config")
|
||||
})
|
||||
}
|
||||
|
||||
fn toml() -> Result<Config, Error> {
|
||||
let config_dir = config_dir().unwrap();
|
||||
let file_dir = format!("{}{CONFIG_DIR}", config_dir.to_string_lossy());
|
||||
let toml_str = read_to_string(file_dir).map_err(Error::new)?;
|
||||
let decode = toml_from_str(&toml_str).map_err(Error::new)?;
|
||||
|
||||
Ok(decode)
|
||||
}
|
36
src/error.rs
Normal file
36
src/error.rs
Normal file
|
@ -0,0 +1,36 @@
|
|||
use thiserror::Error;
|
||||
|
||||
/// Client Errors
|
||||
#[derive(Debug, Error)]
|
||||
pub enum Error {
|
||||
/// Imgur API returned non-successful status code
|
||||
#[error("server reponse non-successful status code - {0}, body = `{1}`")]
|
||||
ApiError(u16, String),
|
||||
/// Imgur API returned non-successful status code (body is too long)
|
||||
#[error("server reponse non-successful status code - {0}, (response body is too long)")]
|
||||
ApiErrorBodyTooLong(u16),
|
||||
/// Invalid file path or URL adress
|
||||
#[error("{0} is not url or file path")]
|
||||
InvalidUrlOrFile(String),
|
||||
/// Imgur API error or reqwest::Error
|
||||
#[error("send request to imgur api: {0}")]
|
||||
SendApiRequest(reqwest::Error),
|
||||
/// std::io::Error
|
||||
#[error("io error - {0}")]
|
||||
IoError(std::io::Error),
|
||||
}
|
||||
|
||||
impl From<reqwest::Error> for Error {
|
||||
fn from(err: reqwest::Error) -> Self {
|
||||
Error::SendApiRequest(err)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<std::io::Error> for Error {
|
||||
fn from(err: std::io::Error) -> Self {
|
||||
Error::IoError(err)
|
||||
}
|
||||
}
|
||||
|
||||
/// A `Result` alias where the `Err` case is `imgurs::Error`
|
||||
pub type Result<T> = std::result::Result<T, Error>;
|
69
src/imgur/album_type.rs
Normal file
69
src/imgur/album_type.rs
Normal file
|
@ -0,0 +1,69 @@
|
|||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::ImageInfoData;
|
||||
|
||||
/// Album Info Response
|
||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
|
||||
pub struct AlbumInfo {
|
||||
/// Image Data
|
||||
pub data: AlbumInfoData,
|
||||
/// Request processed success or not.
|
||||
pub success: bool,
|
||||
/// HTTP status code from API request.
|
||||
pub status: i32,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
|
||||
pub struct AlbumInfoData {
|
||||
/// Album ID
|
||||
pub id: String,
|
||||
/// Title of the album
|
||||
pub title: Option<String>,
|
||||
/// Description of the album
|
||||
pub description: Option<String>,
|
||||
pub datetime: i64,
|
||||
pub cover: String,
|
||||
pub cover_edited: Option<String>,
|
||||
pub cover_width: i64,
|
||||
pub cover_height: i64,
|
||||
pub account_url: Option<String>,
|
||||
pub account_id: Option<AccountId>,
|
||||
pub privacy: String,
|
||||
pub layout: String,
|
||||
pub views: i64,
|
||||
/// Album link
|
||||
pub link: String,
|
||||
pub favorite: bool,
|
||||
pub nsfw: bool,
|
||||
pub section: Option<String>,
|
||||
pub images_count: i64,
|
||||
pub in_gallery: bool,
|
||||
pub is_ad: bool,
|
||||
pub include_album_ads: bool,
|
||||
pub is_album: bool,
|
||||
pub images: Vec<ImageInfoData>,
|
||||
pub ad_config: AdConfig,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
|
||||
#[serde(untagged)]
|
||||
pub enum AccountId {
|
||||
String(String),
|
||||
Int(i64),
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
|
||||
pub struct AdConfig {
|
||||
#[serde(rename = "safeFlags")]
|
||||
pub safe_flags: Vec<String>,
|
||||
#[serde(rename = "highRiskFlags")]
|
||||
pub high_risk_flags: Vec<String>,
|
||||
#[serde(rename = "unsafeFlags")]
|
||||
pub unsafe_flags: Vec<String>,
|
||||
#[serde(rename = "wallUnsafeFlags")]
|
||||
pub wall_unsafe_flags: Vec<String>,
|
||||
#[serde(rename = "showsAds")]
|
||||
pub shows_ads: bool,
|
||||
#[serde(rename = "showAdLevel")]
|
||||
pub show_ad_level: i64,
|
||||
}
|
|
@ -1,16 +1,20 @@
|
|||
use reqwest::Client;
|
||||
use std::fmt;
|
||||
|
||||
macro_rules! api_url (
|
||||
($path: expr) => (
|
||||
format!("{}{}", "https://api.imgur.com/3/", $path)
|
||||
);
|
||||
);
|
||||
|
||||
pub(crate) use api_url;
|
||||
use std::fmt;
|
||||
|
||||
pub(crate) use api_url;
|
||||
use reqwest::Client;
|
||||
|
||||
/// Imgur Client
|
||||
#[derive(Clone)]
|
||||
pub struct ImgurClient {
|
||||
/// Imgur API Client ID
|
||||
pub client_id: String,
|
||||
/// HTTP Client
|
||||
pub client: Client,
|
||||
}
|
||||
|
||||
|
@ -19,10 +23,3 @@ impl fmt::Debug for ImgurClient {
|
|||
write!(f, "ImgurClient - client_id: {}", self.client_id)
|
||||
}
|
||||
}
|
||||
|
||||
impl ImgurClient {
|
||||
pub fn new(client_id: String) -> Self {
|
||||
let client = Client::new();
|
||||
ImgurClient { client_id, client }
|
||||
}
|
||||
}
|
48
src/imgur/image_type.rs
Normal file
48
src/imgur/image_type.rs
Normal file
|
@ -0,0 +1,48 @@
|
|||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// Image Info Response
|
||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
|
||||
pub struct ImageInfo {
|
||||
/// Image Data
|
||||
pub data: ImageInfoData,
|
||||
/// Request processed success or not.
|
||||
pub success: bool,
|
||||
/// HTTP status code from API request.
|
||||
pub status: i32,
|
||||
}
|
||||
|
||||
/// Image Info Reponse (`data` json)
|
||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
|
||||
pub struct ImageInfoData {
|
||||
/// Image ID
|
||||
/// e.g. `iDYNKJq`
|
||||
pub id: String,
|
||||
/// Image title
|
||||
pub title: Option<String>,
|
||||
/// Description of this image
|
||||
pub description: Option<String>,
|
||||
/// Image uploaded time
|
||||
pub datetime: i32,
|
||||
/// Image type
|
||||
/// e.g. `image/png`
|
||||
#[serde(rename = "type")]
|
||||
pub img_type: String,
|
||||
/// If image if animated (gif, etc)
|
||||
pub animated: bool,
|
||||
/// Width of this image
|
||||
pub width: i32,
|
||||
/// Height of this image
|
||||
pub height: i32,
|
||||
/// Image size in bytes
|
||||
pub size: i32,
|
||||
/// Unique image views
|
||||
pub views: i32,
|
||||
/// Bandwidth used by this image
|
||||
pub bandwidth: i64,
|
||||
/// If image is added to favorite
|
||||
pub favorite: bool,
|
||||
/// Delete hash (only show after image upload)
|
||||
pub deletehash: Option<String>,
|
||||
/// Link of this image
|
||||
pub link: String,
|
||||
}
|
148
src/imgur/mod.rs
Normal file
148
src/imgur/mod.rs
Normal file
|
@ -0,0 +1,148 @@
|
|||
mod album_type;
|
||||
mod client;
|
||||
mod image_type;
|
||||
mod requests;
|
||||
mod send_api_request;
|
||||
|
||||
pub use album_type::*;
|
||||
pub(crate) use client::api_url;
|
||||
pub use client::ImgurClient;
|
||||
pub use image_type::*;
|
||||
pub use send_api_request::*;
|
||||
use url::Url;
|
||||
|
||||
use crate::{Error, Result};
|
||||
|
||||
impl ImgurClient {
|
||||
/// Create a new Imgur Client
|
||||
/// ```
|
||||
/// use imgurs::ImgurClient;
|
||||
///
|
||||
/// let client = ImgurClient::new("3e3ce0d7ac14d56");
|
||||
/// ```
|
||||
pub fn new(client_id: &str) -> Self {
|
||||
let client_id = client_id.to_string();
|
||||
let client = reqwest::Client::new();
|
||||
ImgurClient { client_id, client }
|
||||
}
|
||||
|
||||
/// Create a new Imgur Client with the provided `reqwest::Client`
|
||||
///
|
||||
/// This allows for customization of the http client settings like timeout or the user agent.
|
||||
/// ```
|
||||
/// use imgurs::ImgurClient;
|
||||
/// use reqwest::Client;
|
||||
///
|
||||
/// let http_client = Client::builder().build().unwrap();
|
||||
///
|
||||
/// let client = ImgurClient::with_http_client("3e3ce0d7ac14d56", http_client);
|
||||
/// ```
|
||||
pub fn with_http_client(client_id: &str, http_client: reqwest::Client) -> Self {
|
||||
let client_id = client_id.to_string();
|
||||
ImgurClient {
|
||||
client_id,
|
||||
client: http_client,
|
||||
}
|
||||
}
|
||||
|
||||
/// Upload image to Imgur
|
||||
/// ```
|
||||
/// use imgurs::ImgurClient;
|
||||
///
|
||||
/// #[tokio::main]
|
||||
/// async fn main() {
|
||||
/// let client = ImgurClient::new("3e3ce0d7ac14d56");
|
||||
///
|
||||
/// client
|
||||
/// .upload_image("https://i.imgur.com/lFaGr1x.png")
|
||||
/// .await
|
||||
/// .expect("upload image");
|
||||
/// }
|
||||
/// ```
|
||||
pub async fn upload_image(&self, path: &str) -> Result<ImageInfo> {
|
||||
use base64::prelude::{Engine, BASE64_STANDARD};
|
||||
|
||||
let mut image = path.to_string();
|
||||
|
||||
// check if the specified file exists if not then check if it is a url
|
||||
if std::path::Path::new(path).exists() {
|
||||
let bytes = std::fs::read(path)?;
|
||||
image = BASE64_STANDARD.encode(bytes)
|
||||
}
|
||||
// validate url adress
|
||||
else if Url::parse(path).is_err() {
|
||||
Err(Error::InvalidUrlOrFile(path.to_string()))?;
|
||||
}
|
||||
|
||||
requests::upload_image(self, image).await
|
||||
}
|
||||
|
||||
/// Delete image from Imgur
|
||||
/// ```
|
||||
/// use imgurs::ImgurClient;
|
||||
///
|
||||
/// #[tokio::main]
|
||||
/// async fn main() {
|
||||
/// let client = ImgurClient::new("3e3ce0d7ac14d56");
|
||||
///
|
||||
/// let image = client
|
||||
/// .upload_image("https://i.imgur.com/lFaGr1x.png")
|
||||
/// .await
|
||||
/// .expect("upload image");
|
||||
/// let deletehash = image.data.deletehash.unwrap();
|
||||
///
|
||||
/// client
|
||||
/// .delete_image(&deletehash)
|
||||
/// .await
|
||||
/// .expect("delete image");
|
||||
/// }
|
||||
/// ```
|
||||
pub async fn delete_image(&self, delete_hash: &str) -> Result<()> {
|
||||
requests::delete_image(self, delete_hash).await
|
||||
}
|
||||
|
||||
/// Get Rame Limit of this Imgur Client
|
||||
/// ```
|
||||
/// use imgurs::ImgurClient;
|
||||
///
|
||||
/// #[tokio::main]
|
||||
/// async fn main() {
|
||||
/// let client = ImgurClient::new("3e3ce0d7ac14d56");
|
||||
///
|
||||
/// client.rate_limit().await.expect("get rate limit");
|
||||
/// }
|
||||
/// ```
|
||||
pub async fn rate_limit(&self) -> Result<requests::RateLimitInfo> {
|
||||
requests::rate_limit(self).await
|
||||
}
|
||||
|
||||
/// Get image info from a Imgur
|
||||
/// ```
|
||||
/// use imgurs::ImgurClient;
|
||||
///
|
||||
/// #[tokio::main]
|
||||
/// async fn main() {
|
||||
/// let client = ImgurClient::new("3e3ce0d7ac14d56");
|
||||
///
|
||||
/// client.image_info("lFaGr1x").await.expect("delete image");
|
||||
/// }
|
||||
/// ```
|
||||
pub async fn image_info(&self, id: &str) -> Result<ImageInfo> {
|
||||
requests::get_image(self, id).await
|
||||
}
|
||||
|
||||
/// Get album info from a Imgur
|
||||
/// ```no_run
|
||||
/// use imgurs::ImgurClient;
|
||||
///
|
||||
/// #[tokio::main]
|
||||
/// async fn main() {
|
||||
/// let client = ImgurClient::new("3e3ce0d7ac14d56");
|
||||
///
|
||||
/// client.album_info("id").await.expect("get album info");
|
||||
/// }
|
||||
/// ```
|
||||
pub async fn album_info(&self, id: &str) -> Result<AlbumInfo> {
|
||||
requests::get_album(self, id).await
|
||||
}
|
||||
}
|
23
src/imgur/requests/delete_image.rs
Normal file
23
src/imgur/requests/delete_image.rs
Normal file
|
@ -0,0 +1,23 @@
|
|||
use reqwest::Method;
|
||||
|
||||
use crate::{api_url, send_api_request, Error, ImgurClient, Result};
|
||||
|
||||
pub async fn delete_image(client: &ImgurClient, delete_hash: &str) -> Result<()> {
|
||||
// get imgur api url
|
||||
let uri = api_url!(format!("image/{delete_hash}"));
|
||||
|
||||
// send request to imgur api
|
||||
let res = send_api_request(client, Method::DELETE, uri, None).await?;
|
||||
|
||||
// get response http code
|
||||
let status = res.status();
|
||||
|
||||
// check if an error has occurred
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await?;
|
||||
|
||||
Err(Error::ApiError(status.as_u16(), body))?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
24
src/imgur/requests/get_album.rs
Normal file
24
src/imgur/requests/get_album.rs
Normal file
|
@ -0,0 +1,24 @@
|
|||
use reqwest::Method;
|
||||
|
||||
use crate::{api_url, send_api_request, AlbumInfo, Error, ImgurClient, Result};
|
||||
|
||||
pub async fn get_album(client: &ImgurClient, album: &str) -> Result<AlbumInfo> {
|
||||
// get imgur api url
|
||||
let uri = api_url!(format!("album/{album}"));
|
||||
|
||||
// send request to imgur api
|
||||
let res = send_api_request(client, Method::GET, uri, None).await?;
|
||||
|
||||
// get response http code
|
||||
let status = res.status();
|
||||
|
||||
// check if an error has occurred
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await?;
|
||||
|
||||
return Err(Error::ApiError(status.as_u16(), body));
|
||||
}
|
||||
|
||||
// return `ImageInfo`
|
||||
Ok(res.json().await?)
|
||||
}
|
24
src/imgur/requests/get_image.rs
Normal file
24
src/imgur/requests/get_image.rs
Normal file
|
@ -0,0 +1,24 @@
|
|||
use reqwest::Method;
|
||||
|
||||
use crate::{api_url, send_api_request, Error, ImageInfo, ImgurClient, Result};
|
||||
|
||||
pub async fn get_image(client: &ImgurClient, image: &str) -> Result<ImageInfo> {
|
||||
// get imgur api url
|
||||
let uri = api_url!(format!("image/{image}"));
|
||||
|
||||
// send request to imgur api
|
||||
let res = send_api_request(client, Method::GET, uri, None).await?;
|
||||
|
||||
// get response http code
|
||||
let status = res.status();
|
||||
|
||||
// check if an error has occurred
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await?;
|
||||
|
||||
return Err(Error::ApiError(status.as_u16(), body));
|
||||
}
|
||||
|
||||
// return `ImageInfo`
|
||||
Ok(res.json().await?)
|
||||
}
|
11
src/imgur/requests/mod.rs
Normal file
11
src/imgur/requests/mod.rs
Normal file
|
@ -0,0 +1,11 @@
|
|||
mod delete_image;
|
||||
mod get_album;
|
||||
mod get_image;
|
||||
mod rate_limit;
|
||||
mod upload_image;
|
||||
|
||||
pub use delete_image::*;
|
||||
pub use get_album::*;
|
||||
pub use get_image::*;
|
||||
pub use rate_limit::*;
|
||||
pub use upload_image::*;
|
46
src/imgur/requests/rate_limit.rs
Normal file
46
src/imgur/requests/rate_limit.rs
Normal file
|
@ -0,0 +1,46 @@
|
|||
use reqwest::Method;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{api_url, send_api_request, Error, ImgurClient, Result};
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct RateLimitInfo {
|
||||
pub data: RateLimitData,
|
||||
pub success: bool,
|
||||
pub status: i32,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct RateLimitData {
|
||||
#[serde(rename = "UserLimit")]
|
||||
pub user_limit: i32,
|
||||
#[serde(rename = "UserRemaining")]
|
||||
pub user_remaining: i32,
|
||||
#[serde(rename = "UserReset")]
|
||||
pub user_reset: i32,
|
||||
#[serde(rename = "ClientLimit")]
|
||||
pub client_limit: i32,
|
||||
#[serde(rename = "ClientRemaining")]
|
||||
pub client_remaining: i32,
|
||||
}
|
||||
|
||||
pub async fn rate_limit(client: &ImgurClient) -> Result<RateLimitInfo> {
|
||||
// get imgur api url
|
||||
let uri = api_url!("credits");
|
||||
|
||||
// send request to imgur api
|
||||
let res = send_api_request(client, Method::GET, uri, None).await?;
|
||||
|
||||
// get response http code
|
||||
let status = res.status();
|
||||
|
||||
// check if an error has occurred
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await?;
|
||||
|
||||
return Err(Error::ApiError(status.as_u16(), body));
|
||||
}
|
||||
|
||||
// return `RateLimitInfo`
|
||||
Ok(res.json().await?)
|
||||
}
|
36
src/imgur/requests/upload_image.rs
Normal file
36
src/imgur/requests/upload_image.rs
Normal file
|
@ -0,0 +1,36 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use reqwest::Method;
|
||||
|
||||
use crate::{api_url, send_api_request, Error, ImageInfo, ImgurClient, Result};
|
||||
|
||||
pub async fn upload_image(client: &ImgurClient, image: String) -> Result<ImageInfo> {
|
||||
// create http form (hashmap)
|
||||
let mut form = HashMap::new();
|
||||
// insert image to form
|
||||
form.insert("image", image);
|
||||
|
||||
// get imgur api url
|
||||
let uri = api_url!("image");
|
||||
|
||||
// send request to imgur api
|
||||
let res = send_api_request(client, Method::POST, uri, Some(form)).await?;
|
||||
|
||||
// get response http code
|
||||
let status = res.status();
|
||||
|
||||
// check if an error has occurred
|
||||
if status.is_client_error() || status.is_server_error() {
|
||||
let body = res.text().await?;
|
||||
|
||||
// if body is too long do not return it (imgur sometimes returns whole Request)
|
||||
if body.chars().count() > 50 {
|
||||
Err(Error::ApiErrorBodyTooLong(status.as_u16()))?;
|
||||
}
|
||||
|
||||
return Err(Error::ApiError(status.as_u16(), body));
|
||||
}
|
||||
|
||||
// return `ImageInfo`
|
||||
Ok(res.json().await?)
|
||||
}
|
|
@ -1,33 +1,38 @@
|
|||
use super::ImgurClient;
|
||||
|
||||
use anyhow::Error;
|
||||
use reqwest::Method;
|
||||
use std::collections::HashMap;
|
||||
|
||||
use reqwest::{Method, Response};
|
||||
|
||||
use crate::{ImgurClient, Result};
|
||||
|
||||
/// Send request to a Imgur API
|
||||
pub async fn send_api_request(
|
||||
config: &ImgurClient,
|
||||
method: Method,
|
||||
uri: String,
|
||||
form: Option<HashMap<&str, String>>,
|
||||
) -> Result<reqwest::Response, Error> {
|
||||
) -> Result<Response> {
|
||||
// get http client
|
||||
let client = &config.client;
|
||||
|
||||
// create Request buidler
|
||||
let mut req = client.request(method, uri.as_str());
|
||||
|
||||
const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
|
||||
|
||||
// add `Authorization` and `User-Agent` to Request
|
||||
req = req
|
||||
.header("Authorization", format!("Client-ID {}", config.client_id))
|
||||
.header(
|
||||
"User-Agent",
|
||||
format!("Imgur/{:?}", VERSION.unwrap_or("unknown")),
|
||||
format!("Imgur/{:?}", env!("CARGO_PKG_VERSION")),
|
||||
);
|
||||
|
||||
if form != None {
|
||||
// if exists add HashMap to Request
|
||||
if form.is_some() {
|
||||
req = req.form(&form.unwrap())
|
||||
}
|
||||
|
||||
// build Request
|
||||
let req = req.build()?;
|
||||
|
||||
client.execute(req).await.map_err(Error::from)
|
||||
// send Request
|
||||
Ok(client.execute(req).await?)
|
||||
}
|
103
src/lib.rs
103
src/lib.rs
|
@ -1 +1,102 @@
|
|||
pub mod api;
|
||||
//! [![github]](https://github.com/M3DZIK/imgurs)
|
||||
//! [![crates-io]](https://crates.io/crates/imgurs)
|
||||
//! [![docs-rs]](https://docs.rs/imgurs)
|
||||
//!
|
||||
//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
|
||||
//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
|
||||
//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs
|
||||
//!
|
||||
//! This crate is an unofficial implementation of the [Imgur API](https://imgur.com) in Rust.
|
||||
//!
|
||||
//! # Installation
|
||||
//!
|
||||
//! ## Requirements
|
||||
//! - Rust 1.58 (earlier versions are not tested (only the latest stable version is tested!))
|
||||
//! - Network connection
|
||||
//!
|
||||
//! ## Importing
|
||||
//! The driver is available on [crates.io](https://crates.io/crates/imgurs). To use the driver in
|
||||
//! your application, simply add it to your project's `Cargo.toml`.
|
||||
//! ```toml
|
||||
//! [dependencies]
|
||||
//! imgurs = "0.11.3"
|
||||
//! ```
|
||||
//!
|
||||
//! # Example Usage
|
||||
//!
|
||||
//! ## Create new ImgurClient
|
||||
//! ```
|
||||
//! use imgurs::ImgurClient;
|
||||
//!
|
||||
//! let client = ImgurClient::new("client_id");
|
||||
//! ```
|
||||
//!
|
||||
//! ## Image Upload
|
||||
//! ```no_run
|
||||
//! use imgurs::ImgurClient;
|
||||
//!
|
||||
//! #[tokio::main]
|
||||
//! async fn main() {
|
||||
//! let client = ImgurClient::new("client_id");
|
||||
//!
|
||||
//! // From URL
|
||||
//! let info = client
|
||||
//! .upload_image("https://i.imgur.com/lFaGr1x.png")
|
||||
//! .await
|
||||
//! .unwrap();
|
||||
//! println!("{:?}", info);
|
||||
//!
|
||||
//! // From File
|
||||
//! let info = client.upload_image("path/to/file.png").await.unwrap();
|
||||
//! println!("{:?}", info);
|
||||
//! }
|
||||
//! ```
|
||||
//!
|
||||
//! ## Delete Image
|
||||
//! ```no_run
|
||||
//! use imgurs::ImgurClient;
|
||||
//!
|
||||
//! #[tokio::main]
|
||||
//! async fn main() {
|
||||
//! let client = ImgurClient::new("client_id");
|
||||
//!
|
||||
//! client.delete_image("delete_hash").await.unwrap(); // delete hash
|
||||
//! }
|
||||
//! ```
|
||||
//!
|
||||
//! ## Get Image Info
|
||||
//! ```no_run
|
||||
//! use imgurs::ImgurClient;
|
||||
//!
|
||||
//! #[tokio::main]
|
||||
//! async fn main() {
|
||||
//! let client = ImgurClient::new("client_id");
|
||||
//!
|
||||
//! let info = client.image_info("lFaGr1x").await.unwrap(); // image id
|
||||
//!
|
||||
//! println!("{:?}", info);
|
||||
//! }
|
||||
//! ```
|
||||
//!
|
||||
//! ## Get Client RateLimit
|
||||
//! ```no_run
|
||||
//! use imgurs::ImgurClient;
|
||||
//!
|
||||
//! #[tokio::main]
|
||||
//! async fn main() {
|
||||
//! let client = ImgurClient::new("client_id");
|
||||
//!
|
||||
//! let info = client.rate_limit().await.unwrap();
|
||||
//!
|
||||
//! println!("{:?}", info);
|
||||
//! }
|
||||
//! ```
|
||||
|
||||
mod error;
|
||||
pub use error::*;
|
||||
|
||||
#[cfg(feature = "imgur")]
|
||||
mod imgur;
|
||||
|
||||
#[cfg(feature = "imgur")]
|
||||
pub use imgur::*;
|
||||
|
|
18
src/main.rs
18
src/main.rs
|
@ -1,18 +0,0 @@
|
|||
mod cli;
|
||||
mod config;
|
||||
|
||||
use cli::parse::parse;
|
||||
use imgurs::api::ImgurClient;
|
||||
|
||||
use simple_logger::SimpleLogger;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
SimpleLogger::new().init().expect("init SimpleLogger");
|
||||
better_panic::install();
|
||||
|
||||
let config = config::toml::parse();
|
||||
let client = ImgurClient::new((&config.imgur.id).to_string());
|
||||
|
||||
parse(client).await
|
||||
}
|
Loading…
Reference in a new issue