Skip to content

Sourcery refactored master branch #1

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
sourcery-ai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sourcery refactored master branch #1

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
41 changes: 24 additions & 17 deletions pyromod/nav/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ def create(self, page, lines=5, columns=1):
offset = (page-1)*quant_per_page
stop = offset+quant_per_page
cutted = self.objects[offset:stop]

total = len(self.objects)
pages_range = [*range(1, math.ceil(total/quant_per_page)+1)] # each item is a page
last_page = len(pages_range)


Comment on lines -38 to +43
Copy link
Author

@sourcery-ai sourcery-ai bot Dec 11, 2021

Choose a reason for hiding this comment

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

Function Pagination.create refactored with the following changes:

nav = []
if page <= 3:
for n in [1,2,3]:
Expand All @@ -57,29 +57,36 @@ def create(self, page, lines=5, columns=1):
(f'{last_page} »' if last_page > 5 else last_page, self.page_data(last_page))
)
elif page >= last_page-2:
nav.extend([
(f'« 1' if last_page-4 > 1 else 1, self.page_data(1)),
(f'‹ {last_page-3}' if last_page-4 > 1 else last_page-3, self.page_data(last_page-3))
])
nav.extend(
[
('« 1' if last_page > 5 else 1, self.page_data(1)),
(
f'‹ {last_page-3}' if last_page > 5 else last_page - 3,
self.page_data(last_page - 3),
),
]
)

for n in range(last_page-2, last_page+1):
text = f"· {n} ·" if n == page else n
nav.append( (text, self.page_data(n)) )
else:
nav = [
(f'« 1', self.page_data(1)),
(f'‹ {page-1}', self.page_data(page-1)),
('« 1', self.page_data(1)),
(f'‹ {page-1}', self.page_data(page - 1)),
(f'· {page} ·', "noop"),
(f'{page+1} ›', self.page_data(page+1)),
(f'{page+1} ›', self.page_data(page + 1)),
(f'{last_page} »', self.page_data(last_page)),
]

buttons = []
for item in cutted:
buttons.append(
(self.item_title(item, page), self.item_data(item, page))
)


buttons = [
(self.item_title(item, page), self.item_data(item, page))
for item in cutted
]

kb_lines = array_chunk(buttons, columns)
if last_page > 1:
kb_lines.append(nav)

return kb_lines