[api2] get deleted-repos,and restore deleted-repos

seahub/api2/endpoints/deleted_repos.py

@@ -0,0 +1,70 @@
+import logging
+
+from rest_framework.authentication import SessionAuthentication
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+from django.template.defaultfilters import filesizeformat
+from seaserv import seafile_api
+
+from pysearpc import SearpcError
+
+from seahub.api2.throttling import UserRateThrottle
+from seahub.api2.authentication import TokenAuthentication
+from seahub.api2.base import APIView
+from seahub.api2.utils import api_error
+from seahub.base.templatetags.seahub_tags import email2nickname, email2contact_email
+from seahub.utils.timeutils import timestamp_to_isoformat_timestr
+
+logger = logging.getLogger(__name__)
+
+
+class DeletedRepos(APIView):
+    authentication_classes = (TokenAuthentication, SessionAuthentication)
+    permission_classes = (IsAuthenticated,)
+    throttle_classes = (UserRateThrottle,)
+
+    def get(self, request):
+        """
+        get the deleted-repos of owner
+        """
+        trashs_json = []
+        email = request.user.username
+
+        trash_repos = seafile_api.get_trash_repos_by_owner(email)
+        for r in trash_repos:
+            trash = {
+                    "repo_id": r.repo_id,
+                    "owner_email": email,
+                    "owner_name": email2nickname(email),
+                    "owner_contact_email": email2contact_email(email),
+                    "repo_name": r.repo_name,
+                    "org_id": r.org_id,
+                    "head_commit_id": r.head_id,
+                    "encrypted": r.encrypted,
+                    "del_time": timestamp_to_isoformat_timestr(r.del_time),
+                    "size": r.size,
+            }
+            trashs_json.append(trash)
+        return Response(trashs_json)
+
+    def post(self, request):
+        """
+        restore deleted-repo
+            return:
+                return True if success, otherwise api_error 
+        """
+        post_data = request.POST
+        repo_id = post_data.get('repo_id', '')
+        if not repo_id:
+            error_msg = "repo_id invalid"
+            return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+
+        try:
+            seafile_api.restore_repo_from_trash(repo_id)
+        except SearpcError as e:
+            logger.error(e)
+            error = "Internal Server Error"
+            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
+
+        return Response({"success": True})

seahub/urls.py

@@ -30,6 +30,7 @@ from seahub.api2.endpoints.repos import RepoView
 from seahub.api2.endpoints.file import FileView
 from seahub.api2.endpoints.dir import DirView
 from seahub.api2.endpoints.repo_trash import RepoTrash
+from seahub.api2.endpoints.deleted_repos import DeletedRepos
 from seahub.api2.endpoints.repo_history import RepoHistory
 from seahub.api2.endpoints.repo_set_password import RepoSetPassword
 from seahub.api2.endpoints.zip_task import ZipTaskView
@@ -209,6 +210,7 @@ urlpatterns = patterns(
     ## user::repos
     url(r'^api/v2.1/repos/batch/$', ReposBatchView.as_view(), name='api-v2.1-repos-batch'),
     url(r'^api/v2.1/repos/(?P<repo_id>[-0-9a-f]{36})/$', RepoView.as_view(), name='api-v2.1-repo-view'),
+    url(r'^api/v2.1/deleted-repos/$', DeletedRepos.as_view(), name='api2-v2.1-deleted-repos'),
     url(r'^api/v2.1/repos/(?P<repo_id>[-0-9a-f]{36})/file/$', FileView.as_view(), name='api-v2.1-file-view'),
     url(r'^api/v2.1/repos/(?P<repo_id>[-0-9a-f]{36})/dir/$', DirView.as_view(), name='api-v2.1-dir-view'),
     url(r'^api/v2.1/repos/(?P<repo_id>[-0-9a-f]{36})/trash/$', RepoTrash.as_view(), name='api-v2.1-repo-trash'),

tests/api/endpoints/test_deleted_repos.py

@@ -0,0 +1,47 @@
+import json
+
+from django.core.urlresolvers import reverse
+from seaserv import seafile_api
+
+from seahub.test_utils import BaseTestCase
+from seahub.base.templatetags.seahub_tags import email2nickname, email2contact_email
+
+
+class DeletedReposTest(BaseTestCase):
+
+    def test_get_deleted_repos(self):
+        self.login_as(self.user)
+        name = self.user.username
+        repoid = self.create_repo(name='test-repo', desc='',
+                                                    username=name,
+                                                    passwd=None)
+        repo = seafile_api.get_repo(repoid)
+        self.remove_repo(repoid)
+
+        trashs = self.client.get(reverse("api2-v2.1-deleted-repos"))
+        json_trashs = json.loads(trashs.content)
+        json_trashs = [trash for trash in json_trashs if trash['repo_id'] == repo.id]
+        assert json_trashs[0]['repo_id'] == repo.id
+        assert json_trashs[0]['owner_email'] == name
+        assert json_trashs[0]['owner_name'] == email2nickname(name)
+        assert json_trashs[0]['owner_contact_email'] == email2contact_email(name)
+        assert json_trashs[0]['repo_name'] == repo.name
+        #assert json_trashs[0]['org_id'] == repo.org_id
+        assert json_trashs[0]['size'] == repo.size
+        self.assertIsNotNone(json_trashs[0]['head_commit_id'])
+        self.assertIsNotNone(json_trashs[0]['del_time'])
+        #self.assertIsNotNone(json_trashs[0]['encrypted'])
+
+    def test_can_restore_deleted_repos(self):
+        self.login_as(self.user)
+        name = self.user.username
+        repoid = self.create_repo(name='test-repo', desc='',
+                                                    username=name,
+                                                    passwd=None)
+        remove_status = self.remove_repo(repoid)
+        assert remove_status == 0
+        response = self.client.post(
+                reverse("api2-v2.1-deleted-repos"),
+                {"repo_id": repoid}
+                )
+        self.assertEqual(response.status_code, 200)