fix entity image cache fallbacks

Author: neckaros

src/model/entity_images.rs

@@ -133,7 +133,6 @@ impl ModelController {
                     "Unable to get {} image url: {} kind {:?}",
                     config.cache_prefix, external_id, kind,
                 )))?;
-            let (_, mut writer) = local_provider.get_file_write_stream(&image_path).await?;
             let image_reader = SourceRead::Request(image_request)
                 .into_reader(
                     Some(library_id),
@@ -151,7 +150,18 @@ impl ModelController {
                 false,
             )
             .await?;
-            writer.write_all(&resized).await?;
+            let (_, mut writer) = local_provider.get_file_write_stream(&image_path).await?;
+            let write_result = async {
+                writer.write_all(&resized).await?;
+                writer.shutdown().await
+            }
+            .await;
+            if let Err(error) = write_result {
+                // A failed write may leave a partial cache entry that would otherwise be
+                // treated as valid by the next request.
+                let _ = local_provider.remove(&image_path).await;
+                return Err(error.into());
+            }
         }
 
         let source = local_provider.get_file(&image_path, None).await?;

src/model/people.rs

@@ -445,7 +445,7 @@ impl ModelController {
         size: Option<ImageSize>,
         requesting_user: &ConnectedUser,
     ) -> crate::Result<FileStreamResult<AsyncReadPinBox>> {
-        let target_kind = kind.unwrap_or(ImageType::Poster);
+        let target_kind = kind.clone().unwrap_or(ImageType::Poster);
         let config = EntityImageConfig {
             folder: ".portraits",
             cache_prefix: "person",
@@ -465,7 +465,7 @@ impl ModelController {
                     .person_image(
                         library_id,
                         &existing_person.id,
-                        Some(target_kind),
+                        kind,
                         size,
                         requesting_user,
                     )
@@ -502,7 +502,7 @@ impl ModelController {
                         .person_image(
                             library_id,
                             &person.id,
-                            Some(target_kind),
+                            kind,
                             size,
                             requesting_user,
                         )
@@ -530,7 +530,7 @@ impl ModelController {
                     library_id,
                     ".portraits",
                     person_id,
-                    Some(target_kind.clone()),
+                    kind.clone(),
                     requesting_user,
                 )
                 .await?
@@ -540,7 +540,7 @@ impl ModelController {
                     .refresh_person_image(
                         library_id,
                         person_id,
-                        &Some(target_kind.clone()),
+                        &kind,
                         requesting_user,
                     )
                     .await;
@@ -552,7 +552,7 @@ impl ModelController {
                             format!(
                                 "Successfully refreshed person image from external source: {} {:?}",
                                 person_id,
-                                Some(target_kind.clone())
+                                kind.clone()
                             ),
                         );
                     }
@@ -593,7 +593,7 @@ impl ModelController {
                                                 .update_person_image(
                                                     library_id,
                                                     person_id,
-                                                    &Some(target_kind.clone()),
+                                                    &kind,
                                                     reader,
                                                     &ConnectedUser::ServerAdmin,
                                                 )
@@ -626,7 +626,7 @@ impl ModelController {
                     library_id,
                     ".portraits",
                     person_id,
-                    Some(target_kind),
+                    kind,
                     size,
                     requesting_user,
                 )