beta version af the sx importer, don't use for importing production sites, only for...

[osqa.git] / forum / views / writers.py

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 2b2461dec19009fa762348b1c82681cb3dffef1c..70be5eee420ae33f8a78aa034516a15da3e60516 100644 (file)
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -2,7 +2,7 @@
 import os.path
 import time, datetime, random
 import logging
 import os.path
 import time, datetime, random
 import logging

-from django.core.files.storage import default_storage
+from django.core.files.storage import FileSystemStorage

 from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404


@@ -13,13 +13,9 @@ from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
 
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
 

-from forum.utils.html import sanitize_html
-from markdown2 import Markdown

 from forum.forms import *
 from forum.models import *
 from forum.forms import *
 from forum.models import *

-from forum.auth import *

 from forum.const import *
 from forum.const import *

-from forum import auth

 from forum.utils.forms import get_next_url
 from forum.views.readers import _get_tags_cache_json
 
 from forum.utils.forms import get_next_url
 from forum.views.readers import _get_tags_cache_json
 


@@ -34,9 +30,7 @@ QUESTIONS_PAGE_SIZE = 10
 # used in answers
 ANSWERS_PAGE_SIZE = 10
 
 # used in answers
 ANSWERS_PAGE_SIZE = 10
 

-markdowner = Markdown(html4tags=True)
-
-def upload(request):#ajax upload file to a question or answer 
+def upload(request):#ajax upload file to a question or answer

     class FileTypeNotAllow(Exception):
         pass
     class FileSizeNotAllow(Exception):
     class FileTypeNotAllow(Exception):
         pass
     class FileSizeNotAllow(Exception):


@@ -50,86 +44,71 @@ def upload(request):#ajax upload file to a question or answer
     try:
         f = request.FILES['file-upload']
         # check upload permission
     try:
         f = request.FILES['file-upload']
         # check upload permission

-        if not auth.can_upload_files(request.user):
-            raise UploadPermissionNotAuthorized
+        if not request.user.can_upload_files():
+            raise UploadPermissionNotAuthorized()

 
         # check file type
         file_name_suffix = os.path.splitext(f.name)[1].lower()
 
         # check file type
         file_name_suffix = os.path.splitext(f.name)[1].lower()

-        if not file_name_suffix in settings.ALLOW_FILE_TYPES:
-            raise FileTypeNotAllow

 
 

-        # generate new file name
-        new_file_name = str(time.time()).replace('.', str(random.randint(0,100000))) + file_name_suffix
-        # use default storage to store file
-        default_storage.save(new_file_name, f)
+        if not file_name_suffix in ('.jpg', '.jpeg', '.gif', '.png', '.bmp', '.tiff', '.ico'):
+            raise FileTypeNotAllow()
+
+        storage = FileSystemStorage(str(settings.UPFILES_FOLDER), str(settings.UPFILES_ALIAS))
+        new_file_name = storage.save(f.name, f)

         # check file size
         # byte
         # check file size
         # byte

-        size = default_storage.size(new_file_name)
-        if size > settings.ALLOW_MAX_FILE_SIZE:
-            default_storage.delete(new_file_name)
-            raise FileSizeNotAllow
+        size = storage.size(new_file_name)

 
 

-        result = xml_template % ('Good', '', default_storage.url(new_file_name))
+        if size > float(settings.ALLOW_MAX_FILE_SIZE) * 1024 * 1024:
+            storage.delete(new_file_name)
+            raise FileSizeNotAllow()
+
+        result = xml_template % ('Good', '', str(settings.UPFILES_ALIAS) + new_file_name)

     except UploadPermissionNotAuthorized:
         result = xml_template % ('', _('uploading images is limited to users with >60 reputation points'), '')
     except FileTypeNotAllow:
         result = xml_template % ('', _("allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"), '')
     except FileSizeNotAllow:
     except UploadPermissionNotAuthorized:
         result = xml_template % ('', _('uploading images is limited to users with >60 reputation points'), '')
     except FileTypeNotAllow:
         result = xml_template % ('', _("allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"), '')
     except FileSizeNotAllow:

-        result = xml_template % ('', _("maximum upload file size is %sK") % settings.ALLOW_MAX_FILE_SIZE / 1024, '')
-    except Exception:
-        result = xml_template % ('', _('Error uploading file. Please contact the site administrator. Thank you. %s' % Exception), '')
+        result = xml_template % ('', _("maximum upload file size is %sM") % settings.ALLOW_MAX_FILE_SIZE, '')
+    except Exception, e:
+        result = xml_template % ('', _('Error uploading file. Please contact the site administrator. Thank you. %s' % e), '')

 
     return HttpResponse(result, mimetype="application/xml")
 
 
     return HttpResponse(result, mimetype="application/xml")
 

-#@login_required #actually you can post anonymously, but then must register
-def ask(request):#view used to ask a new question
-    """a view to ask a new question
-    gives space for q title, body, tags and checkbox for to post as wiki

 
 

-    user can start posting a question anonymously but then
-    must login/register in order for the question go be shown
-    """
-    if request.method == "POST":
-        form = AskForm(request.POST)
-        if form.is_valid():
+def _create_post(request, post_cls, form, parent=None):
+    post = post_cls()

 
 

-            added_at = datetime.datetime.now()
-            title = strip_tags(form.cleaned_data['title'].strip())
-            wiki = form.cleaned_data['wiki']
-            tagnames = form.cleaned_data['tags'].strip()
-            text = form.cleaned_data['text']
-            html = sanitize_html(markdowner.convert(text))
-            summary = strip_tags(html)[:120]
+    if parent is not None:
+        post.parent = parent

 
 

-            if request.user.is_authenticated():
-                author = request.user 
-
-                question = Question.objects.create_new(
-                    title            = title,
-                    author           = author, 
-                    added_at         = added_at,
-                    wiki             = wiki,
-                    tagnames         = tagnames,
-                    summary          = summary,
-                    text = sanitize_html(markdowner.convert(text))
-                )
+    revision_data = dict(summary=_('Initial revision'), body=form.cleaned_data['text'])
+
+    if form.cleaned_data.get('title', None):
+        revision_data['title'] = strip_tags(form.cleaned_data['title'].strip())
+
+    if form.cleaned_data.get('tags', None):
+        revision_data['tagnames'] = form.cleaned_data['tags'].strip()
+
+    post.create_revision(request.user, **revision_data)
+
+    if form.cleaned_data['wiki']:
+        post.wikify()
+
+    return HttpResponseRedirect(post.get_absolute_url())

 
 

-                return HttpResponseRedirect(question.get_absolute_url())
+
+
+def ask(request):
+    if request.method == "POST" and "text" in request.POST:
+        form = AskForm(request.POST)
+        if form.is_valid():
+            if request.user.is_authenticated():
+                return _create_post(request, Question, form)

             else:
             else:

-                request.session.flush()
-                session_key = request.session.session_key
-                question = AnonymousQuestion(
-                    session_key = session_key,
-                    title       = title,
-                    tagnames = tagnames,
-                    wiki = wiki,
-                    text = text,
-                    summary = summary,
-                    added_at = added_at,
-                    ip_addr = request.META['REMOTE_ADDR'],
-                )
-                question.save()

                 return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))
                 return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))

+    elif request.method == "POST" and "go" in request.POST:
+        form = AskForm({'title': request.POST['q']})

     else:
         form = AskForm()
 
     else:
         form = AskForm()
 


@@ -141,52 +120,31 @@ def ask(request):#view used to ask a new question
         }, context_instance=RequestContext(request))
 
 @login_required
         }, context_instance=RequestContext(request))
 
 @login_required

-def edit_question(request, id):#edit or retag a question
-    """view to edit question
-    """
+def edit_question(request, id):

     question = get_object_or_404(Question, id=id)
     question = get_object_or_404(Question, id=id)

-    if question.deleted and not auth.can_view_deleted_post(request.user, question):
+    if question.deleted and not request.user.can_view_deleted_post(question):

         raise Http404
         raise Http404

-    if auth.can_edit_post(request.user, question):
+    if request.user.can_edit_post(question):

         return _edit_question(request, question)
         return _edit_question(request, question)

-    elif auth.can_retag_questions(request.user):
+    elif request.user.can_retag_questions():

         return _retag_question(request, question)
     else:
         raise Http404
 
         return _retag_question(request, question)
     else:
         raise Http404
 

-def _retag_question(request, question):#non-url subview of edit question - just retag
-    """retag question sub-view used by
-    view "edit_question"
-    """
+def _retag_question(request, question):

     if request.method == 'POST':
         form = RetagQuestionForm(question, request.POST)
         if form.is_valid():
             if form.has_changed():
     if request.method == 'POST':
         form = RetagQuestionForm(question, request.POST)
         if form.is_valid():
             if form.has_changed():

-                latest_revision = question.get_latest_revision()
-                retagged_at = datetime.datetime.now()
-                # Update the Question itself
-                Question.objects.filter(id=question.id).update(
+                active = question.active_revision
+
+                question.create_revision(
+                    request.user,
+                    summary          = _('Retag'),
+                    title            = active.title,

                     tagnames         = form.cleaned_data['tags'],
                     tagnames         = form.cleaned_data['tags'],

-                    last_edited_at   = retagged_at,
-                    last_edited_by   = request.user,
-                    last_activity_at = retagged_at,
-                    last_activity_by = request.user
+                    body             = active.body,

                 )
                 )

-                # Update the Question's tag associations
-                tags_updated = Question.objects.update_tags(question,
-                    form.cleaned_data['tags'], request.user)
-                # Create a new revision
-                QuestionRevision.objects.create(
-                    question   = question,
-                    title      = latest_revision.title,
-                    author     = request.user,
-                    revised_at = retagged_at,
-                    tagnames   = form.cleaned_data['tags'],
-                    summary    = CONST['retagged'],
-                    text       = latest_revision.text
-                )
-                # send tags updated singal
-                tags_updated.send(sender=question.__class__, question=question)

 
             return HttpResponseRedirect(question.get_absolute_url())
     else:
 
             return HttpResponseRedirect(question.get_absolute_url())
     else:


@@ -197,76 +155,39 @@ def _retag_question(request, question):#non-url subview of edit question - just
         'tags' : _get_tags_cache_json(),
     }, context_instance=RequestContext(request))
 
         'tags' : _get_tags_cache_json(),
     }, context_instance=RequestContext(request))
 

-def _edit_question(request, question):#non-url subview of edit_question - just edit the body/title
-    latest_revision = question.get_latest_revision()
-    revision_form = None
+def _edit_question(request, question):

     if request.method == 'POST':
     if request.method == 'POST':

+        revision_form = RevisionForm(question, data=request.POST)
+        revision_form.is_valid()
+        revision = question.revisions.get(revision=revision_form.cleaned_data['revision'])
+

         if 'select_revision' in request.POST:
         if 'select_revision' in request.POST:

-            # user has changed revistion number
-            revision_form = RevisionForm(question, latest_revision, request.POST)
-            if revision_form.is_valid():
-                # Replace with those from the selected revision
-                form = EditQuestionForm(question,
-                    QuestionRevision.objects.get(question=question,
-                        revision=revision_form.cleaned_data['revision']))
-            else:
-                form = EditQuestionForm(question, latest_revision, request.POST)
+            form = EditQuestionForm(question, revision)

         else:
         else:

-            # Always check modifications against the latest revision
-            form = EditQuestionForm(question, latest_revision, request.POST)
-            if form.is_valid():
-                html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
-                if form.has_changed():
-                    edited_at = datetime.datetime.now()
-                    tags_changed = (latest_revision.tagnames !=
-                                    form.cleaned_data['tags'])
-                    tags_updated = False
-                    # Update the Question itself
-                    updated_fields = {
-                        'title': form.cleaned_data['title'],
-                        'last_edited_at': edited_at,
-                        'last_edited_by': request.user,
-                        'last_activity_at': edited_at,
-                        'last_activity_by': request.user,
-                        'tagnames': form.cleaned_data['tags'],
-                        'summary': strip_tags(html)[:120],
-                        'html': html,
-                    }
-
-                    # only save when it's checked
-                    # because wiki doesn't allow to be edited if last version has been enabled already
-                    # and we make sure this in forms.
-                    if ('wiki' in form.cleaned_data and
-                        form.cleaned_data['wiki']):
-                        updated_fields['wiki'] = True
-                        updated_fields['wikified_at'] = edited_at
-
-                    Question.objects.filter(
-                        id=question.id).update(**updated_fields)
-                    # Update the Question's tag associations
-                    if tags_changed:
-                        tags_updated = Question.objects.update_tags(
-                            question, form.cleaned_data['tags'], request.user)
-                    # Create a new revision
-                    revision = QuestionRevision(
-                        question   = question,
-                        title      = form.cleaned_data['title'],
-                        author     = request.user,
-                        revised_at = edited_at,
-                        tagnames   = form.cleaned_data['tags'],
-                        text       = form.cleaned_data['text'],
-                    )
-                    if form.cleaned_data['summary']:
-                        revision.summary = form.cleaned_data['summary']
-                    else:
-                        revision.summary = 'No.%s Revision' % latest_revision.revision
-                    revision.save()
-
-                return HttpResponseRedirect(question.get_absolute_url())
+            form = EditQuestionForm(question, revision, data=request.POST)
+
+        if not 'select_revision' in request.POST and form.is_valid():
+            if form.has_changed():
+                question.create_revision(
+                    request.user,
+                    summary          = form.cleaned_data['summary'],
+                    title            = strip_tags(form.cleaned_data['title'].strip()),
+                    tagnames         = form.cleaned_data['tags'].strip(),
+                    body             = form.cleaned_data['text'],
+                )
+
+                if form.cleaned_data.get('wiki', False):
+                    question.wikify()
+
+            else:
+                if not revision == question.active_revision:
+                    question.activate_revision(request.user, revision)
+
+            return HttpResponseRedirect(question.get_absolute_url())

     else:
     else:

+        revision_form = RevisionForm(question)
+        form = EditQuestionForm(question)

 
 

-        revision_form = RevisionForm(question, latest_revision)
-        form = EditQuestionForm(question, latest_revision)

     return render_to_response('question_edit.html', {
         'question': question,
         'revision_form': revision_form,
     return render_to_response('question_edit.html', {
         'question': question,
         'revision_form': revision_form,


@@ -277,166 +198,56 @@ def _edit_question(request, question):#non-url subview of edit_question - just e
 @login_required
 def edit_answer(request, id):
     answer = get_object_or_404(Answer, id=id)
 @login_required
 def edit_answer(request, id):
     answer = get_object_or_404(Answer, id=id)

-    if answer.deleted and not auth.can_view_deleted_post(request.user, answer):
+    if answer.deleted and not request.user.can_view_deleted_post(answer):

         raise Http404
         raise Http404

-    elif not auth.can_edit_post(request.user, answer):
+    elif not request.user.can_edit_post(answer):

         raise Http404
         raise Http404

-    else:
-        latest_revision = answer.get_latest_revision()
-        if request.method == "POST":
-            if 'select_revision' in request.POST:
-                # user has changed revistion number
-                revision_form = RevisionForm(answer, latest_revision, request.POST)
-                if revision_form.is_valid():
-                    # Replace with those from the selected revision
-                    form = EditAnswerForm(answer,
-                                          AnswerRevision.objects.get(answer=answer,
-                                          revision=revision_form.cleaned_data['revision']))
-                else:
-                    form = EditAnswerForm(answer, latest_revision, request.POST)
-            else:
-                form = EditAnswerForm(answer, latest_revision, request.POST)
-                if form.is_valid():
-                    html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
-                    if form.has_changed():
-                        edited_at = datetime.datetime.now()
-                        updated_fields = {
-                            'last_edited_at': edited_at,
-                            'last_edited_by': request.user,
-                            'html': html,
-                        }
-                        Answer.objects.filter(id=answer.id).update(**updated_fields)
-
-                        revision = AnswerRevision(
-                                                  answer=answer,
-                                                  author=request.user,
-                                                  revised_at=edited_at,
-                                                  text=form.cleaned_data['text']
-                                                  )
-
-                        if form.cleaned_data['summary']:
-                            revision.summary = form.cleaned_data['summary']
-                        else:
-                            revision.summary = 'No.%s Revision' % latest_revision.revision
-                        revision.save()
-
-                        answer.question.last_activity_at = edited_at
-                        answer.question.last_activity_by = request.user
-                        answer.question.save()
-
-                    return HttpResponseRedirect(answer.get_absolute_url())
+
+    if request.method == "POST":
+        revision_form = RevisionForm(answer, data=request.POST)
+        revision_form.is_valid()
+        revision = answer.revisions.get(revision=revision_form.cleaned_data['revision'])
+
+        if 'select_revision' in request.POST:
+            form = EditAnswerForm(answer, revision)

         else:
         else:

-            revision_form = RevisionForm(answer, latest_revision)
-            form = EditAnswerForm(answer, latest_revision)
-        return render_to_response('answer_edit.html', {
-                                  'answer': answer,
-                                  'revision_form': revision_form,
-                                  'form': form,
-                                  }, context_instance=RequestContext(request))
-
-def answer(request, id):#process a new answer
+            form = EditAnswerForm(answer, revision, data=request.POST)
+
+        if not 'select_revision' in request.POST and form.is_valid():
+            if form.has_changed():
+                answer.create_revision(
+                    request.user,
+                    summary          = form.cleaned_data['summary'],
+                    body             = form.cleaned_data['text'],
+                )
+
+                if form.cleaned_data.get('wiki', False):
+                    answer.wikify()
+
+            else:
+                if not revision == answer.active_revision:
+                    answer.activate_revision(request.user, revision)
+
+            return HttpResponseRedirect(answer.get_absolute_url())
+
+    else:
+        revision_form = RevisionForm(answer)
+        form = EditAnswerForm(answer)
+    return render_to_response('answer_edit.html', {
+                              'answer': answer,
+                              'revision_form': revision_form,
+                              'form': form,
+                              }, context_instance=RequestContext(request))
+
+def answer(request, id):

     question = get_object_or_404(Question, id=id)
     if request.method == "POST":
     question = get_object_or_404(Question, id=id)
     if request.method == "POST":

-        form = AnswerForm(question, request.user, request.POST)
+        form = AnswerForm(question, request.POST)

         if form.is_valid():
         if form.is_valid():

-            wiki = form.cleaned_data['wiki']
-            text = form.cleaned_data['text']
-            update_time = datetime.datetime.now()
-

             if request.user.is_authenticated():
             if request.user.is_authenticated():

-                Answer.objects.create_new(
-                                  question=question,
-                                  author=request.user,
-                                  added_at=update_time,
-                                  wiki=wiki,
-                                  text=sanitize_html(markdowner.convert(text)),
-                                  email_notify=form.cleaned_data['email_notify']
-                                  )
+                return _create_post(request, Answer, form, question)

             else:
             else:

-                request.session.flush()
-                html = sanitize_html(markdowner.convert(text))
-                summary = strip_tags(html)[:120]
-                anon = AnonymousAnswer(
-                                       question=question,
-                                       wiki=wiki,
-                                       text=text,
-                                       summary=summary,
-                                       session_key=request.session.session_key,
-                                       ip_addr=request.META['REMOTE_ADDR'],
-                                       )
-                anon.save()
-                return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newanswer'}))
+                return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))

 
     return HttpResponseRedirect(question.get_absolute_url())
 
 
     return HttpResponseRedirect(question.get_absolute_url())
 

-def __generate_comments_json(obj, type, user):#non-view generates json data for the post comments
-    comments = obj.comments.all().order_by('id')
-    # {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
-    json_comments = []
-    from forum.templatetags.extra_tags import diff_date
-    for comment in comments:
-        comment_user = comment.user
-        delete_url = ""
-        if user != None and auth.can_delete_comment(user, comment):
-            #/posts/392845/comments/219852/delete
-            #todo translate this url
-            delete_url = reverse('index') + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
-        json_comments.append({"id" : comment.id,
-            "object_id" : obj.id,
-            "comment_age" : diff_date(comment.added_at),
-            "text" : comment.comment,
-            "user_display_name" : comment_user.username,
-            "user_url" : comment_user.get_profile_url(),
-            "delete_url" : delete_url
-        })
-
-    data = simplejson.dumps(json_comments)
-    return HttpResponse(data, mimetype="application/json")
-
-
-def question_comments(request, id):#ajax handler for loading comments to question
-    question = get_object_or_404(Question, id=id)
-    user = request.user
-    return __comments(request, question, 'question')
-
-def answer_comments(request, id):#ajax handler for loading comments on answer
-    answer = get_object_or_404(Answer, id=id)
-    user = request.user
-    return __comments(request, answer, 'answer')
-
-def __comments(request, obj, type):#non-view generic ajax handler to load comments to an object
-    # only support get post comments by ajax now
-    user = request.user
-    if request.is_ajax():
-        if request.method == "GET":
-            response = __generate_comments_json(obj, type, user)
-        elif request.method == "POST":
-            if auth.can_add_comments(user,obj):
-                comment_data = request.POST.get('comment')
-                comment = Comment(content_object=obj, comment=comment_data, user=request.user)
-                comment.save()
-                obj.comment_count = obj.comment_count + 1
-                obj.save()
-                response = __generate_comments_json(obj, type, user)
-            else:
-                response = HttpResponseForbidden(mimetype="application/json")
-        return response
-
-def delete_comment(request, object_id='', comment_id='', commented_object_type=None):#ajax handler to delete comment
-    response = None
-    commented_object = None
-    if commented_object_type == 'question':
-        commented_object = Question
-    elif commented_object_type == 'answer':
-        commented_object = Answer
-
-    if request.is_ajax():
-        comment = get_object_or_404(Comment, id=comment_id)
-        if auth.can_delete_comment(request.user, comment):
-            obj = get_object_or_404(commented_object, id=object_id)
-            obj.comments.remove(comment)
-            obj.comment_count = obj.comment_count - 1
-            obj.save()
-            user = request.user
-            return __generate_comments_json(obj, commented_object_type, user)
-    raise PermissionDenied()