refactor: rename image-storage crate to object-storage
Some checks failed
CI / Check / Test (push) Failing after 44s
Some checks failed
CI / Check / Test (push) Failing after 44s
This commit is contained in:
38
Cargo.lock
generated
38
Cargo.lock
generated
@@ -2759,7 +2759,7 @@ dependencies = [
|
|||||||
"async-trait",
|
"async-trait",
|
||||||
"domain",
|
"domain",
|
||||||
"image",
|
"image",
|
||||||
"image-storage",
|
"object-storage",
|
||||||
"object_store",
|
"object_store",
|
||||||
"ravif 0.11.20",
|
"ravif 0.11.20",
|
||||||
"tokio",
|
"tokio",
|
||||||
@@ -2768,22 +2768,6 @@ dependencies = [
|
|||||||
"webp",
|
"webp",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "image-storage"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"anyhow",
|
|
||||||
"async-trait",
|
|
||||||
"bytes",
|
|
||||||
"domain",
|
|
||||||
"futures",
|
|
||||||
"infer",
|
|
||||||
"object_store",
|
|
||||||
"tokio",
|
|
||||||
"tracing",
|
|
||||||
"uuid",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "image-webp"
|
name = "image-webp"
|
||||||
version = "0.2.4"
|
version = "0.2.4"
|
||||||
@@ -3693,6 +3677,22 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "object-storage"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"async-trait",
|
||||||
|
"bytes",
|
||||||
|
"domain",
|
||||||
|
"futures",
|
||||||
|
"infer",
|
||||||
|
"object_store",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
"uuid",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "object_store"
|
name = "object_store"
|
||||||
version = "0.11.2"
|
version = "0.11.2"
|
||||||
@@ -4179,12 +4179,12 @@ dependencies = [
|
|||||||
"export",
|
"export",
|
||||||
"futures",
|
"futures",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"image-storage",
|
|
||||||
"importer",
|
"importer",
|
||||||
"infer",
|
"infer",
|
||||||
"jellyfin",
|
"jellyfin",
|
||||||
"metadata",
|
"metadata",
|
||||||
"nats",
|
"nats",
|
||||||
|
"object-storage",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"plex",
|
"plex",
|
||||||
"poster-fetcher",
|
"poster-fetcher",
|
||||||
@@ -7475,10 +7475,10 @@ dependencies = [
|
|||||||
"dotenvy",
|
"dotenvy",
|
||||||
"export",
|
"export",
|
||||||
"image-converter",
|
"image-converter",
|
||||||
"image-storage",
|
|
||||||
"importer",
|
"importer",
|
||||||
"metadata",
|
"metadata",
|
||||||
"nats",
|
"nats",
|
||||||
|
"object-storage",
|
||||||
"poster-fetcher",
|
"poster-fetcher",
|
||||||
"poster-sync",
|
"poster-sync",
|
||||||
"postgres",
|
"postgres",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ members = [
|
|||||||
"crates/adapters/event-publisher",
|
"crates/adapters/event-publisher",
|
||||||
"crates/adapters/metadata",
|
"crates/adapters/metadata",
|
||||||
"crates/adapters/poster-fetcher",
|
"crates/adapters/poster-fetcher",
|
||||||
"crates/adapters/image-storage",
|
"crates/adapters/object-storage",
|
||||||
"crates/adapters/poster-sync",
|
"crates/adapters/poster-sync",
|
||||||
"crates/adapters/rss",
|
"crates/adapters/rss",
|
||||||
"crates/adapters/sqlite",
|
"crates/adapters/sqlite",
|
||||||
@@ -71,7 +71,7 @@ presentation = { path = "crates/presentation" }
|
|||||||
auth = { path = "crates/adapters/auth" }
|
auth = { path = "crates/adapters/auth" }
|
||||||
metadata = { path = "crates/adapters/metadata" }
|
metadata = { path = "crates/adapters/metadata" }
|
||||||
poster-fetcher = { path = "crates/adapters/poster-fetcher" }
|
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" }
|
poster-sync = { path = "crates/adapters/poster-sync" }
|
||||||
event-publisher = { path = "crates/adapters/event-publisher" }
|
event-publisher = { path = "crates/adapters/event-publisher" }
|
||||||
rss = { path = "crates/adapters/rss" }
|
rss = { path = "crates/adapters/rss" }
|
||||||
|
|||||||
@@ -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/nats/Cargo.toml crates/adapters/nats/Cargo.toml
|
||||||
COPY crates/adapters/metadata/Cargo.toml crates/adapters/metadata/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/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/poster-sync/Cargo.toml crates/adapters/poster-sync/Cargo.toml
|
||||||
COPY crates/adapters/export/Cargo.toml crates/adapters/export/Cargo.toml
|
COPY crates/adapters/export/Cargo.toml crates/adapters/export/Cargo.toml
|
||||||
COPY crates/adapters/importer/Cargo.toml crates/adapters/importer/Cargo.toml
|
COPY crates/adapters/importer/Cargo.toml crates/adapters/importer/Cargo.toml
|
||||||
|
|||||||
@@ -14,6 +14,6 @@ ravif = { version = "0.11", default-features = false }
|
|||||||
webp = "0.3"
|
webp = "0.3"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
image-storage = { workspace = true }
|
object-storage = { workspace = true }
|
||||||
object_store = "0.11"
|
object_store = "0.11"
|
||||||
uuid = { workspace = true }
|
uuid = { workspace = true }
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "image-storage"
|
name = "object-storage"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ application = { workspace = true }
|
|||||||
auth = { workspace = true }
|
auth = { workspace = true }
|
||||||
metadata = { workspace = true }
|
metadata = { workspace = true }
|
||||||
poster-fetcher = { workspace = true }
|
poster-fetcher = { workspace = true }
|
||||||
image-storage = { workspace = true }
|
object-storage = { workspace = true }
|
||||||
template-askama = { workspace = true }
|
template-askama = { workspace = true }
|
||||||
nats = { workspace = true, optional = true }
|
nats = { workspace = true, optional = true }
|
||||||
rss = { workspace = true }
|
rss = { workspace = true }
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ pub fn build_poster_fetcher() -> anyhow::Result<Arc<dyn PosterFetcherClient>> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn build_object_storage() -> anyhow::Result<Arc<dyn ObjectStorage>> {
|
pub fn build_object_storage() -> anyhow::Result<Arc<dyn ObjectStorage>> {
|
||||||
image_storage::create()
|
object_storage::create()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn build_profile_fields_repo(
|
pub fn build_profile_fields_repo(
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ dotenvy = { workspace = true }
|
|||||||
auth = { workspace = true }
|
auth = { workspace = true }
|
||||||
metadata = { workspace = true }
|
metadata = { workspace = true }
|
||||||
poster-fetcher = { workspace = true }
|
poster-fetcher = { workspace = true }
|
||||||
image-storage = { workspace = true }
|
object-storage = { workspace = true }
|
||||||
poster-sync = { workspace = true }
|
poster-sync = { workspace = true }
|
||||||
export = { workspace = true }
|
export = { workspace = true }
|
||||||
tmdb-enrichment = { workspace = true }
|
tmdb-enrichment = { workspace = true }
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
let (auth_service, password_hasher) = auth::create()?;
|
let (auth_service, password_hasher) = auth::create()?;
|
||||||
let metadata_client = metadata::create()?;
|
let metadata_client = metadata::create()?;
|
||||||
let poster_fetcher = poster_fetcher::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 db = db::connect(&database_url, &backend).await?;
|
||||||
let (event_publisher_arc, consumer_arc) = event_bus::create(&db.db_pool).await?;
|
let (event_publisher_arc, consumer_arc) = event_bus::create(&db.db_pool).await?;
|
||||||
@@ -215,7 +215,7 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
3,
|
3,
|
||||||
)) as Arc<dyn EventHandler>;
|
)) as Arc<dyn EventHandler>;
|
||||||
|
|
||||||
let cleanup = Arc::new(image_storage::ImageCleanupHandler::new(Arc::clone(
|
let cleanup = Arc::new(object_storage::ImageCleanupHandler::new(Arc::clone(
|
||||||
&ctx.services.object_storage,
|
&ctx.services.object_storage,
|
||||||
))) as Arc<dyn EventHandler>;
|
))) as Arc<dyn EventHandler>;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user