Merge branch 'dev'

Author: helgeerbe

.pylintrc

@@ -1,2 +1,4 @@
 [TYPECHECK]
 generated-members=cv2.*
+[FORMAT]
+max-line-length=100

pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
     "ninepatch>=0.2.0",
     "pi_heif>=0.8.0",
     "python-vlc",
-    "opencv-python"
+    "rubicon-objc; sys_platform == 'darwin'"
 ]
 
 [project.urls]

src/picframe/controller.py

@@ -85,17 +85,17 @@ def next(self):
             self.__viewer.stop_video()
         else:
             self.__next_tm = 0
+            self.__force_navigate = True
         self.__viewer.reset_name_tm()
-        self.__force_navigate = True
-
+        
     def back(self):
         if self.__viewer.is_video_playing():
             self.__viewer.stop_video()
         else:
             self.__next_tm = 0
+            self.__force_navigate = True
         self.__model.set_next_file_to_previous_file()
         self.__viewer.reset_name_tm()
-        self.__force_navigate = True
 
     def delete(self):
         if self.__viewer.is_video_playing():

src/picframe/get_image_meta.py

@@ -17,8 +17,11 @@ def __init__(self, filename):
         self.__logger = logging.getLogger("get_image_meta.GetImageMeta")
         self.__tags = {}
         self.__filename = filename  # in case no exif data in which case needed for size
+        self.__image_width: int = 0
+        self.__image_height: int = 0
         image = self.get_image_object(filename)
         if image:
+            self.__image_width, self.__image_height = image.size
             exif = image.getexif()
             self.__do_image_tags(exif)
             self.__do_exif_tags(exif)
@@ -31,6 +34,11 @@ def __init__(self, filename):
             except Exception as e:
                 xmp = {}
                 self.__logger.warning("PILL getxmp() failed: %s -> %s", filename, e)
+ 
+    @property
+    def size(self) -> tuple[int, int]:
+        """Returns the (width, height) tuple of the image."""
+        return (self.__image_width, self.__image_height)
 
     def __do_image_tags(self, exif):
         tags = {
@@ -219,13 +227,6 @@ def get_exif(self, key):
             self.__logger.warning("get_exif failed on %s -> %s", self.__filename, e)
             return None
 
-    def get_size(self):
-        try:  # corrupt image file might crash app
-            return GetImageMeta.get_image_object(self.__filename).size
-        except Exception as e:
-            self.__logger.warning("get_size failed on %s -> %s", self.__filename, e)
-            return (0, 0)
-
     @staticmethod
     def get_image_object(fname):
         try:

src/picframe/html/index.html

@@ -47,6 +47,8 @@ <h1>Simple Picture Frame page</h1>
         <div id="spans">
         </div>
         <button id="upload_button" onclick="uploadValues()">UPDATE</button>
-        <a href="/current_image">See the current image</a> (use browser BACK to return to this page)
+        <a href="/current_image">See the current image</a>
+        or <a href="/current_image_original">its unmodified original</a>
+        (use browser BACK to return to this page)
     </body>
 </html>

src/picframe/image_cache.py

@@ -4,12 +4,12 @@
 import logging
 import threading
 from picframe import get_image_meta
+from picframe.video_streamer import VIDEO_EXTENSIONS, get_video_info
 
 
 class ImageCache:
 
     EXTENSIONS = ['.png', '.jpg', '.jpeg', '.heif', '.heic']
-    VIDEO_EXTENSIONS = ['.mp4', '.mkv', '.flv', '.mov', '.avi', '.webm', '.hevc']
     EXIF_TO_FIELD = {'EXIF FNumber': 'f_number',
                      'Image Make': 'make',
                      'Image Model': 'model',
@@ -380,7 +380,7 @@ def __get_modified_files(self, modified_folders):
         for dir, _date in modified_folders:
             for file in os.listdir(dir):
                 base, extension = os.path.splitext(file)
-                if (extension.lower() in (ImageCache.EXTENSIONS + ImageCache.VIDEO_EXTENSIONS)
+                if (extension.lower() in (ImageCache.EXTENSIONS + VIDEO_EXTENSIONS)
                         # have to filter out all the Apple junk
                         and '.AppleDouble' not in dir and not file.startswith('.')):
                     full_file = os.path.join(dir, file)
@@ -402,7 +402,12 @@ def __insert_file(self, file, file_id=None):
         base, extension = os.path.splitext(file_only)
 
         # Get the file's meta info and build the INSERT statement dynamically
-        meta = self.__get_exif_info(file)
+        meta = {}
+        ext = os.path.splitext(file)[1].lower()
+        if ext in VIDEO_EXTENSIONS: # no exif info available
+            meta = self.__get_video_info(file)
+        else:
+            meta = self.__get_exif_info(file)
         meta_insert = self.__get_meta_sql_from_dict(meta)
         vals = list(meta.values())
         vals.insert(0, file)
@@ -468,17 +473,14 @@ def __purge_missing_files_and_folders(self):
             self.__purge_files = False
 
     def __get_exif_info(self, file_path_name):
-        ext = os.path.splitext(file_path_name)[1].lower()
-        if ext in ImageCache.VIDEO_EXTENSIONS: # no exif info available
-            return {'width': 100, 'height': 100} # return early with min info for videos TODO duration available in video_info
         exifs = get_image_meta.GetImageMeta(file_path_name)
         # Dict to store interesting EXIF data
         # Note, the 'key' must match a field in the 'meta' table
         e = {}
 
         e['orientation'] = exifs.get_orientation()
 
-        width, height = exifs.get_size()
+        width, height = exifs.size
         ext = os.path.splitext(file_path_name)[1].lower()
         if ext not in ('.heif', '.heic') and e['orientation'] in (5, 6, 7, 8):
             width, height = height, width  # swap values
@@ -521,6 +523,59 @@ def __get_exif_info(self, file_path_name):
 
         return e
 
+    def __get_video_info(self, file_path_name: str) -> dict:
+        """
+        Extracts metadata information from a video file.
+
+        This method retrieves video metadata using the `get_video_info` function and 
+        organizes it into a dictionary. The metadata includes dimensions, orientation, 
+        and other optional EXIF and IPTC data if available.
+
+        Args:
+            file_path_name (str): The full path to the video file.
+
+        Returns:
+            dict: A dictionary containing the meta keys.
+            Note, the 'key' must match a field in the 'meta' table
+        """
+        meta = get_video_info(file_path_name)
+
+        # Dict to store interesting EXIF data
+        # Note, the 'key' must match a field in the 'meta' table
+        e: dict = {}
+
+        # Orientation is set to 1 by default, as video files rarely have this info.
+        e['orientation'] = 1
+
+        width, height = meta.dimensions
+        e['width'] = width
+        e['height'] = height
+
+        # Attempt to retrieve additional metadata if available in meta
+        e['f_number'] = getattr(meta, 'f_number', None)
+        e['make'] = getattr(meta, 'make', None)
+        e['model'] = getattr(meta, 'model', None)
+        e['exposure_time'] = getattr(meta, 'exposure_time', None)
+        e['iso'] = getattr(meta, 'iso', None)
+        e['focal_length'] = getattr(meta, 'focal_length', None)
+        e['rating'] = getattr(meta, 'rating', None)
+        e['lens'] = getattr(meta, 'lens', None)
+        e['exif_datetime'] = meta.exif_datetime if not None else os.path.getmtime(file_path_name)
+
+        if meta.gps_coords is not None:
+            lat, lon = meta.gps_coords
+        else:
+            lat, lon = None, None
+        e['latitude'] = round(lat, 4) if lat is not None else lat  # TODO sqlite requires (None,) to insert NULL
+        e['longitude'] = round(lon, 4) if lon is not None else lon
+
+        # IPTC
+        e['tags'] = getattr(meta, 'tags', None)
+        e['title'] = getattr(meta, 'title', None)
+        e['caption'] = getattr(meta, 'caption', None)
+
+        return e
+
 
 # If being executed (instead of imported), kick it off...
 if __name__ == "__main__":