bugfix script and jpg support

scripts/generate-icat-comparison-projects.py

@@ -32,6 +32,42 @@ def get_png_dimensions(file_path):
 
     return width, height
 
+def get_jpeg_dimensions(file_path):
+    """
+    Returns the (width, height) of a JPG image by reading the file's metadata.
+    """
+    with open(file_path, 'rb') as f:
+        f.seek(0)
+        data = f.read(24)
+        
+        # Check if file is JPEG
+        if data[0:2] == b'\xff\xd8':  # JPEG files start with 0xFFD8
+            while True:
+                f.seek(2, 1)  # Skip marker
+                marker = f.read(2)
+                if marker[0] == 0xFF and marker[1] == 0xC0:  # Start of Frame marker
+                    f.seek(3, 1)  # Skip precision byte
+                    height = int.from_bytes(f.read(2), 'big')
+                    width = int.from_bytes(f.read(2), 'big')
+                    return width, height
+                else:
+                    size = int.from_bytes(f.read(2), 'big')
+                    f.seek(size - 2, 1)  # Skip to the next block
+        else:
+            raise ValueError("Not a JPEG file")
+        
+def get_image_dimensions(file_path):
+    extension = os.path.splitext(file_path)[-1].lower()
+    
+    if extension == '.jpg' or extension == '.jpeg':
+        return get_jpeg_dimensions(file_path)
+    elif extension == '.png':
+        return get_png_dimensions(file_path)
+    else:
+        raise ValueError("Unsupported file format")
+
+
+
 # Get the directory of the current script
 script_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -65,49 +101,49 @@ for root, dirs, files in os.walk(base_dir):
             # Add the file (with its full path) to the corresponding group
             file_groups[number].append(os.path.join(root, file))
 
-# JSON structure template
-json_structure = {
-    "uiVisibility": {
-        "antiAliasSelect": True,
-        "fullscreenButton": True,
-        "gridSelect": True,
-        "helpButton": True,
-        "layersButton": True,
-        "layoutTabs": True,
-        "loopButton": True,
-        "mediaInfo": True,
-        "pixelDataButton": False,
-        "progressBar": True,
-        "setSelect": False,
-        "speedSelect": True,
-        "startEndTime": True,
-        "timeDisplay": True,
-        "titleBar": True,
-        "videoControls": True,
-        "zoomSelect": True,
-        "contentSidebar": True,
-        "timeline": True,
-        "controlBar": True,
-        "addFilterBtn": True,
-        "addLogoBtn": True,
-        "inOutSlider": True,
-        "timelineInOutSlider": False,
-        "appSettingsBtn": True
-    },
-    "sets": []
-}
-
 # Fill JSON structure with grouped files
 for number, group in file_groups.items():
     media_files = []
     media_order = []
+
+    # JSON structure template
+    json_structure = {
+        "uiVisibility": {
+            "antiAliasSelect": True,
+            "fullscreenButton": True,
+            "gridSelect": True,
+            "helpButton": True,
+            "layersButton": True,
+            "layoutTabs": True,
+            "loopButton": True,
+            "mediaInfo": True,
+            "pixelDataButton": False,
+            "progressBar": True,
+            "setSelect": False,
+            "speedSelect": True,
+            "startEndTime": True,
+            "timeDisplay": True,
+            "titleBar": True,
+            "videoControls": True,
+            "zoomSelect": True,
+            "contentSidebar": True,
+            "timeline": True,
+            "controlBar": True,
+            "addFilterBtn": True,
+            "addLogoBtn": True,
+            "inOutSlider": True,
+            "timelineInOutSlider": False,
+            "appSettingsBtn": True
+        },
+        "sets": []
+    }
     
     for file_path in group:
         file_name = os.path.basename(file_path)
         base_name = file_name.rsplit('.', 1)[0]
         hex_id = uuid.uuid4().hex  # Generate a unique hex ID for each file
         cleaned_path = os.path.abspath(file_path).replace('\\', '%5C').replace(':', '%3A')
-        width, height = get_png_dimensions(file_path)
+        width, height = get_image_dimensions(file_path)
         
         # Example media entry
         media_entry = {