From 430fbb21eaecb7b708674029db3340a12bf990d3 Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Wed, 3 Jun 2026 01:37:14 +0200 Subject: [PATCH] refactor: rename image-storage crate to object-storage --- Cargo.lock | 38 +++++++++---------- Cargo.toml | 4 +- Dockerfile | 2 +- crates/adapters/image-converter/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../src/config.rs | 0 .../src/lib.rs | 0 .../src/tests/config.rs | 0 .../src/tests/lib.rs | 0 crates/presentation/Cargo.toml | 2 +- crates/presentation/src/factory.rs | 2 +- crates/worker/Cargo.toml | 2 +- crates/worker/src/main.rs | 4 +- 13 files changed, 29 insertions(+), 29 deletions(-) rename crates/adapters/{image-storage => object-storage}/Cargo.toml (94%) rename crates/adapters/{image-storage => object-storage}/src/config.rs (100%) rename crates/adapters/{image-storage => object-storage}/src/lib.rs (100%) rename crates/adapters/{image-storage => object-storage}/src/tests/config.rs (100%) rename crates/adapters/{image-storage => object-storage}/src/tests/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 80d40e9..b6385b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2759,7 +2759,7 @@ dependencies = [ "async-trait", "domain", "image", - "image-storage", + "object-storage", "object_store", "ravif 0.11.20", "tokio", @@ -2768,22 +2768,6 @@ dependencies = [ "webp", ] -[[package]] -name = "image-storage" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "domain", - "futures", - "infer", - "object_store", - "tokio", - "tracing", - "uuid", -] - [[package]] name = "image-webp" version = "0.2.4" @@ -3693,6 +3677,22 @@ dependencies = [ "libc", ] +[[package]] +name = "object-storage" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "domain", + "futures", + "infer", + "object_store", + "tokio", + "tracing", + "uuid", +] + [[package]] name = "object_store" version = "0.11.2" @@ -4179,12 +4179,12 @@ dependencies = [ "export", "futures", "http-body-util", - "image-storage", "importer", "infer", "jellyfin", "metadata", "nats", + "object-storage", "percent-encoding", "plex", "poster-fetcher", @@ -7475,10 +7475,10 @@ dependencies = [ "dotenvy", "export", "image-converter", - "image-storage", "importer", "metadata", "nats", + "object-storage", "poster-fetcher", "poster-sync", "postgres", diff --git a/Cargo.toml b/Cargo.toml index 436b427..954d30c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = [ "crates/adapters/event-publisher", "crates/adapters/metadata", "crates/adapters/poster-fetcher", - "crates/adapters/image-storage", + "crates/adapters/object-storage", "crates/adapters/poster-sync", "crates/adapters/rss", "crates/adapters/sqlite", @@ -71,7 +71,7 @@ presentation = { path = "crates/presentation" } auth = { path = "crates/adapters/auth" } metadata = { path = "crates/adapters/metadata" } poster-fetcher = { path = "crates/adapters/poster-fetcher" } -image-storage = { path = "crates/adapters/image-storage" } +object-storage = { path = "crates/adapters/object-storage" } poster-sync = { path = "crates/adapters/poster-sync" } event-publisher = { path = "crates/adapters/event-publisher" } rss = { path = "crates/adapters/rss" } diff --git a/Dockerfile b/Dockerfile index 213dfe0..9f64288 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ COPY crates/adapters/event-publisher/Cargo.toml crates/adapters/event-publishe COPY crates/adapters/nats/Cargo.toml crates/adapters/nats/Cargo.toml COPY crates/adapters/metadata/Cargo.toml crates/adapters/metadata/Cargo.toml COPY crates/adapters/poster-fetcher/Cargo.toml crates/adapters/poster-fetcher/Cargo.toml -COPY crates/adapters/image-storage/Cargo.toml crates/adapters/image-storage/Cargo.toml +COPY crates/adapters/object-storage/Cargo.toml crates/adapters/object-storage/Cargo.toml COPY crates/adapters/poster-sync/Cargo.toml crates/adapters/poster-sync/Cargo.toml COPY crates/adapters/export/Cargo.toml crates/adapters/export/Cargo.toml COPY crates/adapters/importer/Cargo.toml crates/adapters/importer/Cargo.toml diff --git a/crates/adapters/image-converter/Cargo.toml b/crates/adapters/image-converter/Cargo.toml index b49baa9..28a1a2d 100644 --- a/crates/adapters/image-converter/Cargo.toml +++ b/crates/adapters/image-converter/Cargo.toml @@ -14,6 +14,6 @@ ravif = { version = "0.11", default-features = false } webp = "0.3" [dev-dependencies] -image-storage = { workspace = true } +object-storage = { workspace = true } object_store = "0.11" uuid = { workspace = true } diff --git a/crates/adapters/image-storage/Cargo.toml b/crates/adapters/object-storage/Cargo.toml similarity index 94% rename from crates/adapters/image-storage/Cargo.toml rename to crates/adapters/object-storage/Cargo.toml index f7dff3c..fa79146 100644 --- a/crates/adapters/image-storage/Cargo.toml +++ b/crates/adapters/object-storage/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "image-storage" +name = "object-storage" version = "0.1.0" edition = "2024" diff --git a/crates/adapters/image-storage/src/config.rs b/crates/adapters/object-storage/src/config.rs similarity index 100% rename from crates/adapters/image-storage/src/config.rs rename to crates/adapters/object-storage/src/config.rs diff --git a/crates/adapters/image-storage/src/lib.rs b/crates/adapters/object-storage/src/lib.rs similarity index 100% rename from crates/adapters/image-storage/src/lib.rs rename to crates/adapters/object-storage/src/lib.rs diff --git a/crates/adapters/image-storage/src/tests/config.rs b/crates/adapters/object-storage/src/tests/config.rs similarity index 100% rename from crates/adapters/image-storage/src/tests/config.rs rename to crates/adapters/object-storage/src/tests/config.rs diff --git a/crates/adapters/image-storage/src/tests/lib.rs b/crates/adapters/object-storage/src/tests/lib.rs similarity index 100% rename from crates/adapters/image-storage/src/tests/lib.rs rename to crates/adapters/object-storage/src/tests/lib.rs diff --git a/crates/presentation/Cargo.toml b/crates/presentation/Cargo.toml index 0f4766e..d7de6f3 100644 --- a/crates/presentation/Cargo.toml +++ b/crates/presentation/Cargo.toml @@ -47,7 +47,7 @@ application = { workspace = true } auth = { workspace = true } metadata = { workspace = true } poster-fetcher = { workspace = true } -image-storage = { workspace = true } +object-storage = { workspace = true } template-askama = { workspace = true } nats = { workspace = true, optional = true } rss = { workspace = true } diff --git a/crates/presentation/src/factory.rs b/crates/presentation/src/factory.rs index 712bce2..f9cd43b 100644 --- a/crates/presentation/src/factory.rs +++ b/crates/presentation/src/factory.rs @@ -129,7 +129,7 @@ pub fn build_poster_fetcher() -> anyhow::Result> { } pub fn build_object_storage() -> anyhow::Result> { - image_storage::create() + object_storage::create() } pub fn build_profile_fields_repo( diff --git a/crates/worker/Cargo.toml b/crates/worker/Cargo.toml index 592f1f3..cc20c8f 100644 --- a/crates/worker/Cargo.toml +++ b/crates/worker/Cargo.toml @@ -23,7 +23,7 @@ dotenvy = { workspace = true } auth = { workspace = true } metadata = { workspace = true } poster-fetcher = { workspace = true } -image-storage = { workspace = true } +object-storage = { workspace = true } poster-sync = { workspace = true } export = { workspace = true } tmdb-enrichment = { workspace = true } diff --git a/crates/worker/src/main.rs b/crates/worker/src/main.rs index 8835822..2c95f17 100644 --- a/crates/worker/src/main.rs +++ b/crates/worker/src/main.rs @@ -34,7 +34,7 @@ async fn main() -> anyhow::Result<()> { let (auth_service, password_hasher) = auth::create()?; let metadata_client = metadata::create()?; let poster_fetcher = poster_fetcher::create()?; - let object_storage = image_storage::create()?; + let object_storage = object_storage::create()?; let db = db::connect(&database_url, &backend).await?; let (event_publisher_arc, consumer_arc) = event_bus::create(&db.db_pool).await?; @@ -215,7 +215,7 @@ async fn main() -> anyhow::Result<()> { 3, )) as Arc; - let cleanup = Arc::new(image_storage::ImageCleanupHandler::new(Arc::clone( + let cleanup = Arc::new(object_storage::ImageCleanupHandler::new(Arc::clone( &ctx.services.object_storage, ))) as Arc;