Migration project comments to django

Author: xtao

app.py

@@ -36,6 +36,7 @@
              (re.compile(r'/\w+/\w+/raw'), django_app),
              (re.compile(r'/\w+/\w+/browsefiles'), django_app),
              (re.compile(r'/\w+/\w+/code_review'), django_app),
+             (re.compile(r'/\w+/\w+/comments'), django_app),
              (re.compile(r'/vilya'), django_app),
              (re.compile(r'/.*'), web)]
 

vilya/urls.py

@@ -108,6 +108,9 @@
     url(r'^(?P<username>\w+)/(?P<projectname>\w+)/browsefiles/?$', project.browsefiles, name="project_browsefiles"),
     url(r'^(?P<username>\w+)/(?P<projectname>\w+)/code_review/(?P<id>[0-9]+)/delete/?$', project.codereview_delete, name="project_codereview_delete"),
     url(r'^(?P<username>\w+)/(?P<projectname>\w+)/code_review/(?P<id>[0-9]+)/edit/?$', project.codereview_edit, name="project_codereview_edit"),
+    url(r'^(?P<username>\w+)/(?P<projectname>\w+)/comments/?$', project.comment, name="project_comment"),
+    url(r'^(?P<username>\w+)/(?P<projectname>\w+)/comments/new/?$', project.comment_new, name="project_comment_new"),
+    url(r'^(?P<username>\w+)/(?P<projectname>\w+)/comments/(?P<id>[0-9]+)/?$', project.comment_delete, name="project_comment_delete"),
     url(r'^(?P<username>\w+)/(?P<projectname>\w+)/watchers/?$', project.watchers, name="project_watchers"),
     url(r'^(?P<username>\w+)/(?P<projectname>\w+)/forkers/?$', project.forkers, name="project_forkers"),
     url(r'^(?P<username>\w+)/(?P<projectname>\w+)/archive/(?P<revision>\w+)/?$', project.archive, name="project_archive"),

vilya/views/__init__.py

@@ -16,7 +16,6 @@
 from vilya.views.uis.pull import PullUI, PullsUI
 from vilya.views.uis.dashboard import DashboardUI
 from vilya.views.uis.compare import CompareUI
-from vilya.views.uis.comments import CommentUI
 from vilya.views.uis.line_comments import LineCommentUI
 from vilya.views.uis.pr_comment import PrCommentUI
 from vilya.views.uis.issue import IssueBoardUI, IssueCommentUI
@@ -125,7 +124,7 @@ def _q_lookup(self, request, url_part):
 
 class CodeUI:
     _q_exports = [
-        'hooks', 'graph', 'commit', 'pull', 'newpull', 'comments',
+        'hooks', 'graph', 'commit', 'pull', 'newpull',
         'compare', 'line_comments', 'pulls',
         'docs', 'remove', 'pr_comment', 'issues',
         'issue_comments', 're_index_docs', 'src_index',
@@ -202,10 +201,6 @@ def pulls(self):
     def dashboard(self):
         return DashboardUI(self.proj_name)
 
-    @property
-    def comments(self):
-        return CommentUI(self.proj_name)
-
     @property
     def line_comments(self):
         return LineCommentUI(self.proj_name)

vilya/views/django/project.py

@@ -680,3 +680,36 @@ def codereview_edit(request, username, projectname, id):
         return HttpResponse(json.dumps(dict(
             r=0, html=st('/pull/ticket_linecomment.html', **locals()))))
     return HttpResponse(json.dumps(dict(r=1)))
+
+
+def comment(request, username, projectname):
+    from vilya.models.comment import latest
+    return HttpResponse("Last comments list TODO" + str(latest()))
+
+
+@csrf_exempt
+def comment_new(request, username, projectname):
+    from vilya.models.project import CodeDoubanProject
+    from vilya.models.comment import Comment
+    name = '/'.join([username, projectname])
+    project = CodeDoubanProject.get_by_name(name)
+    user = request.user
+    ref = request.POST.get('ref')
+    assert ref, "comment ref cannot be empty"
+    content = request.POST.get('content', '')
+    new_comment = Comment.add(project, ref, user.name, content)
+
+    return HttpResponseRedirect("/%s/commit/%s#%s" %
+                            (name, ref, new_comment.uid))
+
+
+@csrf_exempt
+def comment_delete(request, username, projectname, id):
+    from vilya.models.comment import Comment
+    if request.method == 'DELETE':
+        # FIXME: 不用验证user？
+        ok = Comment.delete(id)
+        if not ok:
+            raise Http404("Unable to delete comment %s" % id)
+        return HttpResponse('')
+    return HttpResponse("Display comment %s TODO" % id)