Skip to content

Confluence: fix #412 #433

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

Merged
merged 1 commit into from
Jan 24, 2020
Merged

Confluence: fix #412 #433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions atlassian/confluence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,14 @@ def is_page_content_is_already_updated(self, page_id, body, title=None):
:param title: Title to compare
:return: True if the same
"""
confluence_content = (((self.get_page_by_id(page_id, expand='body.storage') or {})
.get('body') or {})
.get('storage') or {})
if self.advanced_mode:
confluence_content = (((self.get_page_by_id(page_id, expand='body.storage').json() or {})
Copy link

@mikitachab mikitachab Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi!
maybe better will be something like that:

page = self.get_page_by_id(page_id, expand='body.storage') 
page = page.json() if self.advanced_mode else page
confluence_content = (((page or {})
              .get('body') or {})
              .get('storage') or {})

it helps to avoid code duplication and makes code more readable.

.get('body') or {})
.get('storage') or {})
else:
confluence_content = (((self.get_page_by_id(page_id, expand='body.storage') or {})
.get('body') or {})
.get('storage') or {})

if title:
current_title = confluence_content.get('title', None)
Expand Down Expand Up @@ -765,7 +770,10 @@ def update_page(self, page_id, title, body, parent_id=None, type='page', represe
return self.get_page_by_id(page_id)
else:
try:
version = self.history(page_id)['lastUpdated']['number'] + 1
if self.advanced_mode:
Copy link

@mikitachab mikitachab Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and the same here

page_history = self.history(page_id).json() if self.advanced_mode else self.history(page_id)
version = page_history['lastUpdated']['number'] + 1

version = self.history(page_id).json()['lastUpdated']['number'] + 1
else:
version = self.history(page_id)['lastUpdated']['number'] + 1
except (IndexError, TypeError) as e:
log.error("Can't find '{title}' {type}!".format(title=title, type=type))
log.debug(e)
Expand Down