annotate MoinMoin/items/__init__.py @ 1798:d139d7aad071

Add @timed() to several methods of Item related to index view.
author Cheer Xiao <xiaqqaix@gmail.com>
date Sat, 29 Sep 2012 23:55:55 +0800
parents 54160346e469
children 54062fc0ca97
rev   line source
1391
339668f8ad06 refactor of apps/frontend/views.py and items/__init__.py modules
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1361
diff changeset
1 # Copyright: 2012 MoinMoin:CheerXiao
26
4cd8edde9e94 automatically transform module docstrings, moving legal stuff to comments
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 24
diff changeset
2 # 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
3 # 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
4 # 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
5 # 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
6 # 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
7 # 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
8 # 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
9
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
10 """
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
11 MoinMoin - high-level (frontend) 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
12
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
13 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
14 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
15 e.g. showing, editing, etc. of wiki items.
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
16
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
17 Each class in this module corresponds to an itemtype.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
18 """
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
19
1763
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
20 import time
486
b6149c732926 contenttype filtering added to global index page
Akash Sinha <akash2607@gmail.com>
parents: 484
diff changeset
21 import itertools
1623
1e67974bee6e remove simplejson fallback, json is included since python 2.6 (which we require)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1617
diff changeset
22 import json
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
1613
bc8a2546468b Clean up registry code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1460
diff changeset
24 from collections import namedtuple
1763
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
25
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
26 from flask import current_app as app
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
27 from flask import g as flaskg
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
28 from flask import request, Response, redirect, abort, escape
173
89f50aed143f move mimetype related code from wikiutil to util.mimetype
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 170
diff changeset
29
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
30 from flatland import Form
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
31
1662
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
32 from jinja2 import Markup
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
33
1691
28cb88fcc4dd Move Blog item implementation to a separate blog.py module.
Pavel Sviderski <pavel@psviderski.name>
parents: 1690
diff changeset
34 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
35
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
36 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
37 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
38
1763
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
39 from MoinMoin.security.textcha import TextCha, TextChaizedForm
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
40 from MoinMoin.signalling import item_modified
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
41 from MoinMoin.storage.middleware.protecting import AccessDenied
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
42 from MoinMoin.storage.error import NoSuchItemError, NoSuchRevisionError, StorageError
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
43 from MoinMoin.i18n import L_
0
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 MoinMoin.themes import render_template
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
45 from MoinMoin.util.interwiki import url_for_item
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
46 from MoinMoin.util.registry import RegistryBase
1798
d139d7aad071 Add @timed() to several methods of Item related to index view.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1765
diff changeset
47 from MoinMoin.util.clock import timed
1763
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
48 from MoinMoin.forms import RequiredText, OptionalText, JSON, Tags, Submit
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
49 from MoinMoin.constants.keys import (
1691
28cb88fcc4dd Move Blog item implementation to a separate blog.py module.
Pavel Sviderski <pavel@psviderski.name>
parents: 1690
diff changeset
50 NAME, NAME_OLD, NAME_EXACT, WIKINAME, MTIME, SYSITEM_VERSION, ITEMTYPE,
1763
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
51 CONTENTTYPE, SIZE, ACTION, ADDRESS, HOSTNAME, USERID, COMMENT,
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
52 HASH_ALGORITHM, ITEMID, REVID, DATAID, CURRENT, PARENTID
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
53 )
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
54 from MoinMoin.constants.contenttypes import charset, CONTENTTYPE_GROUPS
1727
bb94565c7897 Add MoinMoin.constants.itemtypes module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1726
diff changeset
55 from MoinMoin.constants.itemtypes import ITEMTYPES
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
56
1763
347d11826f95 Clean up imports in items/{__init__,content}.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1727
diff changeset
57 from .content import Content, NonExistentContent, Draw
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
58
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
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
60 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
61 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
62
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
63
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
64 class RegistryItem(RegistryBase):
1613
bc8a2546468b Clean up registry code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1460
diff changeset
65 class Entry(namedtuple('Entry', 'factory itemtype priority')):
bc8a2546468b Clean up registry code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1460
diff changeset
66 def __call__(self, itemtype, *args, **kw):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
67 if self.itemtype == itemtype:
1613
bc8a2546468b Clean up registry code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1460
diff changeset
68 return self.factory(*args, **kw)
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
69
bac248bcf98c use a Item/contenttype registry to get the right Item subclass
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 221
diff changeset
70 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
71 if isinstance(other, self.__class__):
1614
5b5e7190452f Fix various registry Entry `__lt__` methods. This resolves issue #221.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1613
diff changeset
72 if self.priority != other.priority:
5b5e7190452f Fix various registry Entry `__lt__` methods. This resolves issue #221.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1613
diff changeset
73 return self.priority < other.priority
5b5e7190452f Fix various registry Entry `__lt__` methods. This resolves issue #221.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1613
diff changeset
74 return self.itemtype < other.itemtype
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
75 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
76
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
77 def register(self, factory, itemtype, priority=RegistryBase.PRIORITY_MIDDLE):
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
78 """
bac248bcf98c use a Item/contenttype registry to get the right Item subclass
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 221
diff changeset
79 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
80
bac248bcf98c use a Item/contenttype registry to get the right Item subclass
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 221
diff changeset
81 :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
82 """
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
83 return self._register(self.Entry(factory, itemtype, priority))
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
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 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
87
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
88 def register(cls):
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
89 item_registry.register(cls._factory, cls.itemtype)
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
90 return cls
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
91
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
92
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
93 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
94 """ if we have no stored Revision, we use this dummy """
1672
c093039ac8a5 items/__init__.py: DummyRev.__init__: Add default values for itemtype and
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1670
diff changeset
95 def __init__(self, item, itemtype=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
96 self.item = item
1672
c093039ac8a5 items/__init__.py: DummyRev.__init__: Add default values for itemtype and
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1670
diff changeset
97 self.meta = {
c093039ac8a5 items/__init__.py: DummyRev.__init__: Add default values for itemtype and
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1670
diff changeset
98 ITEMTYPE: itemtype or u'nonexistent',
c093039ac8a5 items/__init__.py: DummyRev.__init__: Add default values for itemtype and
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1670
diff changeset
99 CONTENTTYPE: contenttype or u'application/x-nonexistent'
c093039ac8a5 items/__init__.py: DummyRev.__init__: Add default values for itemtype and
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1670
diff changeset
100 }
852
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
101 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
102 self.revid = None
1672
c093039ac8a5 items/__init__.py: DummyRev.__init__: Add default values for itemtype and
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1670
diff changeset
103 if self.item:
c093039ac8a5 items/__init__.py: DummyRev.__init__: Add default values for itemtype and
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1670
diff changeset
104 self.meta[NAME] = self.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
105
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
106
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
107 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
108 """ 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
109 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
110 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
111 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
112 return [] # same as an empty Item
1180
1c5a013b9ebd Fix the three failing tests.
Bilal Akhtar <bilalakhtar@ubuntu.com>
parents: 1152
diff changeset
113 def destroy_all_revisions(self):
1c5a013b9ebd Fix the three failing tests.
Bilal Akhtar <bilalakhtar@ubuntu.com>
parents: 1152
diff changeset
114 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
115
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
116
1765
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
117 def get_storage_revision(name, itemtype=None, contenttype=None, rev_id=CURRENT, item=None):
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
118 """
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
119 Get a storage Revision.
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
120
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
121 If :item is supplied it is used as the storage Item; otherwise the storage
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
122 Item is looked up with :name. If it is not found (either because the item
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
123 doesn't exist or the user does not have the required permissions) a
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
124 DummyItem is created, and a DummyRev is created with appropriate metadata
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
125 properties and the "item" property pointing to the DummyItem. The DummyRev
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
126 is then returned.
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
127
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
128 If the previous step didn't end up with a DummyRev, the revision
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
129 designated by :rev_id is then looked up. If it is not found, current
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
130 revision is looked up and returned instead. If current revision is not
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
131 found (i.e. the item has no revision), a DummyRev is created. (TODO: in
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
132 the last two cases, emit warnings or throw exceptions.)
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
133
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
134 :itemtype and :contenttype are used when creating a DummyRev, where
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
135 metadata is not available from the storage.
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
136 """
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
137 if 1: # try:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
138 if item is None:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
139 item = flaskg.storage[name]
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
140 else:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
141 name = item.name
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
142 if not item: # except NoSuchItemError:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
143 logging.debug("No such item: {0!r}".format(name))
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
144 item = DummyItem(name)
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
145 rev = DummyRev(item, itemtype, contenttype)
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
146 logging.debug("Item {0!r}, created dummy revision with contenttype {1!r}".format(name, contenttype))
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
147 else:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
148 logging.debug("Got item: {0!r}".format(name))
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
149 try:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
150 rev = item.get_revision(rev_id)
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
151 except KeyError: # NoSuchRevisionError:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
152 try:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
153 rev = item.get_revision(CURRENT) # fall back to current revision
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
154 # XXX add some message about invalid revision
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
155 except KeyError: # NoSuchRevisionError:
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
156 logging.debug("Item {0!r} has no revisions.".format(name))
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
157 rev = DummyRev(item, itemtype, contenttype)
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
158 logging.debug("Item {0!r}, created dummy revision with contenttype {1!r}".format(name, contenttype))
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
159 logging.debug("Got item {0!r}, revision: {1!r}".format(name, rev_id))
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
160 return rev
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
161
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
162
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
163 class BaseChangeForm(TextChaizedForm):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
164 comment = OptionalText.using(label=L_('Comment')).with_properties(placeholder=L_("Comment about your change"))
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
165 submit = Submit
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
166
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
167
1624
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
168 class BaseMetaForm(Form):
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
169 itemtype = RequiredText.using(label=L_("Item type")).with_properties(placeholder=L_("Item type"))
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
170 contenttype = RequiredText.using(label=L_("Content type")).with_properties(placeholder=L_("Content type"))
1627
b0b73fe90f3d Remove wikiname, disable ACL in metadata editor
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1626
diff changeset
171 # Disabled - Flatland doesn't distinguish emtpy value and nonexistent
b0b73fe90f3d Remove wikiname, disable ACL in metadata editor
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1626
diff changeset
172 # value, while an emtpy acl and no acl have different semantics
b0b73fe90f3d Remove wikiname, disable ACL in metadata editor
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1626
diff changeset
173 #acl = OptionalText.using(label=L_('ACL')).with_properties(placeholder=L_("Access Control List"))
1624
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
174 summary = OptionalText.using(label=L_("Summary")).with_properties(placeholder=L_("One-line summary of the item"))
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
175 tags = Tags
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
176
1626
346c52c9c1e5 Fixes to forms.py and items/__init__.py
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1625
diff changeset
177
1677
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
178 class BaseModifyForm(BaseChangeForm):
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
179 @classmethod
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
180 def from_item(cls, item):
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
181 form = cls.from_defaults()
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
182 TextCha(form).amend_form()
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
183 form._load(item)
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
184 return form
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
185
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
186 @classmethod
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
187 def from_request(cls, request):
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
188 form = cls.from_flat(request.form.items() + request.files.items())
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
189 TextCha(form).amend_form()
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
190 return form
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
191
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
192
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
193 IndexEntry = namedtuple('IndexEntry', 'relname meta hassubitems')
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
194
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
195 class Item(object):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
196 """ Highlevel (not storage) Item, wraps around a storage 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
197 @classmethod
1613
bc8a2546468b Clean up registry code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1460
diff changeset
198 def _factory(cls, *args, **kw):
bc8a2546468b Clean up registry code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1460
diff changeset
199 return cls(*args, **kw)
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
200
bac248bcf98c use a Item/contenttype registry to get the right Item subclass
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 221
diff changeset
201 @classmethod
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
202 def create(cls, name=u'', itemtype=None, contenttype=None, rev_id=CURRENT, item=None):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
203 """
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
204 Create a highlevel Item by looking up :name or directly wrapping
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
205 :item and extract the Revision designated by :rev_id revision.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
206
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
207 The highlevel Item is created by creating an instance of Content
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
208 subclass according to the item's contenttype metadata entry; The
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
209 :contenttype argument can be used to override contenttype. It is used
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
210 only when handling +convert (when deciding the contenttype of target
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
211 item), +modify (when creating a new item whose contenttype is not yet
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
212 decided), +diff and +diffraw (to coerce the Content to a common
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
213 super-contenttype of both revisions).
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
214
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
215 After that the Content instance, an instance of Item subclass is
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
216 created according to the item's itemtype metadata entry, and the
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
217 previously created Content instance is assigned to its content
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
218 property.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
219 """
1765
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
220 rev = get_storage_revision(name, itemtype, contenttype, rev_id, item)
852
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
221 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
222 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
223 #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
224
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
225 # XXX Cannot pass item=item to Content.__init__ via
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
226 # content_registry.get yet, have to patch it later.
1648
1a2c53092ea1 items/content.py: Implement Content.create.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1631
diff changeset
227 content = Content.create(contenttype)
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
228
1765
54160346e469 items/__init__.py: Add function get_storage_revision().
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1763
diff changeset
229 itemtype = rev.meta.get(ITEMTYPE) or itemtype or u'default'
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
230 logging.debug("Item {0!r}, got itemtype {1!r} from revision meta".format(name, itemtype))
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
231
1613
bc8a2546468b Clean up registry code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1460
diff changeset
232 item = item_registry.get(itemtype, name, rev=rev, content=content)
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
233 logging.debug("Item class {0!r} handles {1!r}".format(item.__class__, itemtype))
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
234
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
235 content.item = item
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
236
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
237 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
238
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
239 def __init__(self, name, rev=None, content=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
240 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
241 self.rev = rev
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
242 self.content = 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
243
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
244 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
245 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
246 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
247
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
248 # XXX Backward compatibility, remove soon
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
249 @property
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
250 def contenttype(self):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
251 return self.content.contenttype if self.content else 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
252
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
253 def _render_meta(self):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
254 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
255
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
256 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
257 """ 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
258 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
259 SYSITEM_VERSION,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
260 NAME_OLD,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
261 # are automatically implanted when saving
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
262 NAME,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
263 ITEMID, REVID, DATAID,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
264 HASH_ALGORITHM,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
265 SIZE,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
266 COMMENT,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
267 MTIME,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
268 ACTION,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
269 ADDRESS, HOSTNAME, USERID,
afe0afe4e1a6 recursive rename
"Luis Henrique Fagundes <lhfagundes@gmail.com>"
parents: 993
diff changeset
270 ]
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
271 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
272 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
273 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
274
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
275 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
276 """ 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
277 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
278 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
279
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
280 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
281 """ 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
282 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
283 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
284 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
285 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
286
892
79f80ce3cf78 implement parents (key PARENTID), add it to index schema
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 891
diff changeset
287 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
288 """
79f80ce3cf78 implement parents (key PARENTID), add it to index schema
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 891
diff changeset
289 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
290 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
291 """
79f80ce3cf78 implement parents (key PARENTID), add it to index schema
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 891
diff changeset
292 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
293 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
294 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
295 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
296 return meta
79f80ce3cf78 implement parents (key PARENTID), add it to index schema
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 891
diff changeset
297
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 def _rename(self, name, comment, action):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
299 self._save(self.meta, self.content.data, name=name, action=action, comment=comment)
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
300 old_prefixlen = len(self.subitems_prefix)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
301 new_prefix = name + '/'
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
302 for child in self.get_subitem_revs():
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
303 child_oldname = child.meta[NAME]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
304 child_newname = new_prefix + child_oldname[old_prefixlen:]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
305 item = Item.create(child_oldname)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
306 item._save(item.meta, item.content.data, name=child_newname, 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
307
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
308 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
309 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
310 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
311 """
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
312 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
313
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
314 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
315 """
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
316 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
317 """
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
318 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
319 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
320 # 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
321 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
322 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
323
1407
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
324 def revert(self, comment=u''):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
325 return self._save(self.meta, self.content.data, action=u'REVERT', 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
326
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
327 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
328 # 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
329 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
330 # destroy complete item with all revisions, metadata, etc.
910
5b7e522d97af fix destroy
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 908
diff changeset
331 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
332 else:
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
333 # just destroy this revision
910
5b7e522d97af fix destroy
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 908
diff changeset
334 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
335
1407
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
336 def modify(self, meta, data, comment=u'', contenttype_guessed=None, contenttype_qs=None):
236
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 225
diff changeset
337 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
338 # 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
339 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
340
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 225
diff changeset
341 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
342
1677
d74b9e4d41e5 items/__init__.py: Split helper methods from_item and from_requst in
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1676
diff changeset
343 class _ModifyForm(BaseModifyForm):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
344 """Base class for ModifyForm of Item subclasses."""
1624
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
345 meta_form = BaseMetaForm
1625
6748d609a242 forms.py: Create JSON widget
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1624
diff changeset
346 extra_meta_text = JSON.using(label=L_("Extra MetaData (JSON)")).with_properties(rows=ROWS_META, cols=COLS)
1624
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
347 meta_template = 'modify_meta.html'
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
348
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
349 def _load(self, item):
1624
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
350 meta = item.prepare_meta_for_modify(item.meta)
1630
24c1a4b29c86 items/__init__.py: comment policy='duck' argument passed to Flatland.Dict.set
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1629
diff changeset
351 # Default value of `policy` argument of Flatland.Dict.set's is
24c1a4b29c86 items/__init__.py: comment policy='duck' argument passed to Flatland.Dict.set
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1629
diff changeset
352 # 'strict', which causes KeyError to be thrown when meta contains
24c1a4b29c86 items/__init__.py: comment policy='duck' argument passed to Flatland.Dict.set
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1629
diff changeset
353 # meta keys that are not present in self['meta_form']. Setting
24c1a4b29c86 items/__init__.py: comment policy='duck' argument passed to Flatland.Dict.set
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1629
diff changeset
354 # policy to 'duck' suppresses this behavior.
24c1a4b29c86 items/__init__.py: comment policy='duck' argument passed to Flatland.Dict.set
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1629
diff changeset
355 self['meta_form'].set(meta, policy='duck')
1624
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
356 for k in self['meta_form'].field_schema_mapping.keys():
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
357 meta.pop(k, None)
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
358 self['extra_meta_text'].set(item.meta_dict_to_text(meta))
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
359 self['content_form']._load(item.content)
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
360
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
361 def _dump(self, item):
1624
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
362 meta = self['meta_form'].value.copy()
c6974ba2e2b2 Widget-based metadata editor.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1614
diff changeset
363 meta.update(item.meta_text_to_dict(self['extra_meta_text'].value))
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
364 data, contenttype_guessed = self['content_form']._dump(item.content)
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
365 comment = self['comment'].value
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
366 return meta, data, contenttype_guessed, comment
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
367
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
368 def do_modify(self):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
369 """
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
370 Handle +modify requests, both GET and POST.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
371
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
372 This method should be overridden in subclasses, providing polymorphic
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
373 behavior for the +modify view.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
374 """
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
375 raise NotImplementedError
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
376
852
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
377 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
378 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
379 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
380 try:
852
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
381 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
382 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
383 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
384 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
385 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
386 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
387 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
388
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
389 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
390
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
391 # 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
392 # 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
393 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
394 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
395 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
396 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
397 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
398 meta[NAME] = name
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
399
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
400 if comment:
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
401 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
402
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
403 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
404 # 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
405 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
406
236
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 225
diff changeset
407 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
408 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
409 # 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
410 # 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
411 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
412 else:
f464adcc3a51 fix saving no data if no previous revision exists
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 236
diff changeset
413 data = ''
236
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 225
diff changeset
414
852
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
415 if isinstance(data, unicode):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
416 data = data.encode(charset) # XXX wrong! if contenttype gives a coding, we MUST use THAT.
236
7a77ae08161e items: cleanup contenttype handling in modify/_save, see below
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 225
diff changeset
417
852
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
418 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
419 data = StringIO(data)
5ad4ae0b1e09 lots of fixes / adaptions for storage-ng code
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 827
diff changeset
420
1266
1c66f39aa44f implement validation for revision metadata storage using flatland
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1236
diff changeset
421 newrev = storage_item.store_revision(meta, data, overwrite=overwrite,
1c66f39aa44f implement validation for revision metadata storage using flatland
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1236
diff changeset
422 action=unicode(action),
1c66f39aa44f implement validation for revision metadata storage using flatland
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1236
diff changeset
423 contenttype_current=contenttype_current,
1c66f39aa44f implement validation for revision metadata storage using flatland
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1236
diff changeset
424 contenttype_guessed=contenttype_guessed,
1c66f39aa44f implement validation for revision metadata storage using flatland
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1236
diff changeset
425 )
242
e93157b8b0bd refactor modify views to use flatland, see details below
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 241
diff changeset
426 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
427 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
428
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
429 @property
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
430 def subitems_prefix(self):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
431 return self.name + u'/' if self.name else u''
486
b6149c732926 contenttype filtering added to global index page
Akash Sinha <akash2607@gmail.com>
parents: 484
diff changeset
432
1798
d139d7aad071 Add @timed() to several methods of Item related to index view.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1765
diff changeset
433 @timed()
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
434 def get_subitem_revs(self):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
435 """
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
436 Create a list of subitems of this item.
486
b6149c732926 contenttype filtering added to global index page
Akash Sinha <akash2607@gmail.com>
parents: 484
diff changeset
437
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
438 Subitems are in the form of storage Revisions.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
439 """
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
440 query = Term(WIKINAME, app.cfg.interwikiname)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
441 # trick: an item of empty name can be considered as "virtual root item"
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
442 # that has all wiki items as sub items
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
443 if self.name:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
444 query = And([query, Prefix(NAME_EXACT, self.subitems_prefix)])
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
445 revs = flaskg.storage.search(query, sortedby=NAME_EXACT, limit=None)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
446 return revs
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
447
1798
d139d7aad071 Add @timed() to several methods of Item related to index view.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1765
diff changeset
448 @timed()
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
449 def make_flat_index(self, subitems):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
450 """
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
451 Create a list of IndexEntry from a list of subitems.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
452
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
453 The resulting list contains only IndexEntry for *direct* subitems, e.g.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
454 'foo' but not 'foo/bar'. When the latter is encountered, the former has
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
455 its `hassubitems` flag set in its IndexEntry.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
456
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
457 When disconnected levels are detected, e.g. when there is foo/bar but no
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
458 foo, a dummy IndexEntry is created for the latter, with 'nonexistent'
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
459 itemtype and 'application/x.nonexistent' contenttype. Its `hassubitems`
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
460 flag is also set.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
461 """
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
462 prefix = self.subitems_prefix
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
463 prefixlen = len(prefix)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
464 index = []
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
465
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
466 # relnames of all encountered subitems
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
467 relnames = set()
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
468 # relnames of subitems that need to have `hassubitems` flag set (but didn't)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
469 relnames_to_patch = set()
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
470
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
471 for rev in subitems:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
472 fullname = rev.meta[NAME]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
473 relname = fullname[prefixlen:]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
474 if '/' in relname:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
475 # Find the *direct* subitem that is the ancestor of current
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
476 # (indirect) subitem. e.g. suppose when the index root is
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
477 # 'foo', and current item (`rev`) is 'foo/bar/lorem/ipsum',
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
478 # 'foo/bar' will be found.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
479 direct_relname = relname.partition('/')[0]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
480 direct_fullname = prefix + direct_relname
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
481 if direct_relname not in relnames:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
482 # Join disconnected level with a dummy IndexEntry.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
483 # NOTE: Patching the index when encountering a disconnected
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
484 # subitem might break the ordering. e.g. suppose the global
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
485 # index has ['lorem-', 'lorem/ipsum'] (thus 'lorem' is a
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
486 # disconnected level; also, note that ord('-') < ord('/'))
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
487 # the patched index will have lorem after lorem-, requiring
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
488 # one more pass of sorting after generating the index.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
489 e = IndexEntry(direct_relname, DummyRev(DummyItem(direct_fullname)).meta, True)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
490 index.append(e)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
491 relnames.add(direct_relname)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
492 else:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
493 relnames_to_patch.add(direct_relname)
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
494 else:
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
495 e = IndexEntry(relname, rev.meta, False)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
496 index.append(e)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
497 relnames.add(relname)
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
498
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
499 for i in xrange(len(index)):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
500 if index[i].relname in relnames_to_patch:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
501 index[i] = index[i]._replace(hassubitems=True)
477
72899d48db41 alphabetic listing of global index, with link to item index
Akash Sinha <akash2607@gmail.com>
parents: 257
diff changeset
502
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
503 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
504
1798
d139d7aad071 Add @timed() to several methods of Item related to index view.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1765
diff changeset
505 @timed()
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
506 def filter_index(self, index, startswith=None, selected_groups=None):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
507 """
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
508 Filter a list of IndexEntry.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
509
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
510 :param startswith: if set, only items whose names start with startswith
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
511 are selected.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
512 :param selected_groups: if set, only items whose contentypes belong to
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
513 the selected contenttype_groups are selected.
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
514 """
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
515 if startswith is not None:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
516 index = [e for e in index
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
517 if e.relname.startswith((startswith, startswith.swapcase()))]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
518
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
519 def build_contenttypes(groups):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
520 ctypes = [[ctype for ctype, clabel in contenttypes]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
521 for gname, contenttypes in CONTENTTYPE_GROUPS
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
522 if gname in groups]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
523 ctypes_chain = itertools.chain(*ctypes)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
524 contenttypes = list(ctypes_chain)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
525 contenttypes_without_encoding = [contenttype[:contenttype.index(u';')]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
526 for contenttype in contenttypes
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
527 if u';' in contenttype]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
528 contenttypes.extend(contenttypes_without_encoding) # adding more mime-types without the encoding term
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
529 return contenttypes
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
530
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
531 if selected_groups is not None:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
532 all_groups = [gname for gname, contenttypes in CONTENTTYPE_GROUPS]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
533 selected_contenttypes = build_contenttypes(selected_groups)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
534 filtered_index = [e for e in index
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
535 if e.meta[CONTENTTYPE] in selected_contenttypes]
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
536
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
537 unknown_item_group = "unknown items"
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
538 if unknown_item_group in selected_groups:
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
539 all_contenttypes = build_contenttypes(all_groups)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
540 filtered_index.extend([e for e in index
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
541 if e.meta[CONTENTTYPE] not in all_contenttypes])
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
542
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
543 index = filtered_index
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
544 return index
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
545
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
546 def get_index(self, startswith=None, selected_groups=None):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
547 return self.filter_index(self.make_flat_index(self.get_subitem_revs()), startswith, selected_groups)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
548
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
549 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
550
1726
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
551 def name_initial(self, subitems):
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
552 prefixlen = len(self.subitems_prefix)
d697fd14e772 Various cleanup for item index code (+index view and related methods of Item).
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1691
diff changeset
553 initials = [(item.meta[NAME][prefixlen]) for item in subitems]
477
72899d48db41 alphabetic listing of global index, with link to item index
Akash Sinha <akash2607@gmail.com>
parents: 257
diff changeset
554 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
555
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
556 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
557 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
558 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
559 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
560 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
561
0
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
562
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
563 class Contentful(Item):
245
52ca5dc1ab15 add a JSON validator, use it to validate meta_text
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 244
diff changeset
564 """
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
565 Base class for Item subclasses that have content.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
566 """
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
567 @property
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
568 def ModifyForm(self):
1653
57e864bb8852 Add the ability to create new Blog and Blog entry items.
Pavel Sviderski <pavel@psviderski.name>
parents: 1650
diff changeset
569 class C(self._ModifyForm):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
570 content_form = self.content.ModifyForm
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
571 C.__name__ = 'ModifyForm'
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
572 return C
1420
100197cb69ab Convert Flatland forms to contain rendering hints.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1408
diff changeset
573
100197cb69ab Convert Flatland forms to contain rendering hints.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1408
diff changeset
574
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
575 @register
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
576 class Default(Contentful):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
577 """
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
578 A "conventional" wiki item.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
579 """
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
580 itemtype = u'default'
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
581
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
582 def _do_modify_show_templates(self):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
583 # call this if the item is still empty
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
584 rev_ids = []
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
585 item_templates = self.content.get_templates(self.contenttype)
1460
157d41b326b1 Rename modify_show_*_selection.html templates to modify_select_*.html
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1456
diff changeset
586 return render_template('modify_select_template.html',
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
587 item_name=self.name,
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
588 itemtype=self.itemtype,
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
589 rev=self.rev,
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
590 contenttype=self.contenttype,
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
591 templates=item_templates,
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
592 first_rev_id=rev_ids and rev_ids[0],
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
593 last_rev_id=rev_ids and rev_ids[-1],
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
594 meta_rendered='',
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
595 data_rendered='',
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
596 )
242
e93157b8b0bd refactor modify views to use flatland, see details below
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 241
diff changeset
597
1662
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
598 def do_show(self, revid):
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
599 show_revision = revid != CURRENT
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
600 show_navigation = False # TODO
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
601 first_rev = last_rev = None # TODO
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
602 return render_template(self.show_template,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
603 item=self, item_name=self.name,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
604 rev=self.rev,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
605 contenttype=self.contenttype,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
606 first_rev_id=first_rev,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
607 last_rev_id=last_rev,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
608 data_rendered=Markup(self.content._render_data()),
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
609 show_revision=show_revision,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
610 show_navigation=show_navigation,
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
611 )
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
612
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
613 def do_modify(self):
1407
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
614 method = request.method
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
615 if method == 'GET':
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
616 if isinstance(self.content, NonExistentContent):
1460
157d41b326b1 Rename modify_show_*_selection.html templates to modify_select_*.html
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1456
diff changeset
617 return render_template('modify_select_contenttype.html',
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
618 item_name=self.name,
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
619 itemtype=self.itemtype,
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
620 contenttype_groups=CONTENTTYPE_GROUPS,
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
621 )
1407
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
622 item = self
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
623 if isinstance(self.rev, DummyRev):
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
624 template_name = request.values.get('template')
1407
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
625 if template_name is None:
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
626 return self._do_modify_show_templates()
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
627 elif template_name:
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
628 item = Item.create(template_name)
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
629 form = self.ModifyForm.from_item(item)
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
630 elif method == 'POST':
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
631 # XXX workaround for *Draw items
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
632 if isinstance(self.content, Draw):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
633 try:
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
634 self.content.handle_post()
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
635 except AccessDenied:
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
636 abort(403)
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
637 else:
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
638 # *Draw Applets POSTs more than once, redirecting would
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
639 # break them
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
640 return "OK"
1407
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
641 form = self.ModifyForm.from_request(request)
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
642 if form.validate():
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
643 meta, data, contenttype_guessed, comment = form._dump(self)
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
644 contenttype_qs = request.values.get('contenttype')
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
645 try:
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
646 self.modify(meta, data, comment, contenttype_guessed, contenttype_qs)
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
647 except AccessDenied:
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
648 abort(403)
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
649 else:
8bbdf554e812 Cleanups and fixes for the items module.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1397
diff changeset
650 return redirect(url_for_item(self.name))
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
651 return render_template(self.modify_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
652 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
653 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
654 form=form,
1229
29301b8a2718 Hide search box in modify views.
Sam Toyer <samATqxcvDOTnet>
parents: 1214
diff changeset
655 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
656 )
5568cf133caf create moin/2.0 repo, drop all history (see notes below)
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents:
diff changeset
657
1662
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
658 show_template = 'show.html'
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
659 modify_template = 'modify.html'
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
660
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
661
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
662 @register
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
663 class Userprofile(Item):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
664 """
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
665 Currently userprofile is implemented as a contenttype. This is a stub of an
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
666 itemtype implementation of userprofile.
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
667 """
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
668 itemtype = u'userprofile'
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
669
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
670
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
671 @register
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
672 class NonExistent(Item):
1649
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
673 """
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
674 A dummy Item for nonexistent items (when modifying, a nonexistent item with
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
675 undetermined itemtype)
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
676 """
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
677 itemtype = u'nonexistent'
5dc142ab43d2 Keep itemtype and contenttype in Item and Content subclasses.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1648
diff changeset
678
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
679 def _convert(self, doc):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
680 abort(404)
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
681
1662
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
682 def do_show(self, revid):
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
683 # First, check if the current user has the required privileges
1670
d3a1a3e7075f items.NonExistent.do_show should always return 404 status code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1667
diff changeset
684 if flaskg.user.may.create(self.name):
d3a1a3e7075f items.NonExistent.do_show should always return 404 status code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1667
diff changeset
685 content = self._select_itemtype()
d3a1a3e7075f items.NonExistent.do_show should always return 404 status code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1667
diff changeset
686 else:
d3a1a3e7075f items.NonExistent.do_show should always return 404 status code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1667
diff changeset
687 content = render_template('show_nonexistent.html',
d3a1a3e7075f items.NonExistent.do_show should always return 404 status code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1667
diff changeset
688 item_name=self.name,
d3a1a3e7075f items.NonExistent.do_show should always return 404 status code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1667
diff changeset
689 )
d3a1a3e7075f items.NonExistent.do_show should always return 404 status code.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1667
diff changeset
690 return Response(content, 404)
1662
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
691
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
692 def do_modify(self):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
693 # First, check if the current user has the required privileges
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
694 if not flaskg.user.may.create(self.name):
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
695 abort(403)
1662
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
696 return self._select_itemtype()
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
697
1662
465b22852fae Let Item subclasses handle +show.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1650
diff changeset
698 def _select_itemtype(self):
1460
157d41b326b1 Rename modify_show_*_selection.html templates to modify_select_*.html
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1456
diff changeset
699 return render_template('modify_select_itemtype.html',
1451
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
700 item_name=self.name,
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
701 itemtypes=ITEMTYPES,
c32ff2e07e7a Introduce itemtype.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1421
diff changeset
702 )
1653
57e864bb8852 Add the ability to create new Blog and Blog entry items.
Pavel Sviderski <pavel@psviderski.name>
parents: 1650
diff changeset
703
57e864bb8852 Add the ability to create new Blog and Blog entry items.
Pavel Sviderski <pavel@psviderski.name>
parents: 1650
diff changeset
704
1667
0104f76e30d0 items/__init__.py: Remove Ticket stub and call load_package_modules there.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1665
diff changeset
705 from ..util.pysupport import load_package_modules
0104f76e30d0 items/__init__.py: Remove Ticket stub and call load_package_modules there.
Cheer Xiao <xiaqqaix@gmail.com>
parents: 1665
diff changeset
706 load_package_modules(__name__, __path__)