Skip to content
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.

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

Feature-#70: Implemented --no-reload flag #76

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ async def main():


@main.command(help="Display a dashboard")
async def dashboard():
@click.option("-n", "--no-reload", is_flag=True)
async def dashboard(no_reload):
"""Dashboard command."""

click.echo("loading dashboard")
Expand All @@ -28,7 +29,7 @@ async def dashboard():
# TODO: move github polling to another thread
await asyncio.gather(
# asyncio.to_thread(update),
asyncio.to_thread(render),
asyncio.to_thread(render, no_reload=no_reload),
)


Expand Down
7 changes: 6 additions & 1 deletion reviews/layout/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,9 @@ def generate_progress_tracker():
),
)

return progress, overall_progress, overall_task, progress_table
return {
"job_progress": progress,
"overall_progress": overall_progress,
"overall_task": overall_task,
"progress_table": progress_table,
}
49 changes: 25 additions & 24 deletions reviews/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,10 @@ def _render_pull_requests(
)


def render():
def render(no_reload: bool):
"""Renders Terminal UI Dashboard"""
(
job_progress,
overall_progress,
overall_task,
progress_table,
) = generate_progress_tracker()

overall_progress = None
prog_tracker = generate_progress_tracker()
prog_tracker["overall_progress"] = None

# initial load should be from database
add_log_event(message="initializing...")
Expand All @@ -70,7 +64,7 @@ def render():
notification_client = NotificationClient()
layout_manager = RenderLayoutManager(layout=generate_layout())
layout_manager.render_layout(
progress_table=progress_table,
progress_table=prog_tracker["progress_table"],
body=Panel(
RenderGroup(),
title="Activity",
Expand All @@ -80,21 +74,21 @@ def render():
log_component=generate_log_table(logs=logs),
)

with Live(layout_manager.layout, refresh_per_second=5, screen=True):
with Live(
layout_manager.layout, refresh_per_second=5, screen=(not no_reload)
) as live:
while True:
if not overall_progress or overall_progress.finished:
(
job_progress,
overall_progress,
overall_task,
progress_table,
) = generate_progress_tracker()
if (
not prog_tracker["overall_progress"]
or prog_tracker["overall_progress"].finished
):
prog_tracker = generate_progress_tracker()

add_log_event(message="waiting...")

# update view (blocking operation)
layout_manager.render_layout(
progress_table=progress_table,
progress_table=prog_tracker["progress_table"],
body=_render_pull_requests(
controller=controller, configuration=configuration
),
Expand All @@ -103,6 +97,9 @@ def render():
),
log_component=generate_log_table(logs=logs),
)
if no_reload:
live.stop()
break

if config.ENABLE_NOTIFICATIONS:
add_log_event(message="sending notification")
Expand All @@ -117,14 +114,18 @@ def render():
add_log_event(message="notification sent")

delay = config.DELAY_REFRESH * 0.01
while not overall_progress.finished:
while not prog_tracker["overall_progress"].finished:
sleep(delay)
for job in job_progress.tasks:
for job in prog_tracker["job_progress"].tasks:
if not job.finished:
job_progress.advance(job.id)
prog_tracker["job_progress"].advance(job.id)

completed = sum(task.completed for task in job_progress.tasks)
overall_progress.update(overall_task, completed=completed)
completed = sum(
task.completed for task in prog_tracker["job_progress"].tasks
)
prog_tracker["overall_progress"].update(
prog_tracker["overall_task"], completed=completed
)

add_log_event(message="updated")

Expand Down