geopic-tag-reader 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

geopic_tag_reader/__init__.py

@@ -2,4 +2,4 @@
 GeoPicTagReader
 """
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"

geopic_tag_reader/i18n.py

@@ -1,8 +1,11 @@
 import gettext
 import os
+from typing import Callable
 
-lang_code = globals().get("LANG") or os.getenv("LANG") or "en"
 localedir = os.path.join(os.path.abspath(os.path.dirname(__file__)), "translations")
-lang = gettext.translation("geopic_tag_reader", localedir, languages=[lang_code], fallback=True)
-lang.install()
-_ = lang.gettext
+
+
+def init(lang_code: str = "en") -> Callable[[str], str]:
+    lang = gettext.translation("geopic_tag_reader", localedir, languages=[lang_code], fallback=True)
+    lang.install()
+    return lang.gettext

geopic_tag_reader/main.py

@@ -4,6 +4,7 @@ from geopic_tag_reader import reader
 from geopic_tag_reader.model import PictureType
 from typing import Optional
 import pyexiv2  # type: ignore
+from geopic_tag_reader.i18n import init as i18n_init
 
 app = typer.Typer(help="GeoPicTagReader")
 
@@ -12,28 +13,30 @@ app = typer.Typer(help="GeoPicTagReader")
 def read(
     image: Path = typer.Option(..., help="Path to your JPEG image file"),
     ignore_exiv2_errors: bool = typer.Option(False, "--ignore-exiv2-errors", help="Do not stop execution even if Exiv2 throws errors"),
+    lang: str = typer.Option("en", help="Lang code (2 letters) to use for printing messages"),
 ):
     """Reads EXIF metadata from a picture file, and prints results"""
 
     with open(image, "rb") as img:
         pyexiv2.set_log_level(4 if ignore_exiv2_errors else 2)
 
-        metadata = reader.readPictureMetadata(img.read())
+        metadata = reader.readPictureMetadata(img.read(), lang)
 
-        print("Latitude:", metadata.lat)
-        print("Longitude:", metadata.lon)
-        print("Timestamp:", metadata.ts.isoformat())
-        print("Heading:", metadata.heading)
-        print("Type:", metadata.type)
-        print("Make:", metadata.make)
-        print("Model:", metadata.model)
-        print("Focal length:", metadata.focal_length)
-        print("Crop parameters:", metadata.crop)
-        print("Pitch:", metadata.pitch)
-        print("Roll:", metadata.roll)
+        _ = i18n_init(lang)
+        print(_("Latitude:"), metadata.lat)
+        print(_("Longitude:"), metadata.lon)
+        print(_("Timestamp:"), metadata.ts.isoformat())
+        print(_("Heading:"), metadata.heading)
+        print(_("Type:"), metadata.type)
+        print(_("Make:"), metadata.make)
+        print(_("Model:"), metadata.model)
+        print(_("Focal length:"), metadata.focal_length)
+        print(_("Crop parameters:"), metadata.crop)
+        print(_("Pitch:"), metadata.pitch)
+        print(_("Roll:"), metadata.roll)
 
         if len(metadata.tagreader_warnings) > 0:
-            print("Warnings raised by reader:")
+            print(_("Warnings raised by reader:"))
             for w in metadata.tagreader_warnings:
                 print(" - " + w)
 
@@ -60,6 +63,7 @@ def write(
         default=None,
         help="type of picture, `equirectangular` for 360° pictures, `flat` otherwise",
     ),
+    lang: str = typer.Option("en", help="Lang code (2 letters) to use for printing messages"),
 ):
     """Override certain exiftags of a picture and write a new picture in another file"""
     from geopic_tag_reader import writer
@@ -71,6 +75,7 @@ def write(
         updated_pic = writer.writePictureMetadata(
             raw_input.read(),
             writer.PictureMetadata(capture_time=capture_dt, longitude=longitude, latitude=latitude, picture_type=picture_type),
+            lang,
         )
 
         out = output or input

geopic_tag_reader/reader.py

@@ -2,14 +2,14 @@ import xmltodict
 import pyexiv2  # type: ignore
 import datetime
 from dataclasses import dataclass, field
-from typing import Dict, List, Optional, Any, Set, Tuple
+from typing import Dict, List, Optional, Any, Set, Tuple, Callable
 import re
 import json
 from fractions import Fraction
 from geopic_tag_reader import camera
 import timezonefinder  # type: ignore
 import pytz
-from geopic_tag_reader.i18n import _
+from geopic_tag_reader.i18n import init as i18n_init
 
 # This is a fix for invalid MakerNotes leading to picture not read at all
 # https://github.com/LeoHsiao1/pyexiv2/issues/58
@@ -86,6 +86,10 @@ class InvalidExifException(Exception):
         super().__init__(msg)
 
 
+class InvalidFractionException(Exception):
+    """Exception for invalid list of fractions"""
+
+
 @dataclass
 class PartialGeoPicTags:
     """Tags associated to a geolocated picture when not all tags have been found
@@ -122,16 +126,18 @@ class PartialExifException(Exception):
         self.tags = partial_tags
 
 
-def readPictureMetadata(picture: bytes) -> GeoPicTags:
+def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
     """Extracts metadata from picture file
 
     Args:
         picture (bytes): Picture file
+        lang_code (str): Language code for translating error labels
 
     Returns:
         GeoPicTags: Extracted metadata from picture
     """
 
+    _ = i18n_init(lang_code)
     warnings = []
     img = pyexiv2.ImageData(picture)
     data = {}
@@ -159,12 +165,12 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
             data[k] = re.sub(r"charset=[^\s]+", "", v).strip()
 
     # Parse latitude/longitude
-    lat, lon, llw = decodeLatLon(data, "Exif.GPSInfo")
+    lat, lon, llw = decodeLatLon(data, "Exif.GPSInfo", _)
     if len(llw) > 0:
         warnings.extend(llw)
 
     if lat is None:
-        lat, lon, llw = decodeLatLon(data, "Xmp.exif")
+        lat, lon, llw = decodeLatLon(data, "Xmp.exif", _)
         if len(llw) > 0:
             warnings.extend(llw)
 
@@ -179,13 +185,13 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         raise InvalidExifException(_("Read longitude is out of WGS84 bounds (should be in [-180, 180])"))
 
     # Parse date/time
-    d, llw = decodeGPSDateTime(data, "Exif.GPSInfo", lat, lon)
+    d, llw = decodeGPSDateTime(data, "Exif.GPSInfo", _, lat, lon)
 
     if len(llw) > 0:
         warnings.extend(llw)
 
     if d is None:
-        d, llw = decodeGPSDateTime(data, "Xmp.exif", lat, lon)
+        d, llw = decodeGPSDateTime(data, "Xmp.exif", _, lat, lon)
         if len(llw) > 0:
             warnings.extend(llw)
 
@@ -196,7 +202,7 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         "Xmp.GPano.SourceImageCreateTime",
     ]:
         if d is None:
-            d, llw = decodeDateTimeOriginal(data, exifField, lat, lon)
+            d, llw = decodeDateTimeOriginal(data, exifField, _, lat, lon)
             if len(llw) > 0:
                 warnings.extend(llw)
 
@@ -423,14 +429,14 @@ def decodeManyFractions(value: str) -> List[Fraction]:
     try:
         vals = [Fraction(v.strip()) for v in value.split(" ")]
         if len([True for v in vals if v.denominator == 0]) > 0:
-            raise ValueError()
+            raise InvalidFractionException()
         return vals
 
     except:
-        raise ValueError(_("Not a valid list of fractions"))
+        raise InvalidFractionException()
 
 
-def decodeLatLon(data: dict, group: str) -> Tuple[Optional[float], Optional[float], List[str]]:
+def decodeLatLon(data: dict, group: str, _: Callable[[str], str]) -> Tuple[Optional[float], Optional[float], List[str]]:
     """Reads GPS info from given group to get latitude/longitude as float coordinates"""
 
     lat, lon = None, None
@@ -486,7 +492,7 @@ def decodeLatLon(data: dict, group: str) -> Tuple[Optional[float], Optional[floa
 
 
 def decodeDateTimeOriginal(
-    data: dict, datetimeField: str, lat: Optional[float] = None, lon: Optional[float] = None
+    data: dict, datetimeField: str, _: Callable[[str], str], lat: Optional[float] = None, lon: Optional[float] = None
 ) -> Tuple[Optional[datetime.datetime], List[str]]:
     d = None
     warnings = []
@@ -498,7 +504,9 @@ def decodeDateTimeOriginal(
             hourRaw = int(timeRaw[0])
             minutesRaw = int(timeRaw[1])
             secondsRaw, microsecondsRaw, msw = decodeSecondsAndMicroSeconds(
-                timeRaw[2], data["Exif.Photo.SubSecTimeOriginal"] if isExifTagUsable(data, "Exif.Photo.SubSecTimeOriginal", float) else "0"
+                timeRaw[2],
+                data["Exif.Photo.SubSecTimeOriginal"] if isExifTagUsable(data, "Exif.Photo.SubSecTimeOriginal", float) else "0",
+                _,
             )
             warnings += msw
 
@@ -550,7 +558,7 @@ def decodeTimeOffset(data: dict, offsetTimeField: str) -> Optional[datetime.tzin
 
 
 def decodeGPSDateTime(
-    data: dict, group: str, lat: Optional[float] = None, lon: Optional[float] = None
+    data: dict, group: str, _: Callable[[str], str], lat: Optional[float] = None, lon: Optional[float] = None
 ) -> Tuple[Optional[datetime.datetime], List[str]]:
     d = None
     warnings = []
@@ -576,6 +584,7 @@ def decodeGPSDateTime(
                 seconds, microseconds, msw = decodeSecondsAndMicroSeconds(
                     str(float(timeRaw[2])),
                     data["Exif.Photo.SubSecTimeOriginal"] if isExifTagUsable(data, "Exif.Photo.SubSecTimeOriginal", float) else "0",
+                    _,
                 )
 
                 warnings += msw
@@ -607,7 +616,7 @@ def decodeGPSDateTime(
     return (d, warnings)
 
 
-def decodeSecondsAndMicroSeconds(secondsRaw: str, microsecondsRaw: str) -> Tuple[int, int, List[str]]:
+def decodeSecondsAndMicroSeconds(secondsRaw: str, microsecondsRaw: str, _: Callable[[str], str]) -> Tuple[int, int, List[str]]:
     warnings = []
 
     # Read microseconds from SubSecTime field

geopic_tag_reader/translations/geopic_tag_reader.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-25 08:45+0200\n"
+"POT-Creation-Date: 2024-07-10 08:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,95 +17,131 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: geopic_tag_reader/reader.py:177
+#: geopic_tag_reader/main.py:26
+msgid "Latitude:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:27
+msgid "Longitude:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:28
+msgid "Timestamp:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:29
+msgid "Heading:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:30
+msgid "Type:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:31
+msgid "Make:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:32
+msgid "Model:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:33
+msgid "Focal length:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:34
+msgid "Crop parameters:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:35
+msgid "Pitch:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:36
+msgid "Roll:"
+msgstr ""
+
+#: geopic_tag_reader/main.py:39
+msgid "Warnings raised by reader:"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:183
 msgid "Read latitude is out of WGS84 bounds (should be in [-90, 90])"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:179
+#: geopic_tag_reader/reader.py:185
 msgid "Read longitude is out of WGS84 bounds (should be in [-180, 180])"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:221
+#: geopic_tag_reader/reader.py:227
 #, python-brace-format
 msgid "Skipping Mapillary date/time as it was not recognized: {v}"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:234
+#: geopic_tag_reader/reader.py:240
 msgid "Contradicting heading values found, GPSImgDirection value is used"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:345
+#: geopic_tag_reader/reader.py:351
 msgid "No GPS coordinates or broken coordinates in picture EXIF tags"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:351
+#: geopic_tag_reader/reader.py:357
 msgid "No valid date in picture EXIF tags"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:356
+#: geopic_tag_reader/reader.py:362
 msgid "The picture is missing mandatory metadata:"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:430
-msgid "Not a valid list of fractions"
-msgstr ""
-
-#: geopic_tag_reader/reader.py:443 geopic_tag_reader/reader.py:472
+#: geopic_tag_reader/reader.py:449 geopic_tag_reader/reader.py:478
 msgid "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:451
+#: geopic_tag_reader/reader.py:457
 msgid "Broken GPS coordinates in picture EXIF tags"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:454 geopic_tag_reader/reader.py:478
+#: geopic_tag_reader/reader.py:460 geopic_tag_reader/reader.py:484
 msgid "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:529
+#: geopic_tag_reader/reader.py:537
 msgid "Precise timezone information not found, fallback to UTC"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:534
+#: geopic_tag_reader/reader.py:542
 msgid ""
 "Precise timezone information not found (and no GPS coordinates to help), "
 "fallback to UTC"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:538
+#: geopic_tag_reader/reader.py:546
 #, python-brace-format
 msgid ""
 "Skipping original date/time (from {datefield}) as it was not recognized: {v}"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:572
+#: geopic_tag_reader/reader.py:580
 #, python-brace-format
 msgid ""
 "GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
 "group)"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:602
+#: geopic_tag_reader/reader.py:611
 #, python-brace-format
 msgid "Skipping GPS date/time ({group} group) as it was not recognized: {v}"
 msgstr ""
 
-#: geopic_tag_reader/reader.py:628
+#: geopic_tag_reader/reader.py:637
 #, python-brace-format
 msgid ""
 "Microseconds read from decimal seconds value ({microsecondsFromSeconds}) is "
 "not matching value from EXIF field ({microseconds}). Max value will be kept."
 msgstr ""
 
-#: geopic_tag_reader/writer.py:15
-msgid ""
-"Impossible to write the exif tags without the '[write-exif]' dependency "
-"(that will need to install libexiv2).\n"
-"Install this package with `pip install geopic-tag-reader[write-exif]` to use "
-"this function"
-msgstr ""
-
-#: geopic_tag_reader/writer.py:131
+#: geopic_tag_reader/writer.py:132
 #, python-brace-format
 msgid "Unsupported key in additional tags ({k})"
 msgstr ""

geopic_tag_reader/writer.py

@@ -5,16 +5,14 @@ from geopic_tag_reader.model import PictureType
 from enum import Enum
 import timezonefinder  # type: ignore
 import pytz
-from geopic_tag_reader.i18n import _
+from geopic_tag_reader.i18n import init as i18n_init
 
 try:
     import pyexiv2  # type: ignore
 except ImportError:
     raise Exception(
-        _(
-            """Impossible to write the exif tags without the '[write-exif]' dependency (that will need to install libexiv2).
+        """Impossible to write the exif tags without the '[write-exif]' dependency (that will need to install libexiv2).
 Install this package with `pip install geopic-tag-reader[write-exif]` to use this function"""
-        )
     )
 
 tz_finder = timezonefinder.TimezoneFinder()
@@ -75,10 +73,13 @@ def _fraction(value: float):
     return f"{int(value * FLOAT_PRECISION)}/{FLOAT_PRECISION}"
 
 
-def writePictureMetadata(picture: bytes, metadata: PictureMetadata) -> bytes:
+def writePictureMetadata(picture: bytes, metadata: PictureMetadata, lang_code: str = "en") -> bytes:
     """
     Override exif metadata on raw picture and return updated bytes
     """
+
+    _ = i18n_init(lang_code)
+
     if not metadata.has_change():
         return picture
 

{geopic_tag_reader-1.1.2.dist-info → geopic_tag_reader-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geopic-tag-reader
-Version: 1.1.2
+Version: 1.1.3
 Summary: GeoPicTagReader
 Author-email: Adrien PAVIE <panieravide@riseup.net>
 Requires-Python: >=3.8

geopic_tag_reader-1.1.3.dist-info/RECORD

@@ -0,0 +1,15 @@
+geopic_tag_reader/__init__.py,sha256=5U9FfeZGkInbD3H9zaqteUjP5wK3mmNATj3vZPy31pE,47
+geopic_tag_reader/camera.py,sha256=Nw6dQjnrUCCOXujjk8Y7IwjJPMuDf4DAGCmHk0LDfEg,1975
+geopic_tag_reader/i18n.py,sha256=LOLBj7eB_hpHTc5XdMP97EoWdD2kgmkP_uvJJDKEVsU,342
+geopic_tag_reader/main.py,sha256=NJFDdPlyj0HvBcPABTVPqdSPm0SP3lnW4HF1fmhONY4,3550
+geopic_tag_reader/model.py,sha256=rsWVE3T1kpNsKXX8iv6xb_3PCVY6Ea7iU9WOqUgXklU,129
+geopic_tag_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geopic_tag_reader/reader.py,sha256=4tk-qvN-mBryp8FbtG9smQkSlWDjWZU1CDedm07MqP0,25746
+geopic_tag_reader/writer.py,sha256=HdZenoY_5Qv1Kq0jedCJhVFDYsv0iQaCzB6necU_LrY,8793
+geopic_tag_reader/translations/geopic_tag_reader.pot,sha256=1myoxYDZfHh7R_Iiyn9VFdz5T6nbYR3S_jxFhkrw0GI,3590
+geopic_tag_reader/translations/fr/LC_MESSAGES/geopic_tag_reader.po,sha256=QxuV0AYxOAVCI4xaKDDCvgUfeym6oRQC2YeRJpI9i9c,4223
+geopic_tag_reader-1.1.3.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
+geopic_tag_reader-1.1.3.dist-info/LICENSE,sha256=oHWDwXkJJb9zJzThMN3F9Li4yFhz1qxOUByouY7L3bI,1070
+geopic_tag_reader-1.1.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+geopic_tag_reader-1.1.3.dist-info/METADATA,sha256=UWeERQ-wFwg-URJUXsRaGJLzcuJq8BkQNmw-3jSpcJ0,4578
+geopic_tag_reader-1.1.3.dist-info/RECORD,,

geopic_tag_reader-1.1.2.dist-info/RECORD

@@ -1,15 +0,0 @@
-geopic_tag_reader/__init__.py,sha256=DCAt2kbPER8vsAuxzbjuzgbgYxV4aajpxsaPx--ZQ28,47
-geopic_tag_reader/camera.py,sha256=Nw6dQjnrUCCOXujjk8Y7IwjJPMuDf4DAGCmHk0LDfEg,1975
-geopic_tag_reader/i18n.py,sha256=MnhttLwppXnioXYUdlTi1J9SPtSKhaHc9ARYtsS5t-M,303
-geopic_tag_reader/main.py,sha256=ZEZaZEeaDxRjrVMwhR5lUYJWKkUcjd8avjqm7JxJdhM,3219
-geopic_tag_reader/model.py,sha256=rsWVE3T1kpNsKXX8iv6xb_3PCVY6Ea7iU9WOqUgXklU,129
-geopic_tag_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geopic_tag_reader/reader.py,sha256=lHAMafZK7rCFsO1joCXGrbjyYJfgwab7dQF-eKFLRHs,25337
-geopic_tag_reader/writer.py,sha256=gUvs2fVe7VIMzsT6ZGnXOiKqtsTgndDaJeTTCYnOpXQ,8748
-geopic_tag_reader/translations/geopic_tag_reader.pot,sha256=-Z6YYskO_jYKXGJssbfigAixHMcAXylNAMKebcjFCXY,3198
-geopic_tag_reader/translations/fr/LC_MESSAGES/geopic_tag_reader.po,sha256=QxuV0AYxOAVCI4xaKDDCvgUfeym6oRQC2YeRJpI9i9c,4223
-geopic_tag_reader-1.1.2.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
-geopic_tag_reader-1.1.2.dist-info/LICENSE,sha256=oHWDwXkJJb9zJzThMN3F9Li4yFhz1qxOUByouY7L3bI,1070
-geopic_tag_reader-1.1.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-geopic_tag_reader-1.1.2.dist-info/METADATA,sha256=fH9KBmz593jrgLNiRrYrWYH2gSWBi_xPXghP22v_92k,4578
-geopic_tag_reader-1.1.2.dist-info/RECORD,,