Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ccad50f414 | ||
|
|
b9a40a20dd |
No files matched your search
@@ -21,7 +21,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: cargo check
|
- run: cargo check
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: cargo test
|
- run: cargo test
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: rustup component add rustfmt
|
- run: rustup component add rustfmt
|
||||||
- run: cargo fmt --all -- --check
|
- run: cargo fmt --all -- --check
|
||||||
@@ -55,7 +55,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: rustup component add clippy
|
- run: rustup component add clippy
|
||||||
- run: cargo clippy -- -D warnings
|
- run: cargo clippy -- -D warnings
|
||||||
@@ -67,7 +67,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: cargo build
|
- run: cargo build
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@ jobs:
|
|||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
components: cargo
|
components: cargo
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
|
|||||||
Generated
+316
-311
File diff suppressed because it is too large.
Load diff
+5
-5
@@ -1,13 +1,13 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "labyrinth"
|
name = "labyrinth"
|
||||||
version = "0.0.5"
|
version = "0.0.7"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
description = "Library for managing soaricarus storage"
|
description = "Library for managing soaricarus storage"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
aws-config = { version = "1.10.1", features = ["behavior-version-latest"] }
|
aws-config = { version = "1.13.0", features = ["behavior-version-latest"] }
|
||||||
aws-sdk-s3 = { version = "1.141.0" }
|
aws-sdk-s3 = { version = "1.157.0" }
|
||||||
time = "0.3.55"
|
time = "0.3.55"
|
||||||
tokio = { version = "1.53.1", features = ["full"] }
|
tokio = { version = "1.54.1", features = ["full"] }
|
||||||
uuid = "1.24.1"
|
uuid = "1.27.0"
|
||||||
+8
-8
@@ -52,12 +52,12 @@ impl Labyrinth {
|
|||||||
&self,
|
&self,
|
||||||
file_key: &str,
|
file_key: &str,
|
||||||
data: &Data,
|
data: &Data,
|
||||||
) -> Result<aws_sdk_s3::operation::put_object::PutObjectOutput, Error> {
|
) -> Result<aws_sdk_s3::operation::put_object::PutObjectOutput, Box<Error>> {
|
||||||
let client = init_client(&self.config).await;
|
let client = init_client(&self.config).await;
|
||||||
let data_content = if data.raw_data.is_empty() {
|
let data_content = if data.raw_data.is_empty() {
|
||||||
match load_data(&data.filepath).await {
|
match load_data(&data.filepath).await {
|
||||||
Ok(content) => content,
|
Ok(content) => content,
|
||||||
Err(err) => return Err(Error::Info(err.to_string())),
|
Err(err) => return Err(Box::new(Error::Info(err.to_string()))),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
data.raw_data.to_owned()
|
data.raw_data.to_owned()
|
||||||
@@ -74,12 +74,12 @@ impl Labyrinth {
|
|||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(response) => Ok(response),
|
Ok(response) => Ok(response),
|
||||||
Err(err) => Err(Error::Info(err.to_string())),
|
Err(err) => Err(Box::new(Error::Info(err.to_string()))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Download object from the bucket
|
/// Download object from the bucket
|
||||||
pub async fn download(&self, file_key: &str) -> Result<Vec<u8>, Error> {
|
pub async fn download(&self, file_key: &str) -> Result<Vec<u8>, Box<Error>> {
|
||||||
let client = init_client(&self.config).await;
|
let client = init_client(&self.config).await;
|
||||||
|
|
||||||
match client
|
match client
|
||||||
@@ -99,10 +99,10 @@ impl Labyrinth {
|
|||||||
let raw_data = bytes.to_vec();
|
let raw_data = bytes.to_vec();
|
||||||
Ok(raw_data)
|
Ok(raw_data)
|
||||||
}
|
}
|
||||||
Err(err) => Err(Error::Info(err.to_string())),
|
Err(err) => Err(Box::new(Error::Info(err.to_string()))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => Err(Error::Info(err.to_string())),
|
Err(err) => Err(Box::new(Error::Info(err.to_string()))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,7 +110,7 @@ impl Labyrinth {
|
|||||||
pub async fn delete(
|
pub async fn delete(
|
||||||
&self,
|
&self,
|
||||||
file_key: &str,
|
file_key: &str,
|
||||||
) -> Result<aws_sdk_s3::operation::delete_object::DeleteObjectOutput, Error> {
|
) -> Result<aws_sdk_s3::operation::delete_object::DeleteObjectOutput, Box<Error>> {
|
||||||
let client = init_client(&self.config).await;
|
let client = init_client(&self.config).await;
|
||||||
|
|
||||||
match client
|
match client
|
||||||
@@ -121,7 +121,7 @@ impl Labyrinth {
|
|||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(response) => Ok(response),
|
Ok(response) => Ok(response),
|
||||||
Err(err) => Err(Error::Info(err.to_string())),
|
Err(err) => Err(Box::new(Error::Info(err.to_string()))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user