From bb419480f85e3ba6bfe147a6f05a1fc265b5592a Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 3 Feb 2011 14:20:12 +0100 Subject: [PATCH 01/16] toolbar: dlugi_cyt -> dlugi_cytat --- apps/toolbar/fixtures/initial_data.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbar/fixtures/initial_data.yaml b/apps/toolbar/fixtures/initial_data.yaml index ba3148a6..45a1c7de 100644 --- a/apps/toolbar/fixtures/initial_data.yaml +++ b/apps/toolbar/fixtures/initial_data.yaml @@ -222,7 +222,7 @@ group: [21] label: "d\u0142ugi cytat" link: '' - params: '{"tag": "dlugi_cyt"}' + params: '{"tag": "dlugi_cytat"}' scriptlet: insert_tag slug: dlugi-cytat tooltip: "d\u0142ugi cytat wyr\xF3\u017Cniony sk\u0142adem" -- 2.20.1 From c90765fe23c28ef7d482d448d336dd5aa1736608 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 22 Feb 2011 10:25:04 +0100 Subject: [PATCH 02/16] tiff2png fix for .tif files --- scripts/tiff2png | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tiff2png b/scripts/tiff2png index 61b00b7b..054908c0 100755 --- a/scripts/tiff2png +++ b/scripts/tiff2png @@ -9,7 +9,7 @@ # Pliki wyjściowe zapisywane są obok plików źródłowych, z rozszerzeniem # zmienionym na .png. -find . -iname '*.tiff' -print0 | while read -d $'\0' file +find . -iregex '.*\.tiff?' -print0 | while read -d $'\0' file do echo "$file" convert "$file" -depth 7 -resize 640x960 png:- | pngnq -n 128 -s 1 > "${file%.tiff}.png" -- 2.20.1 From a592c332d7b2923669aa3705326c094388598b08 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 23 Feb 2011 11:16:10 +0100 Subject: [PATCH 03/16] #1230: german quotes in special chas --- redakcja/static/js/wiki/view_editor_wysiwyg.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js index ab0c9889..8fe8051c 100644 --- a/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -218,7 +218,7 @@ 'Τ','τ','Υ','υ','Φ','φ','Χ','χ','Ψ','ψ','Ω','ω','–', '—','¡','¿','$','¢','£','€','©','®','°','¹','²','³', '¼','½','¾','†','§','‰','•','←','↑','→','↓', - '„','”','„”','«','»','«»','’','[',']','~','|','−','·', + '„','”','„”','«','»','«»','»«','’','[',']','~','|','−','·', '×','÷','≈','≠','±','≤','≥','∈']; var tableContent = ""; @@ -257,7 +257,7 @@ // if we want to surround text with quotes // not sure if just check if value has length == 2 - if(insertVal == '„”' || insertVal == '«»'){ + if (insertVal.length) == 2) { var startTag = insertVal[0]; var endTag = insertVal[1]; var textAreaOpened = editArea; -- 2.20.1 From 77d054cf52faf3ac0a56040cb29f40016a3c7453 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 23 Feb 2011 11:19:38 +0100 Subject: [PATCH 04/16] bugfix --- redakcja/static/js/wiki/view_editor_wysiwyg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js index 8fe8051c..a3f42786 100644 --- a/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -257,7 +257,7 @@ // if we want to surround text with quotes // not sure if just check if value has length == 2 - if (insertVal.length) == 2) { + if (insertVal.length == 2) { var startTag = insertVal[0]; var endTag = insertVal[1]; var textAreaOpened = editArea; -- 2.20.1 From db50b75e23a5cd6b29d1315f3a8ed2b7befeb81f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Rekucki?= Date: Tue, 22 Jun 2010 02:08:18 +0200 Subject: [PATCH 05/16] Added lqc's DVCS application - mercurial on database. Distilled from backend-rewrite branch. --- apps/dvcs/__init__.py | 0 apps/dvcs/admin.py | 5 ++ apps/dvcs/models.py | 151 +++++++++++++++++++++++++++++++++ apps/dvcs/tests.py | 164 ++++++++++++++++++++++++++++++++++++ apps/dvcs/urls.py | 6 ++ apps/dvcs/views.py | 21 +++++ redakcja/settings/common.py | 2 + redakcja/urls.py | 1 + 8 files changed, 350 insertions(+) create mode 100644 apps/dvcs/__init__.py create mode 100644 apps/dvcs/admin.py create mode 100644 apps/dvcs/models.py create mode 100644 apps/dvcs/tests.py create mode 100644 apps/dvcs/urls.py create mode 100644 apps/dvcs/views.py diff --git a/apps/dvcs/__init__.py b/apps/dvcs/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/dvcs/admin.py b/apps/dvcs/admin.py new file mode 100644 index 00000000..c81d3b7b --- /dev/null +++ b/apps/dvcs/admin.py @@ -0,0 +1,5 @@ +from django.contrib.admin import site +from dvcs.models import Document, Change + +site.register(Document) +site.register(Change) diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py new file mode 100644 index 00000000..47e7c26d --- /dev/null +++ b/apps/dvcs/models.py @@ -0,0 +1,151 @@ +from django.db import models +from django.contrib.auth.models import User +from django.utils.translation import ugettext_lazy as _ +from mercurial import mdiff, simplemerge +import pickle + +class Change(models.Model): + """ + Single document change related to previous change. The "parent" + argument points to the version against which this change has been + recorded. Initial text will have a null parent. + + Data contains a pickled diff needed to reproduce the initial document. + """ + author = models.ForeignKey(User) + patch = models.TextField(blank=True) + tree = models.ForeignKey('Document') + + parent = models.ForeignKey('self', + null=True, blank=True, default=None, + related_name="children") + + merge_parent = models.ForeignKey('self', + null=True, blank=True, default=None, + related_name="merge_children") + + description = models.TextField(blank=True, default='') + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + ordering = ('created_at',) + + def __unicode__(self): + return u"Id: %r, Tree %r, Parent %r, Patch '''\n%s'''" % (self.id, self.tree_id, self.parent_id, self.patch) + + @staticmethod + def make_patch(src, dst): + return pickle.dumps(mdiff.textdiff(src, dst)) + + def materialize(self): + changes = Change.objects.exclude(parent=None).filter( + tree=self.tree, + created_at__lte=self.created_at).order_by('created_at') + text = u'' + for change in changes: + text = change.apply_to(text) + return text + + def make_child(self, patch, author, description): + return self.children.create(patch=patch, + tree=self.tree, author=author, + description=description) + + def make_merge_child(self, patch, author, description): + return self.merge_children.create(patch=patch, + tree=self.tree, author=author, + description=description) + + def apply_to(self, text): + return mdiff.patch(text, pickle.loads(self.patch.encode('ascii'))) + + def merge_with(self, other, author, description=u"Automatic merge."): + assert self.tree_id == other.tree_id # same tree + if other.parent_id == self.pk: + # immediate child + return other + + local = self.materialize() + base = other.merge_parent.materialize() + remote = other.apply_to(base) + + merge = simplemerge.Merge3Text(base, local, remote) + result = ''.join(merge.merge_lines()) + patch = self.make_patch(local, result) + return self.children.create( + patch=patch, merge_parent=other, tree=self.tree, + author=author, description=description) + + +class Document(models.Model): + """ + File in repository. + """ + creator = models.ForeignKey(User) + head = models.ForeignKey(Change, + null=True, blank=True, default=None, + help_text=_("This document's current head.")) + + # Some meta-data + name = models.CharField(max_length=200, + help_text=_("Name for this file to display.")) + + def __unicode__(self): + return u"{0}, HEAD: {1}".format(self.name, self.head_id) + + @models.permalink + def get_absolute_url(self): + return ('dvcs.views.document_data', (), { + 'document_id': self.id, + 'version': self.head_id, + }) + + def materialize(self, version=None): + if self.head is None: + return u'' + if version is None: + version = self.head + elif not isinstance(version, Change): + version = self.change_set.get(pk=version) + return version.materialize() + + def commit(self, **kwargs): + if 'parent' not in kwargs: + parent = self.head + else: + parent = kwargs['parent'] + if not isinstance(parent, Change): + parent = Change.objects.get(pk=kwargs['parent']) + + if 'patch' not in kwargs: + if 'text' not in kwargs: + raise ValueError("You must provide either patch or target document.") + patch = Change.make_patch(self.materialize(version=parent), kwargs['text']) + else: + if 'text' in kwargs: + raise ValueError("You can provide only text or patch - not both") + patch = kwargs['patch'] + + old_head = self.head + if parent != old_head: + change = parent.make_merge_child(patch, kwargs['author'], kwargs.get('description', '')) + # not Fast-Forward - perform a merge + self.head = old_head.merge_with(change, author=kwargs['author']) + else: + self.head = parent.make_child(patch, kwargs['author'], kwargs.get('description', '')) + self.save() + return self.head + + def history(self): + return self.changes.all() + + @staticmethod + def listener_initial_commit(sender, instance, created, **kwargs): + if created: + instance.head = Change.objects.create( + author=instance.creator, + patch=pickle.dumps(mdiff.textdiff('', '')), + tree=instance) + instance.save() + +models.signals.post_save.connect(Document.listener_initial_commit, sender=Document) diff --git a/apps/dvcs/tests.py b/apps/dvcs/tests.py new file mode 100644 index 00000000..0c712957 --- /dev/null +++ b/apps/dvcs/tests.py @@ -0,0 +1,164 @@ +from django.test import TestCase +from dvcs.models import Change, Document +from django.contrib.auth.models import User + +class DocumentModelTests(TestCase): + + def setUp(self): + self.user = User.objects.create_user("tester", "tester@localhost.local") + + def assertTextEqual(self, given, expected): + return self.assertEqual(given, expected, + "Expected '''%s'''\n differs from text: '''%s'''" % (expected, given) + ) + + def test_empty_file(self): + doc = Document.objects.create(name=u"Sample Document", creator=self.user) + self.assert_(doc.head is not None) + self.assertEqual(doc.materialize(), u"") + + def test_single_commit(self): + doc = Document.objects.create(name=u"Sample Document", creator=self.user) + doc.commit(text=u"Ala ma kota", description="Commit #1", author=self.user) + self.assert_(doc.head is not None) + self.assertEqual(doc.change_set.count(), 2) + self.assertEqual(doc.materialize(), u"Ala ma kota") + + def test_chained_commits(self): + doc = Document.objects.create(name=u"Sample Document", creator=self.user) + c1 = doc.commit(description="Commit #1", text=u""" + Line #1 + Line #2 is cool + """, author=self.user) + c2 = doc.commit(description="Commit #2", text=u""" + Line #1 + Line #2 is hot + """, author=self.user) + c3 = doc.commit(description="Commit #3", text=u""" + Line #1 + ... is hot + Line #3 ate Line #2 + """, author=self.user) + self.assert_(doc.head is not None) + self.assertEqual(doc.change_set.count(), 4) + + self.assertEqual(doc.materialize(), u""" + Line #1 + ... is hot + Line #3 ate Line #2 + """) + self.assertEqual(doc.materialize(version=c3), u""" + Line #1 + ... is hot + Line #3 ate Line #2 + """) + self.assertEqual(doc.materialize(version=c2), u""" + Line #1 + Line #2 is hot + """) + self.assertEqual(doc.materialize(version=c1), """ + Line #1 + Line #2 is cool + """) + + + def test_parallel_commit_noconflict(self): + doc = Document.objects.create(name=u"Sample Document", creator=self.user) + self.assert_(doc.head is not None) + base = doc.head + base = doc.commit(description="Commit #1", text=u""" + Line #1 + Line #2 +""", author=self.user) + + c1 = doc.commit(description="Commit #2", text=u""" + Line #1 is hot + Line #2 +""", parent=base, author=self.user) + self.assertTextEqual(c1.materialize(), u""" + Line #1 is hot + Line #2 +""") + c2 = doc.commit(description="Commit #3", text=u""" + Line #1 + Line #2 + Line #3 +""", parent=base, author=self.user) + self.assertEqual(doc.change_set.count(), 5) + self.assertTextEqual(doc.materialize(), u""" + Line #1 is hot + Line #2 + Line #3 +""") + + def test_parallel_commit_conflict(self): + doc = Document.objects.create(name=u"Sample Document", creator=self.user) + self.assert_(doc.head is not None) + base = doc.head + base = doc.commit(description="Commit #1", text=u""" +Line #1 +Line #2 +Line #3 +""", author=self.user) + + c1 = doc.commit(description="Commit #2", text=u""" +Line #1 +Line #2 is hot +Line #3 +""", parent=base, author=self.user) + c2 = doc.commit(description="Commit #3", text=u""" +Line #1 +Line #2 is cool +Line #3 +""", parent=base, author=self.user) + self.assertEqual(doc.change_set.count(), 5) + self.assertTextEqual(doc.materialize(), u""" +Line #1 +<<<<<<< +Line #2 is hot +======= +Line #2 is cool +>>>>>>> +Line #3 +""") + + def test_multiply_parallel_commits(self): + doc = Document.objects.create(name=u"Sample Document", creator=self.user) + self.assert_(doc.head is not None) + c1 = doc.commit(description="Commit A1", text=u""" +Line #1 + +Line #2 + +Line #3 +""", author=self.user) + c2 = doc.commit(description="Commit A2", text=u""" +Line #1 * + +Line #2 + +Line #3 +""", author=self.user) + c3 = doc.commit(description="Commit B1", text=u""" +Line #1 + +Line #2 ** + +Line #3 +""", parent=c1, author=self.user) + c4 = doc.commit(description="Commit C1", text=u""" +Line #1 * + +Line #2 + +Line #3 *** +""", parent=c2, author=self.user) + self.assertEqual(doc.change_set.count(), 7) + self.assertTextEqual(doc.materialize(), u""" +Line #1 * + +Line #2 ** + +Line #3 *** +""") + diff --git a/apps/dvcs/urls.py b/apps/dvcs/urls.py new file mode 100644 index 00000000..d1e1e296 --- /dev/null +++ b/apps/dvcs/urls.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 +from django.conf.urls.defaults import * + +urlpatterns = patterns('dvcs.views', + url(r'^data/(?P[^/]+)/(?P.*)$', 'document_data', name='storage_document_data'), +) diff --git a/apps/dvcs/views.py b/apps/dvcs/views.py new file mode 100644 index 00000000..7918e96c --- /dev/null +++ b/apps/dvcs/views.py @@ -0,0 +1,21 @@ +# Create your views here. +from django.views.generic.simple import direct_to_template +from django import http +from dvcs.models import Document + +def document_list(request, template_name="dvcs/document_list.html"): + return direct_to_template(request, template_name, { + "documents": Document.objects.all(), + }) + +def document_data(request, document_id, version=None): + doc = Document.objects.get(pk=document_id) + return http.HttpResponse(doc.materialize(version or None), content_type="text/plain") + +def document_history(request, docid, template_name="dvcs/document_history.html"): + document = Document.objects.get(pk=docid) + return direct_to_template(request, template_name, { + "document": document, + "changes": document.history(), + }) + diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 8d032ef6..587374be 100644 --- a/redakcja/settings/common.py +++ b/redakcja/settings/common.py @@ -117,6 +117,7 @@ INSTALLED_APPS = ( 'south', 'sorl.thumbnail', 'filebrowser', + 'dvcs', 'wiki', 'toolbar', @@ -145,3 +146,4 @@ try: from redakcja.settings.compress import * except ImportError: pass + diff --git a/redakcja/urls.py b/redakcja/urls.py index dd7f884d..20994ce1 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -20,6 +20,7 @@ urlpatterns = patterns('', url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), url(r'^documents/', include('wiki.urls')), + url(r'^storage/', include('dvcs.urls')), # Static files (should be served by Apache) url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', -- 2.20.1 From 7e94b10a9875ce8b4d7d109606cdac85b0ab831d Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 7 Mar 2011 11:03:45 +0100 Subject: [PATCH 06/16] work-in-progress --- apps/dvcs/models.py | 14 +++--- apps/wiki/models.py | 104 ++++++------------------------------------ apps/wiki/settings.py | 4 -- 3 files changed, 20 insertions(+), 102 deletions(-) diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py index 47e7c26d..18fe18fe 100644 --- a/apps/dvcs/models.py +++ b/apps/dvcs/models.py @@ -12,7 +12,7 @@ class Change(models.Model): Data contains a pickled diff needed to reproduce the initial document. """ - author = models.ForeignKey(User) + author = models.ForeignKey(User, null=True, blank=True) patch = models.TextField(blank=True) tree = models.ForeignKey('Document') @@ -35,6 +35,10 @@ class Change(models.Model): @staticmethod def make_patch(src, dst): + if isinstance(src, unicode): + src = src.encode('utf-8') + if isinstance(dst, unicode): + dst = dst.encode('utf-8') return pickle.dumps(mdiff.textdiff(src, dst)) def materialize(self): @@ -81,17 +85,13 @@ class Document(models.Model): """ File in repository. """ - creator = models.ForeignKey(User) + creator = models.ForeignKey(User, null=True, blank=True) head = models.ForeignKey(Change, null=True, blank=True, default=None, help_text=_("This document's current head.")) - # Some meta-data - name = models.CharField(max_length=200, - help_text=_("Name for this file to display.")) - def __unicode__(self): - return u"{0}, HEAD: {1}".format(self.name, self.head_id) + return u"{0}, HEAD: {1}".format(self.id, self.head_id) @models.permalink def get_absolute_url(self): diff --git a/apps/wiki/models.py b/apps/wiki/models.py index 7cb20c65..a3b952a0 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -4,110 +4,36 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django.db import models -import re -import os -import vstorage -from vstorage import DocumentNotFound -from wiki import settings, constants -from slughifi import slughifi from django.utils.translation import ugettext_lazy as _ -from django.http import Http404 +from dvcs import models as dvcs_models + import logging logger = logging.getLogger("fnp.wiki") -# _PCHARS_DICT = dict(zip((ord(x) for x in u"ĄĆĘŁŃÓŚŻŹąćęłńóśżź "), u"ACELNOSZZacelnoszz_")) -_PCHARS_DICT = dict(zip((ord(x) for x in u" "), u"_")) - -# I know this is barbaric, but I didn't find a better solution ;( -def split_name(name): - parts = name.translate(_PCHARS_DICT).split('__') - return parts - -def join_name(*parts, **kwargs): - name = u'__'.join(p.translate(_PCHARS_DICT) for p in parts) - logger.info("JOIN %r -> %r", parts, name) - return name - -def normalize_name(name): - """ - >>> normalize_name("gąska".decode('utf-8')) - u'g\u0105ska' - """ - return unicode(name).translate(_PCHARS_DICT) - -STAGE_TAGS_RE = re.compile(r'^#stage-finished: (.*)$', re.MULTILINE) - - -class DocumentStorage(object): - def __init__(self, path): - self.vstorage = vstorage.VersionedStorage(path) - - def get(self, name, revision=None): - text, rev = self.vstorage.page_text(name, revision) - return Document(self, name=name, text=text, revision=rev) - - def get_by_tag(self, name, tag): - text, rev = self.vstorage.page_text_by_tag(name, tag) - return Document(self, name=name, text=text, revision=rev) +class Document(models.Model): + """ A document edited on the wiki """ - def revert(self, name, revision, **commit_args): - self.vstorage.revert(name, revision, **commit_args) + slug = models.CharField(_('slug')) + title = models.CharField(_('displayed title'), blank=True) + data = models.ForeignKey(dvcs_models.Document) + gallery = models.CharField(_('scan gallery name'), blank=True) - def get_or_404(self, *args, **kwargs): - try: - return self.get(*args, **kwargs) - except DocumentNotFound: - raise Http404 - def put(self, document, author, comment, parent=None): - self.vstorage.save_text( - title=document.name, - text=document.text, - author=author, - comment=comment, - parent=parent) - return document - def create_document(self, text, name): - title = u', '.join(p.title() for p in split_name(name)) - - if text is None: - text = u'' - - document = Document(self, name=name, text=text, title=title) - return self.put(document, u"", u"Document created.") - - def delete(self, name, author, comment): - self.vstorage.delete_page(name, author, comment) - - def all(self): - return list(self.vstorage.all_pages()) - - def history(self, title): - def stage_desc(match): - stage = match.group(1) - return _("Finished stage: %s") % constants.DOCUMENT_STAGES_DICT[stage] +''' +from wiki import settings, constants +from slughifi import slughifi - for changeset in self.vstorage.page_history(title): - changeset['description'] = STAGE_TAGS_RE.sub(stage_desc, changeset['description']) - yield changeset +from django.http import Http404 - def doc_meta(self, title, revision=None): - return self.vstorage.page_meta(title, revision) class Document(object): - META_REGEX = re.compile(r'\s*', re.DOTALL | re.MULTILINE) - - def __init__(self, storage, **kwargs): - self.storage = storage - for attr, value in kwargs.iteritems(): - setattr(self, attr, value) def add_tag(self, tag, revision, author): """ Add document specific tag """ @@ -141,13 +67,9 @@ class Document(object): def info(self): return self.storage.vstorage.page_meta(self.name, self.revision) -def getstorage(): - return DocumentStorage(settings.REPOSITORY_PATH) -# -# Django models -# +''' class Theme(models.Model): name = models.CharField(_('name'), max_length=50, unique=True) diff --git a/apps/wiki/settings.py b/apps/wiki/settings.py index 0a227e4a..50f49d8b 100644 --- a/apps/wiki/settings.py +++ b/apps/wiki/settings.py @@ -1,7 +1,3 @@ from django.conf import settings -if not hasattr(settings, 'WIKI_REPOSITORY_PATH'): - raise Exception('You must set WIKI_REPOSITORY_PATH in your settings file.') - -REPOSITORY_PATH = settings.WIKI_REPOSITORY_PATH GALLERY_URL = settings.MEDIA_URL + 'images/' -- 2.20.1 From cbb14d2ed3eb0b72a6c3c68ab93847923e6142f4 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 18 May 2011 16:46:36 +0200 Subject: [PATCH 07/16] working prototype without mercurial repo --- apps/dvcs/migrations/0001_initial.py | 98 ++++++ apps/dvcs/migrations/__init__.py | 0 apps/dvcs/models.py | 48 ++- apps/wiki/admin.py | 1 + apps/wiki/forms.py | 10 +- apps/wiki/migrations/0003_auto__add_book.py | 97 ++++++ apps/wiki/models.py | 32 +- .../templates/wiki/document_details_base.html | 13 +- apps/wiki/templates/wiki/document_list.html | 13 +- apps/wiki/templates/wiki/document_upload.html | 11 +- .../templates/wiki/tabs/history_view.html | 2 +- .../templates/wiki/tabs/source_editor.html | 8 +- .../templates/wiki/tabs/summary_view.html | 11 +- .../wiki/tabs/summary_view_item.html | 1 - .../templates/wiki/tabs/wysiwyg_editor.html | 2 +- apps/wiki/urls.py | 30 +- apps/wiki/views.py | 304 ++++++++---------- redakcja/static/js/wiki/wikiapi.js | 6 +- 18 files changed, 452 insertions(+), 235 deletions(-) create mode 100644 apps/dvcs/migrations/0001_initial.py create mode 100644 apps/dvcs/migrations/__init__.py create mode 100644 apps/wiki/migrations/0003_auto__add_book.py diff --git a/apps/dvcs/migrations/0001_initial.py b/apps/dvcs/migrations/0001_initial.py new file mode 100644 index 00000000..c5e75c97 --- /dev/null +++ b/apps/dvcs/migrations/0001_initial.py @@ -0,0 +1,98 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'Change' + db.create_table('dvcs_change', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)), + ('patch', self.gf('django.db.models.fields.TextField')(blank=True)), + ('tree', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dvcs.Document'])), + ('parent', self.gf('django.db.models.fields.related.ForeignKey')(default=None, related_name='children', null=True, blank=True, to=orm['dvcs.Change'])), + ('merge_parent', self.gf('django.db.models.fields.related.ForeignKey')(default=None, related_name='merge_children', null=True, blank=True, to=orm['dvcs.Change'])), + ('description', self.gf('django.db.models.fields.TextField')(default='', blank=True)), + ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + )) + db.send_create_signal('dvcs', ['Change']) + + # Adding model 'Document' + db.create_table('dvcs_document', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('creator', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)), + ('head', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['dvcs.Change'], null=True, blank=True)), + )) + db.send_create_signal('dvcs', ['Document']) + + + def backwards(self, orm): + + # Deleting model 'Change' + db.delete_table('dvcs_change') + + # Deleting model 'Document' + db.delete_table('dvcs_document') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'dvcs.change': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'Change'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'merge_parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'merge_children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), + 'patch': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'tree': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dvcs.Document']"}) + }, + 'dvcs.document': { + 'Meta': {'object_name': 'Document'}, + 'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'head': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['dvcs.Change']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + } + } + + complete_apps = ['dvcs'] diff --git a/apps/dvcs/migrations/__init__.py b/apps/dvcs/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py index 18fe18fe..1c303873 100644 --- a/apps/dvcs/models.py +++ b/apps/dvcs/models.py @@ -42,7 +42,12 @@ class Change(models.Model): return pickle.dumps(mdiff.textdiff(src, dst)) def materialize(self): - changes = Change.objects.exclude(parent=None).filter( + # special care for merged nodes + if self.parent is None and self.merge_parent is not None: + return self.apply_to(self.merge_parent.materialize()) + + changes = Change.objects.filter( + ~models.Q(parent=None) | models.Q(merge_parent=None), tree=self.tree, created_at__lte=self.created_at).order_by('created_at') text = u'' @@ -80,6 +85,10 @@ class Change(models.Model): patch=patch, merge_parent=other, tree=self.tree, author=author, description=description) + def revert(self, **kwargs): + """ commit this version of a doc as new head """ + self.tree.commit(text=self.materialize(), **kwargs) + class Document(models.Model): """ @@ -90,6 +99,15 @@ class Document(models.Model): null=True, blank=True, default=None, help_text=_("This document's current head.")) + @classmethod + def create(cls, text='', *args, **kwargs): + instance = cls(*args, **kwargs) + instance.save() + head = instance.head + head.patch = Change.make_patch('', text) + head.save() + return instance + def __unicode__(self): return u"{0}, HEAD: {1}".format(self.id, self.head_id) @@ -100,14 +118,14 @@ class Document(models.Model): 'version': self.head_id, }) - def materialize(self, version=None): + def materialize(self, change=None): if self.head is None: return u'' - if version is None: - version = self.head - elif not isinstance(version, Change): - version = self.change_set.get(pk=version) - return version.materialize() + if change is None: + change = self.head + elif not isinstance(change, Change): + change = self.change_set.get(pk=change) + return change.materialize() def commit(self, **kwargs): if 'parent' not in kwargs: @@ -120,7 +138,7 @@ class Document(models.Model): if 'patch' not in kwargs: if 'text' not in kwargs: raise ValueError("You must provide either patch or target document.") - patch = Change.make_patch(self.materialize(version=parent), kwargs['text']) + patch = Change.make_patch(self.materialize(change=parent), kwargs['text']) else: if 'text' in kwargs: raise ValueError("You can provide only text or patch - not both") @@ -133,18 +151,28 @@ class Document(models.Model): self.head = old_head.merge_with(change, author=kwargs['author']) else: self.head = parent.make_child(patch, kwargs['author'], kwargs.get('description', '')) + self.save() return self.head def history(self): - return self.changes.all() + return self.change_set.all() + + def revision(self): + return self.change_set.all().count() + + def at_revision(self, rev): + if rev: + return self.change_set.all()[rev-1] + else: + return self.head @staticmethod def listener_initial_commit(sender, instance, created, **kwargs): if created: instance.head = Change.objects.create( author=instance.creator, - patch=pickle.dumps(mdiff.textdiff('', '')), + patch=Change.make_patch('', ''), tree=instance) instance.save() diff --git a/apps/wiki/admin.py b/apps/wiki/admin.py index 1a61b660..60a78f4a 100644 --- a/apps/wiki/admin.py +++ b/apps/wiki/admin.py @@ -2,4 +2,5 @@ from django.contrib import admin from wiki import models +admin.site.register(models.Book) admin.site.register(models.Theme) diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 74934bd2..b057be05 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -5,6 +5,7 @@ # from django import forms from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES +from wiki.models import Book from django.utils.translation import ugettext_lazy as _ @@ -18,16 +19,19 @@ class DocumentTagForm(forms.Form): revision = forms.IntegerField(widget=forms.HiddenInput) -class DocumentCreateForm(forms.Form): +class DocumentCreateForm(forms.ModelForm): """ Form used for creating new documents. """ - title = forms.CharField() - id = forms.RegexField(regex=ur"^[-\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]+$") file = forms.FileField(required=False) text = forms.CharField(required=False, widget=forms.Textarea) + class Meta: + model = Book + exclude = ['gallery'] + def clean(self): + super(DocumentCreateForm, self).clean() file = self.cleaned_data['file'] if file is not None: diff --git a/apps/wiki/migrations/0003_auto__add_book.py b/apps/wiki/migrations/0003_auto__add_book.py new file mode 100644 index 00000000..1c570043 --- /dev/null +++ b/apps/wiki/migrations/0003_auto__add_book.py @@ -0,0 +1,97 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'Book' + db.create_table('wiki_book', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=255, db_index=True)), + ('title', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('doc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dvcs.Document'])), + ('gallery', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + )) + db.send_create_signal('wiki', ['Book']) + + + def backwards(self, orm): + + # Deleting model 'Book' + db.delete_table('wiki_book') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'dvcs.change': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'Change'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'merge_parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'merge_children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), + 'patch': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'tree': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dvcs.Document']"}) + }, + 'dvcs.document': { + 'Meta': {'object_name': 'Document'}, + 'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'head': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['dvcs.Change']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'wiki.book': { + 'Meta': {'ordering': "['title']", 'object_name': 'Book'}, + 'doc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dvcs.Document']"}), + 'gallery': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'wiki.theme': { + 'Meta': {'ordering': "('name',)", 'object_name': 'Theme'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}) + } + } + + complete_apps = ['wiki'] diff --git a/apps/wiki/models.py b/apps/wiki/models.py index a3b952a0..a9264934 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -13,14 +13,36 @@ import logging logger = logging.getLogger("fnp.wiki") -class Document(models.Model): +class Book(models.Model): """ A document edited on the wiki """ - slug = models.CharField(_('slug')) - title = models.CharField(_('displayed title'), blank=True) - data = models.ForeignKey(dvcs_models.Document) - gallery = models.CharField(_('scan gallery name'), blank=True) + slug = models.SlugField(_('slug'), max_length=255, unique=True) + title = models.CharField(_('displayed title'), max_length=255, blank=True) + doc = models.ForeignKey(dvcs_models.Document, editable=False) + gallery = models.CharField(_('scan gallery name'), max_length=255, blank=True) + class Meta: + ordering = ['title'] + verbose_name = _('book') + verbose_name_plural = _('books') + + def __unicode__(self): + return self.title + + @classmethod + def create(cls, creator=None, text=u'', *args, **kwargs): + instance = cls(*args, **kwargs) + instance.doc = dvcs_models.Document.create(creator=creator, text=text) + instance.save() + return instance + + @staticmethod + def listener_create(sender, instance, created, **kwargs): + if created and instance.doc is None: + instance.doc = dvcs_models.Document.objects.create() + instance.save() + +models.signals.post_save.connect(Book.listener_create, sender=Book) diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html index 03231330..183da3de 100644 --- a/apps/wiki/templates/wiki/document_details_base.html +++ b/apps/wiki/templates/wiki/document_details_base.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load toolbar_tags i18n %} -{% block title %}{{ document.name }} - {{ block.super }}{% endblock %} +{% block title %}{{ book.title }} - {{ block.super }}{% endblock %} {% block extrahead %} {% load compressed %} {% compressed_css 'detail' %} @@ -16,15 +16,10 @@ {% block maincontent %} diff --git a/apps/wiki/templates/wiki/document_list.html b/apps/wiki/templates/wiki/document_list.html index 6853801f..726eaf29 100644 --- a/apps/wiki/templates/wiki/document_list.html +++ b/apps/wiki/templates/wiki/document_list.html @@ -1,7 +1,6 @@ {% extends "wiki/base.html" %} {% load i18n %} -{% load wiki %} {% block extrabody %} {{ block.super }} @@ -31,10 +30,10 @@ $(function() { - {% for doc in docs %} + {% for book in books %} - {{ doc|wiki_title }} + {{ book.title }} {% endfor %} @@ -47,9 +46,9 @@ $(function() {

{% trans "Your last edited documents" %}

    - {% for name, date in last_docs %} -
  1. {{ name|wiki_title }}
    ({{ date|date:"H:i:s, d/m/Y" }})
    2. + {% for slug, item in last_books %} +
  2. {{ item.title }}
    ({{ item.time|date:"H:i:s, d/m/Y" }})
    3. {% endfor %}
diff --git a/apps/wiki/templates/wiki/document_upload.html b/apps/wiki/templates/wiki/document_upload.html index d4c89d35..929ee4db 100644 --- a/apps/wiki/templates/wiki/document_upload.html +++ b/apps/wiki/templates/wiki/document_upload.html @@ -1,6 +1,5 @@ {% extends "wiki/base.html" %} {% load i18n %} -{% load wiki %} {% block leftcolumn %} @@ -25,15 +24,15 @@

{% trans "Offending files" %}

    {% for filename, title, error in error_list %} -
  • {{title|wiki_title}} ({{ filename }}): {{ error }}
    • +
  • {{ title }} ({{ filename }}): {{ error }}
    • {% endfor %}
{% if ok_list %}

{% trans "Correct files" %}

    - {% for filename, title in ok_list %} -
  • {{title|wiki_title}} ({{ filename }})
    • + {% for filename, slug, title in ok_list %} +
  • {{ title }} ({{ filename }})
    • {% endfor %}
{% endif %} @@ -44,8 +43,8 @@

{% trans "Files have been successfully uploaded to the repository." %}

{% trans "Uploaded files" %}

    - {% for filename, title in ok_list %} -
  • {{ title|wiki_title }} ({{ filename }})
    • + {% for filename, slug, title in ok_list %} +
  • {{ title }} ({{ filename }})
    • {% endfor %}
{% endif %} diff --git a/apps/wiki/templates/wiki/tabs/history_view.html b/apps/wiki/templates/wiki/tabs/history_view.html index d9b74dcb..7d61f993 100644 --- a/apps/wiki/templates/wiki/tabs/history_view.html +++ b/apps/wiki/templates/wiki/tabs/history_view.html @@ -9,7 +9,7 @@ data-enabled-when="1" disabled="disabled">{% trans "Revert document" %} + data-basehref="{% url wiki_editor_readonly book.slug %}">{% trans "View version" %}
diff --git a/apps/wiki/templates/wiki/tabs/source_editor.html b/apps/wiki/templates/wiki/tabs/source_editor.html index 72d881c4..9c3558f0 100644 --- a/apps/wiki/templates/wiki/tabs/source_editor.html +++ b/apps/wiki/templates/wiki/tabs/source_editor.html @@ -1,10 +1,10 @@ {% load toolbar_tags i18n %}
- {% if not document_info.readonly %}{% toolbar %}{% endif %} + {% if not readonly %}{% toolbar %}{% endif %} - -
\ No newline at end of file +
diff --git a/apps/wiki/templates/wiki/tabs/summary_view.html b/apps/wiki/templates/wiki/tabs/summary_view.html index c33baecc..90c24298 100644 --- a/apps/wiki/templates/wiki/tabs/summary_view.html +++ b/apps/wiki/templates/wiki/tabs/summary_view.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load wiki %}
- {% if not document_info.readonly %} + {% if not readonly %} diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py index 2b4a65ae..ceb7416a 100644 --- a/apps/wiki/urls.py +++ b/apps/wiki/urls.py @@ -4,48 +4,48 @@ from django.views.generic.simple import redirect_to from django.conf import settings -PART = ur"""[ ĄĆĘŁŃÓŚŻŹąćęłńóśżź0-9\w_.-]+""" +#PART = ur"""[ ĄĆĘŁŃÓŚŻŹąćęłńóśżź0-9\w_.-]+""" urlpatterns = patterns('wiki.views', url(r'^$', redirect_to, {'url': 'catalogue/'}), url(r'^catalogue/$', 'document_list', name='wiki_document_list'), - url(r'^catalogue/([^/]+)/$', 'document_list'), - url(r'^catalogue/([^/]+)/([^/]+)/$', 'document_list'), - url(r'^catalogue/([^/]+)/([^/]+)/([^/]+)$', 'document_list'), + #url(r'^catalogue/([^/]+)/$', 'document_list'), + #url(r'^catalogue/([^/]+)/([^/]+)/$', 'document_list'), + #url(r'^catalogue/([^/]+)/([^/]+)/([^/]+)$', 'document_list'), - url(r'^(?P%s)$' % PART, + url(r'^(?P[^/]+)/$', 'editor', name="wiki_editor"), - url(r'^(?P[^/]+)/readonly$', + url(r'^(?P[^/]+)/readonly$', 'editor_readonly', name="wiki_editor_readonly"), url(r'^upload/$', 'upload', name='wiki_upload'), - url(r'^create/(?P[^/]+)', + url(r'^create/(?P[^/]+)', 'create_missing', name='wiki_create_missing'), url(r'^(?P[^/]+)/gallery$', 'gallery', name="wiki_gallery"), - url(r'^(?P[^/]+)/history$', + url(r'^(?P[^/]+)/history$', 'history', name="wiki_history"), - url(r'^(?P[^/]+)/rev$', + url(r'^(?P[^/]+)/rev$', 'revision', name="wiki_revision"), - url(r'^(?P[^/]+)/text$', + url(r'^(?P[^/]+)/text$', 'text', name="wiki_text"), - url(r'^(?P[^/]+)/revert$', + url(r'^(?P[^/]+)/revert$', 'revert', name='wiki_revert'), - url(r'^(?P[^/]+)/publish$', 'publish', name="wiki_publish"), - url(r'^(?P[^/]+)/publish/(?P\d+)$', 'publish', name="wiki_publish"), + #url(r'^(?P[^/]+)/publish$', 'publish', name="wiki_publish"), + #url(r'^(?P[^/]+)/publish/(?P\d+)$', 'publish', name="wiki_publish"), - url(r'^(?P[^/]+)/diff$', 'diff', name="wiki_diff"), - url(r'^(?P[^/]+)/tags$', 'add_tag', name="wiki_add_tag"), + url(r'^(?P[^/]+)/diff$', 'diff', name="wiki_diff"), + #url(r'^(?P[^/]+)/tags$', 'add_tag', name="wiki_add_tag"), diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 918eb91d..6f09ddd6 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,5 +1,4 @@ import os -import functools import logging logger = logging.getLogger("fnp.wiki") @@ -11,8 +10,9 @@ from django.core.urlresolvers import reverse from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, ajax_require_permission, recursive_groupby) from django import http +from django.shortcuts import get_object_or_404, redirect -from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name, Theme +from wiki.models import Book, Theme from wiki.forms import DocumentTextSaveForm, DocumentTextRevertForm, DocumentTagForm, DocumentCreateForm, DocumentsUploadForm from datetime import datetime from django.utils.encoding import smart_unicode @@ -26,62 +26,42 @@ from django.middleware.gzip import GZipMiddleware # from django.views.decorators.cache import never_cache -import wlapi import nice_diff import operator MAX_LAST_DOCS = 10 -def normalized_name(view): - - @functools.wraps(view) - def decorated(request, name, *args): - normalized = normalize_name(name) - logger.debug('View check %r -> %r', name, normalized) - - if normalized != name: - return http.HttpResponseRedirect( - reverse('wiki_' + view.__name__, kwargs={'name': normalized})) - - return view(request, name, *args) - - return decorated - - @never_cache def document_list(request): return direct_to_template(request, 'wiki/document_list.html', extra_context={ - 'docs': getstorage().all(), - 'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(), - key=operator.itemgetter(1), reverse=True), + 'books': Book.objects.all(), + 'last_books': sorted(request.session.get("wiki_last_books", {}).items(), + key=lambda x: x[1]['time'], reverse=True), }) @never_cache -@normalized_name -def editor(request, name, template_name='wiki/document_details.html'): - storage = getstorage() - +def editor(request, slug, template_name='wiki/document_details.html'): try: - document = storage.get(name) - except DocumentNotFound: - return http.HttpResponseRedirect(reverse("wiki_create_missing", args=[name])) + book = Book.objects.get(slug=slug) + except Book.DoesNotExist: + return http.HttpResponseRedirect(reverse("wiki_create_missing", args=[slug])) access_time = datetime.now() - last_documents = request.session.get("wiki_last_docs", {}) - last_documents[name] = access_time + last_books = request.session.get("wiki_last_books", {}) + last_books[slug] = { + 'time': access_time, + 'title': book.title, + } - if len(last_documents) > MAX_LAST_DOCS: - oldest_key = min(last_documents, key=last_documents.__getitem__) - del last_documents[oldest_key] - request.session['wiki_last_docs'] = last_documents + if len(last_books) > MAX_LAST_DOCS: + oldest_key = min(last_books, key=operator.itemgetter('time')) + del last_books[oldest_key] + request.session['wiki_last_books'] = last_books return direct_to_template(request, template_name, extra_context={ - 'document': document, - 'document_name': document.name, - 'document_info': document.info, - 'document_meta': document.meta, + 'book': book, 'forms': { "text_save": DocumentTextSaveForm(prefix="textsave"), "text_revert": DocumentTextRevertForm(prefix="textrevert"), @@ -92,95 +72,105 @@ def editor(request, name, template_name='wiki/document_details.html'): @require_GET -@normalized_name -def editor_readonly(request, name, template_name='wiki/document_details_readonly.html'): - name = normalize_name(name) - storage = getstorage() - +def editor_readonly(request, slug, template_name='wiki/document_details_readonly.html'): try: + book = Book.objects.get(slug=slug) revision = request.GET['revision'] - document = storage.get(name, revision) - except (KeyError, DocumentNotFound): + except KeyError: raise http.Http404 access_time = datetime.now() - last_documents = request.session.get("wiki_last_docs", {}) - last_documents[name] = access_time + last_books = request.session.get("wiki_last_books", {}) + last_books[slug] = { + 'time': access_time, + 'title': book.title, + } - if len(last_documents) > MAX_LAST_DOCS: - oldest_key = min(last_documents, key=last_documents.__getitem__) - del last_documents[oldest_key] - request.session['wiki_last_docs'] = last_documents + if len(last_books) > MAX_LAST_DOCS: + oldest_key = min(last_books, key=operator.itemgetter('time')) + del last_books[oldest_key] + request.session['wiki_last_books'] = last_books return direct_to_template(request, template_name, extra_context={ - 'document': document, - 'document_name': document.name, - 'document_info': dict(document.info(), readonly=True), - 'document_meta': document.meta, + 'book': book, + 'revision': revision, + 'readonly': True, 'REDMINE_URL': settings.REDMINE_URL, }) -@normalized_name -def create_missing(request, name): - storage = getstorage() +def create_missing(request, slug): + slug = slug.replace(' ', '-') if request.method == "POST": form = DocumentCreateForm(request.POST, request.FILES) if form.is_valid(): - doc = storage.create_document( - name=form.cleaned_data['id'], + + if request.user.is_authenticated(): + creator = request.user + else: + creator = None + book = Book.create(creator=creator, + slug=form.cleaned_data['slug'], + title=form.cleaned_data['title'], text=form.cleaned_data['text'], ) - return http.HttpResponseRedirect(reverse("wiki_editor", args=[doc.name])) + return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug])) else: form = DocumentCreateForm(initial={ - "id": name.replace(" ", "_"), - "title": name.title(), + "slug": slug, + "title": slug.replace('-', ' ').title(), }) return direct_to_template(request, "wiki/document_create_missing.html", extra_context={ - "document_name": name, + "slug": slug, "form": form, }) def upload(request): - storage = getstorage() - if request.method == "POST": form = DocumentsUploadForm(request.POST, request.FILES) if form.is_valid(): + import slughifi + + if request.user.is_authenticated(): + creator = request.user + else: + creator = None + zip = form.cleaned_data['zip'] skipped_list = [] ok_list = [] error_list = [] - titles = {} - existing = storage.all() + slugs = {} + existing = [book.slug for book in Book.objects.all()] for filename in zip.namelist(): if filename[-1] == '/': continue - title = normalize_name(os.path.basename(filename)[:-4]) - if not (title and filename.endswith('.xml')): + title = os.path.basename(filename)[:-4] + slug = slughifi(title) + if not (slug and filename.endswith('.xml')): skipped_list.append(filename) - elif title in titles: - error_list.append((filename, title, _('Title already used for %s' % titles[title]))) - elif title in existing: - error_list.append((filename, title, _('Title already used in repository.'))) + elif slug in slugs: + error_list.append((filename, slug, _('Slug already used for %s' % slugs[slug]))) + elif slug in existing: + error_list.append((filename, slug, _('Slug already used in repository.'))) else: try: zip.read(filename).decode('utf-8') # test read - ok_list.append((filename, title)) + ok_list.append((filename, slug, title)) except UnicodeDecodeError: error_list.append((filename, title, _('File should be UTF-8 encoded.'))) - titles[title] = filename + slugs[slug] = filename if not error_list: - for filename, title in ok_list: - storage.create_document( - name=title, - text=zip.read(filename).decode('utf-8') + for filename, slug, title in ok_list: + Book.create(creator=creator, + slug=slug, + title=title, + text=zip.read(filename).decode('utf-8'), ) return direct_to_template(request, "wiki/document_upload.html", extra_context={ @@ -189,12 +179,6 @@ def upload(request): "skipped_list": skipped_list, "error_list": error_list, }) - #doc = storage.create_document( - # name=base, - # text=form.cleaned_data['text'], - - - return http.HttpResponse('\n'.join(yeslist) + '\n\n' + '\n'.join(nolist)) else: form = DocumentsUploadForm() @@ -204,93 +188,77 @@ def upload(request): @never_cache -@normalized_name @decorator_from_middleware(GZipMiddleware) -def text(request, name): - storage = getstorage() +def text(request, slug): + doc = get_object_or_404(Book, slug=slug).doc if request.method == 'POST': form = DocumentTextSaveForm(request.POST, prefix="textsave") if form.is_valid(): - revision = form.cleaned_data['parent_revision'] - document = storage.get_or_404(name, revision) - document.text = form.cleaned_data['text'] - comment = form.cleaned_data['comment'] - if form.cleaned_data['stage_completed']: - comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed'] + # TODO: + # - stage completion should be stored (as a relation) + if request.user.is_authenticated(): - author_name = request.user - author_email = request.user.email + author = request.user else: - author_name = form.cleaned_data['author_name'] - author_email = form.cleaned_data['author_email'] - author = "%s <%s>" % (author_name, author_email) - storage.put(document, author=author, comment=comment, parent=revision) - document = storage.get(name) + author = None + text = form.cleaned_data['text'] + parent_revision = form.cleaned_data['parent_revision'] + parent = doc.at_revision(parent_revision) + doc.commit(author=author, + text=text, + parent=parent, + description=form.cleaned_data['comment'], + ) + revision = doc.revision() return JSONResponse({ - 'text': document.plain_text if revision != document.revision else None, - 'meta': document.meta(), - 'revision': document.revision, + 'text': doc.materialize() if parent_revision != revision else None, + 'meta': {}, + 'revision': revision, }) else: return JSONFormInvalid(form) else: revision = request.GET.get("revision", None) - + try: - try: - revision = revision and int(revision) - logger.info("Fetching %s", revision) - document = storage.get(name, revision) - except ValueError: - # treat as a tag - logger.info("Fetching tag %s", revision) - document = storage.get_by_tag(name, revision) - except DocumentNotFound: - raise http.Http404 + revision = int(revision) + except ValueError: + revision = None return JSONResponse({ - 'text': document.plain_text, - 'meta': document.meta(), - 'revision': document.revision, + 'text': doc.at_revision(revision).materialize(), + 'meta': {}, + 'revision': revision if revision else doc.revision(), }) @never_cache -@normalized_name @require_POST -def revert(request, name): - storage = getstorage() +def revert(request, slug): form = DocumentTextRevertForm(request.POST, prefix="textrevert") if form.is_valid(): - print 'valid' + doc = get_object_or_404(Book, slug=slug).doc revision = form.cleaned_data['revision'] comment = form.cleaned_data['comment'] comment += "\n#revert to %s" % revision if request.user.is_authenticated(): - author_name = request.user - author_email = request.user.email + author = request.user else: - author_name = form.cleaned_data['author_name'] - author_email = form.cleaned_data['author_email'] - author = "%s <%s>" % (author_name, author_email) - - before = storage.get(name).revision - logger.info("Reverting %s to %s", name, revision) - storage.revert(name, revision, comment=comment, author=author) - logger.info("Fetching %s", name) - document = storage.get(name) + author = None + before = doc.revision() + logger.info("Reverting %s to %s", slug, revision) + doc.at_revision(revision).revert(author=author, description=comment) return JSONResponse({ - 'text': document.plain_text if before != document.revision else None, - 'meta': document.meta(), - 'revision': document.revision, + 'text': doc.materialize() if before != doc.revision() else None, + 'meta': {}, + 'revision': doc.revision(), }) else: - print 'invalid' return JSONFormInvalid(form) @@ -322,10 +290,7 @@ def gallery(request, directory): @never_cache -@normalized_name -def diff(request, name): - storage = getstorage() - +def diff(request, slug): revA = int(request.GET.get('from', 0)) revB = int(request.GET.get('to', 0)) @@ -335,33 +300,48 @@ def diff(request, name): if revB == 0: revB = None - docA = storage.get_or_404(name, int(revA)) - docB = storage.get_or_404(name, int(revB)) + doc = get_object_or_404(Book, slug=slug).doc + docA = doc.at_revision(revA).materialize() + docB = doc.at_revision(revB).materialize() - return http.HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(), - docB.plain_text.splitlines(), context=3)) + return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), + docB.splitlines(), context=3)) @never_cache -@normalized_name -def revision(request, name): - storage = getstorage() - - try: - return http.HttpResponse(str(storage.doc_meta(name)['revision'])) - except DocumentNotFound: - raise http.Http404 +def revision(request, slug): + book = get_object_or_404(Book, slug=slug) + return http.HttpResponse(str(book.doc.revision())) @never_cache -@normalized_name -def history(request, name): - storage = getstorage() - +def history(request, slug): # TODO: pagination - changesets = list(storage.history(name)) + book = get_object_or_404(Book, slug=slug) + rev = book.doc.revision() + changes = [] + for change in book.doc.history().order_by('-created_at'): + if change.author: + author = "%s %s <%s>" % ( + change.author.first_name, + change.author.last_name, + change.author.email) + else: + author = None + changes.append({ + "version": rev, + "description": change.description, + "author": author, + "date": change.created_at, + "tag": [], + }) + rev -= 1 + return JSONResponse(changes) + - return JSONResponse(changesets) + +""" +import wlapi @require_POST @@ -395,7 +375,7 @@ def publish(request, name): return JSONResponse({"result": api.publish_book(document)}) except wlapi.APICallException, e: return JSONServerError({"message": str(e)}) - +""" def themes(request): prefix = request.GET.get('q', '') diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js index 8da5929a..1fe49d48 100644 --- a/redakcja/static/js/wiki/wikiapi.js +++ b/redakcja/static/js/wiki/wikiapi.js @@ -234,11 +234,7 @@ data[this.name] = this.value; }); - var metaComment = '\n' - - data['textsave-text'] = metaComment + self.text; + data['textsave-text'] = self.text; $.ajax({ url: reverse("ajax_document_text", self.id), -- 2.20.1 From 793b39c86e9583467f1cbc41f8b1a4677d079f23 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 20 May 2011 15:30:30 +0200 Subject: [PATCH 08/16] text splitted into chunks, parts can be automagically joined (but no parts adding mechanism yet), some URL changes --- apps/dvcs/migrations/0001_initial.py | 14 ++- apps/dvcs/models.py | 43 ++++---- apps/wiki/admin.py | 7 +- ...nique_chunk_book_number__add_unique_ch.py} | 56 ++++++++-- apps/wiki/models.py | 101 ++++++++++++++++-- apps/wiki/templates/wiki/book_detail.html | 17 +++ .../templates/wiki/document_details_base.html | 4 +- apps/wiki/templates/wiki/document_list.html | 23 +++- .../templates/wiki/tabs/history_view.html | 2 +- .../templates/wiki/tabs/source_editor.html | 5 - .../templates/wiki/tabs/summary_view.html | 10 +- apps/wiki/urls.py | 24 +++-- apps/wiki/views.py | 100 +++++++++++------ redakcja/static/css/filelist.css | 13 ++- redakcja/static/js/wiki/wikiapi.js | 18 ++-- redakcja/static/js/wiki/xslt.js | 7 +- redakcja/static/xsl/wl2html_client.xsl | 6 +- 17 files changed, 338 insertions(+), 112 deletions(-) rename apps/wiki/migrations/{0003_auto__add_book.py => 0003_auto__add_book__add_chunk__add_unique_chunk_book_number__add_unique_ch.py} (67%) create mode 100755 apps/wiki/templates/wiki/book_detail.html diff --git a/apps/dvcs/migrations/0001_initial.py b/apps/dvcs/migrations/0001_initial.py index c5e75c97..0e01d03b 100644 --- a/apps/dvcs/migrations/0001_initial.py +++ b/apps/dvcs/migrations/0001_initial.py @@ -14,13 +14,17 @@ class Migration(SchemaMigration): ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)), ('patch', self.gf('django.db.models.fields.TextField')(blank=True)), ('tree', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dvcs.Document'])), + ('revision', self.gf('django.db.models.fields.IntegerField')(db_index=True)), ('parent', self.gf('django.db.models.fields.related.ForeignKey')(default=None, related_name='children', null=True, blank=True, to=orm['dvcs.Change'])), ('merge_parent', self.gf('django.db.models.fields.related.ForeignKey')(default=None, related_name='merge_children', null=True, blank=True, to=orm['dvcs.Change'])), ('description', self.gf('django.db.models.fields.TextField')(default='', blank=True)), - ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)), )) db.send_create_signal('dvcs', ['Change']) + # Adding unique constraint on 'Change', fields ['tree', 'revision'] + db.create_unique('dvcs_change', ['tree_id', 'revision']) + # Adding model 'Document' db.create_table('dvcs_document', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), @@ -32,6 +36,9 @@ class Migration(SchemaMigration): def backwards(self, orm): + # Removing unique constraint on 'Change', fields ['tree', 'revision'] + db.delete_unique('dvcs_change', ['tree_id', 'revision']) + # Deleting model 'Change' db.delete_table('dvcs_change') @@ -77,14 +84,15 @@ class Migration(SchemaMigration): 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, 'dvcs.change': { - 'Meta': {'ordering': "('created_at',)", 'object_name': 'Change'}, + 'Meta': {'ordering': "('created_at',)", 'unique_together': "(['tree', 'revision'],)", 'object_name': 'Change'}, 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'merge_parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'merge_children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), 'parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), 'patch': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'revision': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), 'tree': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dvcs.Document']"}) }, 'dvcs.document': { diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py index 1c303873..9c9d350b 100644 --- a/apps/dvcs/models.py +++ b/apps/dvcs/models.py @@ -15,6 +15,7 @@ class Change(models.Model): author = models.ForeignKey(User, null=True, blank=True) patch = models.TextField(blank=True) tree = models.ForeignKey('Document') + revision = models.IntegerField(db_index=True) parent = models.ForeignKey('self', null=True, blank=True, default=None, @@ -25,14 +26,23 @@ class Change(models.Model): related_name="merge_children") description = models.TextField(blank=True, default='') - created_at = models.DateTimeField(auto_now_add=True) + created_at = models.DateTimeField(auto_now_add=True, db_index=True) class Meta: ordering = ('created_at',) + unique_together = ['tree', 'revision'] def __unicode__(self): return u"Id: %r, Tree %r, Parent %r, Patch '''\n%s'''" % (self.id, self.tree_id, self.parent_id, self.patch) + def save(self, *args, **kwargs): + """ + take the next available revision number if none yet + """ + if self.revision is None: + self.revision = self.tree.revision() + 1 + return super(Change, self).save(*args, **kwargs) + @staticmethod def make_patch(src, dst): if isinstance(src, unicode): @@ -46,10 +56,9 @@ class Change(models.Model): if self.parent is None and self.merge_parent is not None: return self.apply_to(self.merge_parent.materialize()) - changes = Change.objects.filter( - ~models.Q(parent=None) | models.Q(merge_parent=None), + changes = Change.objects.exclude(parent=None).filter( tree=self.tree, - created_at__lte=self.created_at).order_by('created_at') + revision__lte=self.revision).order_by('revision') text = u'' for change in changes: text = change.apply_to(text) @@ -99,15 +108,6 @@ class Document(models.Model): null=True, blank=True, default=None, help_text=_("This document's current head.")) - @classmethod - def create(cls, text='', *args, **kwargs): - instance = cls(*args, **kwargs) - instance.save() - head = instance.head - head.patch = Change.make_patch('', text) - head.save() - return instance - def __unicode__(self): return u"{0}, HEAD: {1}".format(self.id, self.head_id) @@ -144,26 +144,30 @@ class Document(models.Model): raise ValueError("You can provide only text or patch - not both") patch = kwargs['patch'] + author = kwargs.get('author', None) + old_head = self.head if parent != old_head: - change = parent.make_merge_child(patch, kwargs['author'], kwargs.get('description', '')) + change = parent.make_merge_child(patch, author, kwargs.get('description', '')) # not Fast-Forward - perform a merge - self.head = old_head.merge_with(change, author=kwargs['author']) + self.head = old_head.merge_with(change, author=author) else: - self.head = parent.make_child(patch, kwargs['author'], kwargs.get('description', '')) + self.head = parent.make_child(patch, author, kwargs.get('description', '')) self.save() return self.head def history(self): - return self.change_set.all() + return self.change_set.filter(revision__gt=0) def revision(self): - return self.change_set.all().count() + rev = self.change_set.aggregate( + models.Max('revision'))['revision__max'] + return rev if rev is not None else 0 def at_revision(self, rev): if rev: - return self.change_set.all()[rev-1] + return self.change_set.get(revision=rev) else: return self.head @@ -171,6 +175,7 @@ class Document(models.Model): def listener_initial_commit(sender, instance, created, **kwargs): if created: instance.head = Change.objects.create( + revision=0, author=instance.creator, patch=Change.make_patch('', ''), tree=instance) diff --git a/apps/wiki/admin.py b/apps/wiki/admin.py index 60a78f4a..9725d0bf 100644 --- a/apps/wiki/admin.py +++ b/apps/wiki/admin.py @@ -2,5 +2,10 @@ from django.contrib import admin from wiki import models -admin.site.register(models.Book) +class BookAdmin(admin.ModelAdmin): + prepopulated_fields = {'slug': ['title']} + + +admin.site.register(models.Book, BookAdmin) +admin.site.register(models.Chunk) admin.site.register(models.Theme) diff --git a/apps/wiki/migrations/0003_auto__add_book.py b/apps/wiki/migrations/0003_auto__add_book__add_chunk__add_unique_chunk_book_number__add_unique_ch.py similarity index 67% rename from apps/wiki/migrations/0003_auto__add_book.py rename to apps/wiki/migrations/0003_auto__add_book__add_chunk__add_unique_chunk_book_number__add_unique_ch.py index 1c570043..39154ac1 100644 --- a/apps/wiki/migrations/0003_auto__add_book.py +++ b/apps/wiki/migrations/0003_auto__add_book__add_chunk__add_unique_chunk_book_number__add_unique_ch.py @@ -11,19 +11,46 @@ class Migration(SchemaMigration): # Adding model 'Book' db.create_table('wiki_book', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=255, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), - ('doc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dvcs.Document'])), + ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=128, db_index=True)), ('gallery', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='children', null=True, to=orm['wiki.Book'])), + ('parent_number', self.gf('django.db.models.fields.IntegerField')(db_index=True, null=True, blank=True)), )) db.send_create_signal('wiki', ['Book']) + # Adding model 'Chunk' + db.create_table('wiki_chunk', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('book', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['wiki.Book'])), + ('number', self.gf('django.db.models.fields.IntegerField')()), + ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, db_index=True)), + ('comment', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('doc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dvcs.Document'], unique=True)), + )) + db.send_create_signal('wiki', ['Chunk']) + + # Adding unique constraint on 'Chunk', fields ['book', 'number'] + db.create_unique('wiki_chunk', ['book_id', 'number']) + + # Adding unique constraint on 'Chunk', fields ['book', 'slug'] + db.create_unique('wiki_chunk', ['book_id', 'slug']) + def backwards(self, orm): + # Removing unique constraint on 'Chunk', fields ['book', 'slug'] + db.delete_unique('wiki_chunk', ['book_id', 'slug']) + + # Removing unique constraint on 'Chunk', fields ['book', 'number'] + db.delete_unique('wiki_chunk', ['book_id', 'number']) + # Deleting model 'Book' db.delete_table('wiki_book') + # Deleting model 'Chunk' + db.delete_table('wiki_chunk') + models = { 'auth.group': { @@ -63,14 +90,15 @@ class Migration(SchemaMigration): 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, 'dvcs.change': { - 'Meta': {'ordering': "('created_at',)", 'object_name': 'Change'}, + 'Meta': {'ordering': "('created_at',)", 'unique_together': "(['tree', 'revision'],)", 'object_name': 'Change'}, 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'merge_parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'merge_children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), 'parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'children'", 'null': 'True', 'blank': 'True', 'to': "orm['dvcs.Change']"}), 'patch': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'revision': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), 'tree': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dvcs.Document']"}) }, 'dvcs.document': { @@ -80,12 +108,22 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) }, 'wiki.book': { - 'Meta': {'ordering': "['title']", 'object_name': 'Book'}, - 'doc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dvcs.Document']"}), + 'Meta': {'ordering': "['parent_number', 'title']", 'object_name': 'Book'}, 'gallery': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['wiki.Book']"}), + 'parent_number': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'wiki.chunk': { + 'Meta': {'ordering': "['number']", 'unique_together': "[['book', 'number'], ['book', 'slug']]", 'object_name': 'Chunk'}, + 'book': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wiki.Book']"}), + 'comment': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'doc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dvcs.Document']", 'unique': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.IntegerField', [], {}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}) }, 'wiki.theme': { 'Meta': {'ordering': "('name',)", 'object_name': 'Theme'}, diff --git a/apps/wiki/models.py b/apps/wiki/models.py index a9264934..66f8a288 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -3,6 +3,9 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +import itertools +import re + from django.db import models from django.utils.translation import ugettext_lazy as _ @@ -13,16 +16,22 @@ import logging logger = logging.getLogger("fnp.wiki") +RE_TRIM_BEGIN = re.compile("^$", re.M) +RE_TRIM_END = re.compile("^$", re.M) + + class Book(models.Model): """ A document edited on the wiki """ - slug = models.SlugField(_('slug'), max_length=255, unique=True) - title = models.CharField(_('displayed title'), max_length=255, blank=True) - doc = models.ForeignKey(dvcs_models.Document, editable=False) + title = models.CharField(_('title'), max_length=255) + slug = models.SlugField(_('slug'), max_length=128, unique=True) gallery = models.CharField(_('scan gallery name'), max_length=255, blank=True) + parent = models.ForeignKey('self', null=True, blank=True, verbose_name=_('parent'), related_name="children") + parent_number = models.IntegerField(_('parent number'), null=True, blank=True, db_index=True) + class Meta: - ordering = ['title'] + ordering = ['parent_number', 'title'] verbose_name = _('book') verbose_name_plural = _('books') @@ -31,20 +40,96 @@ class Book(models.Model): @classmethod def create(cls, creator=None, text=u'', *args, **kwargs): + """ + >>> Book.create(slug='x', text='abc').materialize() + 'abc' + """ instance = cls(*args, **kwargs) - instance.doc = dvcs_models.Document.create(creator=creator, text=text) instance.save() + instance.chunk_set.all()[0].doc.commit(author=creator, text=text) return instance + @staticmethod + def trim(text, trim_begin=True, trim_end=True): + """ + Cut off everything before RE_TRIM_BEGIN and after RE_TRIM_END, so + that eg. one big XML file can be compiled from many small XML files. + """ + if trim_begin: + text = RE_TRIM_BEGIN.split(text, maxsplit=1)[-1] + if trim_end: + text = RE_TRIM_END.split(text, maxsplit=1)[0] + return text + + def materialize(self): + """ + Get full text of the document compiled from chunks. + Takes the current versions of all texts for now, but it should + be possible to specify a tag or a point in time for compiling. + + First non-empty text's beginning isn't trimmed, + and last non-empty text's end isn't trimmed. + """ + texts = [] + trim_begin = False + text = '' + for chunk in self.chunk_set.all(): + next_text = chunk.doc.materialize() + if not next_text: + continue + if text: + # trim the end, because there's more non-empty text + # don't trim beginning, if `text' is the first non-empty part + texts.append(self.trim(text, trim_begin=trim_begin)) + trim_begin = True + text = next_text + # don't trim the end, because there's no more text coming after `text' + # only trim beginning if it's not still the first non-empty + texts.append(self.trim(text, trim_begin=trim_begin, trim_end=False)) + return "".join(texts) + @staticmethod def listener_create(sender, instance, created, **kwargs): - if created and instance.doc is None: - instance.doc = dvcs_models.Document.objects.create() - instance.save() + if created: + instance.chunk_set.create(number=1, slug='1') models.signals.post_save.connect(Book.listener_create, sender=Book) +class Chunk(models.Model): + """ An editable chunk of text. Every Book text is divided into chunks. """ + + book = models.ForeignKey(Book) + number = models.IntegerField() + slug = models.SlugField() + comment = models.CharField(max_length=255) + doc = models.ForeignKey(dvcs_models.Document, editable=False, unique=True, null=True) + + class Meta: + unique_together = [['book', 'number'], ['book', 'slug']] + ordering = ['number'] + + def __unicode__(self): + return "%d-%d: %s" % (self.book_id, self.number, self.comment) + + def save(self, *args, **kwargs): + if self.doc is None: + self.doc = dvcs_models.Document.objects.create() + super(Chunk, self).save(*args, **kwargs) + + @classmethod + def get(cls, slug, chunk=None): + if chunk is None: + return cls.objects.get(book__slug=slug, number=1) + else: + return cls.objects.get(book__slug=slug, slug=chunk) + + def pretty_name(self): + return "%s, %s (%d/%d)" % (self.book.title, self.comment, + self.number, self.book.chunk_set.count()) + + + ''' from wiki import settings, constants diff --git a/apps/wiki/templates/wiki/book_detail.html b/apps/wiki/templates/wiki/book_detail.html new file mode 100755 index 00000000..ee645f13 --- /dev/null +++ b/apps/wiki/templates/wiki/book_detail.html @@ -0,0 +1,17 @@ +{% extends "wiki/base.html" %} +{% load i18n %} + +{% block leftcolumn %} + +

{{ object.title }}

+ + + {% for chunk in object.chunk_set.all %} + + {% endfor %} +
{{ chunk.number }}{{ chunk.slug }}
+ +{% endblock leftcolumn %} + +{% block rightcolumn %} +{% endblock rightcolumn %} diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html index 183da3de..3eda939b 100644 --- a/apps/wiki/templates/wiki/document_details_base.html +++ b/apps/wiki/templates/wiki/document_details_base.html @@ -16,9 +16,9 @@ {% block maincontent %}