mapillary-downloader 0.4.0__tar.gz → 0.4.2__tar.gz

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapillary_downloader
-Version: 0.4.0
+Version: 0.4.2
 Summary: Download your Mapillary data before it's gone
 Author-email: Gareth Davidson <gaz@bitplane.net>
 Requires-Python: >=3.10
@@ -72,18 +72,17 @@ mapillary-downloader --output ./downloads USERNAME1
 
 The downloader will:
 
+* 🏛️ Check Internet Archive to avoid duplicate downloads
 * 📷 Download multiple users' images organized by sequence
 * 📜 Inject EXIF metadata (GPS coordinates, camera info, timestamps,
   compass direction)
+* 🗜️ Convert to WebP (by default) to save ~70% disk space
 * 🛟 Save progress so you can safely resume if interrupted
-* 🗜️ Convert to WebP by default to save ~70% disk space
-* 📦 Tar sequence directories for faster uploads
-* 🏛️ Check Internet Archive to avoid duplicate downloads
-* 💾 Stage downloads in cache, move atomically when complete
+* 📦 Tar sequence directories (by default) for faster uploads to Internet Archive
 
 ## WebP Conversion
 
-WebP conversion is **enabled by default** (saves ~70% disk space). You'll need the `cwebp` binary installed:
+You'll need the `cwebp` binary installed:
 
 ```bash
 # Debian/Ubuntu
@@ -105,18 +104,13 @@ By default, sequence directories are automatically tarred after download because
 if they weren't, you'd spend more time setting up upload metadata than actually
 uploading files to IA.
 
-To keep individual files instead of creating tars, use the `--no-tar` flag:
-
-```bash
-mapillary-downloader --no-tar USERNAME
-```
+To keep individual files instead of creating tars, use the `--no-tar` flag.
 
 ## Internet Archive upload
 
 I've written a bash tool to rip media then tag, queue, and upload to The
-Internet Archive. The metadata is in the same format. If you copy completed
-download dirs into the `4.ship` dir, they'll find their way into an
-appropriately named item.
+Internet Archive. The metadata is in the same format. If you symlink your
+`./mapillary_data` dir to `rip`'s `4.ship` dir, they'll be queued for upload.
 
 See inlay for details:
 
@@ -138,7 +132,7 @@ make help     # See other make options
   * [📖 pydoc](https://bitplane.net/dev/python/mapillary_downloader/pydoc)
 * [🐍 pypi](https://pypi.org/project/mapillary-downloader)
 * [🐱 github](https://github.com/bitplane/mapillary_downloader)
-* [📀 rip](https://bitplane.net/dev/sh/rip
+* [📀 rip](https://bitplane.net/dev/sh/rip)
 
 ## License
 

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/README.md

@@ -42,18 +42,17 @@ mapillary-downloader --output ./downloads USERNAME1
 
 The downloader will:
 
+* 🏛️ Check Internet Archive to avoid duplicate downloads
 * 📷 Download multiple users' images organized by sequence
 * 📜 Inject EXIF metadata (GPS coordinates, camera info, timestamps,
   compass direction)
+* 🗜️ Convert to WebP (by default) to save ~70% disk space
 * 🛟 Save progress so you can safely resume if interrupted
-* 🗜️ Convert to WebP by default to save ~70% disk space
-* 📦 Tar sequence directories for faster uploads
-* 🏛️ Check Internet Archive to avoid duplicate downloads
-* 💾 Stage downloads in cache, move atomically when complete
+* 📦 Tar sequence directories (by default) for faster uploads to Internet Archive
 
 ## WebP Conversion
 
-WebP conversion is **enabled by default** (saves ~70% disk space). You'll need the `cwebp` binary installed:
+You'll need the `cwebp` binary installed:
 
 ```bash
 # Debian/Ubuntu
@@ -75,18 +74,13 @@ By default, sequence directories are automatically tarred after download because
 if they weren't, you'd spend more time setting up upload metadata than actually
 uploading files to IA.
 
-To keep individual files instead of creating tars, use the `--no-tar` flag:
-
-```bash
-mapillary-downloader --no-tar USERNAME
-```
+To keep individual files instead of creating tars, use the `--no-tar` flag.
 
 ## Internet Archive upload
 
 I've written a bash tool to rip media then tag, queue, and upload to The
-Internet Archive. The metadata is in the same format. If you copy completed
-download dirs into the `4.ship` dir, they'll find their way into an
-appropriately named item.
+Internet Archive. The metadata is in the same format. If you symlink your
+`./mapillary_data` dir to `rip`'s `4.ship` dir, they'll be queued for upload.
 
 See inlay for details:
 
@@ -108,7 +102,7 @@ make help     # See other make options
   * [📖 pydoc](https://bitplane.net/dev/python/mapillary_downloader/pydoc)
 * [🐍 pypi](https://pypi.org/project/mapillary-downloader)
 * [🐱 github](https://github.com/bitplane/mapillary_downloader)
-* [📀 rip](https://bitplane.net/dev/sh/rip
+* [📀 rip](https://bitplane.net/dev/sh/rip)
 
 ## License
 

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "mapillary_downloader"
 description = "Download your Mapillary data before it's gone"
-version = "0.4.0"
+version = "0.4.2"
 authors = [
     { name = "Gareth Davidson", email = "gaz@bitplane.net" }
 ]

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/src/mapillary_downloader/__main__.py

@@ -56,9 +56,21 @@ def main():
         action="store_true",
         help="Don't check if collection exists on Internet Archive before downloading",
     )
+    parser.add_argument(
+        "--debug",
+        action="store_true",
+        help="Enable debug logging (EXIF data, API responses, etc.)",
+    )
 
     args = parser.parse_args()
 
+    # Set debug logging level if requested
+    if args.debug:
+        import logging
+
+        logging.getLogger("mapillary_downloader").setLevel(logging.DEBUG)
+        logger.debug("Debug logging enabled")
+
     # Check for token
     if not args.token:
         logger.error("Error: Mapillary API token required. Use --token or set MAPILLARY_TOKEN environment variable")

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/src/mapillary_downloader/client.py

@@ -92,8 +92,10 @@ class MapillaryClient:
             images = data.get("data", [])
             total_fetched += len(images)
             logger.info(f"Fetched metadata for {total_fetched:,} images...")
+            logger.debug(f"API response paging: {data.get('paging', {})}")
 
             for image in images:
+                logger.debug(f"Image metadata: {image}")
                 yield image
 
             # Get next page URL

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/src/mapillary_downloader/downloader.py

@@ -95,8 +95,9 @@ class MapillaryDownloader:
         logger.info(f"Staging directory: {self.staging_dir}")
         logger.info(f"Final destination: {self.final_dir}")
 
-        # Set up file logging for archival
-        log_file = self.output_dir / "download.log"
+        # Set up file logging for archival with timestamp for incremental runs
+        timestamp = time.strftime("%Y%m%d-%H%M%S")
+        log_file = self.output_dir / f"download.log.{timestamp}"
         add_file_handler(log_file)
         logger.info(f"Logging to: {log_file}")
 

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/src/mapillary_downloader/exif_writer.py

@@ -1,8 +1,11 @@
 """EXIF metadata writer for Mapillary images."""
 
+import logging
 import piexif
 from datetime import datetime
 
+logger = logging.getLogger("mapillary_downloader")
+
 
 def decimal_to_dms(decimal):
     """Convert decimal degrees to degrees, minutes, seconds format for EXIF.
@@ -47,6 +50,9 @@ def write_exif_to_image(image_path, metadata):
         True if successful, False otherwise
     """
     try:
+        logger.debug(f"Writing EXIF to {image_path}")
+        logger.debug(f"Metadata: {metadata}")
+
         # Load existing EXIF data if any
         try:
             exif_dict = piexif.load(str(image_path))
@@ -99,13 +105,17 @@ def write_exif_to_image(image_path, metadata):
         # GPS Altitude - prefer computed_altitude over altitude
         altitude = metadata.get("computed_altitude") or metadata.get("altitude")
         if altitude is not None:
-            exif_dict["GPS"][piexif.GPSIFD.GPSAltitude] = (int(abs(altitude) * 100), 100)
+            altitude_val = int(abs(altitude) * 100)
+            logger.debug(f"Raw altitude value: {altitude}, calculated: {altitude_val}")
+            exif_dict["GPS"][piexif.GPSIFD.GPSAltitude] = (altitude_val, 100)
             exif_dict["GPS"][piexif.GPSIFD.GPSAltitudeRef] = 1 if altitude < 0 else 0
 
         # GPS Compass direction
         compass = metadata.get("computed_compass_angle") or metadata.get("compass_angle")
         if compass is not None:
-            exif_dict["GPS"][piexif.GPSIFD.GPSImgDirection] = (int(compass * 100), 100)
+            # Normalize compass to 0-360 range
+            compass_val = int((compass % 360) * 100)
+            exif_dict["GPS"][piexif.GPSIFD.GPSImgDirection] = (compass_val, 100)
             exif_dict["GPS"][piexif.GPSIFD.GPSImgDirectionRef] = b"T"  # True north
 
         # GPS Version
@@ -115,8 +125,10 @@ def write_exif_to_image(image_path, metadata):
         exif_bytes = piexif.dump(exif_dict)
         piexif.insert(exif_bytes, str(image_path))
 
+        logger.debug(f"Successfully wrote EXIF to {image_path}")
         return True
 
     except Exception as e:
-        print(f"Warning: Failed to write EXIF data to {image_path}: {e}")
+        logger.warning(f"Failed to write EXIF data to {image_path}: {e}")
+        logger.debug(f"Full metadata: {metadata}")
         return False

{mapillary_downloader-0.4.0 → mapillary_downloader-0.4.2}/src/mapillary_downloader/ia_meta.py

@@ -128,6 +128,10 @@ def generate_ia_metadata(collection_dir):
         logger.warning("Could not determine date range from metadata")
         first_date = last_date = "unknown"
 
+    # Detect WebP conversion and tarring
+    is_webp = "-webp" in collection_dir.name
+    has_tars = len(list(collection_dir.glob("*.tar"))) > 0
+
     # Create .meta directory
     meta_dir = collection_dir / ".meta"
     meta_dir.mkdir(exist_ok=True)
@@ -139,14 +143,31 @@ def generate_ia_metadata(collection_dir):
         f"Mapillary images by {username}",
     )
 
+    # Build resolution string
+    if quality == "original":
+        resolution_str = "original resolution"
+    else:
+        resolution_str = f"{quality}px resolution"
+
+    # Build description with processing details
     description = (
         f"Street-level imagery from Mapillary user '{username}'. "
-        f"Contains {image_count:,} images captured between {first_date} and {last_date}. "
-        f"Images are organized by sequence ID and include EXIF metadata with GPS coordinates, "
-        f"camera information, and compass direction.\n\n"
-        f"Downloaded using mapillary_downloader (https://bitplane.net/dev/python/mapillary_downloader/). "
-        f"Uploaded using rip (https://bitplane.net/dev/sh/rip)."
+        f"Contains {image_count:,} images in {resolution_str} captured between {first_date} and {last_date}."
     )
+
+    if has_tars:
+        description += " Sequences have been individually tarred."
+
+    if is_webp:
+        description += " Images were recompressed with WebP."
+
+    description += (
+        " Images are organized by sequence ID and include EXIF metadata with GPS coordinates, "
+        "camera information, and compass direction.\n\n"
+        "Downloaded using mapillary_downloader (https://bitplane.net/dev/python/mapillary_downloader/). "
+        "Uploaded using rip (https://bitplane.net/dev/sh/rip)."
+    )
+
     write_meta_tag(meta_dir, "description", description)
 
     # Subject tags