Merge pull request #787 from bal-a/bal/bugfix-thumbnail

bugfix/gracefully-handle-large-thumbnails

Author: caglarpir

mapillary_tools/authenticate.py

@@ -7,7 +7,6 @@
 import typing as T
 
 import jsonschema
-
 import requests
 
 from . import api_v4, config, constants, exceptions, http

mapillary_tools/blackvue_parser.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import dataclasses
-
 import json
 import logging
 import re

mapillary_tools/camm/camm_builder.py

@@ -9,7 +9,6 @@
     mp4_sample_parser as sample_parser,
     simple_mp4_builder as builder,
 )
-
 from . import camm_parser
 
 

mapillary_tools/commands/process_and_upload.py

@@ -1,7 +1,6 @@
 import inspect
 
 from ..authenticate import fetch_user_items
-
 from .process import Command as ProcessCommand
 from .upload import Command as UploadCommand
 

mapillary_tools/commands/video_process_and_upload.py

@@ -1,7 +1,6 @@
 import inspect
 
 from ..authenticate import fetch_user_items
-
 from .upload import Command as UploadCommand
 from .video_process import Command as VideoProcessCommand
 

mapillary_tools/exif_write.py

@@ -214,6 +214,18 @@ def _safe_dump(self) -> bytes:
                     else:
                         del self._ef[ifd][tag]
                         # retry later
+                elif "thumbnail is too large" in message.lower():
+                    # Handle oversized thumbnails (max 64kB per EXIF spec)
+                    if thumbnail_removed:
+                        raise exc
+                    LOG.debug(
+                        "Thumbnail too large (max 64kB) -- removing thumbnail and 1st: %s",
+                        exc,
+                    )
+                    del self._ef["thumbnail"]
+                    del self._ef["1st"]
+                    thumbnail_removed = True
+                    # retry later
                 else:
                     raise exc
             except Exception as exc:

mapillary_tools/http.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-
 import ssl
 import sys
 import typing as T

mapillary_tools/serializer/gpx.py

@@ -12,7 +12,6 @@
 import gpxpy.gpx
 
 from .. import geo, types
-
 from ..telemetry import CAMMGPSPoint, GPSPoint
 from ..types import (
     BaseSerializer,

mapillary_tools/uploader.py

@@ -797,6 +797,10 @@ def dump_image_bytes(cls, metadata: types.ImageMetadata) -> bytes:
             raise ExifError(
                 f"Failed to dump EXIF bytes: {ex}", metadata.filename
             ) from ex
+        except ValueError as ex:
+            raise ExifError(
+                f"Failed to dump EXIF bytes: {ex}", metadata.filename
+            ) from ex
 
     # Thread-safe
     def _get_cached_file_handle(self, key: str) -> str | None:

mapillary_tools/utils.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import concurrent.futures
-
 import hashlib
 import logging
 import os