Closes #142: Generate folders default labels

tracim/tracim/lib/content.py

@@ -336,6 +336,10 @@ class ContentApi(object):
 
     def create(self, content_type: str, workspace: Workspace, parent: Content=None, label:str ='', do_save=False, is_temporary: bool=False) -> Content:
         assert content_type in ContentType.allowed_types()
+
+        if not label:
+            label = self.generate_folder_label(workspace, parent)
+
         content = Content()
         content.owner = self._user
         content.parent = parent
@@ -1036,3 +1040,25 @@ class ContentApi(object):
             )
         )
         return query.one()
+
+    def generate_folder_label(
+            self,
+            workspace: Workspace,
+            parent: Content=None,
+    ) -> str:
+        """
+        Generate a folder label
+        :param workspace: Future folder workspace
+        :param parent: Parent of foture folder (can be None)
+        :return: Generated folder name
+        """
+        query = self._base_query(workspace=workspace)\
+            .filter(Content.label.ilike('{0}%'.format(
+                _('New folder'),
+            )))
+        if parent:
+            query = query.filter(Content.parent == parent)
+
+        return _('New folder {0}').format(
+            query.count() + 1,
+        )

tracim/tracim/lib/workspace.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import transaction
+
 from sqlalchemy.orm import Query
+from tg.i18n import ugettext as _
 
 from tracim.lib.userworkspace import RoleApi
 from tracim.model.auth import Group
@@ -17,9 +19,12 @@ class WorkspaceApi(object):
     def __init__(self, current_user: User):
         self._user = current_user
 
+    def _base_query_without_roles(self):
+        return DBSession.query(Workspace).filter(Workspace.is_deleted==False)
+
     def _base_query(self):
         if self._user.profile.id>=Group.TIM_ADMIN:
-            return DBSession.query(Workspace).filter(Workspace.is_deleted==False)
+            return self._base_query_without_roles()
 
         return DBSession.query(Workspace).\
             join(Workspace.roles).\
@@ -28,11 +33,14 @@ class WorkspaceApi(object):
 
     def create_workspace(
             self,
-            label: str,
+            label: str='',
             description: str='',
             calendar_enabled: bool=False,
             save_now: bool=False,
     ) -> Workspace:
+        if not label:
+            label = self.generate_label()
+
         workspace = Workspace()
         workspace.label = label
         workspace.description = description
@@ -146,6 +154,19 @@ class WorkspaceApi(object):
     def get_base_query(self) -> Query:
         return self._base_query()
 
+    def generate_label(self) -> str:
+        """
+        :return: Generated workspace label
+        """
+        query = self._base_query_without_roles() \
+            .filter(Workspace.label.ilike('{0}%'.format(
+                _('Workspace'),
+            )))
+
+        return _('Workspace {}').format(
+            query.count() + 1,
+        )
+
 
 class UnsafeWorkspaceApi(WorkspaceApi):
     def _base_query(self):