1.1 --- a/MoinSupport.py Wed Nov 06 12:41:01 2013 +0100
1.2 +++ b/MoinSupport.py Wed Nov 06 14:40:30 2013 +0100
1.3 @@ -13,11 +13,8 @@
1.4 """
1.5
1.6 from DateSupport import *
1.7 -from ItemSupport import DirectoryItemStore, GeneralItemStore
1.8 from MoinMoin.parser import text_moin_wiki
1.9 -from MoinMoin.Page import Page, RootPage
1.10 -from MoinMoin.PageEditor import PageEditor
1.11 -from MoinMoin.util import lock
1.12 +from MoinMoin.Page import Page
1.13 from MoinMoin import config, search, wikiutil
1.14 from shlex import shlex
1.15 import re
1.16 @@ -37,7 +34,7 @@
1.17 except ImportError:
1.18 pass
1.19
1.20 -__version__ = "0.4.1"
1.21 +__version__ = "0.4.2"
1.22
1.23 # Extraction of shared fragments.
1.24
1.25 @@ -1091,235 +1088,4 @@
1.26 else:
1.27 return title
1.28
1.29 -# Content storage support.
1.30 -
1.31 -# Underlying storage mechanisms.
1.32 -
1.33 -class SubpageItemStore(GeneralItemStore):
1.34 -
1.35 - "A subpage-based item store."
1.36 -
1.37 - def __init__(self, page, lock_dir):
1.38 -
1.39 - "Initialise an item store for subpages under the given 'page'."
1.40 -
1.41 - GeneralItemStore.__init__(self, lock_dir)
1.42 - self.page = page
1.43 -
1.44 - def mtime(self):
1.45 -
1.46 - "Return the last modified time of the item store."
1.47 -
1.48 - keys = self.get_keys()
1.49 - if not keys:
1.50 - page = self.page
1.51 - else:
1.52 - page = Page(self.page.request, self.get_item_path(max(keys)))
1.53 -
1.54 - return wikiutil.version2timestamp(
1.55 - getMetadata(page)["last-modified"]
1.56 - )
1.57 -
1.58 - def get_next(self):
1.59 -
1.60 - "Return the next item number."
1.61 -
1.62 - return self.deduce_next()
1.63 -
1.64 - def get_keys(self):
1.65 -
1.66 - "Return the item keys."
1.67 -
1.68 - is_subpage = re.compile(u"^%s/" % re.escape(self.page.page_name), re.UNICODE).match
1.69 -
1.70 - # Collect the strict subpages of the parent page.
1.71 -
1.72 - leafnames = []
1.73 - parentname = self.page.page_name
1.74 -
1.75 - for pagename in RootPage(self.page.request).getPageList(filter=is_subpage):
1.76 - parts = pagename[len(parentname)+1:].split("/")
1.77 -
1.78 - # Only collect numbered pages immediately below the parent.
1.79 -
1.80 - if len(parts) == 1 and parts[0].isdigit():
1.81 - leafnames.append(int(parts[0]))
1.82 -
1.83 - return leafnames
1.84 -
1.85 - def write_item(self, item, next):
1.86 -
1.87 - "Write the given 'item' to a file with the given 'next' item number."
1.88 -
1.89 - page = PageEditor(self.page.request, self.get_item_path(next))
1.90 - page.saveText(item, 0)
1.91 -
1.92 - def read_item(self, number):
1.93 -
1.94 - "Read the item with the given item 'number'."
1.95 -
1.96 - page = Page(self.page.request, self.get_item_path(number))
1.97 - return page.get_raw_body()
1.98 -
1.99 - def remove_item(self, number):
1.100 -
1.101 - "Remove the item with the given item 'number'."
1.102 -
1.103 - page = PageEditor(self.page.request, self.get_item_path(number))
1.104 - page.deletePage()
1.105 -
1.106 - def get_item_path(self, number):
1.107 -
1.108 - "Get the path for the given item 'number'."
1.109 -
1.110 - return "%s/%s" % (self.page.page_name, number)
1.111 -
1.112 - # High-level methods.
1.113 -
1.114 - def append(self, item):
1.115 -
1.116 - "Append the given 'item' to the store."
1.117 -
1.118 - self.writelock.acquire()
1.119 - try:
1.120 - next = self.get_next()
1.121 - self.write_item(item, next)
1.122 - finally:
1.123 - self.writelock.release()
1.124 -
1.125 -def getDirectoryItemStoreForPage(page, item_dir, lock_dir):
1.126 -
1.127 - """
1.128 - A convenience function returning a directory-based store for the given
1.129 - 'page', using the given 'item_dir' and 'lock_dir'.
1.130 - """
1.131 -
1.132 - item_dir_path = tuple(item_dir.split("/"))
1.133 - lock_dir_path = tuple(lock_dir.split("/"))
1.134 - return DirectoryItemStore(page.getPagePath(*item_dir_path), page.getPagePath(*lock_dir_path))
1.135 -
1.136 -def getSubpageItemStoreForPage(page, lock_dir):
1.137 -
1.138 - """
1.139 - A convenience function returning a subpage-based store for the given
1.140 - 'page', using the given 'lock_dir'.
1.141 - """
1.142 -
1.143 - lock_dir_path = tuple(lock_dir.split("/"))
1.144 - return SubpageItemStore(page, page.getPagePath(*lock_dir_path))
1.145 -
1.146 -# Page-oriented item store classes.
1.147 -
1.148 -class ItemStoreBase:
1.149 -
1.150 - "Access item stores via pages, observing page access restrictions."
1.151 -
1.152 - def __init__(self, page, store):
1.153 - self.page = page
1.154 - self.store = store
1.155 -
1.156 - def can_write(self):
1.157 -
1.158 - """
1.159 - Return whether the user associated with the request can write to the
1.160 - page owning this store.
1.161 - """
1.162 -
1.163 - user = self.page.request.user
1.164 - return user and user.may.write(self.page.page_name)
1.165 -
1.166 - def can_read(self):
1.167 -
1.168 - """
1.169 - Return whether the user associated with the request can read from the
1.170 - page owning this store.
1.171 - """
1.172 -
1.173 - user = self.page.request.user
1.174 - return user and user.may.read(self.page.page_name)
1.175 -
1.176 - def can_delete(self):
1.177 -
1.178 - """
1.179 - Return whether the user associated with the request can delete the
1.180 - page owning this store.
1.181 - """
1.182 -
1.183 - user = self.page.request.user
1.184 - return user and user.may.delete(self.page.page_name)
1.185 -
1.186 - # Store-specific methods.
1.187 -
1.188 - def mtime(self):
1.189 - return self.store.mtime()
1.190 -
1.191 - # High-level methods.
1.192 -
1.193 - def keys(self):
1.194 -
1.195 - "Return a list of keys for items in the store."
1.196 -
1.197 - if not self.can_read():
1.198 - return 0
1.199 -
1.200 - return self.store.keys()
1.201 -
1.202 - def append(self, item):
1.203 -
1.204 - "Append the given 'item' to the store."
1.205 -
1.206 - if not self.can_write():
1.207 - return
1.208 -
1.209 - self.store.append(item)
1.210 -
1.211 - def __len__(self):
1.212 -
1.213 - "Return the number of items in the store."
1.214 -
1.215 - if not self.can_read():
1.216 - return 0
1.217 -
1.218 - return len(self.store)
1.219 -
1.220 - def __getitem__(self, number):
1.221 -
1.222 - "Return the item with the given 'number'."
1.223 -
1.224 - if not self.can_read():
1.225 - raise IndexError, number
1.226 -
1.227 - return self.store.__getitem__(number)
1.228 -
1.229 - def __delitem__(self, number):
1.230 -
1.231 - "Remove the item with the given 'number'."
1.232 -
1.233 - if not self.can_delete():
1.234 - return
1.235 -
1.236 - return self.store.__delitem__(number)
1.237 -
1.238 - def __iter__(self):
1.239 - return self.store.__iter__()
1.240 -
1.241 - def next(self):
1.242 - return self.store.next()
1.243 -
1.244 -# Convenience store classes.
1.245 -
1.246 -class ItemStore(ItemStoreBase):
1.247 -
1.248 - "Store items in a directory via a page."
1.249 -
1.250 - def __init__(self, page, item_dir="items", lock_dir="item_locks"):
1.251 - ItemStoreBase.__init__(self, page, getDirectoryItemStoreForPage(page, item_dir, lock_dir))
1.252 -
1.253 -class ItemSubpageStore(ItemStoreBase):
1.254 -
1.255 - "Store items in subpages of a page."
1.256 -
1.257 - def __init__(self, page, lock_dir="item_locks"):
1.258 - ItemStoreBase.__init__(self, page, getSubpageItemStoreForPage(page, lock_dir))
1.259 -
1.260 # vim: tabstop=4 expandtab shiftwidth=4