Handle content type errors explicitly

huangsam · Dec 8, 2024 · dd2eab0 · dd2eab0
1 parent ed66769
commit dd2eab0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/io/huangsam/photohaul/migration/GoogleDriveMigrator.java b/src/main/java/io/huangsam/photohaul/migration/GoogleDriveMigrator.java
@@ -43,7 +43,7 @@ public void migratePhotos(@NotNull Collection<Photo> photos) {
             try {
                 String folderId = createDriveFolder(targetRoot, targetPath);
                 createDrivePhoto(folderId, photo);
-            } catch (IOException | NullPointerException e) {
+            } catch (IOException e) {
                 LOG.error("Cannot move {}: {}", photo.name(), e.getMessage());
                 failureCount++;
             }
@@ -105,6 +105,11 @@ private void createDrivePhoto(String folderId, @NotNull Photo photo) throws IOEx
         photoMetadata.setParents(List.of(folderId));
 
         String contentType = Files.probeContentType(photo.path());
+        if (contentType == null) {
+            failureCount++;
+            return;
+        }
+
         java.io.File photoFile = new java.io.File(photo.path().toString());
         FileContent photoContent = new FileContent(contentType, photoFile);
 

diff --git a/src/main/java/io/huangsam/photohaul/traversal/PathRule.java b/src/main/java/io/huangsam/photohaul/traversal/PathRule.java
@@ -24,8 +24,9 @@ public static Predicate<Path> validExtensions() {
     public static Predicate<Path> isImageContent() {
         return path -> {
             try {
-                return Files.probeContentType(path).startsWith("image/");
-            } catch (IOException | NullPointerException e) {
+                String contentType = Files.probeContentType(path);
+                return contentType != null && contentType.startsWith("image/");
+            } catch (IOException e) {
                 return false;
             }
         };