Take every usecases into account when updating a file already in a session:

- scan_id
- file filename
Added utils.get_file_info

Author: gbastien

src/imio/esign/events.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from imio.esign.utils import get_file_info
 from imio.esign.utils import get_sessions_for
+from imio.helpers.transmogrifier import get_correct_id
+from os import path
 
 
 def on_categorized_annex_updated(annex, event):
@@ -14,6 +17,7 @@ def on_categorized_annex_updated(annex, event):
     if not sessions:
         return
 
+    annex_uid = annex.UID()
     new_values = event.new_values
     # if something usefull changed, we will update the session
     update = False
@@ -22,8 +26,15 @@ def on_categorized_annex_updated(annex, event):
         if new_values[checked_key] != old_values[checked_key]:
             update = True
             break
+    # check scan_id and filename
+    for session_id in sessions:
+        file_info = get_file_info(session_id, annex_uid)
+        if annex.scan_id != file_info['scan_id'] or \
+           annex.file.filename != file_info['filename']:
+            update = True
+            break
+
     if update:
-        annex_uid = annex.UID()
         for session_id, session in sessions.items():
             # size
             size_diff = new_values['filesize'] - old_values['filesize']
@@ -32,4 +43,12 @@ def on_categorized_annex_updated(annex, event):
             for file_data in session['files']:
                 if file_data['uid'] == annex_uid:
                     file_data['title'] = new_values['title']
-                    file_data['filename'] = annex.file.filename
+                    file_data['scan_id'] = annex.scan_id
+                    # filename changed, need to make sure new filename is unique
+                    if annex.file.filename != file_data['filename']:
+                        existing_files = [path.splitext(f["filename"])[0]
+                                          for f in session["files"]]
+                        filename, ext = path.splitext(annex.file.filename)
+                        new_filename = get_correct_id(existing_files, filename)
+                        file_data['filename'] = new_filename + ext
+                        session._p_changed = True

src/imio/esign/tests/test_utils.py

@@ -508,7 +508,15 @@ def test_add_files_already_exist_is_updated(self):
         self.assertEqual(len(session["files"]), 2)
         self.assertEqual(session["files"][1]["filename"], "new_annex1.pdf")
         self.assertEqual(session["files"][1]["title"], "New Annex 1")
+        self.assertEqual(session["files"][1]["scan_id"], "012345600000001")
         self.assertEqual(session["size"], 13936)
+        # change file but add a filename already used, change scan_id as well
+        with open(os.path.join(os.path.dirname(__file__), "annex1.pdf"), "rb") as f:
+            annex1.file = NamedBlobFile(data=f.read(), filename=u"new_annex0.pdf", contentType="application/pdf")
+        annex1.scan_id = str(int(annex1.scan_id) + 1)
+        notify(ObjectModifiedEvent(annex1))
+        self.assertEqual(session["files"][1]["filename"], "new_annex0-1.pdf")
+        self.assertEqual(session["files"][1]["scan_id"], "012345600000002")
         # just to check, remove annex1
         remove_files_from_session((annex0_uid,))
         self.assertEqual(session["size"], 6968)

src/imio/esign/utils.py

@@ -340,6 +340,17 @@ def get_session_annotation(portal=None):
     return annotations["imio.esign"]
 
 
+def get_file_info(session_id, file_uid, portal=None, readonly=True):
+    """ """
+    session = get_session_info(session_id, portal=portal)
+    if session:
+        for file_info in session['files']:
+            if file_info['uid'] == file_uid:
+                if readonly:
+                    file_info = deepcopy(file_info)
+                return file_info
+
+
 def get_session_info(session_id, portal=None, readonly=True):
     """Return a session info for a given numbering.