Moved copy dms files after duplication to execute after next edit

Author: chris-adam

imio/dms/mail/subscribers.py

@@ -72,6 +72,7 @@
 # from zope.component.interfaces import ComponentLookupError
 from zope.annotation import IAnnotations
 from zope.component import getAdapter
+from zope.component import getMultiAdapter
 from zope.component import getSiteManager
 from zope.component import getUtility
 from zope.component import queryUtility
@@ -384,6 +385,16 @@ def dmsoutgoingmail_transition(mail, event):
         mail.portal_catalog.reindexObject(mail, idxs=("in_out_date",), update_metadata=0)
 
 
+def dmsoutgoingmail_modified(mail, event):
+    annot = IAnnotations(mail).get('imio.dms.mail', {})
+    copy_dms_files_from = annot.get('copy_dms_files_from')
+    if copy_dms_files_from:
+        del annot['copy_dms_files_from']
+        original_mail = uuidToObject(copy_dms_files_from, unrestricted=True)
+        odm_utils = getMultiAdapter((mail, mail.REQUEST), name="odm-utils")
+        odm_utils.copy_dms_files(original_mail)
+
+
 def dv_handle_file_creation(obj, event):
     """Intermediate function to avoid converting some files in documentviewer"""
     if obj.portal_type in DV_AVOIDED_TYPES:

imio/dms/mail/subscribers.zcml

@@ -98,6 +98,12 @@
         handler=".subscribers.dmsoutgoingmail_transition"
       />
 
+    <subscriber
+        for="imio.dms.mail.dmsmail.IImioDmsOutgoingMail
+            zope.lifecycleevent.interfaces.IObjectModifiedEvent"
+        handler=".subscribers.dmsoutgoingmail_modified"
+      />
+
     <!-- Various -->
     <subscriber
         for="plone.dexterity.interfaces.IDexterityContent

imio/dms/mail/utils.py

@@ -1222,36 +1222,10 @@ def duplicate(self, keep_category, keep_folder, keep_reply_to, keep_dms_files, k
             duplicated_mail.reply_to = original_mail.reply_to[:]
 
         if keep_dms_files:
-            dms_files = [sub_content for sub_content in original_mail.values() if sub_content.portal_type == self.mainfile_type]
-            used_template_uids = set()
-            for dms_file in dms_files:
-                annot = IAnnotations(dms_file).get('documentgenerator', {})
-
-                # Skip if document was not generated (could be scanned)
-                if not annot:
-                    continue
-
-                # Skip if document was already generated from the same template
-                if annot.get('template_uid') in used_template_uids:
-                    continue
-
-                # Skip if document is final step of a mailing
-                document_generation_helper_view = getMultiAdapter((duplicated_mail, self.request), name="document_generation_helper_view")
-                requires_mailing = len(document_generation_helper_view.mailing_list()) > 1
-                if requires_mailing and not annot.get('need_mailing'):
-                    continue
-
-                # Generate a new document from the same template
-                template_uid = annot.get('template_uid')
-                generation_view = getMultiAdapter((duplicated_mail, self.request), name="persistent-document-generation")
-                pod_template = generation_view.get_pod_template(template_uid)
-                # Skip if it's a mailing loop template
-                if IMailingLoopTemplate.providedBy(pod_template):
-                    continue
-                generation_view.pod_template = pod_template
-                generation_view.output_format = 'odt'
-                generation_view.generate_persistent_doc(pod_template, 'odt')
-                used_template_uids.add(template_uid)
+            # Add an annotation to copy DMS files only after next edit
+            annot = IAnnotations(duplicated_mail)
+            annot.setdefault('imio.dms.mail', PersistentDict())  # make sure the key exists
+            annot['imio.dms.mail']['copy_dms_files_from'] = original_mail.UID()
 
         if keep_annexes:
             annexes = [sub_content.getId() for sub_content in original_mail.values() if IDmsAppendixFile.providedBy(sub_content)]
@@ -1268,6 +1242,39 @@ def duplicate(self, keep_category, keep_folder, keep_reply_to, keep_dms_files, k
 
         return duplicated_mail
 
+    def copy_dms_files(self, original_mail):
+        """Re-generate DMS files on this mail based on the templates used in the original mail."""
+        dms_files = [sub_content for sub_content in original_mail.values() if sub_content.portal_type == self.mainfile_type]
+        used_template_uids = set()
+        for dms_file in dms_files:
+            annot = IAnnotations(dms_file).get('documentgenerator', {})
+
+            # Skip if document was not generated (could be scanned)
+            if not annot:
+                continue
+
+            # Skip if document was already generated from the same template
+            if annot.get('template_uid') in used_template_uids:
+                continue
+
+            # Skip if document is final step of a mailing
+            document_generation_helper_view = getMultiAdapter((self.context, self.request), name="document_generation_helper_view")
+            requires_mailing = len(document_generation_helper_view.mailing_list()) > 1
+            if requires_mailing and not annot.get('need_mailing'):
+                continue
+
+            # Generate a new document from the same template
+            template_uid = annot.get('template_uid')
+            generation_view = getMultiAdapter((self.context, self.request), name="persistent-document-generation")
+            pod_template = generation_view.get_pod_template(template_uid)
+            # Skip if it's a mailing loop template
+            if IMailingLoopTemplate.providedBy(pod_template):
+                continue
+            generation_view.pod_template = pod_template
+            generation_view.output_format = 'odt'
+            generation_view.generate_persistent_doc(pod_template, 'odt')
+            used_template_uids.add(template_uid)
+
 
 class Dummy(object):
     """dummy class that allows setting attributes"""