refactor: rename ImageStorage → ObjectStorage
Some checks failed
CI / Check / Test (push) Failing after 46s
Some checks failed
CI / Check / Test (push) Failing after 46s
This commit is contained in:
@@ -2,7 +2,7 @@ use std::sync::Arc;
|
||||
|
||||
use anyhow::Context;
|
||||
use domain::ports::{
|
||||
AuthService, ImageStorage, LocalApContentQuery, MetadataClient, PasswordHasher,
|
||||
AuthService, ObjectStorage, LocalApContentQuery, MetadataClient, PasswordHasher,
|
||||
PosterFetcherClient, UserProfileFieldsRepository, WatchEventRepository, WebhookTokenRepository,
|
||||
};
|
||||
|
||||
@@ -128,7 +128,7 @@ pub fn build_poster_fetcher() -> anyhow::Result<Arc<dyn PosterFetcherClient>> {
|
||||
poster_fetcher::create()
|
||||
}
|
||||
|
||||
pub fn build_image_storage() -> anyhow::Result<Arc<dyn ImageStorage>> {
|
||||
pub fn build_object_storage() -> anyhow::Result<Arc<dyn ObjectStorage>> {
|
||||
image_storage::create()
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ pub async fn get_image(
|
||||
if key.starts_with("http://") || key.starts_with("https://") {
|
||||
return axum::response::Redirect::temporary(&key).into_response();
|
||||
}
|
||||
match state.app_ctx.services.image_storage.get(&key).await {
|
||||
match state.app_ctx.services.object_storage.get(&key).await {
|
||||
Ok(bytes) => {
|
||||
let mime = infer::get(&bytes)
|
||||
.map(|t| t.mime_type())
|
||||
|
||||
@@ -172,7 +172,7 @@ pub async fn get_video(State(state): State<AppState>, Path(id): Path<Uuid>) -> i
|
||||
match state
|
||||
.app_ctx
|
||||
.services
|
||||
.image_storage
|
||||
.object_storage
|
||||
.get_stream(&video_key)
|
||||
.await
|
||||
{
|
||||
|
||||
@@ -57,7 +57,7 @@ async fn wire_dependencies() -> anyhow::Result<(AppState, axum::Router)> {
|
||||
let (auth_service, password_hasher) = factory::build_auth_adapters()?;
|
||||
let metadata_client = factory::build_metadata_client()?;
|
||||
let poster_fetcher = factory::build_poster_fetcher()?;
|
||||
let image_storage = factory::build_image_storage()?;
|
||||
let object_storage = factory::build_object_storage()?;
|
||||
|
||||
let db = factory::build_database_adapters(&backend, &database_url).await?;
|
||||
let ap_content_repo = db.ap_content;
|
||||
@@ -201,7 +201,7 @@ async fn wire_dependencies() -> anyhow::Result<(AppState, axum::Router)> {
|
||||
password_hasher,
|
||||
metadata: metadata_client,
|
||||
poster_fetcher,
|
||||
image_storage,
|
||||
object_storage,
|
||||
event_publisher: event_publisher_arc,
|
||||
diary_exporter: Arc::new(ExportAdapter) as Arc<dyn DiaryExporter>,
|
||||
document_parser: Arc::new(ImporterDocumentParser) as Arc<dyn DocumentParser>,
|
||||
|
||||
@@ -19,7 +19,7 @@ use domain::{
|
||||
collections::{PageParams, Paginated},
|
||||
},
|
||||
ports::{
|
||||
AuthService, DiaryRepository, EventPublisher, GeneratedToken, ImageStorage, MetadataClient,
|
||||
AuthService, DiaryRepository, EventPublisher, GeneratedToken, ObjectStorage, MetadataClient,
|
||||
MovieRepository, PasswordHasher, PersonCommand, PersonQuery, PosterFetcherClient,
|
||||
ReviewRepository, SearchCommand, SearchPort, StatsRepository, UserRepository,
|
||||
WatchlistRepository,
|
||||
@@ -194,7 +194,7 @@ impl PosterFetcherClient for Panic {
|
||||
}
|
||||
}
|
||||
#[async_trait::async_trait]
|
||||
impl ImageStorage for Panic {
|
||||
impl ObjectStorage for Panic {
|
||||
async fn store(&self, _: &str, _: &[u8]) -> Result<String, DomainError> {
|
||||
panic!()
|
||||
}
|
||||
@@ -670,7 +670,7 @@ pub fn make_test_state(auth_service: Arc<dyn AuthService>) -> crate::state::AppS
|
||||
password_hasher: Arc::clone(&repo) as _,
|
||||
metadata: Arc::clone(&repo) as _,
|
||||
poster_fetcher: Arc::clone(&repo) as _,
|
||||
image_storage: Arc::clone(&repo) as _,
|
||||
object_storage: Arc::clone(&repo) as _,
|
||||
event_publisher: Arc::clone(&repo) as _,
|
||||
diary_exporter: Arc::clone(&repo) as _,
|
||||
document_parser: Arc::clone(&repo) as _,
|
||||
|
||||
Reference in New Issue
Block a user