moin/2.0: MoinMoin/items/__init_

annotate MoinMoin/items/init.py @ 1236:3b723046d80e

First, check if the user has the needed ACLs before allowing the user to enter page content or choose content type for creating a new page

author	Bilal Akhtar <bilalakhtar@ubuntu.com>
date	Wed, 11 Jan 2012 23:18:26 -0500
parents	4899314f049a
children	20625402725c 1c66f39aa44f

rev	line source
26 4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 24 diff changeset	1 # Copyright: 2009 MoinMoin:ThomasWaldmann
254 91330de48b9c items: implemented 2.6 r:2031 alpha of svg-edit using a save extension for doing a single post for svg and png data. Reimar Bauer <rb.proj AT googlemail DOT com> parents: 248 diff changeset	2 # Copyright: 2009-2011 MoinMoin:ReimarBauer
26 4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 24 diff changeset	3 # Copyright: 2009 MoinMoin:ChristopherDenter
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	4 # Copyright: 2008,2009 MoinMoin:BastianBlank
26 4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 24 diff changeset	5 # Copyright: 2010 MoinMoin:ValentinJaniaut
4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 24 diff changeset	6 # Copyright: 2010 MoinMoin:DiogenesAugusto
4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 24 diff changeset	7 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 24 diff changeset	8
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	9 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	10 MoinMoin - misc. mimetype items
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	11
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	12 While MoinMoin.storage cares for backend storage of items,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	13 this module cares for more high-level, frontend items,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	14 e.g. showing, editing, etc. of wiki items.
26 4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 24 diff changeset	15 """
168 7926fa38e797 update TODO, move some TODOs to the code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 157 diff changeset	16 # TODO: split this huge module into multiple ones after code has stabilized
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	17
71 efe399a0375b cleanup some imports, fix pep8 issue Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 67 diff changeset	18 import os, re, time, datetime, base64
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	19 import tarfile
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	20 import zipfile
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	21 import tempfile
486 b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	22 import itertools
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	23 from StringIO import StringIO
204 af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	24 from array import array
173 89f50aed143f move mimetype related code from wikiutil to util.mimetype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 170 diff changeset	25
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	26 from flatland import Form, String, Integer, Boolean, Enum
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	27 from flatland.validation import Validator, Present, IsEmail, ValueBetween, URLValidator, Converted
779 815c46100e2c whooshify get_templates, adapt MimeType analyzer so it yields also a full and normalized contenttype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 525 diff changeset	28
780 f5e0f85e66ce whooshify get_index() Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 779 diff changeset	29 from whoosh.query import Term, And, Prefix
779 815c46100e2c whooshify get_templates, adapt MimeType analyzer so it yields also a full and normalized contenttype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 525 diff changeset	30
244 a11656ba1eab modify views: use flatland also for the file upload form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 243 diff changeset	31 from MoinMoin.util.forms import FileStorage
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	32
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	33 from MoinMoin.security.textcha import TextCha, TextChaizedForm, TextChaValid
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	34 from MoinMoin.signalling import item_modified
173 89f50aed143f move mimetype related code from wikiutil to util.mimetype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 170 diff changeset	35 from MoinMoin.util.mimetype import MimeType
203 1d416427b7be items: do some imports globally Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 202 diff changeset	36 from MoinMoin.util.mime import Type, type_moin_document
1d416427b7be items: do some imports globally Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 202 diff changeset	37 from MoinMoin.util.tree import moin_page, html, xlink, docbook
1d416427b7be items: do some imports globally Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 202 diff changeset	38 from MoinMoin.util.iri import Iri
174 e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	39 from MoinMoin.util.crypto import cache_key
1005 c36f61f85e97 AccessDeniedError replaced by AccessDenied, from the new storage api. Bruno Martin <bruno@hacklab.com.br> parents: 1004 diff changeset	40 from MoinMoin.storage.middleware.protecting import AccessDenied
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	41
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	42 try:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	43 import PIL
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	44 from PIL import Image as PILImage
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	45 from PIL.ImageChops import difference as PILdiff
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	46 except ImportError:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	47 PIL = None
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	48
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	49 from MoinMoin import log
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	50 logging = log.getLogger(__name__)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	51
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	52 try:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	53 import json
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	54 except ImportError:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	55 import simplejson as json
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	56
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	57 from flask import current_app as app
109 e4c332436733 remove flask monkeypatch, use 'from flask import g as flaskg' Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 103 diff changeset	58 from flask import g as flaskg
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	59
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	60 from flask import request, url_for, flash, Response, redirect, abort, escape
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	61
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	62 from werkzeug import is_resource_modified
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	63 from jinja2 import Markup
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	64
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	65 from MoinMoin.i18n import _, L_, N_
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	66 from MoinMoin.themes import render_template
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	67 from MoinMoin import wikiutil, config, user
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	68 from MoinMoin.util.send_file import send_file
316 4ee796d759bf use url_for_item where appropriate (in py code, no template changes yet) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 315 diff changeset	69 from MoinMoin.util.interwiki import url_for_item
1005 c36f61f85e97 AccessDeniedError replaced by AccessDenied, from the new storage api. Bruno Martin <bruno@hacklab.com.br> parents: 1004 diff changeset	70 from MoinMoin.storage.error import NoSuchItemError, NoSuchRevisionError, StorageError
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	71 from MoinMoin.config import NAME, NAME_OLD, NAME_EXACT, WIKINAME, MTIME, REVERTED_TO, ACL, \
102 c084c1369078 move metadata name constant defs to MoinMoin.config Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 101 diff changeset	72 IS_SYSITEM, SYSITEM_VERSION, USERGROUP, SOMEDICT, \
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	73 CONTENTTYPE, SIZE, LANGUAGE, ITEMLINKS, ITEMTRANSCLUSIONS, \
102 c084c1369078 move metadata name constant defs to MoinMoin.config Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 101 diff changeset	74 TAGS, ACTION, ADDRESS, HOSTNAME, USERID, EXTRA, COMMENT, \
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	75 HASH_ALGORITHM, CONTENTTYPE_GROUPS, ITEMID, REVID, DATAID, \
892 79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	76 CURRENT, PARENTID
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	77
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	78 COLS = 80
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	79 ROWS_DATA = 20
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	80 ROWS_META = 10
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	81
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	82
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	83 from ..util.registry import RegistryBase
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	84
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	85
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	86 class RegistryItem(RegistryBase):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	87 class Entry(object):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	88 def __init__(self, factory, content_type, priority):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	89 self.factory = factory
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	90 self.content_type = content_type
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	91 self.priority = priority
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	92
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	93 def __call__(self, name, content_type, kw):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	94 if self.content_type.issupertype(content_type):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	95 return self.factory(name, content_type, **kw)
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	96
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	97 def __eq__(self, other):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	98 if isinstance(other, self.__class__):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	99 return (self.factory == other.factory and
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	100 self.content_type == other.content_type and
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	101 self.priority == other.priority)
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	102 return NotImplemented
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	103
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	104 def __lt__(self, other):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	105 if isinstance(other, self.__class__):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	106 if self.priority < other.priority:
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	107 return True
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	108 if self.content_type != other.content_type:
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	109 return other.content_type.issupertype(self.content_type)
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	110 return False
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	111 return NotImplemented
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	112
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	113 def __repr__(self):
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	114 return '<{0}: {1}, prio {2} [{3!r}]>' % (self.__class__.__name__,
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	115 self.content_type,
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	116 self.priority,
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	117 self.factory)
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	118
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	119 def get(self, name, content_type, **kw):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	120 for entry in self._entries:
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	121 item = entry(name, content_type, kw)
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	122 if item is not None:
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	123 return item
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	124
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	125 def register(self, factory, content_type, priority=RegistryBase.PRIORITY_MIDDLE):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	126 """
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	127 Register a factory
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	128
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	129 :param factory: Factory to register. Callable, must return an object.
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	130 """
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	131 return self._register(self.Entry(factory, content_type, priority))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	132
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	133
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	134 item_registry = RegistryItem()
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	135
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	136
204 af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	137 def conv_serialize(doc, namespaces):
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	138 out = array('u')
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	139 flaskg.clock.start('conv_serialize')
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	140 doc.write(out.fromunicode, namespaces=namespaces, method='xml')
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	141 out = out.tounicode()
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	142 flaskg.clock.stop('conv_serialize')
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	143 return out
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	144
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	145
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	146 class DummyRev(dict):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	147 """ if we have no stored Revision, we use this dummy """
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	148 def __init__(self, item, contenttype):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	149 self.item = item
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	150 self.meta = {CONTENTTYPE: contenttype}
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	151 self.data = StringIO('')
891 d90782ad8b24 instead of parent revno (int), we give parent revid (str) now Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 890 diff changeset	152 self.revid = None
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	153
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	154
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	155 class DummyItem(object):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	156 """ if we have no stored Item, we use this dummy """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	157 def __init__(self, name):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	158 self.name = name
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	159 def list_revisions(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	160 return [] # same as an empty Item
1180 1c5a013b9ebd Fix the three failing tests. Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1152 diff changeset	161 def destroy_all_revisions(self):
1c5a013b9ebd Fix the three failing tests. Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1152 diff changeset	162 return True
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	163
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	164
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	165 class Item(object):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	166 """ Highlevel (not storage) Item """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	167 @classmethod
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	168 def _factory(cls, name=u'', contenttype=None, **kw):
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	169 return cls(name, contenttype=unicode(contenttype), **kw)
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	170
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	171 @classmethod
905 51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	172 def create(cls, name=u'', contenttype=None, rev_id=CURRENT, item=None):
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	173 if contenttype is None:
415 d755f798fe66 fix some tests Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 402 diff changeset	174 contenttype = u'application/x-nonexistent'
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	175
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	176 if 1: # try:
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	177 if item is None:
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	178 item = flaskg.storage[name]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	179 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	180 name = item.name
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	181 if not item: # except NoSuchItemError:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	182 logging.debug("No such item: {0!r}".format(name))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	183 item = DummyItem(name)
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	184 rev = DummyRev(item, contenttype)
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	185 logging.debug("Item {0!r}, created dummy revision with contenttype {1!r}".format(name, contenttype))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	186 else:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	187 logging.debug("Got item: {0!r}".format(name))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	188 try:
905 51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	189 rev = item.get_revision(rev_id)
415 d755f798fe66 fix some tests Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 402 diff changeset	190 contenttype = u'application/octet-stream' # it exists
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	191 except KeyError: # NoSuchRevisionError:
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	192 try:
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	193 rev = item.get_revision(CURRENT) # fall back to current revision
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	194 # XXX add some message about invalid revision
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	195 except KeyError: # NoSuchRevisionError:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	196 logging.debug("Item {0!r} has no revisions.".format(name))
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	197 rev = DummyRev(item, contenttype)
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	198 logging.debug("Item {0!r}, created dummy revision with contenttype {1!r}".format(name, contenttype))
5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	199 logging.debug("Got item {0!r}, revision: {1!r}".format(name, rev_id))
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	200 contenttype = rev.meta.get(CONTENTTYPE) or contenttype # use contenttype in case our metadata does not provide CONTENTTYPE
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	201 logging.debug("Item {0!r}, got contenttype {1!r} from revision meta".format(name, contenttype))
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	202 #logging.debug("Item %r, rev meta dict: %r" % (name, dict(rev.meta)))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	203
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	204 item = item_registry.get(name, Type(contenttype), rev=rev)
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	205 logging.debug("ItemClass {0!r} handles {1!r}".format(item.__class__, contenttype))
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	206 return item
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	207
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	208 def __init__(self, name, rev=None, contenttype=None):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	209 self.name = name
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	210 self.rev = rev
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	211 self.contenttype = contenttype
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	212
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	213 def get_meta(self):
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	214 return self.rev.meta
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	215 meta = property(fget=get_meta)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	216
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	217 def _render_meta(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	218 # override this in child classes
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	219 return ''
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	220
197 19e92e1ff286 fix the +dom view, details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 193 diff changeset	221 def internal_representation(self, converters=['smiley']):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	222 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	223 Return the internal representation of a document using a DOM Tree
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	224 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	225 flaskg.clock.start('conv_in_dom')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	226 hash_name = HASH_ALGORITHM
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	227 hash_hexdigest = self.rev.meta.get(hash_name)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	228 if hash_hexdigest:
174 e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	229 cid = cache_key(usage="internal_representation",
e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	230 hash_name=hash_name,
e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	231 hash_hexdigest=hash_hexdigest)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	232 doc = app.cache.get(cid)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	233 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	234 # likely a non-existing item
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	235 doc = cid = None
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	236 if doc is None:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	237 # We will see if we can perform the conversion:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	238 # FROM_mimetype --> DOM
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	239 # if so we perform the transformation, otherwise we don't
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	240 from MoinMoin.converter import default_registry as reg
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	241 input_conv = reg.get(Type(self.contenttype), type_moin_document)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	242 if not input_conv:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	243 raise TypeError("We cannot handle the conversion from {0} to the DOM tree".format(self.contenttype))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	244 smiley_conv = reg.get(type_moin_document, type_moin_document,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	245 icon='smiley')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	246
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	247 # We can process the conversion
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	248 links = Iri(scheme='wiki', authority='', path='/' + self.name)
292 ebdfe9448e01 make converter api more homogeneous, adapt tests Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 257 diff changeset	249 doc = input_conv(self.rev, self.contenttype)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	250 # XXX is the following assuming that the top element of the doc tree
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	251 # is a moin_page.page element? if yes, this is the wrong place to do that
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	252 # as not every doc will have that element (e.g. for images, we just get
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	253 # moin_page.object, for a tar item, we get a moin_page.table):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	254 doc.set(moin_page.page_href, unicode(links))
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	255 for conv in converters:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	256 if conv == 'smiley':
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	257 doc = smiley_conv(doc)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	258 if cid:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	259 app.cache.set(cid, doc)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	260 flaskg.clock.stop('conv_in_dom')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	261 return doc
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	262
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	263 def _expand_document(self, doc):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	264 from MoinMoin.converter import default_registry as reg
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	265 include_conv = reg.get(type_moin_document, type_moin_document, includes='expandall')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	266 macro_conv = reg.get(type_moin_document, type_moin_document, macros='expandall')
315 fed6024028b4 link converter: remove url_root param, not needed any more Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 298 diff changeset	267 link_conv = reg.get(type_moin_document, type_moin_document, links='extern')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	268 flaskg.clock.start('conv_include')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	269 doc = include_conv(doc)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	270 flaskg.clock.stop('conv_include')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	271 flaskg.clock.start('conv_macro')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	272 doc = macro_conv(doc)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	273 flaskg.clock.stop('conv_macro')
67 d43c7fb728e0 Items - Move link converter into output Bastian Blank <bblank@thinkmo.de> parents: 38 diff changeset	274 flaskg.clock.start('conv_link')
d43c7fb728e0 Items - Move link converter into output Bastian Blank <bblank@thinkmo.de> parents: 38 diff changeset	275 doc = link_conv(doc)
d43c7fb728e0 Items - Move link converter into output Bastian Blank <bblank@thinkmo.de> parents: 38 diff changeset	276 flaskg.clock.stop('conv_link')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	277 return doc
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	278
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	279 def _render_data(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	280 from MoinMoin.converter import default_registry as reg
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	281 include_conv = reg.get(type_moin_document, type_moin_document, includes='expandall')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	282 macro_conv = reg.get(type_moin_document, type_moin_document, macros='expandall')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	283 # TODO: Real output format
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	284 html_conv = reg.get(type_moin_document, Type('application/x-xhtml-moin-page'))
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	285 doc = self.internal_representation()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	286 doc = self._expand_document(doc)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	287 flaskg.clock.start('conv_dom_html')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	288 doc = html_conv(doc)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	289 flaskg.clock.stop('conv_dom_html')
1224 0e5107719adf Return a break if rendered_data has no content in it to avoid CSS theming issues. Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1214 diff changeset	290 rendered_data = conv_serialize(doc, {html.namespace: ''})
1225 63d51e0ddc47 Change br to <div></div> and add comment explaining the issue Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1224 diff changeset	291 # This is a work-around to avoid the invalid <div /> tag from being passed
63d51e0ddc47 Change br to <div></div> and add comment explaining the issue Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1224 diff changeset	292 # and causing layout issues in many browsers
63d51e0ddc47 Change br to <div></div> and add comment explaining the issue Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1224 diff changeset	293 # Instead, send a <div></div> tag which is valid according to the HTML spec
63d51e0ddc47 Change br to <div></div> and add comment explaining the issue Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1224 diff changeset	294 # The wider issue with serialization is covered here:
63d51e0ddc47 Change br to <div></div> and add comment explaining the issue Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1224 diff changeset	295 # https://bitbucket.org/thomaswaldmann/moin-2.0/issue/145/xml-mode-serialization-returns-self
63d51e0ddc47 Change br to <div></div> and add comment explaining the issue Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1224 diff changeset	296 return "<div></div>" if rendered_data == "<div xmlns=\"http://www.w3.org/1999/xhtml\" />" \
63d51e0ddc47 Change br to <div></div> and add comment explaining the issue Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1224 diff changeset	297 else rendered_data
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	298
197 19e92e1ff286 fix the +dom view, details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 193 diff changeset	299 def _render_data_xml(self):
19e92e1ff286 fix the +dom view, details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 193 diff changeset	300 doc = self.internal_representation()
204 af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	301 return conv_serialize(doc,
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	302 {moin_page.namespace: '',
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	303 xlink.namespace: 'xlink',
af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	304 html.namespace: 'html',
1019 afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	305 })
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	306
202 9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	307 def _render_data_highlight(self):
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	308 # override this in child classes
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	309 return ''
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	310
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	311 def _do_modify_show_templates(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	312 # call this if the item is still empty
905 51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	313 rev_ids = []
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	314 item_templates = self.get_templates(self.contenttype)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	315 return render_template('modify_show_template_selection.html',
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	316 item_name=self.name,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	317 rev=self.rev,
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	318 contenttype=self.contenttype,
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	319 templates=item_templates,
905 51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	320 first_rev_id=rev_ids and rev_ids[0],
51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	321 last_rev_id=rev_ids and rev_ids[-1],
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	322 meta_rendered='',
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	323 data_rendered='',
1019 afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	324 )
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	325
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	326 def meta_filter(self, meta):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	327 """ kill metadata entries that we set automatically when saving """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	328 kill_keys = [# shall not get copied from old rev to new rev
1019 afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	329 SYSITEM_VERSION,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	330 NAME_OLD,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	331 # are automatically implanted when saving
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	332 NAME,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	333 ITEMID, REVID, DATAID,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	334 HASH_ALGORITHM,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	335 SIZE,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	336 COMMENT,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	337 MTIME,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	338 ACTION,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	339 ADDRESS, HOSTNAME, USERID,
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	340 ]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	341 for key in kill_keys:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	342 meta.pop(key, None)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	343 return meta
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	344
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	345 def meta_text_to_dict(self, text):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	346 """ convert meta data from a text fragment to a dict """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	347 meta = json.loads(text)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	348 return self.meta_filter(meta)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	349
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	350 def meta_dict_to_text(self, meta, use_filter=True):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	351 """ convert meta data from a dict to a text fragment """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	352 meta = dict(meta)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	353 if use_filter:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	354 meta = self.meta_filter(meta)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	355 return json.dumps(meta, sort_keys=True, indent=2, ensure_ascii=False)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	356
892 79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	357 def prepare_meta_for_modify(self, meta):
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	358 """
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	359 transform the meta dict of the current revision into a meta dict
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	360 that can be used for savind next revision (after "modify").
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	361 """
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	362 meta = dict(meta)
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	363 revid = meta.pop(REVID, None)
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	364 if revid is not None:
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	365 meta[PARENTID] = revid
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	366 return meta
79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	367
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	368 def get_data(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	369 return '' # TODO create a better method for binary stuff
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	370 data = property(fget=get_data)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	371
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	372 def _write_stream(self, content, new_rev, bufsize=8192):
193 17693a043442 some preparations for jquery.file-upload code, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 174 diff changeset	373 written = 0
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	374 if hasattr(content, "read"):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	375 while True:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	376 buf = content.read(bufsize)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	377 if not buf:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	378 break
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	379 new_rev.data.write(buf)
193 17693a043442 some preparations for jquery.file-upload code, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 174 diff changeset	380 written += len(buf)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	381 elif isinstance(content, str):
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	382 new_rev.data.write(content)
193 17693a043442 some preparations for jquery.file-upload code, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 174 diff changeset	383 written += len(content)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	384 else:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	385 raise StorageError("unsupported content object: {0!r}".format(content))
193 17693a043442 some preparations for jquery.file-upload code, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 174 diff changeset	386 return written
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	387
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	388 def _rename(self, name, comment, action):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	389 self._save(self.meta, self.data, name=name, action=action, comment=comment)
1019 afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	390 for child in self.get_index():
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	391 item = Item.create(child[0])
afe0afe4e1a6 recursive rename "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 993 diff changeset	392 item._save(item.meta, item.data, name='/'.join((name, child[1])), action=action, comment=comment)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	393
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	394 def rename(self, name, comment=u''):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	395 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	396 rename this item to item <name>
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	397 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	398 return self._rename(name, comment, action=u'RENAME')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	399
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	400 def delete(self, comment=u''):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	401 """
904 46263060782e remove references to "trash" (is an implementation detail and might change) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 903 diff changeset	402 delete this item
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	403 """
903 50aa61c9b952 fixed rename issue: do not use the new name to load the item, but the old one Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 902 diff changeset	404 trash_prefix = u'Trash/' # XXX move to config
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	405 now = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime())
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	406 # make trash name unique by including timestamp:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	407 trashname = u'{0}{1} ({2} UTC)'.format(trash_prefix, self.name, now)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	408 return self._rename(trashname, comment, action=u'TRASH')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	409
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	410 def revert(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	411 # called from revert UI/POST
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	412 comment = request.form.get('comment')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	413 self._save(self.meta, self.data, action=u'REVERT', comment=comment)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	414
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	415 def destroy(self, comment=u'', destroy_item=False):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	416 # called from destroy UI/POST
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	417 if destroy_item:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	418 # destroy complete item with all revisions, metadata, etc.
910 5b7e522d97af fix destroy Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 908 diff changeset	419 self.rev.item.destroy_all_revisions()
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	420 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	421 # just destroy this revision
910 5b7e522d97af fix destroy Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 908 diff changeset	422 self.rev.item.destroy_revision(self.rev.revid)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	423
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	424 def modify(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	425 # called from modify UI/POST
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	426 meta = data = contenttype_guessed = None
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	427 contenttype_qs = request.values.get('contenttype')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	428 data_file = request.files.get('data_file')
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	429 if data_file and data_file.filename: # XXX is this the right way to check if there was a file uploaded?
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	430 data = data_file.stream
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	431 # this is likely a guess by the browser, based on the filename
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	432 contenttype_guessed = data_file.content_type # comes from form multipart data
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	433 if data is None:
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	434 # no file upload, try taking stuff from textarea
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	435 data = request.form.get('data_text')
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	436 if data is not None:
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	437 # there was a data_text field with (possibly empty) content
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	438 assert isinstance(data, unicode) # we get unicode from the form
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	439 data = self.data_form_to_internal(data)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	440 data = self.data_internal_to_storage(data)
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	441 # we know it is text and utf-8 - XXX is there a way to get the charset of the form?
415 d755f798fe66 fix some tests Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 402 diff changeset	442 contenttype_guessed = u'text/plain;charset=utf-8'
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	443 # data might be None here, if we have a form with just the data_file field, no file was uploaded
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	444 # and no data_text field. this can happen if just metadata of a non-text item is edited.
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	445
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	446 meta_text = request.form.get('meta_text')
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	447 if meta_text is not None:
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	448 # there was a meta_text field with (possibly empty) content
245 52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	449 # Note: if you get crashes here, please see the ValidJSON validator
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	450 # to catch invalid json issues early.
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	451 meta = self.meta_text_to_dict(meta_text)
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	452 if meta is None:
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	453 # no form metadata - reuse some stuff from previous metadata?
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	454 meta = {}
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	455
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	456 if contenttype_qs:
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	457 # we use querystring param to FORCE content type
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	458 meta[CONTENTTYPE] = contenttype_qs
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	459
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	460 comment = request.form.get('comment')
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	461 return self._save(meta, data, contenttype_guessed=contenttype_guessed, comment=comment)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	462
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	463 def _save(self, meta, data=None, name=None, action=u'SAVE', contenttype_guessed=None, comment=u'', overwrite=False):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	464 backend = flaskg.storage
903 50aa61c9b952 fixed rename issue: do not use the new name to load the item, but the old one Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 902 diff changeset	465 storage_item = backend[self.name]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	466 try:
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	467 currentrev = storage_item.get_revision(CURRENT)
905 51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	468 rev_id = currentrev.revid
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	469 contenttype_current = currentrev.meta.get(CONTENTTYPE)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	470 except KeyError: # XXX was: NoSuchRevisionError:
241 f464adcc3a51 fix saving no data if no previous revision exists Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 236 diff changeset	471 currentrev = None
905 51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	472 rev_id = None
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	473 contenttype_current = None
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	474
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	475 meta = dict(meta) # we may get a read-only dict-like, copy it
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	476
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	477 # we store the previous (if different) and current item name into revision metadata
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	478 # this is useful for rename history and backends that use item uids internally
903 50aa61c9b952 fixed rename issue: do not use the new name to load the item, but the old one Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 902 diff changeset	479 if name is None:
50aa61c9b952 fixed rename issue: do not use the new name to load the item, but the old one Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 902 diff changeset	480 name = self.name
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	481 oldname = meta.get(NAME)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	482 if oldname and oldname != name:
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	483 meta[NAME_OLD] = oldname
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	484 meta[NAME] = name
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	485
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	486 if comment:
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	487 meta[COMMENT] = unicode(comment)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	488
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	489 if CONTENTTYPE not in meta:
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	490 # make sure we have CONTENTTYPE
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	491 meta[CONTENTTYPE] = unicode(contenttype_current or contenttype_guessed or 'application/octet-stream')
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	492
861 9a7889c04a25 fixed history view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 860 diff changeset	493 if ADDRESS not in meta:
9a7889c04a25 fixed history view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 860 diff changeset	494 meta[ADDRESS] = u'0.0.0.0' # TODO
9a7889c04a25 fixed history view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 860 diff changeset	495
890 9c862a0aee26 for logged-in users, add userid to metadata when saving Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 861 diff changeset	496 if USERID not in meta and flaskg.user.valid:
9c862a0aee26 for logged-in users, add userid to metadata when saving Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 861 diff changeset	497 meta[USERID] = flaskg.user.itemid
9c862a0aee26 for logged-in users, add userid to metadata when saving Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 861 diff changeset	498
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	499 meta[ACTION] = unicode(action)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	500
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	501 if not overwrite and REVID in meta:
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	502 # we usually want to create a new revision, thus we must remove the existing REVID
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	503 del meta[REVID]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	504
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	505 if data is None:
241 f464adcc3a51 fix saving no data if no previous revision exists Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 236 diff changeset	506 if currentrev is not None:
f464adcc3a51 fix saving no data if no previous revision exists Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 236 diff changeset	507 # we don't have (new) data, just copy the old one.
f464adcc3a51 fix saving no data if no previous revision exists Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 236 diff changeset	508 # a valid usecase of this is to just edit metadata.
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	509 data = currentrev.data
241 f464adcc3a51 fix saving no data if no previous revision exists Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 236 diff changeset	510 else:
f464adcc3a51 fix saving no data if no previous revision exists Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 236 diff changeset	511 data = ''
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	512
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	513 if isinstance(data, unicode):
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	514 data = data.encode(config.charset)
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	515
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	516 if isinstance(data, str):
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	517 data = StringIO(data)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	518
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	519 newrev = storage_item.store_revision(meta, data, overwrite=overwrite)
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	520 item_modified.send(app._get_current_object(), item_name=name)
905 51475954290f rename all revno usages to revid (no numbers any more), remove update_item param Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 904 diff changeset	521 return newrev.revid, newrev.meta[SIZE]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	522
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	523 def get_index(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	524 """ create an index of sub items of this item """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	525 if self.name:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	526 prefix = self.name + u'/'
827 94e388cd4e28 use 'constants' for metadata keys / whoosh field names Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 794 diff changeset	527 query = And([Term(WIKINAME, app.cfg.interwikiname), Prefix(NAME_EXACT, prefix)])
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	528 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	529 # trick: an item of empty name can be considered as "virtual root item",
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	530 # that has all wiki items as sub items
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	531 prefix = u''
827 94e388cd4e28 use 'constants' for metadata keys / whoosh field names Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 794 diff changeset	532 query = Term(WIKINAME, app.cfg.interwikiname)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	533 # We only want the sub-item part of the item names, not the whole item objects.
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	534 prefix_len = len(prefix)
953 326f7a365007 search/indexing: remove all_revs=False params (it is the default) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 910 diff changeset	535 revs = flaskg.storage.search(query, sortedby=NAME_EXACT, limit=None)
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	536 items = [(rev.meta[NAME], rev.meta[NAME][prefix_len:], rev.meta[CONTENTTYPE])
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	537 for rev in revs]
780 f5e0f85e66ce whooshify get_index() Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 779 diff changeset	538 return items
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	539
993 6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	540 def _connect_levels(self, index):
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	541 new_index = []
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	542 last = self.name
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	543 for item in index:
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	544 name = item[0]
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	545
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	546 while not name.startswith(last):
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	547 last = last.rpartition('/')[0]
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	548
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	549 missing_layers = name.split('/')[last.count('/')+1:-1]
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	550
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	551 for layer in missing_layers:
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	552 last = '/'.join([last, layer])
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	553 new_index.append((last, last[len(self.name)+1:], u'application/x-nonexistent'))
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	554
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	555 last = item[0]
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	556 new_index.append(item)
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	557
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	558 return new_index
6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	559
486 b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	560 def flat_index(self, startswith=None, selected_groups=None):
b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	561 """
993 6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	562 creates a top level index of sub items of this item
486 b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	563 if startswith is set, filtering is done on the basis of starting letter of item name
b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	564 if selected_groups is set, items whose contentype belonging to the selected contenttype_groups, are filtered.
b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	565 """
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	566 index = self.get_index()
993 6dd0b0755b6a disconnected levels now shown in index, fixes #75 "Luis Henrique Fagundes <lhfagundes@gmail.com>" parents: 969 diff changeset	567 index = self._connect_levels(index)
486 b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	568
496 a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	569 all_ctypes = [[ctype for ctype, clabel in contenttypes]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	570 for gname, contenttypes in CONTENTTYPE_GROUPS]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	571 all_ctypes_chain = itertools.chain(*all_ctypes)
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	572 all_contenttypes = list(all_ctypes_chain)
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	573 contenttypes_without_encoding = [contenttype[:contenttype.index(u';')]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	574 for contenttype in all_contenttypes
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	575 if u';' in contenttype]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	576 all_contenttypes.extend(contenttypes_without_encoding) # adding more mime-types without the encoding term
486 b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	577
496 a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	578 if selected_groups:
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	579 ctypes = [[ctype for ctype, clabel in contenttypes]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	580 for gname, contenttypes in CONTENTTYPE_GROUPS
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	581 if gname in selected_groups]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	582 ctypes_chain = itertools.chain(*ctypes)
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	583 selected_contenttypes = list(ctypes_chain)
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	584 contenttypes_without_encoding = [contenttype[:contenttype.index(u';')]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	585 for contenttype in selected_contenttypes
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	586 if u';' in contenttype]
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	587 selected_contenttypes.extend(contenttypes_without_encoding)
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	588 else:
a286df67f294 contenttype filter code updated, due to lack of encoding information for uploaded files, some extra checks have been added. Akash Sinha <akash2607@gmail.com> parents: 492 diff changeset	589 selected_contenttypes = all_contenttypes
486 b6149c732926 contenttype filtering added to global index page Akash Sinha <akash2607@gmail.com> parents: 484 diff changeset	590
518 0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	591 unknown_item_group = "unknown items"
477 72899d48db41 alphabetic listing of global index, with link to item index Akash Sinha <akash2607@gmail.com> parents: 257 diff changeset	592 if startswith:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	593 startswith = (u'{0}'.format(startswith), u'{0}'.format(startswith.swapcase()))
520 6332dda59cb6 some pep8 fixes Akash Sinha <akash2607@gmail.com> parents: 518 diff changeset	594 if not selected_groups or unknown_item_group in selected_groups:
518 0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	595 index = [(fullname, relname, contenttype)
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	596 for fullname, relname, contenttype in index
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	597 if u'/' not in relname
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	598 and relname.startswith(startswith)
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	599 and (contenttype not in all_contenttypes or contenttype in selected_contenttypes)]
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	600 # If an item's contenttype not present in the default contenttype list,
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	601 # then it will be shown without going through any filter.
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	602 else:
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	603 index = [(fullname, relname, contenttype)
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	604 for fullname, relname, contenttype in index
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	605 if u'/' not in relname
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	606 and relname.startswith(startswith)
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	607 and (contenttype in selected_contenttypes)]
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	608
477 72899d48db41 alphabetic listing of global index, with link to item index Akash Sinha <akash2607@gmail.com> parents: 257 diff changeset	609 else:
518 0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	610 if not selected_groups or unknown_item_group in selected_groups:
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	611 index = [(fullname, relname, contenttype)
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	612 for fullname, relname, contenttype in index
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	613 if u'/' not in relname
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	614 and (contenttype not in all_contenttypes or contenttype in selected_contenttypes)]
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	615 else:
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	616 index = [(fullname, relname, contenttype)
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	617 for fullname, relname, contenttype in index
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	618 if u'/' not in relname
0398d1eb14c1 small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected) Akash Sinha <akash2607@gmail.com> parents: 510 diff changeset	619 and contenttype in selected_contenttypes]
477 72899d48db41 alphabetic listing of global index, with link to item index Akash Sinha <akash2607@gmail.com> parents: 257 diff changeset	620
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	621 return index
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	622
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	623 index_template = 'index.html'
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	624
484 19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	625 def get_detailed_index(self, index):
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	626 """ appends a flag in the index of items indicating that the parent has sub items """
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	627 detailed_index = []
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	628 all_item_index = self.get_index()
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	629 all_item_text = "\n".join(item_info[1] for item_info in all_item_index)
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	630 for fullname, relname, contenttype in index:
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	631 hassubitem = False
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	632 subitem_name_re = u"^{0}/[^/]+$".format(re.escape(relname))
524 77a9bd2d3dc8 regex search function updated, to get the subitem flag correctly Akash Sinha <akash2607@gmail.com> parents: 520 diff changeset	633 regex = re.compile(subitem_name_re, re.UNICODE\|re.M)
484 19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	634 if regex.search(all_item_text):
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	635 hassubitem = True
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	636 detailed_index.append((fullname, relname, contenttype, hassubitem))
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	637 return detailed_index
19b257c0e102 code to get the subitem index flag has been refactored and moved under items/__init__.py and also unitest is added for the same. Akash Sinha <akash2607@gmail.com> parents: 477 diff changeset	638
477 72899d48db41 alphabetic listing of global index, with link to item index Akash Sinha <akash2607@gmail.com> parents: 257 diff changeset	639 def name_initial(self, names=None):
72899d48db41 alphabetic listing of global index, with link to item index Akash Sinha <akash2607@gmail.com> parents: 257 diff changeset	640 initials = [(name[1][0])
72899d48db41 alphabetic listing of global index, with link to item index Akash Sinha <akash2607@gmail.com> parents: 257 diff changeset	641 for name in names]
72899d48db41 alphabetic listing of global index, with link to item index Akash Sinha <akash2607@gmail.com> parents: 257 diff changeset	642 return initials
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	643
1003 8621c3e273a1 fixes #72. Implements the page to handle 404 error, and calls abort(404) in some view, when apropriate. Bruno Martin <bruno@hacklab.com.br> parents: 969 diff changeset	644 delete_template = 'delete.html'
8621c3e273a1 fixes #72. Implements the page to handle 404 error, and calls abort(404) in some view, when apropriate. Bruno Martin <bruno@hacklab.com.br> parents: 969 diff changeset	645 destroy_template = 'destroy.html'
8621c3e273a1 fixes #72. Implements the page to handle 404 error, and calls abort(404) in some view, when apropriate. Bruno Martin <bruno@hacklab.com.br> parents: 969 diff changeset	646 diff_template = 'diff.html'
8621c3e273a1 fixes #72. Implements the page to handle 404 error, and calls abort(404) in some view, when apropriate. Bruno Martin <bruno@hacklab.com.br> parents: 969 diff changeset	647 rename_template = 'rename.html'
8621c3e273a1 fixes #72. Implements the page to handle 404 error, and calls abort(404) in some view, when apropriate. Bruno Martin <bruno@hacklab.com.br> parents: 969 diff changeset	648 revert_template = 'revert.html'
8621c3e273a1 fixes #72. Implements the page to handle 404 error, and calls abort(404) in some view, when apropriate. Bruno Martin <bruno@hacklab.com.br> parents: 969 diff changeset	649
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	650 class NonExistent(Item):
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	651 def do_get(self, force_attachment=False, mimetype=None):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	652 abort(404)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	653
1099 2068f99501c5 fix a few bugs exposed by the new view tests Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1023 diff changeset	654 def _convert(self, doc):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	655 abort(404)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	656
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	657 def do_modify(self, contenttype, template_name):
1236 3b723046d80e First, check if the user has the needed ACLs before allowing the user to enter page content or choose content type for creating a new page Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1230 diff changeset	658 # First, check if the current user has the required privileges
3b723046d80e First, check if the user has the needed ACLs before allowing the user to enter page content or choose content type for creating a new page Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1230 diff changeset	659 if not flaskg.user.may.create(self.name):
3b723046d80e First, check if the user has the needed ACLs before allowing the user to enter page content or choose content type for creating a new page Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1230 diff changeset	660 abort(403)
3b723046d80e First, check if the user has the needed ACLs before allowing the user to enter page content or choose content type for creating a new page Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1230 diff changeset	661
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	662 # XXX think about and add item template support
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	663 return render_template('modify_show_type_selection.html',
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	664 item_name=self.name,
488 8462764f59d2 contenttype_groups structure moved under config Akash Sinha <akash2607@gmail.com> parents: 486 diff changeset	665 contenttype_groups=CONTENTTYPE_GROUPS,
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	666 )
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	667
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	668 item_registry.register(NonExistent._factory, Type('application/x-nonexistent'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	669
245 52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	670 class ValidJSON(Validator):
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	671 """Validator for JSON
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	672 """
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	673 invalid_json_msg = L_('Invalid JSON.')
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	674
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	675 def validate(self, element, state):
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	676 try:
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	677 json.loads(element.value)
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	678 except:
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	679 return self.note_error(element, state, 'invalid_json_msg')
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	680 return True
52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	681
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	682
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	683 class Binary(Item):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	684 """ An arbitrary binary item, fallback class for every item mimetype. """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	685 modify_help = """\
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	686 There is no help, you're doomed!
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	687 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	688
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	689 template = "modify_binary.html"
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	690
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	691 # XXX reads item rev data into memory!
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	692 def get_data(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	693 if self.rev is not None:
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	694 return self.rev.data.read()
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	695 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	696 return ''
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	697 data = property(fget=get_data)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	698
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	699 def _render_meta(self):
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	700 return "<pre>{0}</pre>".format(escape(self.meta_dict_to_text(self.meta, use_filter=False)))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	701
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	702 def get_templates(self, contenttype=None):
661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	703 """ create a list of templates (for some specific contenttype) """
827 94e388cd4e28 use 'constants' for metadata keys / whoosh field names Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 794 diff changeset	704 terms = [Term(WIKINAME, app.cfg.interwikiname), Term(TAGS, u'template')]
779 815c46100e2c whooshify get_templates, adapt MimeType analyzer so it yields also a full and normalized contenttype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 525 diff changeset	705 if contenttype is not None:
815c46100e2c whooshify get_templates, adapt MimeType analyzer so it yields also a full and normalized contenttype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 525 diff changeset	706 terms.append(Term(CONTENTTYPE, contenttype))
815c46100e2c whooshify get_templates, adapt MimeType analyzer so it yields also a full and normalized contenttype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 525 diff changeset	707 query = And(terms)
953 326f7a365007 search/indexing: remove all_revs=False params (it is the default) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 910 diff changeset	708 revs = flaskg.storage.search(query, sortedby=NAME_EXACT, limit=None)
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	709 return [rev.meta[NAME] for rev in revs]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	710
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	711 def do_modify(self, contenttype, template_name):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	712 # XXX think about and add item template support
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	713 #if template_name is None and isinstance(self.rev, DummyRev):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	714 # return self._do_modify_show_templates()
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	715 from MoinMoin.apps.frontend.views import CommentForm
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	716 class ModifyForm(CommentForm):
245 52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	717 meta_text = String.using(optional=False).with_properties(placeholder=L_("MetaData (JSON)")).validated_by(ValidJSON())
244 a11656ba1eab modify views: use flatland also for the file upload form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 243 diff changeset	718 data_file = FileStorage.using(optional=True, label=L_('Upload file:'))
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	719
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	720 if request.method == 'GET':
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	721 form = ModifyForm.from_defaults()
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	722 TextCha(form).amend_form()
892 79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	723 form['meta_text'] = self.meta_dict_to_text(self.prepare_meta_for_modify(self.meta))
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	724 elif request.method == 'POST':
244 a11656ba1eab modify views: use flatland also for the file upload form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 243 diff changeset	725 form = ModifyForm.from_flat(request.form.items() + request.files.items())
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	726 TextCha(form).amend_form()
246 727e03c59dbf simplify form validation check, fix indentation Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 245 diff changeset	727 if form.validate():
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	728 try:
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	729 self.modify() # XXX
1005 c36f61f85e97 AccessDeniedError replaced by AccessDenied, from the new storage api. Bruno Martin <bruno@hacklab.com.br> parents: 1004 diff changeset	730 except AccessDenied:
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	731 abort(403)
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	732 else:
316 4ee796d759bf use url_for_item where appropriate (in py code, no template changes yet) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 315 diff changeset	733 return redirect(url_for_item(self.name))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	734 return render_template(self.template,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	735 item_name=self.name,
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	736 rows_meta=str(ROWS_META), cols=str(COLS),
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	737 help=self.modify_help,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	738 form=form,
1229 29301b8a2718 Hide search box in modify views. Sam Toyer <samATqxcvDOTnet> parents: 1214 diff changeset	739 search_form=None,
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	740 )
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	741
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	742 def _render_data_diff(self, oldrev, newrev):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	743 hash_name = HASH_ALGORITHM
860 de6ece090b7d fix download view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 859 diff changeset	744 if oldrev.meta[hash_name] == newrev.meta[hash_name]:
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	745 return _("The items have the same data hash code (that means they very likely have the same data).")
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	746 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	747 return _("The items have different data.")
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	748
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	749 _render_data_diff_text = _render_data_diff
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	750 _render_data_diff_raw = _render_data_diff
1211 e63c9c8d0ad9 Move revision info to the end Shitiz Garg <mail@dragooon.net> parents: 1210 diff changeset	751
1208 92d8f0777a9a Improve handling of other data types in atom feed, also remove anchor tags from line numbers Shitiz Garg <mail@dragooon.net> parents: 1199 diff changeset	752 def _render_data_diff_atom(self, oldrev, newrev):
1211 e63c9c8d0ad9 Move revision info to the end Shitiz Garg <mail@dragooon.net> parents: 1210 diff changeset	753 return render_template('atom.html',
1208 92d8f0777a9a Improve handling of other data types in atom feed, also remove anchor tags from line numbers Shitiz Garg <mail@dragooon.net> parents: 1199 diff changeset	754 oldrev=oldrev, newrev=newrev, get='binary',
92d8f0777a9a Improve handling of other data types in atom feed, also remove anchor tags from line numbers Shitiz Garg <mail@dragooon.net> parents: 1199 diff changeset	755 content=Markup(self._render_data()))
1198 2aa4f4ec6a94 Minor fixes for atom feed Shitiz Garg <mail@dragooon.net> parents: 1197 diff changeset	756
1099 2068f99501c5 fix a few bugs exposed by the new view tests Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1023 diff changeset	757 def _convert(self, doc):
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	758 return _("Impossible to convert the data to the contenttype: %(contenttype)s",
661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	759 contenttype=request.values.get('contenttype'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	760
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	761 def do_get(self, force_attachment=False, mimetype=None):
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	762 hash = self.rev.meta.get(HASH_ALGORITHM)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	763 if is_resource_modified(request.environ, hash): # use hash as etag
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	764 return self._do_get_modified(hash, force_attachment=force_attachment, mimetype=mimetype)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	765 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	766 return Response(status=304)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	767
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	768 def _do_get_modified(self, hash, force_attachment=False, mimetype=None):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	769 member = request.values.get('member')
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	770 return self._do_get(hash, member, force_attachment=force_attachment, mimetype=mimetype)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	771
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	772 def _do_get(self, hash, member=None, force_attachment=False, mimetype=None):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	773 if member: # content = file contained within a archive item revision
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	774 path, filename = os.path.split(member)
173 89f50aed143f move mimetype related code from wikiutil to util.mimetype Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 170 diff changeset	775 mt = MimeType(filename=filename)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	776 content_length = None
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	777 file_to_send = self.get_member(member)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	778 else: # content = item revision
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	779 rev = self.rev
255 76a4e3cc8705 add +download view for just downloading a revision with forced content-disposition: attachment Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 254 diff changeset	780 filename = rev.item.name
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	781 try:
860 de6ece090b7d fix download view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 859 diff changeset	782 mimestr = rev.meta[CONTENTTYPE]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	783 except KeyError:
255 76a4e3cc8705 add +download view for just downloading a revision with forced content-disposition: attachment Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 254 diff changeset	784 mt = MimeType(filename=filename)
221 faa06b4873dd more contenttype related changes/fixes, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 216 diff changeset	785 else:
faa06b4873dd more contenttype related changes/fixes, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 216 diff changeset	786 mt = MimeType(mimestr=mimestr)
860 de6ece090b7d fix download view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 859 diff changeset	787 content_length = rev.meta[SIZE]
de6ece090b7d fix download view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 859 diff changeset	788 file_to_send = rev.data
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	789 if mimetype:
92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	790 content_type = mimetype
92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	791 else:
92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	792 content_type = mt.content_type()
255 76a4e3cc8705 add +download view for just downloading a revision with forced content-disposition: attachment Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 254 diff changeset	793 as_attachment = force_attachment or mt.as_attachment(app.cfg)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	794 return send_file(file=file_to_send,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	795 mimetype=content_type,
255 76a4e3cc8705 add +download view for just downloading a revision with forced content-disposition: attachment Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 254 diff changeset	796 as_attachment=as_attachment, attachment_filename=filename,
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	797 cache_timeout=10, # wiki data can change rapidly
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	798 add_etags=True, etag=hash, conditional=True)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	799
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	800 item_registry.register(Binary._factory, Type('/'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	801
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	802
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	803 class RenderableBinary(Binary):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	804 """ Base class for some binary stuff that renders with a object tag. """
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	805
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	806
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	807 class Application(Binary):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	808 """ Base class for application/* """
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	809
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	810
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	811 class TarMixin(object):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	812 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	813 TarMixin offers additional functionality for tar-like items to list and
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	814 access member files and to create new revisions by multiple posts.
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	815 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	816 def list_members(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	817 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	818 list tar file contents (member file names)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	819 """
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	820 self.rev.data.seek(0)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	821 tf = tarfile.open(fileobj=self.rev.data, mode='r')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	822 return tf.getnames()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	823
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	824 def get_member(self, name):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	825 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	826 return a file-like object with the member file data
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	827
38 1d8e9b1153d6 docstrings: convert epydoc fields to rst/sphinx fields Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 26 diff changeset	828 :param name: name of the data in the container file
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	829 """
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	830 self.rev.data.seek(0)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	831 tf = tarfile.open(fileobj=self.rev.data, mode='r')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	832 return tf.extractfile(name)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	833
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	834 def put_member(self, name, content, content_length, expected_members):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	835 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	836 puts a new member file into a temporary tar container.
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	837 If all expected members have been put, it saves the tar container
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	838 to a new item revision.
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	839
38 1d8e9b1153d6 docstrings: convert epydoc fields to rst/sphinx fields Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 26 diff changeset	840 :param name: name of the data in the container file
1d8e9b1153d6 docstrings: convert epydoc fields to rst/sphinx fields Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 26 diff changeset	841 :param content: the data to store into the tar file (str or file-like)
1d8e9b1153d6 docstrings: convert epydoc fields to rst/sphinx fields Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 26 diff changeset	842 :param content_length: byte-length of content (for str, None can be given)
1d8e9b1153d6 docstrings: convert epydoc fields to rst/sphinx fields Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 26 diff changeset	843 :param expected_members: set of expected member file names
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	844 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	845 if not name in expected_members:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	846 raise StorageError("tried to add unexpected member {0!r} to container item {1!r}".format(name, self.name))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	847 if isinstance(name, unicode):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	848 name = name.encode('utf-8')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	849 temp_fname = os.path.join(tempfile.gettempdir(), 'TarContainer_' +
174 e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	850 cache_key(usage='TarContainer', name=self.name))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	851 tf = tarfile.TarFile(temp_fname, mode='a')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	852 ti = tarfile.TarInfo(name)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	853 if isinstance(content, str):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	854 if content_length is None:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	855 content_length = len(content)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	856 content = StringIO(content) # we need a file obj
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	857 elif not hasattr(content, 'read'):
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	858 logging.error("unsupported content object: {0!r}".format(content))
5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	859 raise StorageError("unsupported content object: {0!r}".format(content))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	860 assert content_length >= 0 # we don't want -1 interpreted as 4G-1
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	861 ti.size = content_length
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	862 tf.addfile(ti, content)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	863 tf_members = set(tf.getnames())
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	864 tf.close()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	865 if tf_members - expected_members:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	866 msg = "found unexpected members in container item {0!r}".format(self.name)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	867 logging.error(msg)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	868 os.remove(temp_fname)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	869 raise StorageError(msg)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	870 if tf_members == expected_members:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	871 # everything we expected has been added to the tar file, save the container as revision
216 661a57c747bd replace mimetype by contenttype, use more constants Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 204 diff changeset	872 meta = {CONTENTTYPE: self.contenttype}
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	873 data = open(temp_fname, 'rb')
236 7a77ae08161e items: cleanup contenttype handling in modify/_save, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 225 diff changeset	874 self._save(meta, data, name=self.name, action=u'SAVE', comment='')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	875 data.close()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	876 os.remove(temp_fname)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	877
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	878
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	879 class ApplicationXTar(TarMixin, Application):
257 eea3a94a4061 refactored calling convention of converters, add rev=n qs argument for Iris (fixes #21) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 256 diff changeset	880 """
eea3a94a4061 refactored calling convention of converters, add rev=n qs argument for Iris (fixes #21) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 256 diff changeset	881 Tar items
eea3a94a4061 refactored calling convention of converters, add rev=n qs argument for Iris (fixes #21) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 256 diff changeset	882 """
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	883
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	884 item_registry.register(ApplicationXTar._factory, Type('application/x-tar'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	885 item_registry.register(ApplicationXTar._factory, Type('application/x-gtar'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	886
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	887
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	888 class ZipMixin(object):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	889 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	890 ZipMixin offers additional functionality for zip-like items to list and
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	891 access member files.
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	892 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	893 def list_members(self):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	894 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	895 list zip file contents (member file names)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	896 """
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	897 self.rev.data.seek(0)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	898 zf = zipfile.ZipFile(self.rev.data, mode='r')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	899 return zf.namelist()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	900
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	901 def get_member(self, name):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	902 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	903 return a file-like object with the member file data
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	904
38 1d8e9b1153d6 docstrings: convert epydoc fields to rst/sphinx fields Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 26 diff changeset	905 :param name: name of the data in the zip file
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	906 """
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	907 self.rev.data.seek(0)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	908 zf = zipfile.ZipFile(self.rev.data, mode='r')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	909 return zf.open(name, mode='r')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	910
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	911 def put_member(self, name, content, content_length, expected_members):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	912 raise NotImplementedError
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	913
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	914
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	915 class ApplicationZip(ZipMixin, Application):
257 eea3a94a4061 refactored calling convention of converters, add rev=n qs argument for Iris (fixes #21) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 256 diff changeset	916 """
eea3a94a4061 refactored calling convention of converters, add rev=n qs argument for Iris (fixes #21) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 256 diff changeset	917 Zip items
eea3a94a4061 refactored calling convention of converters, add rev=n qs argument for Iris (fixes #21) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 256 diff changeset	918 """
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	919
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	920 item_registry.register(ApplicationZip._factory, Type('application/zip'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	921
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	922
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	923 class PDF(Application):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	924 """ PDF """
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	925
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	926 item_registry.register(PDF._factory, Type('application/pdf'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	927
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	928
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	929 class Video(Binary):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	930 """ Base class for video/* """
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	931
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	932 item_registry.register(Video._factory, Type('video/*'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	933
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	934
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	935 class Audio(Binary):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	936 """ Base class for audio/* """
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	937
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	938 item_registry.register(Audio._factory, Type('audio/*'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	939
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	940
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	941 class Image(Binary):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	942 """ Base class for image/* """
1214 8d547ec39a76 Cosmetic changes Shitiz Garg <mail@dragooon.net> parents: 1213 diff changeset	943
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	944 item_registry.register(Image._factory, Type('image/*'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	945
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	946
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	947 class RenderableImage(RenderableBinary):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	948 """ Base class for renderable Image mimetypes """
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	949
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	950
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	951 class SvgImage(RenderableImage):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	952 """ SVG images use <object> tag mechanism from RenderableBinary base class """
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	953
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	954 item_registry.register(SvgImage._factory, Type('image/svg+xml'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	955
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	956
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	957 class RenderableBitmapImage(RenderableImage):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	958 """ PNG/JPEG/GIF images use <img> tag (better browser support than <object>) """
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	959 # if mimetype is also transformable, please register in TransformableImage ONLY!
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	960
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	961
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	962 class TransformableBitmapImage(RenderableBitmapImage):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	963 """ We can transform (resize, rotate, mirror) some image types """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	964 def _transform(self, content_type, size=None, transpose_op=None):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	965 """ resize to new size (optional), transpose according to exif infos,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	966 result data should be content_type.
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	967 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	968 try:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	969 from PIL import Image as PILImage
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	970 except ImportError:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	971 # no PIL, we can't do anything, we just output the revision data as is
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	972 return content_type, self.rev.data.read()
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	973
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	974 if content_type == 'image/jpeg':
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	975 output_type = 'JPEG'
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	976 elif content_type == 'image/png':
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	977 output_type = 'PNG'
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	978 elif content_type == 'image/gif':
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	979 output_type = 'GIF'
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	980 else:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	981 raise ValueError("content_type {0!r} not supported".format(content_type))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	982
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	983 # revision obj has read() seek() tell(), thus this works:
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	984 image = PILImage.open(self.rev.data)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	985 image.load()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	986
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	987 try:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	988 # if we have EXIF data, we can transpose (e.g. rotate left),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	989 # so the rendered image is correctly oriented:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	990 transpose_op = transpose_op or 1 # or self.exif['Orientation']
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	991 except KeyError:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	992 transpose_op = 1 # no change
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	993
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	994 if size is not None:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	995 image = image.copy() # create copy first as thumbnail works in-place
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	996 image.thumbnail(size, PILImage.ANTIALIAS)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	997
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	998 transpose_func = {
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	999 1: lambda image: image,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1000 2: lambda image: image.transpose(PILImage.FLIP_LEFT_RIGHT),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1001 3: lambda image: image.transpose(PILImage.ROTATE_180),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1002 4: lambda image: image.transpose(PILImage.FLIP_TOP_BOTTOM),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1003 5: lambda image: image.transpose(PILImage.ROTATE_90).transpose(PILImage.FLIP_TOP_BOTTOM),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1004 6: lambda image: image.transpose(PILImage.ROTATE_270),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1005 7: lambda image: image.transpose(PILImage.ROTATE_90).transpose(PILImage.FLIP_LEFT_RIGHT),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1006 8: lambda image: image.transpose(PILImage.ROTATE_90),
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1007 }
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1008 image = transpose_func[transpose_op](image)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1009
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1010 outfile = StringIO()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1011 image.save(outfile, output_type)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1012 data = outfile.getvalue()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1013 outfile.close()
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1014 return content_type, data
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1015
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	1016 def _do_get_modified(self, hash, force_attachment=False, mimetype=None):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1017 try:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1018 width = int(request.values.get('w'))
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1019 except (TypeError, ValueError):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1020 width = None
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1021 try:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1022 height = int(request.values.get('h'))
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1023 except (TypeError, ValueError):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1024 height = None
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1025 try:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1026 transpose = int(request.values.get('t'))
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1027 assert 1 <= transpose <= 8
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1028 except (TypeError, ValueError, AssertionError):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1029 transpose = 1
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1030 if width or height or transpose != 1:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1031 # resize requested, XXX check ACL behaviour! XXX
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1032 hash_name = HASH_ALGORITHM
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	1033 hash_hexdigest = self.rev.meta[hash_name]
174 e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	1034 cid = cache_key(usage="ImageTransform",
e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	1035 hash_name=hash_name,
e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	1036 hash_hexdigest=hash_hexdigest,
e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	1037 width=width, height=height, transpose=transpose)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1038 c = app.cache.get(cid)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1039 if c is None:
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	1040 if mimetype:
92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	1041 content_type = mimetype
92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	1042 else:
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	1043 content_type = self.rev.meta[CONTENTTYPE]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1044 size = (width or 99999, height or 99999)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1045 content_type, data = self._transform(content_type, size=size, transpose_op=transpose)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1046 headers = wikiutil.file_headers(content_type=content_type, content_length=len(data))
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1047 app.cache.set(cid, (headers, data))
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1048 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1049 # XXX TODO check ACL behaviour
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1050 headers, data = c
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1051 return Response(data, headers=headers)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1052 else:
509 92cc4c7ea1c0 mimetype parameter added in the download item link, such that we could set the contenttype of item being downloaded as desired. Akash Sinha <akash2607@gmail.com> parents: 496 diff changeset	1053 return self._do_get(hash, force_attachment=force_attachment, mimetype=mimetype)
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1054
1209 c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1055 def _render_data_diff_atom(self, oldrev, newrev):
c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1056 if PIL is None:
c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1057 # no PIL, we can't do anything, we just call the base class method
c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1058 return super(TransformableBitmapImage, self)._render_data_diff_atom(oldrev, newrev)
1210 d5c6c9ada478 Fix incorrect URL while fetching images' diff Shitiz Garg <mail@dragooon.net> parents: 1209 diff changeset	1059 url = url_for('frontend.diffraw', _external=True, item_name=self.name, rev1=oldrev.revid, rev2=newrev.revid)
1209 c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1060 return render_template('atom.html',
c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1061 oldrev=oldrev, newrev=newrev, get='binary',
c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1062 content=Markup('<img src="{0}" />'.format(escape(url))))
c0eaed311e0e Try using PIL for image diffs Shitiz Garg <mail@dragooon.net> parents: 1208 diff changeset	1063
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1064 def _render_data_diff(self, oldrev, newrev):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1065 if PIL is None:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1066 # no PIL, we can't do anything, we just call the base class method
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1067 return super(TransformableBitmapImage, self)._render_data_diff(oldrev, newrev)
859 95d1033b7808 fix show/meta view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 852 diff changeset	1068 url = url_for('frontend.diffraw', item_name=self.name, rev1=oldrev.revid, rev2=newrev.revid)
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	1069 return Markup('<img src="{0}" />'.format(escape(url)))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1070
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1071 def _render_data_diff_raw(self, oldrev, newrev):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1072 hash_name = HASH_ALGORITHM
174 e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	1073 cid = cache_key(usage="ImageDiff",
e8f61cbd661b modularize crypto/random stuff, move it to MoinMoin.util.crypto, pw change bugfix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 173 diff changeset	1074 hash_name=hash_name,
860 de6ece090b7d fix download view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 859 diff changeset	1075 hash_old=oldrev.meta[hash_name],
de6ece090b7d fix download view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 859 diff changeset	1076 hash_new=newrev.meta[hash_name])
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1077 c = app.cache.get(cid)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1078 if c is None:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1079 if PIL is None:
256 02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1080 abort(404) # TODO render user friendly error image
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1081
860 de6ece090b7d fix download view Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 859 diff changeset	1082 content_type = newrev.meta[CONTENTTYPE]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1083 if content_type == 'image/jpeg':
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1084 output_type = 'JPEG'
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1085 elif content_type == 'image/png':
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1086 output_type = 'PNG'
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1087 elif content_type == 'image/gif':
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1088 output_type = 'GIF'
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1089 else:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	1090 raise ValueError("content_type {0!r} not supported".format(content_type))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1091
256 02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1092 try:
1152 a284e43d1292 Use rev.data instead of rev, to fix crash that occured on image diff Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1112 diff changeset	1093 oldimage = PILImage.open(oldrev.data)
a284e43d1292 Use rev.data instead of rev, to fix crash that occured on image diff Bilal Akhtar <bilalakhtar@ubuntu.com> parents: 1112 diff changeset	1094 newimage = PILImage.open(newrev.data)
256 02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1095 oldimage.load()
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1096 newimage.load()
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1097 diffimage = PILdiff(newimage, oldimage)
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1098 outfile = StringIO()
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1099 diffimage.save(outfile, output_type)
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1100 data = outfile.getvalue()
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1101 outfile.close()
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1102 headers = wikiutil.file_headers(content_type=content_type, content_length=len(data))
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1103 app.cache.set(cid, (headers, data))
02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1104 except (IOError, ValueError) as err:
969 5bf6d7a2ffcf Convert all %r, %s, %x, %d, %i, %o to new Format String Syntax Vedran Mileti? <rivanvx@gmail.com> parents: 957 diff changeset	1105 logging.exception("error during PILdiff: {0}".format(err.message))
256 02888ad76719 added exception handling if PIL can't diff the image bsx <bsx+bitbucket@0xcafec0.de> parents: 255 diff changeset	1106 abort(404) # TODO render user friendly error image
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1107 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1108 # XXX TODO check ACL behaviour
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1109 headers, data = c
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1110 return Response(data, headers=headers)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1111
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1112 def _render_data_diff_text(self, oldrev, newrev):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1113 return super(TransformableBitmapImage, self)._render_data_diff_text(oldrev, newrev)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1114
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1115 item_registry.register(TransformableBitmapImage._factory, Type('image/png'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1116 item_registry.register(TransformableBitmapImage._factory, Type('image/jpeg'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1117 item_registry.register(TransformableBitmapImage._factory, Type('image/gif'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1118
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1119
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1120 class Text(Binary):
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1121 """ Base class for text/* """
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1122 template = "modify_text.html"
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1123
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1124 # text/plain mandates crlf - but in memory, we want lf only
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1125 def data_internal_to_form(self, text):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1126 """ convert data from memory format to form format """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1127 return text.replace(u'\n', u'\r\n')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1128
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1129 def data_form_to_internal(self, data):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1130 """ convert data from form format to memory format """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1131 return data.replace(u'\r\n', u'\n')
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1132
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1133 def data_internal_to_storage(self, text):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1134 """ convert data from memory format to storage format """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1135 return text.replace(u'\n', u'\r\n').encode(config.charset)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1136
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1137 def data_storage_to_internal(self, data):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1138 """ convert data from storage format to memory format """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1139 return data.decode(config.charset).replace(u'\r\n', u'\n')
1198 2aa4f4ec6a94 Minor fixes for atom feed Shitiz Garg <mail@dragooon.net> parents: 1197 diff changeset	1140
1197 98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1141 def _get_data_diff_html(self, oldrev, newrev, template):
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1142 from MoinMoin.util.diff_html import diff
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	1143 old_text = self.data_storage_to_internal(oldrev.data.read())
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	1144 new_text = self.data_storage_to_internal(newrev.data.read())
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	1145 storage_item = flaskg.storage[self.name]
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1146 diffs = [(d[0], Markup(d[1]), d[2], Markup(d[3])) for d in diff(old_text, new_text)]
1197 98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1147 return render_template(template,
98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1148 item_name=self.name,
98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1149 oldrev=oldrev,
98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1150 newrev=newrev,
98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1151 diffs=diffs,
98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1152 )
1198 2aa4f4ec6a94 Minor fixes for atom feed Shitiz Garg <mail@dragooon.net> parents: 1197 diff changeset	1153
1197 98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1154 def _render_data_diff_atom(self, oldrev, newrev):
98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1155 """ renders diff in HTML for atom feed """
98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1156 return self._get_data_diff_html(oldrev, newrev, 'diff_text_atom.html')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1157
1197 98ff5e7a0bec Improved atom feed for page history Shitiz Garg <mail@dragooon.net> parents: 1180 diff changeset	1158 def _render_data_diff(self, oldrev, newrev):
1199 a4ce283b0ca2 Text::_render_data_diff should return unicode in keeping it consistent with _render_data_diff_atom Shitiz Garg <mail@dragooon.net> parents: 1198 diff changeset	1159 return self._get_data_diff_html(oldrev, newrev, 'diff_text.html')
1198 2aa4f4ec6a94 Minor fixes for atom feed Shitiz Garg <mail@dragooon.net> parents: 1197 diff changeset	1160
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1161 def _render_data_diff_text(self, oldrev, newrev):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1162 from MoinMoin.util import diff_text
852 5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	1163 oldlines = self.data_storage_to_internal(oldrev.data.read()).split('\n')
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 827 diff changeset	1164 newlines = self.data_storage_to_internal(newrev.data.read()).split('\n')
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1165 difflines = diff_text.diff(oldlines, newlines)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1166 return '\n'.join(difflines)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1167
1112 b02f88f4428e Fix diffraw view, fix text diffraw Sam Toyer <samATqxcvDOTnet> parents: 1099 diff changeset	1168 _render_data_diff_raw = _render_data_diff
b02f88f4428e Fix diffraw view, fix text diffraw Sam Toyer <samATqxcvDOTnet> parents: 1099 diff changeset	1169
202 9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1170 def _render_data_highlight(self):
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1171 from MoinMoin.converter import default_registry as reg
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1172 data_text = self.data_storage_to_internal(self.data)
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1173 # TODO: use registry as soon as it is in there
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1174 from MoinMoin.converter.pygments_in import Converter as PygmentsConverter
221 faa06b4873dd more contenttype related changes/fixes, see below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 216 diff changeset	1175 pygments_conv = PygmentsConverter(contenttype=self.contenttype)
298 07143bd03aed fix pygments converter call for new converter api Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 292 diff changeset	1176 doc = pygments_conv(data_text)
202 9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1177 # TODO: Real output format
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1178 html_conv = reg.get(type_moin_document, Type('application/x-xhtml-moin-page'))
9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1179 doc = html_conv(doc)
204 af274db0ed53 items: move duplicated code to function conv_serialize Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 203 diff changeset	1180 return conv_serialize(doc, {html.namespace: ''})
202 9ffa82e550ba highlight view: move dom conversion code to Item method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 197 diff changeset	1181
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1182 def do_modify(self, contenttype, template_name):
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1183 # XXX think about and add item template support
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1184 #if template_name is None and isinstance(self.rev, DummyRev):
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1185 # return self._do_modify_show_templates()
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1186 from MoinMoin.apps.frontend.views import CommentForm
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1187 class ModifyForm(CommentForm):
245 52ca5dc1ab15 add a JSON validator, use it to validate meta_text Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 244 diff changeset	1188 meta_text = String.using(optional=False).with_properties(placeholder=L_("MetaData (JSON)")).validated_by(ValidJSON())
244 a11656ba1eab modify views: use flatland also for the file upload form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 243 diff changeset	1189 data_text = String.using(optional=True).with_properties(placeholder=L_("Type your text here"))
a11656ba1eab modify views: use flatland also for the file upload form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 243 diff changeset	1190 data_file = FileStorage.using(optional=True, label=L_('Upload file:'))
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1191
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1192 if request.method == 'GET':
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1193 if template_name is None and isinstance(self.rev, DummyRev):
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1194 return self._do_modify_show_templates()
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1195 form = ModifyForm.from_defaults()
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1196 TextCha(form).amend_form()
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1197 if template_name:
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1198 item = Item.create(template_name)
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1199 form['data_text'] = self.data_storage_to_internal(item.data)
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1200 else:
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1201 form['data_text'] = self.data_storage_to_internal(self.data)
892 79f80ce3cf78 implement parents (key PARENTID), add it to index schema Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 891 diff changeset	1202 form['meta_text'] = self.meta_dict_to_text(self.prepare_meta_for_modify(self.meta))
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1203 elif request.method == 'POST':
244 a11656ba1eab modify views: use flatland also for the file upload form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 243 diff changeset	1204 form = ModifyForm.from_flat(request.form.items() + request.files.items())
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1205 TextCha(form).amend_form()
246 727e03c59dbf simplify form validation check, fix indentation Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 245 diff changeset	1206 if form.validate():
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1207 try:
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1208 self.modify() # XXX
1005 c36f61f85e97 AccessDeniedError replaced by AccessDenied, from the new storage api. Bruno Martin <bruno@hacklab.com.br> parents: 1004 diff changeset	1209 except AccessDenied:
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1210 abort(403)
e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1211 else:
316 4ee796d759bf use url_for_item where appropriate (in py code, no template changes yet) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 315 diff changeset	1212 return redirect(url_for_item(self.name))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1213 return render_template(self.template,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1214 item_name=self.name,
242 e93157b8b0bd refactor modify views to use flatland, see details below Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 241 diff changeset	1215 rows_data=str(ROWS_DATA), rows_meta=str(ROWS_META), cols=str(COLS),
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1216 help=self.modify_help,
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1217 form=form,
1229 29301b8a2718 Hide search box in modify views. Sam Toyer <samATqxcvDOTnet> parents: 1214 diff changeset	1218 search_form=None,
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1219 )
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1220
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1221 item_registry.register(Text._factory, Type('text/*'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1222
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1223
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1224 class MarkupItem(Text):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1225 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1226 some kind of item with markup
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1227 (internal links and transcluded items)
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1228 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1229
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1230
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1231 class MoinWiki(MarkupItem):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1232 """ MoinMoin wiki markup """
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1233
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1234 item_registry.register(MoinWiki._factory, Type('text/x.moin.wiki'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1235
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1236
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1237 class CreoleWiki(MarkupItem):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1238 """ Creole wiki markup """
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1239
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1240 item_registry.register(CreoleWiki._factory, Type('text/x.moin.creole'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1241
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1242
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1243 class MediaWiki(MarkupItem):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1244 """ MediaWiki markup """
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1245
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1246 item_registry.register(MediaWiki._factory, Type('text/x-mediawiki'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1247
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1248
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1249 class ReST(MarkupItem):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1250 """ ReStructured Text markup """
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1251
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1252 item_registry.register(ReST._factory, Type('text/x-rst'))
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1253
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1254
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1255 class HTML(Text):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1256 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1257 HTML markup
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1258
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1259 Note: As we use html_in converter to convert this to DOM and later some
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1260 output converterter to produce output format (e.g. html_out for html
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1261 output), all(?) unsafe stuff will get lost.
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1262
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1263 Note: If raw revision data is accessed, unsafe stuff might be present!
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1264 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1265 template = "modify_text_html.html"
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1266
225 bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1267 item_registry.register(HTML._factory, Type('text/html'))
bac248bcf98c use a Item/contenttype registry to get the right Item subclass Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 221 diff changeset	1268
0 5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1269
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1270 class DocBook(MarkupItem):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1271 """ DocBook Document """
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1272 def _convert(self, doc):
5568cf133caf create moin/2.0 repo, drop all history (see notes below) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: diff changeset	1273 from emeraldtree import ElementTree as ET

Mercurial > moin > 2.0

annotate MoinMoin/items/__init__.py @ 1236:3b723046d80e

annotate MoinMoin/items/init.py @ 1236:3b723046d80e