Skip to content

fix: decode the post.uuid before comparing it with other uuids #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmaljovec wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: decode the post.uuid before comparing it with other uuids #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1205fb4
fix: decode the post.uuid before comparing it with other uuids
dmaljovec Oct 23, 2020
694288d
oops
dmaljovec Oct 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions knowledge_repo/app/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,15 @@ def update_index(check_timeouts=True, force=False, reindex=False):
posts = db_session.query(Post).all()

for post in posts:
if isinstance(post.uuid, str) and post.uuid.startswith('\\x'):
decoded_post_uuid = bytes.fromhex(post.uuid.replace('\\x', ''))
elif isinstance(post.uuid, str):
decoded_post_uuid = bytes(post.uuid)
else:
decoded_post_uuid = post.uuid

# If UUID has changed, check if we can find it elsewhere in the repository, and if so update index path
if post.uuid and ((post.path not in kr_dir) or (post.uuid != kr_dir[post.path].uuid)):
if post.uuid and ((post.path not in kr_dir) or (decoded_post_uuid != kr_dir[post.path].uuid)):
if post.uuid in kr_uuids:
logger.info('Updating location of post: {} -> {}'.format(post.path, kr_uuids[post.uuid].path))
post.path = kr_uuids[post.uuid].path
Expand All @@ -172,7 +178,7 @@ def update_index(check_timeouts=True, force=False, reindex=False):
kp = kr_dir.pop(post.path)

# Update metadata of post if required
if reindex or (kp.revision > post.revision or not post.is_published or kp.uuid != post.uuid):
if reindex or (kp.revision > post.revision or not post.is_published or kp.uuid != decoded_post_uuid):
if kp.is_valid():
logger.info('Recording update to post at: {}'.format(kp.path))
post.update_metadata_from_kp(kp)
Expand Down