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

nt25/lib/et.py

@@ -1,4 +1,5 @@
 import io
+from operator import length_hint
 import time
 import json
 import struct
@@ -8,6 +9,7 @@ from datetime import UTC, datetime, timedelta, timezone
 from exif import Image, DATETIME_STR_FORMAT
 
 VERSION = "0.1.2"
+COMMENT_SEGMENT = b"\xff\xfe"
 EPOCH = datetime.fromtimestamp(0, UTC)
 
 
@@ -43,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():
@@ -112,18 +115,18 @@ class InvalidImageDataError(ValueError):
   pass
 
 
-def split_into_segments(data):
-  """Slices JPEG meta data into a list from JPEG binary data.
-  """
+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
@@ -137,39 +140,34 @@ def split_into_segments(data):
   return segments
 
 
-def read_exif_from_file(filename):
-  """Slices JPEG meta data into a list from JPEG binary data.
-  """
-  f = open(filename, "rb")
-  data = f.read(6)
+def setComment(segments, comment: str, enc='utf-8'):
+  contains = False
+  cb = comment.encode(enc)
+  length = len(cb) + 2
 
-  if data[0:2] != b"\xff\xd8":
-    raise InvalidImageDataError("Given data isn't JPEG.")
+  cbSeg = COMMENT_SEGMENT + length.to_bytes(2, byteorder='big') + cb
 
-  head = data[2:6]
-  HEAD_LENGTH = 4
-  exif = None
-  while len(head) == HEAD_LENGTH:
-    length = struct.unpack(">H", head[2: 4])[0]
-
-    if head[:2] == b"\xff\xe1":
-      segment_data = f.read(length - 2)
-      if segment_data[:4] != b'Exif':
-        head = f.read(HEAD_LENGTH)
-        continue
-      exif = head + segment_data
-      break
-    elif head[0:1] == b"\xff":
-      f.read(length - 2)
-      head = f.read(HEAD_LENGTH)
-    else:
-      break
+  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')
 
-  f.close()
-  return exif
+  return None
 
 
-def get_exif_seg(segments):
+def getExif(segments):
   """Returns Exif from JPEG meta data list
   """
   for seg in segments:
@@ -179,7 +177,7 @@ def get_exif_seg(segments):
   return None
 
 
-def merge_segments(segments, exif=b""):
+def mergeSegments(segments, exif=b""):
   """Merges Exif with APP0 and APP1 manipulations.
   """
   if segments[1][0:2] == b"\xff\xe0" and \
@@ -212,14 +210,7 @@ def merge_segments(segments, exif=b""):
   return b"".join(segments)
 
 
-def remove(src, new_file=None):
-  """
-  py:function:: piexif.remove(filename)
-
-  Remove exif from JPEG.
-
-  :param str filename: JPEG
-  """
+def removeExif(src, new_file=None):
   output_is_file = False
   if src[0:2] == b"\xff\xd8":
     src_data = src
@@ -232,12 +223,13 @@ def remove(src, new_file=None):
       file_type = "jpeg"
 
   if file_type == "jpeg":
-    segments = split_into_segments(src_data)
-    exif = get_exif_seg(segments)
-    if exif:
-      new_data = src_data.replace(exif, b"")
-    else:
-      new_data = src_data
+    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)
@@ -267,8 +259,8 @@ def transplant(exif_src, image, new_file=None):
     with open(exif_src, 'rb') as f:
       src_data = f.read()
 
-  segments = split_into_segments(src_data)
-  exif = get_exif_seg(segments)
+  segments = genSegments(src_data)
+  exif = getExif(segments)
 
   if exif is None:
     raise ValueError("not found exif in input")
@@ -281,8 +273,9 @@ def transplant(exif_src, image, new_file=None):
       image_data = f.read()
     output_file = True
 
-  segments = split_into_segments(image_data)
-  new_data = merge_segments(segments, exif)
+  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)
@@ -319,7 +312,7 @@ def main():
   if args.dump:
     r = dumpExif(args.file)
   elif args.rm:
-    r = remove(args.file)
+    r = removeExif(args.file)
   elif args.copy:
     r = transplant(args.copy, args.file)
   else:

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

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: nt25
-Version: 0.1.5
+Version: 0.1.6
 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: piexif>=1.1.3
 Requires-Dist: pyinstaller>=6.15.0
 Requires-Dist: scikit-learn>=1.7.1
 Requires-Dist: sympy>=1.14.0

{nt25-0.1.5.dist-info → nt25-0.1.6.dist-info}/RECORD

@@ -1,11 +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=BWg4dl1EuDA6pKQbWqxSY_OE5ya7l8vvGsMb7SGDpaM,7933
+nt25/lib/et.py,sha256=b7inPmDy-Vj0v7hdJdpCV-K5c05BgJpVzKAWJe75tfE,7873
 nt25/lib/fio.py,sha256=WvHpG6QYR1NE19Ss3Sy2FdajTxibX5SVW3PyC5Y5Krk,2525
-nt25-0.1.5.dist-info/METADATA,sha256=NbRanYnyhkstfCxQIS-nxf2f1E4VdI_QZJhd0TBmmeM,683
-nt25-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nt25-0.1.5.dist-info/entry_points.txt,sha256=mtt7YI92CecNLeMvyM3o5IyVzRpYSqqwmUgAzldhFH8,62
-nt25-0.1.5.dist-info/RECORD,,
+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,,