nt25 0.1.6__tar.gz → 0.1.7__tar.gz

{nt25-0.1.6 → nt25-0.1.7}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: nt25
-Version: 0.1.6
+Version: 0.1.7
 Summary: Neo's Tools of Python
 Requires-Python: >=3.10
 Requires-Dist: exif>=1.6.1
 Requires-Dist: matplotlib>=3.10.6
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: pandas>=2.3.2
+Requires-Dist: pillow>=11.3.0
 Requires-Dist: pyinstaller>=6.15.0
 Requires-Dist: scikit-learn>=1.7.1
 Requires-Dist: sympy>=1.14.0

{nt25-0.1.6 → nt25-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nt25"
-version = "0.1.6"
+version = "0.1.7"
 description = "Neo's Tools of Python"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -12,6 +12,7 @@ dependencies = [
     "openpyxl>=3.1.5",
     "scikit-learn>=1.7.1",
     "sympy>=1.14.0",
+    "pillow>=11.3.0",
 ]
 
 [project.scripts]

{nt25-0.1.6 → nt25-0.1.7}/src/nt25/lib/et.py

@@ -1,14 +1,16 @@
 import io
-from operator import length_hint
+import os
 import time
 import json
 import struct
 import argparse
 
+from PIL import Image as pi
+
 from datetime import UTC, datetime, timedelta, timezone
 from exif import Image, DATETIME_STR_FORMAT
 
-VERSION = "0.1.2"
+VERSION = "0.1.3"
 COMMENT_SEGMENT = b"\xff\xfe"
 EPOCH = datetime.fromtimestamp(0, UTC)
 
@@ -32,6 +34,21 @@ def gpsDt2Dt(date, time, offset=8):
   return utc.astimezone(timezone(timedelta(hours=offset)))
 
 
+def optimizeFile(file, q=80):
+  less = False
+  ofile = file + '.jpg'
+  pi.open(file).save(ofile, quality=q, optimize=True, progression=True)
+
+  if os.path.getsize(ofile) < os.path.getsize(file) * 0.9:
+    less = True
+    transplant(file, ofile)
+    os.replace(ofile, file)
+  else:
+    os.remove(ofile)
+
+  return less
+
+
 def tryGet(img, key, default):
   value = default
 
@@ -43,9 +60,12 @@ def tryGet(img, key, default):
   return value
 
 
-def dumpExif(file):
+def dumpExif(file, optimize=False):
   result = {}
 
+  if optimize:
+    optimizeFile(file)
+
   with open(file, 'rb') as f:
     img = Image(f)
     for key in img.get_all():
@@ -57,58 +77,74 @@ def dumpExif(file):
   return result
 
 
-def parseExif(file):
+def parseExif(file, optimize=False):
+  if optimize:
+    optimizeFile(file)
+
   with open(file, 'rb') as f:
     try:
       img = Image(f)
     except Exception:
       return {}
 
-    width = tryGet(img, 'pixel_x_dimension', -1)
-    height = tryGet(img, 'pixel_y_dimension', -1)
+  width = tryGet(img, 'pixel_x_dimension', -1)
+  height = tryGet(img, 'pixel_y_dimension', -1)
+
+  if width < 0:
+    width = tryGet(img, 'image_width', -1)
+    height = tryGet(img, 'image_height', -1)
+
+  create = tryGet(img, 'datetime_original', None)
+  modify = tryGet(img, 'datetime', None)
+
+  createDt = None if create is None else dtFormatter(create)
+  modifyDt = None if modify is None else dtFormatter(modify)
 
-    if width < 0:
-      width = tryGet(img, 'image_width', -1)
-      height = tryGet(img, 'image_height', -1)
+  latitude = tryGet(img, 'gps_latitude', None)
+  latitude = None if latitude is None else dms2dec(latitude)
 
-    create = tryGet(img, 'datetime_original', None)
-    modify = tryGet(img, 'datetime', None)
+  latRef = tryGet(img, "gps_latitude_ref", default='N')
+  if latRef != 'N' and latitude:
+    latitude = -latitude
 
-    createDt = None if create is None else dtFormatter(create)
-    modifyDt = None if modify is None else dtFormatter(modify)
+  longitude = tryGet(img, 'gps_longitude', None)
+  longitude = None if longitude is None else dms2dec(longitude)
 
-    latitude = tryGet(img, 'gps_latitude', None)
-    latitude = None if latitude is None else dms2dec(latitude)
+  longRef = tryGet(img, "gps_longitude_ref", default='E')
+  if longRef != 'E' and longitude:
+    longitude = -longitude
 
-    longitude = tryGet(img, 'gps_longitude', None)
-    longitude = None if longitude is None else dms2dec(longitude)
+  gpsDatetime = None
+  gd = tryGet(img, 'gps_datestamp', None)
+  gt = tryGet(img, 'gps_timestamp', None)
 
-    gpsDatetime = None
-    gd = tryGet(img, 'gps_datestamp', None)
-    gt = tryGet(img, 'gps_timestamp', None)
+  if gd and gt:
+    offset = int(time.localtime().tm_gmtoff / 3600)
+    gpsDatetime = gpsDt2Dt(gd, gt, offset=offset)
 
-    if gd and gt:
-      offset = int(time.localtime().tm_gmtoff / 3600)
-      gpsDatetime = gpsDt2Dt(gd, gt, offset=offset)
+  ts = -1 if createDt is None else int(createDt.timestamp())
+  mTs = -1 if modifyDt is None else int(modifyDt.timestamp())
+  gpsTs = -1 if gpsDatetime is None else int(gpsDatetime.timestamp())
 
-    ts = -1 if createDt is None else int(createDt.timestamp())
-    mTs = -1 if modifyDt is None else int(modifyDt.timestamp())
-    gpsTs = -1 if gpsDatetime is None else int(gpsDatetime.timestamp())
+  if ts > 0:
     offset = max(mTs, gpsTs) - ts
-    offsetDelta = datetime.fromtimestamp(offset, UTC) - EPOCH
-
-    return {
-        "width": width,
-        "height": height,
-        "latitude": latitude,
-        "longitude": longitude,
-        "datetime.create": dt2str(createDt),
-        "datetime.modify": dt2str(modifyDt),
-        "datetime.gps": dt2str(gpsDatetime),
-        "ts": ts,
-        "offset": offset,
-        "offset.delta": str(offsetDelta),
-    }
+    offsetDelta = str(datetime.fromtimestamp(offset, UTC) - EPOCH)
+  else:
+    offset = None
+    offsetDelta = None
+
+  return {
+      "width": width,
+      "height": height,
+      "latitude": latitude,
+      "longitude": longitude,
+      "datetime.create": dt2str(createDt),
+      "datetime.modify": dt2str(modifyDt),
+      "datetime.gps": dt2str(gpsDatetime),
+      "ts": ts,
+      "offset": offset,
+      "offset.delta": offsetDelta,
+  }
 
 
 class InvalidImageDataError(ValueError):
@@ -174,7 +210,7 @@ def getExif(segments):
     if seg[0:2] == b"\xff\xe1" and seg[4:10] == b"Exif\x00\x00":
       return seg
 
-  return None
+  return b""
 
 
 def mergeSegments(segments, exif=b""):
@@ -210,49 +246,29 @@ def mergeSegments(segments, exif=b""):
   return b"".join(segments)
 
 
-def removeExif(src, new_file=None):
-  output_is_file = False
-  if src[0:2] == b"\xff\xd8":
-    src_data = src
-    file_type = "jpeg"
-  else:
-    with open(src, 'rb') as f:
-      src_data = f.read()
-    output_is_file = True
-    if src_data[0:2] == b"\xff\xd8":
-      file_type = "jpeg"
-
-  if file_type == "jpeg":
-    segments = genSegments(src_data)
-    segments = list(filter(lambda seg: not (seg[0:2] == b"\xff\xe1"
-                                            and seg[4:10] == b"Exif\x00\x00"),
-                           segments))
-
-    segments = setComment(segments, "nt25.et")
-    new_data = b"".join(segments)
-
-  if isinstance(new_file, io.BytesIO):
-    new_file.write(new_data)
-    new_file.seek(0)
-  elif new_file:
-    with open(new_file, "wb+") as f:
-      f.write(new_data)
-  elif output_is_file:
-    with open(src, "wb+") as f:
-      f.write(new_data)
-  else:
-    raise ValueError("Give a second argument to 'remove' to output file")
+def removeExif(src, optimize=False):
+  if optimize:
+    optimizeFile(src)
 
+  with open(src, 'rb') as f:
+    src_data = f.read()
 
-def transplant(exif_src, image, new_file=None):
-  """
-  py:function:: piexif.transplant(filename1, filename2)
+  segments = genSegments(src_data)
+  segments = list(filter(lambda seg: not (seg[0:2] == b"\xff\xe1"
+                                          and seg[4:10] == b"Exif\x00\x00"),
+                         segments))
 
-  Transplant exif from filename1 to filename2.
+  segments = setComment(segments, "nt25.et")
+  new_data = b"".join(segments)
+
+  with open(src, "wb+") as f:
+    f.write(new_data)
+
+
+def transplant(exif_src, image, optimize=False):
+  if optimize:
+    optimizeFile(image)
 
-  :param str filename1: JPEG
-  :param str filename2: JPEG
-  """
   if exif_src[0:2] == b"\xff\xd8":
     src_data = exif_src
   else:
@@ -262,41 +278,29 @@ def transplant(exif_src, image, new_file=None):
   segments = genSegments(src_data)
   exif = getExif(segments)
 
-  if exif is None:
-    raise ValueError("not found exif in input")
-
-  output_file = False
-  if image[0:2] == b"\xff\xd8":
-    image_data = image
-  else:
-    with open(image, 'rb') as f:
-      image_data = f.read()
-    output_file = True
+  with open(image, 'rb') as f:
+    image_data = f.read()
 
   segments = genSegments(image_data)
   segments = setComment(segments, "nt25.et")
   new_data = mergeSegments(segments, exif)
 
-  if isinstance(new_file, io.BytesIO):
-    new_file.write(new_data)
-    new_file.seek(0)
-  elif new_file:
-    with open(new_file, "wb+") as f:
-      f.write(new_data)
-  elif output_file:
-    with open(image, "wb+") as f:
-      f.write(new_data)
-  else:
-    raise ValueError("Give a 3rd argument to 'transplant' to output file")
+  with open(image, "wb+") as f:
+    f.write(new_data)
 
 
 def main():
   parser = argparse.ArgumentParser(description="EXIF tool")
-  parser.add_argument('-v', '--version',
-                      help='echo version', action='store_true')
-  parser.add_argument('-d', '--dump', help='dump meta', action='store_true')
-  parser.add_argument('-r', '--rm', help='remove meta', action='store_true')
-  parser.add_argument('-c', '--copy', type=str, help='copy meta')
+  parser.add_argument('-v', '--version', action='store_true',
+                      help='echo version')
+  parser.add_argument('-o', '--optimize', action='store_true',
+                      help='optimize jpg file, work with -r, -d, -c, -f')
+  parser.add_argument('-r', '--rm', action='store_true',
+                      help='remove meta, use: -r -f FILE')
+  parser.add_argument('-d', '--dump', action='store_true',
+                      help='dump meta, use: -d -f FILE')
+  parser.add_argument('-c', '--copy', type=str,
+                      help='copy meta, use: -c SRC -f DST')
   parser.add_argument('-f', '--file', type=str, help='image file')
 
   args = parser.parse_args()
@@ -306,17 +310,20 @@ def main():
     return
 
   if args.file is None:
-    print("usage: et [-h] [-v] [-r FILE] [-c FILE] [-d] [-f FILE]")
+    print("usage: et [-h] [-v] [-o] [-f FILE] [-d -f FILE]\n"
+          "\t\t[-r -f FILE] [-c SRC -f DST]")
     return
 
+  opt = True if args.optimize else False
+
   if args.dump:
-    r = dumpExif(args.file)
+    r = dumpExif(args.file, optimize=opt)
   elif args.rm:
-    r = removeExif(args.file)
+    r = removeExif(args.file, optimize=opt)
   elif args.copy:
-    r = transplant(args.copy, args.file)
+    r = transplant(args.copy, args.file, optimize=opt)
   else:
-    r = parseExif(args.file)
+    r = parseExif(args.file, optimize=opt)
 
   if r is not None:
     print(json.dumps(r, indent=2, sort_keys=False))