fix #546

tracim/tracim/lib/content.py

@@ -29,6 +29,7 @@ from sqlalchemy.sql.elements import and_
 from tracim.lib import cmp_to_key
 from tracim.lib.notifications import NotifierFactory
 from tracim.lib.utils import SameValueError
+from tracim.lib.utils import current_date_for_filename
 from tracim.model import DBSession
 from tracim.model import new_revision
 from tracim.model.auth import User
@@ -894,6 +895,14 @@ class ContentApi(object):
     def archive(self, content: Content):
         content.owner = self._user
         content.is_archived = True
+        # TODO - G.M - 12-03-2018 - Inspect possible label conflict problem
+        # INFO - G.M - 12-03-2018 - Set label name to avoid trouble when
+        # un-archiving file.
+        content.label = '{label}-{action}-{date}'.format(
+            label=content.label,
+            action='archived',
+            date=current_date_for_filename()
+        )
         content.revision_type = ActionDescription.ARCHIVING
 
     def unarchive(self, content: Content):
@@ -904,6 +913,14 @@ class ContentApi(object):
     def delete(self, content: Content):
         content.owner = self._user
         content.is_deleted = True
+        # TODO - G.M - 12-03-2018 - Inspect possible label conflict problem
+        # INFO - G.M - 12-03-2018 - Set label name to avoid trouble when
+        # un-deleting file.
+        content.label = '{label}-{action}-{date}'.format(
+            label=content.label,
+            action='deleted',
+            date=current_date_for_filename()
+        )
         content.revision_type = ActionDescription.DELETION
 
     def undelete(self, content: Content):

tracim/tracim/lib/utils.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import datetime
 import os
 import time
 import signal
@@ -180,3 +181,12 @@ def get_rq_queue(queue_name: str= 'default') -> Queue:
         port=cfg.EMAIL_SENDER_REDIS_PORT,
         db=cfg.EMAIL_SENDER_REDIS_DB,
     ))
+
+
+def current_date_for_filename() -> str:
+    """
+    ISO8601 current date, adapted to be used in filename (for
+    webdav feature for example), with trouble-free characters.
+    :return: current date as string
+    """
+    return datetime.datetime.now().isoformat().replace(':', '.')

tracim/tracim/lib/webdav/sql_resources.py

@@ -36,7 +36,8 @@ logger = logging.getLogger()
 
 class ManageActions(object):
     """
-    This object is used to encapsulate all Deletion/Archiving related method as to not duplicate too much code
+    This object is used to encapsulate all Deletion/Archiving related
+    method as to not duplicate too much code
     """
     def __init__(self, action_type: str, api: ContentApi, content: Content):
         self.content_api = api
@@ -49,57 +50,14 @@ class ManageActions(object):
             ActionDescription.UNDELETION: self.content_api.undelete
         }
 
-        self._to_name = {
-            ActionDescription.ARCHIVING: 'archived',
-            ActionDescription.DELETION: 'deleted'
-        }
-
         self._type = action_type
-        self._new_name = self.make_name()
 
     def action(self):
-        try:
-            # When undeleting/unarchiving we except a content with the new name to not exist, thus if we
-            # don't get an error and the database request send back a result, we stop the action
-            self.content_api.get_one_by_label_and_parent(self._new_name, self.content.parent)
-            raise DAVError(HTTP_FORBIDDEN)
-        except NoResultFound:
-            with new_revision(self.content):
-                self.content_api.update_content(self.content, self._new_name)
-                self._actions[self._type](self.content)
-                self.content_api.save(self.content, self._type)
-
-            transaction.commit()
-
-    def make_name(self) -> str:
-        """
-        Will create the new name, either by adding '- deleted the [date]' after the name when archiving/deleting or
-        removing this string when undeleting/unarchiving
-        """
-        new_name = self.content.get_label_as_file()
-        extension = ''
-
-        # if the content has no label, the last .ext is important
-        # thus we want to rename a file from 'file.txt' to 'file - deleted... .txt' and not 'file.txt - deleted...'
-        is_file_name = self.content.label == ''
-        if is_file_name:
-            search = re.search(r'(\.[^.]+)$', new_name)
-            if search:
-                extension = search.group(0)
-            new_name = re.sub(r'(\.[^.]+)$', '', new_name)
-
-        if self._type in [ActionDescription.ARCHIVING, ActionDescription.DELETION]:
-            new_name += ' - %s the %s' % (self._to_name[self._type], datetime.now().strftime('%d-%m-%Y at %H_%M'))
-        else:
-            new_name = re.sub(
-                r'( - (%s|%s) the .*)$' % (self._to_name[ActionDescription.DELETION], self._to_name[ActionDescription.ARCHIVING]),
-                '',
-                new_name
-            )
-
-        new_name += extension
+        with new_revision(self.content):
+            self._actions[self._type](self.content)
+            self.content_api.save(self.content, self._type)
 
-        return new_name
+        transaction.commit()
 
 
 class Root(DAVCollection):