Fixed for python >3.10 and pyexiftool

README.md

@@ -83,8 +83,10 @@ output:
 ```
 
 ## Release Notes
+### 2024.1.1
+ * Support for python 3.12, fixed missing files in tests
 
 ### 2021.1.4
  * PIL image library has been replaced for exiftool so datetime from videos can
    be obtained too.
- * Files with no creation datetime EXIF or tags are ignored for now.
+ * Files with no creation datetime EXIF or tags are ignored for now.

photosort/exif.py

@@ -1,4 +1,5 @@
 import exiftool
+from exiftool.exceptions import ExifToolExecuteError
 
 et = None
 
@@ -7,12 +8,20 @@ def start():
     """Starts a background batch exiftool process for quickly processing files
     """
     global et
-    et = exiftool.ExifTool()
-    et.start()
+    et = exiftool.ExifToolHelper()
 
 
 def get_metadata(filename):
     global et
     if et is None:
         start()
-    return et.get_metadata(filename)
+    # exiftool.get_metadata returns a list of maps with the
+    # exif metadata, because now it supports a list of files as input
+    try:
+        return et.get_metadata(filename)[0]
+    except ExifToolExecuteError as e:
+        print("ExifToolExecutError: %s" % e)
+        print("args: %s" % e.args)
+        print("stderr: %s" % e.stderr)
+        print("stdout: %s" % e.stdout)
+        raise e

photosort/media.py

@@ -83,7 +83,11 @@ def _exif_datetime(self):
                          'EXIF:CreateDate',
                          'XMP-exif:DateTimeDigitized',
                          'QuickTime:ContentCreateDate',
-                         'QuickTime:CreationDate'
+                         'QuickTime:CreationDate',
+                         'QuickTime:CreateDate',
+                         'MediaCreateDate',
+                         'TrackCreateDate',
+                         'CreateDate',
                          ]:
             try:
                 exif_datetime_str = exif_data[exif_tag]

photosort/photosort.py

@@ -136,6 +136,7 @@ def main():
 
     log_level = logging.INFO
     if ns.debug:
+        print("Debug log level")
         log_level = logging.DEBUG
     photo_sort = PhotoSort(ns.config, log_level)
 

photosort/test/testcases/test_002_exif_media.py

@@ -9,6 +9,7 @@
 import shutil
 import stat
 
+from photosort.test import test as test_main
 from photosort import test
 from photosort import media
 
@@ -39,7 +40,7 @@ def test_hash_creation(self):
     def test_datetime(self):
         self.assertEqual(str(self.photo.datetime()), "2013-08-24 13:05:52")
         self.assertEqual(str(self.movie.datetime()),
-                         "2020-03-08 21:51:41+01:00")
+                         "2020-06-18 07:50:31")
 
     def test_equal_checking(self):
         self.assertTrue(self.photo.is_equal_to(self.img1dup))
@@ -145,4 +146,4 @@ def test_move_to_existing_directory_pattern_file_fmt(self):
 
 
 if __name__ == '__main__':
-    test.test.main()
+    test_main.main()

photosort/test/testcases/test_003_noexif_media.py

@@ -13,11 +13,11 @@ class TestMovieMedia(test.TestCase):
 
     def setUp(self):
         super().setUp()
-        self.mov1 = self.get_data_path('media2/mov1.mp4')
+        self.mov1 = self.get_data_path('media2/BigBuckBunny.avi')
         self.movie = media.MediaFile.build_for(self.mov1)
 
     def test_hash_creation(self):
-        expected_hash = "d41d8cd98f00b204e9800998ecf8427e"
+        expected_hash = "630569ce2efda22d55d271bfe8ec4428"
         self.assertEqual(self.movie.hash(), expected_hash)
 
         # check for hasher non being re-started

pyproject.toml

@@ -0,0 +1,26 @@
+[project]
+name = "photosort"
+authors = [{name="Miguel Angel Ajo Pelayo", email = "[email protected]"}]
+version = "2024.1.0"
+description = "Picture inbox simplified"
+readme = "README.md"
+requires-python = ">=3.9"
+dependencies = [
+    "pyaml>=24.7.0",
+    "pyexiftool>=0.5.6",
+]
+
+[project.scripts]
+photosort = "photosort.photosort:main"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.uv]
+dev-dependencies = [
+    "pytest>=8.3.2",
+    "mock>=5.1.0",
+    "setuptools>=73.0.1",
+    "twine>=5.1.1",
+]