1.1 --- a/MoinSupport.py Wed Oct 30 15:38:24 2013 +0100
1.2 +++ b/MoinSupport.py Wed Nov 06 00:24:17 2013 +0100
1.3 @@ -13,9 +13,10 @@
1.4 """
1.5
1.6 from DateSupport import *
1.7 -from ItemSupport import ItemDirectoryStore
1.8 +from ItemSupport import ItemDirectoryStore, ItemStoreBase
1.9 from MoinMoin.parser import text_moin_wiki
1.10 from MoinMoin.Page import Page
1.11 +from MoinMoin.PageEditor import PageEditor
1.12 from MoinMoin.util import lock
1.13 from MoinMoin import config, search, wikiutil
1.14 from shlex import shlex
1.15 @@ -1092,18 +1093,18 @@
1.16
1.17 # Content storage support.
1.18
1.19 -class ItemStore(ItemDirectoryStore):
1.20 +class ItemStore:
1.21
1.22 "A page-specific item store."
1.23
1.24 - def __init__(self, page, item_dir="items", lock_dir="item_locks"):
1.25 + def __init__(self, page, item_dir="items", lock_dir="item_locks", store=None):
1.26
1.27 "Initialise an item store for the given 'page'."
1.28
1.29 item_dir_path = tuple(item_dir.split("/"))
1.30 lock_dir_path = tuple(lock_dir.split("/"))
1.31 - ItemDirectoryStore.__init__(self, page.getPagePath(*item_dir_path), page.getPagePath(*lock_dir_path))
1.32 self.page = page
1.33 + self.store = store or ItemDirectoryStore(page.getPagePath(*item_dir_path), page.getPagePath(*lock_dir_path))
1.34
1.35 def can_write(self):
1.36
1.37 @@ -1135,8 +1136,22 @@
1.38 user = self.page.request.user
1.39 return user and user.may.delete(self.page.page_name)
1.40
1.41 + # Store-specific methods.
1.42 +
1.43 + def mtime(self):
1.44 + return self.store.mtime()
1.45 +
1.46 # High-level methods.
1.47
1.48 + def keys(self):
1.49 +
1.50 + "Return a list of keys for items in the store."
1.51 +
1.52 + if not self.can_read():
1.53 + return 0
1.54 +
1.55 + return self.store.keys()
1.56 +
1.57 def append(self, item):
1.58
1.59 "Append the given 'item' to the store."
1.60 @@ -1144,7 +1159,7 @@
1.61 if not self.can_write():
1.62 return
1.63
1.64 - ItemDirectoryStore.append(self, item)
1.65 + self.store.append(item)
1.66
1.67 def __len__(self):
1.68
1.69 @@ -1153,7 +1168,7 @@
1.70 if not self.can_read():
1.71 return 0
1.72
1.73 - return ItemDirectoryStore.__len__(self)
1.74 + return len(self.store)
1.75
1.76 def __getitem__(self, number):
1.77
1.78 @@ -1162,7 +1177,7 @@
1.79 if not self.can_read():
1.80 raise IndexError, number
1.81
1.82 - return ItemDirectoryStore.__getitem__(self, number)
1.83 + return self.store.__getitem__(number)
1.84
1.85 def __delitem__(self, number):
1.86
1.87 @@ -1171,6 +1186,105 @@
1.88 if not self.can_delete():
1.89 return
1.90
1.91 - return ItemDirectoryStore.__delitem__(self, number)
1.92 + return self.store.__delitem__(number)
1.93 +
1.94 + def __iter__(self):
1.95 + return self.store.__iter__()
1.96 +
1.97 + def next(self):
1.98 + return self.store.next()
1.99 +
1.100 +class ItemSubpageStore(ItemStoreBase):
1.101 +
1.102 + "A subpage-based item store."
1.103 +
1.104 + def __init__(self, page, lock_dir="item_locks"):
1.105 +
1.106 + "Initialise an item store for subpages under the given 'page'."
1.107 +
1.108 + lock_dir_path = tuple(lock_dir.split("/"))
1.109 + ItemStoreBase.__init__(self, page.getPagePath(*lock_dir_path))
1.110 + self.page = page
1.111 +
1.112 + def mtime(self):
1.113 +
1.114 + "Return the last modified time of the item store."
1.115 +
1.116 + keys = self.get_keys()
1.117 + if not keys:
1.118 + page = self.page
1.119 + else:
1.120 + page = Page(self.page.request, self.get_item_path(max(keys)))
1.121 +
1.122 + return wikiutil.version2timestamp(
1.123 + getMetadata(page)["last-modified"]
1.124 + )
1.125 +
1.126 + def get_next(self):
1.127 +
1.128 + "Return the next item number."
1.129 +
1.130 + return self.deduce_next()
1.131 +
1.132 + def get_keys(self):
1.133 +
1.134 + "Return the item keys."
1.135 +
1.136 + is_subpage = re.compile(u"^%s/" % re.escape(self.page.page_name), re.UNICODE).match
1.137 +
1.138 + # Collect the strict subpages of the parent page.
1.139 +
1.140 + leafnames = []
1.141 + parentname = self.page.page_name
1.142 +
1.143 + for pagename in RootPage(self.page.request).getPageList(filter=is_subpage):
1.144 + parts = pagename[len(parentname)+1:].split("/")
1.145 +
1.146 + # Only collect numbered pages immediately below the parent.
1.147 +
1.148 + if len(parts) == 1 and parts[0].isdigit():
1.149 + leafnames.append(int(parts[0]))
1.150 +
1.151 + return leafnames
1.152 +
1.153 + def write_item(self, item, next):
1.154 +
1.155 + "Write the given 'item' to a file with the given 'next' item number."
1.156 +
1.157 + page = PageEditor(self.page.request, self.get_item_path(next))
1.158 + page.saveText(item, 0)
1.159 +
1.160 + def read_item(self, number):
1.161 +
1.162 + "Read the item with the given item 'number'."
1.163 +
1.164 + page = Page(self.page.request, self.get_item_path(number))
1.165 + return page.get_raw_body()
1.166 +
1.167 + def remove_item(self, number):
1.168 +
1.169 + "Remove the item with the given item 'number'."
1.170 +
1.171 + page = PageEditor(self.page.request, self.get_item_path(number))
1.172 + page.deletePage()
1.173 +
1.174 + def get_item_path(self, number):
1.175 +
1.176 + "Get the path for the given item 'number'."
1.177 +
1.178 + return "%s/%s" % (self.page.page_name, number)
1.179 +
1.180 + # High-level methods.
1.181 +
1.182 + def append(self, item):
1.183 +
1.184 + "Append the given 'item' to the store."
1.185 +
1.186 + self.writelock.acquire()
1.187 + try:
1.188 + next = self.get_next()
1.189 + self.write_item(item, next)
1.190 + finally:
1.191 + self.writelock.release()
1.192
1.193 # vim: tabstop=4 expandtab shiftwidth=4