nt25 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

nt25/__init__.py

@@ -1,9 +1,10 @@
 import importlib.metadata as meta
 
-from .lib import fio, calc, draw
+from .lib import fio, calc, draw, et
 from .lib.draw import DType
 
 __version__ = meta.version(str(__package__))
 __data_path__ = __file__.replace('__init__.py', 'data')
 
-__all__ = ('__version__', '__data_path__', 'fio', 'calc', 'draw', 'DType')
+__all__ = ('__version__', '__data_path__',
+           'fio', 'calc', 'draw', 'DType', 'et')

nt25/{main.py → demo.py}

@@ -1,5 +1,5 @@
 import os
-from nt25 import fio, calc, draw, DType, __version__, __data_path__
+from nt25 import fio, calc, draw, DType, et, __version__, __data_path__
 
 # import timeit
 # timeit.timeit('', number=100, globals=globals())
@@ -70,7 +70,10 @@ def main():
   bar = calc.solveEq(foo['eq'], output=True)
 
   if len(bar) > 0:
-    print(f'solveEq(750, 1.5) ~ {bar[0]['func'](y=[750], x1=1.5):.4f}')
+    print(f'solveEq(750, 1.5) ~ {bar[0]['func'](y=[750], x1=1.5):.4f}\n')
+
+  exif = et.parseExif(__data_path__ + '/exif.jpg')
+  print('exif:', exif)
 
 
 if __name__ == "__main__":

nt25/lib/et.py

@@ -1,16 +1,16 @@
+import io
+from operator import length_hint
 import time
 import json
+import struct
 import argparse
 
 from datetime import UTC, datetime, timedelta, timezone
-from exif import Image
-
-VERSION = "0.1.1"
+from exif import Image, DATETIME_STR_FORMAT
 
+VERSION = "0.1.2"
+COMMENT_SEGMENT = b"\xff\xfe"
 EPOCH = datetime.fromtimestamp(0, UTC)
-IGNORE = ['orientation', 'maker_note', '_interoperability_ifd_Pointer',
-          'components_configuration', 'scene_type', 'flashpix_version',
-          'gps_processing_method',]
 
 
 def dms2dec(dms: tuple):
@@ -19,11 +19,11 @@ def dms2dec(dms: tuple):
 
 
 def dtFormatter(str):
-  return datetime.strptime(str, '%Y:%m:%d %H:%M:%S')
+  return datetime.strptime(str, DATETIME_STR_FORMAT)
 
 
 def dt2str(dt):
-  return None if dt is None else dt.strftime('%Y-%m-%d %H:%M:%S')
+  return None if dt is None else dt.strftime(DATETIME_STR_FORMAT)
 
 
 def gpsDt2Dt(date, time, offset=8):
@@ -45,6 +45,7 @@ def tryGet(img, key, default):
 
 def dumpExif(file):
   result = {}
+
   with open(file, 'rb') as f:
     img = Image(f)
     for key in img.get_all():
@@ -73,13 +74,6 @@ def parseExif(file):
     create = tryGet(img, 'datetime_original', None)
     modify = tryGet(img, 'datetime', None)
 
-    # da = []
-    # for d in (d1, d2, d3):
-    #     if d is not None:
-    #         print(d)
-    #         da.append(dtFormatter(d))
-    # dt = None if len(da) == 0 else max(da)
-
     createDt = None if create is None else dtFormatter(create)
     modifyDt = None if modify is None else dtFormatter(modify)
 
@@ -117,11 +111,192 @@ def parseExif(file):
     }
 
 
+class InvalidImageDataError(ValueError):
+  pass
+
+
+def genSegments(data):
+  if data[0:2] != b"\xff\xd8":
+    raise InvalidImageDataError("Given data isn't JPEG.")
+
+  head = 2
+  segments = [b"\xff\xd8"]
+
+  while 1:
+    if data[head: head + 2] == b"\xff\xda":
+      segments.append(data[head:])
+      break
+
+    else:
+      length = struct.unpack(">H", data[head + 2: head + 4])[0]
+      endPoint = head + length + 2
+      seg = data[head: endPoint]
+      segments.append(seg)
+      head = endPoint
+
+    if (head >= len(data)):
+      raise InvalidImageDataError("Wrong JPEG data.")
+
+  return segments
+
+
+def setComment(segments, comment: str, enc='utf-8'):
+  contains = False
+  cb = comment.encode(enc)
+  length = len(cb) + 2
+
+  cbSeg = COMMENT_SEGMENT + length.to_bytes(2, byteorder='big') + cb
+
+  for i in range(len(segments)):
+    if segments[i][0:2] == COMMENT_SEGMENT:
+      contains = True
+      segments[i] = cbSeg
+
+  if not contains:
+    length = len(segments)
+    segments.insert(1 if length == 2 else length - 2, cbSeg)
+
+  return segments
+
+
+def getComment(segments, enc='utf-8'):
+  for seg in segments:
+    if seg[0:2] == COMMENT_SEGMENT:
+      return seg[4:].decode(encoding=enc, errors='replace')
+
+  return None
+
+
+def getExif(segments):
+  """Returns Exif from JPEG meta data list
+  """
+  for seg in segments:
+    if seg[0:2] == b"\xff\xe1" and seg[4:10] == b"Exif\x00\x00":
+      return seg
+
+  return None
+
+
+def mergeSegments(segments, exif=b""):
+  """Merges Exif with APP0 and APP1 manipulations.
+  """
+  if segments[1][0:2] == b"\xff\xe0" and \
+     segments[2][0:2] == b"\xff\xe1" and \
+     segments[2][4:10] == b"Exif\x00\x00":
+    if exif:
+      segments[2] = exif
+      segments.pop(1)
+    elif exif is None:
+      segments.pop(2)
+    else:
+      segments.pop(1)
+
+  elif segments[1][0:2] == b"\xff\xe0":
+    if exif:
+      segments[1] = exif
+
+  elif (segments[1][0:2] == b"\xff\xe1" and
+        segments[1][4:10] == b"Exif\x00\x00"):
+
+    if exif:
+      segments[1] = exif
+    elif exif is None:
+      segments.pop(1)
+
+  else:
+    if exif:
+      segments.insert(1, exif)
+
+  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 transplant(exif_src, image, new_file=None):
+  """
+  py:function:: piexif.transplant(filename1, filename2)
+
+  Transplant exif from filename1 to filename2.
+
+  :param str filename1: JPEG
+  :param str filename2: JPEG
+  """
+  if exif_src[0:2] == b"\xff\xd8":
+    src_data = exif_src
+  else:
+    with open(exif_src, 'rb') as f:
+      src_data = f.read()
+
+  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
+
+  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")
+
+
 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('-f', '--file', type=str, help='image file')
 
   args = parser.parse_args()
@@ -131,11 +306,20 @@ def main():
     return
 
   if args.file is None:
-    print("usage: et [-h] [-v] [-d] [-f FILE]")
+    print("usage: et [-h] [-v] [-r FILE] [-c FILE] [-d] [-f FILE]")
     return
 
-  r = dumpExif(args.file) if args.dump else parseExif(args.file)
-  print(json.dumps(r, indent=2, sort_keys=False))
+  if args.dump:
+    r = dumpExif(args.file)
+  elif args.rm:
+    r = removeExif(args.file)
+  elif args.copy:
+    r = transplant(args.copy, args.file)
+  else:
+    r = parseExif(args.file)
+
+  if r is not None:
+    print(json.dumps(r, indent=2, sort_keys=False))
 
 
 if __name__ == "__main__":

{nt25-0.1.4.dist-info → nt25-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nt25
-Version: 0.1.4
+Version: 0.1.6
 Summary: Neo's Tools of Python
 Requires-Python: >=3.10
 Requires-Dist: exif>=1.6.1
@@ -32,7 +32,7 @@ Neo's Tools of Python in 2025
 ```sh
 uv init
 # fio, calc, draw basic demo
-uv run nt25
+uv run demo
 # et
 uv run et
 ```

nt25-0.1.6.dist-info/RECORD

@@ -0,0 +1,12 @@
+nt25/__init__.py,sha256=28wWlyuyScDrZx9ytGM_TxUipk5dg4pOyp_xyj6-NWk,295
+nt25/demo.py,sha256=W34-7KTYVpBYXg0UrgmkVCRWAdO5RAc1K7zS9pz-BEQ,2179
+nt25/data/exif.jpg,sha256=Wl9QqZ3UAC_ldd055lJOcZKqvU5swqLEw_HxRBbLYgc,347767
+nt25/data/test.xlsx,sha256=7C0JDS-TLm_KmjnKtfeajkpwGKSUhcLdr2W2UFUxAgM,10542
+nt25/lib/calc.py,sha256=3X3k9jisSjRP7OokSdKvoVo4IIOzk2efexW8z1gMo-w,2265
+nt25/lib/draw.py,sha256=OKTlkkNVUz_LGBA9Gk7fjcnbbbl7e_hT8nWKkcfeg2k,5642
+nt25/lib/et.py,sha256=b7inPmDy-Vj0v7hdJdpCV-K5c05BgJpVzKAWJe75tfE,7873
+nt25/lib/fio.py,sha256=WvHpG6QYR1NE19Ss3Sy2FdajTxibX5SVW3PyC5Y5Krk,2525
+nt25-0.1.6.dist-info/METADATA,sha256=LV7UAehxnrZbCOXjbivjfT-xHC9StucF_5xmgb5V4c0,654
+nt25-0.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nt25-0.1.6.dist-info/entry_points.txt,sha256=mtt7YI92CecNLeMvyM3o5IyVzRpYSqqwmUgAzldhFH8,62
+nt25-0.1.6.dist-info/RECORD,,

{nt25-0.1.4.dist-info → nt25-0.1.6.dist-info}/entry_points.txt

@@ -1,3 +1,3 @@
 [console_scripts]
+demo = nt25.demo:main
 et = nt25.lib.et:main
-nt25 = nt25.main:main

nt25-0.1.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-nt25/__init__.py,sha256=oIVhU2wegSHArUmypHr3nXQa8RRtH5TBZgRdRNN-OEw,274
-nt25/main.py,sha256=nVzuGx8PaxDU-QbLmVtAvDkfEFX5Z5g0xE0CWf9EwBA,2098
-nt25/data/test.xlsx,sha256=7C0JDS-TLm_KmjnKtfeajkpwGKSUhcLdr2W2UFUxAgM,10542
-nt25/lib/calc.py,sha256=3X3k9jisSjRP7OokSdKvoVo4IIOzk2efexW8z1gMo-w,2265
-nt25/lib/draw.py,sha256=OKTlkkNVUz_LGBA9Gk7fjcnbbbl7e_hT8nWKkcfeg2k,5642
-nt25/lib/et.py,sha256=X_w-f2yb2jPtauPZKfbonDH4FhNFVOiFwZBp9yga8HE,3643
-nt25/lib/fio.py,sha256=WvHpG6QYR1NE19Ss3Sy2FdajTxibX5SVW3PyC5Y5Krk,2525
-nt25-0.1.4.dist-info/METADATA,sha256=DbMNv3C3BKdJ0yD2iQg7ii3-pQw3qEDFbjUZqJE8MLo,654
-nt25-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nt25-0.1.4.dist-info/entry_points.txt,sha256=6O4CnhT__4-ORTKEY9vV-MjSzJwDM4FFbVODQsN4Gr8,62
-nt25-0.1.4.dist-info/RECORD,,