application/piki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix: storage and index update, if page or meta data changed

Browse Source
This commit is contained in:
Dirk Alders 2024-10-13 16:48:41 +02:00
parent 30433d8733
commit 7b8a5d0305
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pages/page.py
View File

@ -54,17 +54,25 @@ class meta_data(dict):
def history_filename(self, history_version): def history_filename(self, history_version):
return os.path.join(self._path, HISTORY_FOLDER_NAME, "%05d_%s" % (history_version, self.META_FILE_NAME)) return os.path.join(self._path, HISTORY_FOLDER_NAME, "%05d_%s" % (history_version, self.META_FILE_NAME))
def update_required(self, tags):
return tags != self.get(self.KEY_TAGS)
def update(self, username, tags): def update(self, username, tags):
if username: if self._history_version:
self[self.KEY_MODIFIED_TIME] = int(time.time()) logger.error("A history version %05d can not be updated!", self._history_version)
self[self.KEY_MODIFIED_USER] = username return False
if self.KEY_CREATION_TIME not in self: else:
self[self.KEY_CREATION_TIME] = self[self.KEY_MODIFIED_TIME] if username:
if tags: self[self.KEY_MODIFIED_TIME] = int(time.time())
self[self.KEY_TAGS] = tags self[self.KEY_MODIFIED_USER] = username
# if self.KEY_CREATION_TIME not in self:
if username or tags: self[self.KEY_CREATION_TIME] = self[self.KEY_MODIFIED_TIME]
self.save() if tags:
self[self.KEY_TAGS] = tags
#
if username or tags:
self.save()
return True
def save(self): def save(self):
if self._history_version: if self._history_version:
@ -421,21 +429,23 @@ class page_wrapped(object):
return rv return rv
def update_page(self, txt, tags): def update_page(self, txt, tags):
if self._page.update_required(txt): if self._page.update_required(txt) or self._page_meta.update_required(tags):
rv = False
# Store history # Store history
self.__store_history__() self.__store_history__()
# Update page
rv = self._page.update_page(txt)
# Update meta data
username = None username = None
try: if self._page.update_required(txt):
if self._request.user.is_authenticated: # Update page
username = self._request.user.username rv |= self._page.update_page(txt)
else: # Identify username, to update meta
logger.warning("Page edit without having a logged in user. This is not recommended. Check your access definitions!") try:
except AttributeError: if self._request.user.is_authenticated:
logger.exception("Page edit without having a request object. Check programming!") username = self._request.user.username
self._page_meta.update(username, tags) else:
logger.warning("Page edit without having a logged in user. This is not recommended. Check your access definitions!")
except AttributeError:
logger.exception("Page edit without having a request object. Check programming!")
rv |= self._page_meta.update(username, tags)
# Update search index # Update search index
from pages.search import update_item from pages.search import update_item
update_item(self) update_item(self)