Merge pull request #40 from eea/develop

Fix broken brain error at the upgrade svg step - refs #276995

docs/HISTORY.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+5.5 - (2024-10-18)
+---------------------------
+* Change: Fix broken brain error at the upgrade svg step - refs #276995
+  [avoinea]
+
 5.4 - (2024-10-09)
 ---------------------------
 * Fix: Create a content upgrade script to fix SVGs display 

eea/volto/policy/upgrades/upgrade_svgs/upgrade_svg.py

@@ -4,6 +4,7 @@
 import transaction
 from plone.namedfile.utils import getImageInfo
 from zope.lifecycleevent import modified
+from zope.annotation.interfaces import IAnnotations
 
 logger = logging.getLogger("upgrade_svgs")
 logger.setLevel(logging.INFO)
@@ -12,32 +13,48 @@
 def upgrade_svgs(portal):
     """Upgrade SVG dimensions"""
     i = 0
-    for brain in portal.portal_catalog():
-        obj = brain.getObject()
+    brains = portal.portal_catalog()
+    total = len(brains)
+    for idx, brain in enumerate(brains):
+        obj = dict()
+        try:
+            obj = brain.getObject()
+        except Exception:
+            continue  # Skip to the next item if there's an error
+
         if (
-            hasattr(obj, "image") and hasattr(obj.image, "_width") and
+            hasattr(obj, "image") and
+            hasattr(obj.image, "_width") and
             hasattr(obj.image, "_height")
         ):
-            logger.info("Processing %s", obj.absolute_url())
+
             contentType, width, height = getImageInfo(obj.image.data)
             if contentType == "image/svg+xml":
+                logger.info("Processing %s", obj.absolute_url())
                 obj.image._width = width
                 obj.image._height = height
-                modified(obj.image)
+                anno = IAnnotations(obj)
+                if "plone.scale" in anno:
+                    del anno["plone.scale"]
+                modified(obj)
                 i += 1
         if (
             hasattr(obj, "preview_image") and
             hasattr(obj.preview_image, "_width") and
             hasattr(obj.preview_image, "_height")
         ):
-            logger.info("Processing %s", obj.absolute_url())
             contentType, width, height = getImageInfo(obj.preview_image.data)
             if contentType == "image/svg+xml":
+                logger.info("Processing %s", obj.absolute_url())
                 obj.preview_image._width = width
                 obj.preview_image._height = height
-                modified(obj.preview_image)
+                anno = IAnnotations(obj)
+                if "plone.scale" in anno:
+                    del anno["plone.scale"]
+                modified(obj)
                 i += 1
         if not i % 100:
-            logger.info(i)
+            logger.warning("Progress %s/%s", idx, total)
+            logger.warning("Modified %s items", i)
             transaction.commit()
     transaction.commit()

eea/volto/policy/version.txt

@@ -1 +1 @@
-5.4
+5.5