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

Compare commits

base: application:7b8a5d030548ea9fefe38229a923a7ed8fa5c576
Branches Tags
application:master
..
compare: application:35ea8c148cfbf6b14ff889b1e227932f04d0d230
Branches Tags
application:master

No commits in common. "7b8a5d030548ea9fefe38229a923a7ed8fa5c576" and "35ea8c148cfbf6b14ff889b1e227932f04d0d230" have entirely different histories.
7b8a5d0305 ... 35ea8c148c

2 changed files with 24 additions and 34 deletions
Show Stats Expand all files Collapse all files

56
pages/page.py
View File

@ -54,25 +54,17 @@ 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 self._history_version: if username:
logger.error("A history version %05d can not be updated!", self._history_version) self[self.KEY_MODIFIED_TIME] = int(time.time())
return False self[self.KEY_MODIFIED_USER] = username
else: if self.KEY_CREATION_TIME not in self:
if username: self[self.KEY_CREATION_TIME] = self[self.KEY_MODIFIED_TIME]
self[self.KEY_MODIFIED_TIME] = int(time.time()) if tags:
self[self.KEY_MODIFIED_USER] = username self[self.KEY_TAGS] = tags
if self.KEY_CREATION_TIME not in self: #
self[self.KEY_CREATION_TIME] = self[self.KEY_MODIFIED_TIME] if username or tags:
if tags: self.save()
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:
@ -137,7 +129,7 @@ class page_data(object):
def is_available(self): def is_available(self):
is_a = os.path.isfile(self.filename) is_a = os.path.isfile(self.filename)
if not is_a: if not is_a:
logger.debug("page.is_available: Not available - %s", self.filename) logger.info("page.is_available: Not available - %s", self.filename)
return is_a return is_a
@property @property
@ -429,23 +421,21 @@ 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) or self._page_meta.update_required(tags): if self._page.update_required(txt):
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
if self._page.update_required(txt): try:
# Update page if self._request.user.is_authenticated:
rv |= self._page.update_page(txt) username = self._request.user.username
# Identify username, to update meta else:
try: logger.warning("Page edit without having a logged in user. This is not recommended. Check your access definitions!")
if self._request.user.is_authenticated: except AttributeError:
username = self._request.user.username logger.exception("Page edit without having a request object. Check programming!")
else: self._page_meta.update(username, tags)
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)

2
pages/search.py
View File

@ -72,7 +72,7 @@ def add_item(ix, pw: page_wrapped):
) )
with ix.writer() as w: with ix.writer() as w:
logger.info('Adding document with id=%s to the search index.', data.get('id')) logger.info('Adding document with id=%s to the search index.', data.get('id'))
w.update_document(**data) w.add_document(**data)
for key in data: for key in data:
logger.debug(' - Adding %s=%s', key, repr(data[key])) logger.debug(' - Adding %s=%s', key, repr(data[key]))