Modified code to run on both dmsmail versions

scripts/run-del-dv.py

@@ -1,23 +1,23 @@
 # -*- coding: utf-8 -*-
-from imio.helpers.content import object_values
-from zope.annotation import IAnnotations
-
+from plone import api
 
+import logging
 import transaction
 
 
 portal = obj  # noqa
-
+logger = logging.getLogger('del dv')
 types = ['dmsincomingmail', 'dmsincoming_email', 'dmsoutgoingmail']
+count = 0
 
 pc = portal.portal_catalog
 brains = pc.unrestrictedSearchResults(portal_type=types)
 for brain in brains:
     mail = brain.getObject()
-    for fobj in object_values(mail, ['DmsFile', 'DmsAppendixFile', 'ImioDmsFile']):
-        annot = IAnnotations(fobj)
-        if 'collective.documentviewer' not in annot:
-            continue
-        del annot['collective.documentviewer']
+    for contained in mail.objectValues():
+        if contained.__class__.__name__ in ['DmsFile', 'DmsAppendixFile', 'ImioDmsFile']:
+            count += 1
+            api.content.delete(obj=contained, check_linkintegrity=False)
 
+logger.warn('Deleted {} files'.format(count))
 transaction.commit()

scripts/run-del-files.py

@@ -20,8 +20,7 @@
 count = 0
 for brain in brains:
     mail = brain.getObject()
-    # files = object_values(mail, ['DmsFile', 'DmsAppendixFile', 'ImioDmsFile']) dmsmail 3.0 only
-    for contained in mail.objectValues():  # works with dmsmail 2.3
+    for contained in mail.objectValues():
         if contained.__class__.__name__ in ['DmsFile', 'DmsAppendixFile', 'ImioDmsFile']:
             count += 1
             api.content.delete(obj=contained, check_linkintegrity=False)