From e5b94279fd73f6a987373226724ec22d51cb0bce Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 6 Aug 2023 12:23:29 +0000 Subject: [PATCH 1/7] Restyled by autopep8 --- src/scan/gui.py | 121 +++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 68 deletions(-) diff --git a/src/scan/gui.py b/src/scan/gui.py index 1c1f152..0ecde16 100644 --- a/src/scan/gui.py +++ b/src/scan/gui.py @@ -67,13 +67,13 @@ def scan_page(page: ft.Page): ft.Text("Port"), numeric=True), ], rows=[ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text("Loading")), - ft.DataCell(ft.Text("0")), + ft.DataRow( + cells=[ + ft.DataCell(ft.Text("Loading")), + ft.DataCell(ft.Text("0")), - ], - )], + ], + )], ), ], scroll="AUTO", @@ -127,7 +127,6 @@ def scan_page(page: ft.Page): ]), ], alignment=ft.MainAxisAlignment.CENTER) - tx_row = ft.ResponsiveRow([ft.Card( content=ft.Container( content=ft.Column( @@ -163,21 +162,22 @@ def scan_page(page: ft.Page): )], alignment=ft.MainAxisAlignment.CENTER) def close_bs(e): - bs.open = False - bs.update() + bs.open = False + bs.update() bs = ft.BottomSheet( - ft.Container( - ft.Column( - [ - ft.Text("This is sheet's content!"), - ft.Row([ft.ElevatedButton("Close bottom sheet", on_click=close_bs)], alignment=ft.MainAxisAlignment.CENTER) - ], - tight=True, - ), - padding=10, + ft.Container( + ft.Column( + [ + ft.Text("This is sheet's content!"), + ft.Row([ft.ElevatedButton( + "Close bottom sheet", on_click=close_bs)], alignment=ft.MainAxisAlignment.CENTER) + ], + tight=True, ), - open=False, - ) + padding=10, + ), + open=False, + ) page.overlay.append(bs) def block_situation_tracker_updater(topic, message): @@ -198,8 +198,6 @@ def block_situation_tracker_updater(topic, message): row.controls[2].controls[0].content.content.controls[2] = ft.ProgressBar( value=value, color="#dbff00") - - def show_bs(signature): bs.open = True the_signature = signature["signature"] @@ -208,30 +206,30 @@ def show_bs(signature): amount = signature["amount"] transaction_fee = signature["transaction_fee"] bs.content.content.controls = [ft.Text(f"Signature: {the_signature}"), - ft.Text(f"FromUser: {from_user}"), - ft.Text(f"ToUser: {to_user}"), - ft.Text(f"Amount: {amount}"), - ft.Text(f"Fee: {transaction_fee}"), - ft.Row([ft.ElevatedButton("Close", on_click=close_bs)], alignment=ft.MainAxisAlignment.CENTER) - ] + ft.Text( + f"FromUser: {from_user}"), + ft.Text(f"ToUser: {to_user}"), + ft.Text(f"Amount: {amount}"), + ft.Text( + f"Fee: {transaction_fee}"), + ft.Row([ft.ElevatedButton( + "Close", on_click=close_bs)], alignment=ft.MainAxisAlignment.CENTER) + ] bs.update() - - - - tx_row.controls[0].content.content.controls[1].controls[0].rows = [ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text(i["signature"]), on_tap=lambda e, i=i: show_bs(i)), - ft.DataCell(ft.Text(i["transaction_fee"])), + ft.DataRow( + cells=[ + ft.DataCell( + ft.Text(i["signature"]), on_tap=lambda e, i=i: show_bs(i)), + ft.DataCell( + ft.Text(i["transaction_fee"])), - ], - ) for i in validating_list] - + ], + ) for i in validating_list] try: - page.update() + page.update() except: traceback.print_exc() @@ -251,17 +249,11 @@ def block_situation_tracker(): except: pass page.pubsub.send_all_on_topic("block", "block") - - - def threaderblock_situation_tracker(): while True: block_situation_tracker() time.sleep(interval_1) - - - def status_situation_tracker_update(topic, message): global status_record @@ -271,62 +263,55 @@ def status_situation_tracker_update(topic, message): if not working: row.controls[1].controls[0].content.content.controls[1] = ft.Row([ft.Text("", style="headlineSmall", - color="red")], alignment=ft.MainAxisAlignment.CENTER) # type: ignore + color="red")], alignment=ft.MainAxisAlignment.CENTER) # type: ignore row.controls[1].controls[0].content.content.controls[2] = ft.Row([ft.Text("Not Working", style="headlineSmall", - color="red")], alignment=ft.MainAxisAlignment.CENTER) + color="red")], alignment=ft.MainAxisAlignment.CENTER) else: row.controls[1].controls[0].content.content.controls[1] = ft.Row([ft.ProgressRing(width=50, height=50, stroke_width=5, - color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER) # type: ignore + color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER) # type: ignore row.controls[1].controls[0].content.content.controls[2] = ft.Row([ft.Text("Working", style="headlineSmall", - color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER) + color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER) - raw_nodes = status_record["connected_nodes"] nodes = [] for i in raw_nodes: nodes.append([i.split(":")[0], i.split(":")[1]]) row.controls[0].controls[0].content.content.controls[1].rows = [ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text(i[0])), - ft.DataCell(ft.Text(i[1])), - - ], - ) for i in nodes] - + ft.DataRow( + cells=[ + ft.DataCell(ft.Text(i[0])), + ft.DataCell(ft.Text(i[1])), + ], + ) for i in nodes] try: - page.update() + page.update() except: traceback.print_exc() + def status_situation_tracker(): global status_record status_record = the_statatus_db.get("status") if status_record != None: page.pubsub.send_all_on_topic("status", "status") - - - def threaderstatus_situation_tracker(): while True: status_situation_tracker() time.sleep(interval_2) - page.pubsub.subscribe_topic("block",block_situation_tracker_updater) - page.pubsub.subscribe_topic("status",status_situation_tracker_update) + page.pubsub.subscribe_topic("block", block_situation_tracker_updater) + page.pubsub.subscribe_topic("status", status_situation_tracker_update) block_situation_tracker() status_situation_tracker() if not thread_generated: print("Threader started") Thread(target=threaderblock_situation_tracker).start() - Thread(target=threaderstatus_situation_tracker).start() + Thread(target=threaderstatus_situation_tracker).start() thread_generated = True - - page.add(row, tx_row,) From 32f5ce0d7f2c148879d133f2c1b9a6ddab446315 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 6 Aug 2023 12:23:31 +0000 Subject: [PATCH 2/7] Restyled by black --- src/scan/gui.py | 376 ++++++++++++++++++++++++++++++------------------ 1 file changed, 233 insertions(+), 143 deletions(-) diff --git a/src/scan/gui.py b/src/scan/gui.py index 0ecde16..e68fdd6 100644 --- a/src/scan/gui.py +++ b/src/scan/gui.py @@ -38,139 +38,200 @@ def scan_page(page: ft.Page): page.appbar = ft.AppBar( bgcolor="#212529", leading=ft.Image( - src=f"https://docs.naruno.org/assets/images/logo.png", - width=40, - height=40, - fit=ft.ImageFit.FIT_WIDTH, + src=f"https://docs.naruno.org/assets/images/logo.png", + width=40, + height=40, + fit=ft.ImageFit.FIT_WIDTH, ), leading_width=40, title=ft.Text("Naruno Scan"), center_title=False, - ) - the_block_situations = ft.Row([ft.Text(value="False", style="headlineLarge"), ft.Text(value="Loading", style="headlineLarge"), ft.Text( - value="False", style="headlineLarge"),], alignment=ft.MainAxisAlignment.CENTER) # type: ignore + the_block_situations = ft.Row( + [ + ft.Text(value="False", style="headlineLarge"), + ft.Text(value="Loading", style="headlineLarge"), + ft.Text(value="False", style="headlineLarge"), + ], + alignment=ft.MainAxisAlignment.CENTER, + ) # type: ignore + + row = ft.ResponsiveRow( + spacing=10, + controls=[ + ft.Column( + col={"sm": 4}, + controls=[ + ft.Card( + content=ft.Container( + content=ft.Column( + [ + ft.Row( + [ + ft.Text( + value="Connected Nodes", + style="headlineMedium", + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ), # type: ignore + ft.DataTable( + columns=[ + ft.DataColumn(ft.Text("Host")), + ft.DataColumn( + ft.Text("Port"), numeric=True + ), + ], + rows=[ + ft.DataRow( + cells=[ + ft.DataCell(ft.Text("Loading")), + ft.DataCell(ft.Text("0")), + ], + ) + ], + ), + ], + scroll="AUTO", + ), + padding=10, + ), + height=180, + width=400, + ), + ], + ), + ft.Column( + col={"sm": 4}, + controls=[ + ft.Card( + content=ft.Container( + content=ft.Column( + [ + ft.Row( + [ + ft.Text( + value="Health", style="headlineMedium" + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ), # type: ignore + ft.Row( + [ + ft.Text( + "Loading", + style="headlineSmall", + color="#00ff00", + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ), + ft.Row( + [ + ft.Text( + "Loading", + style="headlineSmall", + color="#00ff00", + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ), + ] + ), + padding=10, + ), + height=180, + width=400, + ), + ], + ), + ft.Column( + col={"sm": 4}, + controls=[ + ft.Card( + content=ft.Container( + content=ft.Column( + [ + ft.Row( + [ + ft.Text( + value="Block", style="headlineMedium" + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ), # type: ignore + ft.Text(value="Loading", style="headlineSmall"), + ft.Text(value="Loading", style="headlineSmall"), + ] + ), + padding=20, + ), + height=180, + width=400, + ), + ], + ), + ], + alignment=ft.MainAxisAlignment.CENTER, + ) - row = ft.ResponsiveRow(spacing=10, controls=[ - ft.Column(col={"sm": 4}, controls=[ + tx_row = ft.ResponsiveRow( + [ ft.Card( content=ft.Container( content=ft.Column( [ - ft.Row([ft.Text(value="Connected Nodes", style="headlineMedium")], - alignment=ft.MainAxisAlignment.CENTER), # type: ignore - ft.DataTable( - columns=[ - ft.DataColumn(ft.Text("Host")), - ft.DataColumn( - ft.Text("Port"), numeric=True), - ], - rows=[ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text("Loading")), - ft.DataCell(ft.Text("0")), - + ft.Row( + [ft.Text(value="Transactions", style="headlineMedium")], + alignment=ft.MainAxisAlignment.CENTER, + ), # type: ignore + ft.Row( + [ + ft.DataTable( + width=1200, + columns=[ + ft.DataColumn(ft.Text("Signature")), + ft.DataColumn(ft.Text("Fee")), ], - )], + rows=[ + ft.DataRow( + cells=[ + ft.DataCell(ft.Text("Loading")), + ft.DataCell(ft.Text("Loading")), + ], + ) + ], + ) + ], + scroll="AUTO", + alignment=ft.MainAxisAlignment.CENTER, ), ], scroll="AUTO", ), - padding=10, - ), - height=180, - width=400, - ), - ]), - - - ft.Column(col={"sm": 4}, controls=[ft.Card( - content=ft.Container( - content=ft.Column( - [ - ft.Row([ft.Text(value="Health", style="headlineMedium")], - alignment=ft.MainAxisAlignment.CENTER), # type: ignore - ft.Row([ft.Text("Loading", style="headlineSmall", - color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER), - ft.Row([ft.Text("Loading", style="headlineSmall", - color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER), - ] - ), - - padding=10, - ), - height=180, - width=400, - ), - ]), - - - ft.Column(col={"sm": 4}, controls=[ft.Card( - content=ft.Container( - content=ft.Column( - [ - ft.Row([ft.Text(value="Block", style="headlineMedium")], - alignment=ft.MainAxisAlignment.CENTER), # type: ignore - ft.Text(value="Loading", style="headlineSmall"), - ft.Text(value="Loading", style="headlineSmall"), - ] + padding=20, ), - - padding=20, - ), - height=180, - width=400, - ), - - ]), - ], alignment=ft.MainAxisAlignment.CENTER) - - tx_row = ft.ResponsiveRow([ft.Card( - content=ft.Container( - content=ft.Column( - - [ - ft.Row([ft.Text(value="Transactions", style="headlineMedium")], - alignment=ft.MainAxisAlignment.CENTER), # type: ignore - ft.Row([ft.DataTable( - width=1200, - columns=[ - ft.DataColumn(ft.Text("Signature")), - ft.DataColumn(ft.Text("Fee")), - ], - rows=[ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text("Loading")), - ft.DataCell(ft.Text("Loading")), - - ], - )], - )], scroll="AUTO", alignment=ft.MainAxisAlignment.CENTER) - - ], - scroll="AUTO", - - ), - - padding=20, - ), - width=1220, - height=540, - )], alignment=ft.MainAxisAlignment.CENTER) + width=1220, + height=540, + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ) def close_bs(e): bs.open = False bs.update() + bs = ft.BottomSheet( ft.Container( ft.Column( [ ft.Text("This is sheet's content!"), - ft.Row([ft.ElevatedButton( - "Close bottom sheet", on_click=close_bs)], alignment=ft.MainAxisAlignment.CENTER) + ft.Row( + [ft.ElevatedButton("Close bottom sheet", on_click=close_bs)], + alignment=ft.MainAxisAlignment.CENTER, + ), ], tight=True, ), @@ -193,10 +254,15 @@ def block_situation_tracker_updater(topic, message): value = 0.6 if third_value == True: value = 1 - row.controls[2].controls[0].content.content.controls[1] = ft.Row([ft.Text( - value=second_value, style="headlineLarge"),], alignment=ft.MainAxisAlignment.CENTER) # type: ignore + row.controls[2].controls[0].content.content.controls[1] = ft.Row( + [ + ft.Text(value=second_value, style="headlineLarge"), + ], + alignment=ft.MainAxisAlignment.CENTER, + ) # type: ignore row.controls[2].controls[0].content.content.controls[2] = ft.ProgressBar( - value=value, color="#dbff00") + value=value, color="#dbff00" + ) def show_bs(signature): bs.open = True @@ -205,28 +271,30 @@ def show_bs(signature): to_user = signature["toUser"] amount = signature["amount"] transaction_fee = signature["transaction_fee"] - bs.content.content.controls = [ft.Text(f"Signature: {the_signature}"), - ft.Text( - f"FromUser: {from_user}"), - ft.Text(f"ToUser: {to_user}"), - ft.Text(f"Amount: {amount}"), - ft.Text( - f"Fee: {transaction_fee}"), - ft.Row([ft.ElevatedButton( - "Close", on_click=close_bs)], alignment=ft.MainAxisAlignment.CENTER) - ] + bs.content.content.controls = [ + ft.Text(f"Signature: {the_signature}"), + ft.Text(f"FromUser: {from_user}"), + ft.Text(f"ToUser: {to_user}"), + ft.Text(f"Amount: {amount}"), + ft.Text(f"Fee: {transaction_fee}"), + ft.Row( + [ft.ElevatedButton("Close", on_click=close_bs)], + alignment=ft.MainAxisAlignment.CENTER, + ), + ] bs.update() tx_row.controls[0].content.content.controls[1].controls[0].rows = [ ft.DataRow( cells=[ ft.DataCell( - ft.Text(i["signature"]), on_tap=lambda e, i=i: show_bs(i)), - ft.DataCell( - ft.Text(i["transaction_fee"])), - + ft.Text(i["signature"]), on_tap=lambda e, i=i: show_bs(i) + ), + ft.DataCell(ft.Text(i["transaction_fee"])), ], - ) for i in validating_list] + ) + for i in validating_list + ] try: page.update() @@ -243,7 +311,9 @@ def block_situation_tracker(): for i in raw_record: list_record.append([float(i), raw_record[i]]) - list_record.sort(key=lambda x: x[0], ) + list_record.sort( + key=lambda x: x[0], + ) block_record = list_record[0][1] except: @@ -261,16 +331,27 @@ def status_situation_tracker_update(topic, message): working = True if status_record["status"] == "Working" else False if not working: - - row.controls[1].controls[0].content.content.controls[1] = ft.Row([ft.Text("", style="headlineSmall", - color="red")], alignment=ft.MainAxisAlignment.CENTER) # type: ignore - row.controls[1].controls[0].content.content.controls[2] = ft.Row([ft.Text("Not Working", style="headlineSmall", - color="red")], alignment=ft.MainAxisAlignment.CENTER) + row.controls[1].controls[0].content.content.controls[1] = ft.Row( + [ft.Text("", style="headlineSmall", color="red")], + alignment=ft.MainAxisAlignment.CENTER, + ) # type: ignore + row.controls[1].controls[0].content.content.controls[2] = ft.Row( + [ft.Text("Not Working", style="headlineSmall", color="red")], + alignment=ft.MainAxisAlignment.CENTER, + ) else: - row.controls[1].controls[0].content.content.controls[1] = ft.Row([ft.ProgressRing(width=50, height=50, stroke_width=5, - color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER) # type: ignore - row.controls[1].controls[0].content.content.controls[2] = ft.Row([ft.Text("Working", style="headlineSmall", - color="#00ff00")], alignment=ft.MainAxisAlignment.CENTER) + row.controls[1].controls[0].content.content.controls[1] = ft.Row( + [ + ft.ProgressRing( + width=50, height=50, stroke_width=5, color="#00ff00" + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ) # type: ignore + row.controls[1].controls[0].content.content.controls[2] = ft.Row( + [ft.Text("Working", style="headlineSmall", color="#00ff00")], + alignment=ft.MainAxisAlignment.CENTER, + ) raw_nodes = status_record["connected_nodes"] nodes = [] @@ -282,9 +363,10 @@ def status_situation_tracker_update(topic, message): cells=[ ft.DataCell(ft.Text(i[0])), ft.DataCell(ft.Text(i[1])), - ], - ) for i in nodes] + ) + for i in nodes + ] try: page.update() @@ -312,7 +394,10 @@ def threaderstatus_situation_tracker(): Thread(target=threaderstatus_situation_tracker).start() thread_generated = True - page.add(row, tx_row,) + page.add( + row, + tx_row, + ) def GUI(interval_1_data=1, interval_2_data=100): @@ -321,12 +406,12 @@ def GUI(interval_1_data=1, interval_2_data=100): interval_1 = interval_1_data interval_2 = interval_2_data - ft.app(target=scan_page, assets_dir=os.path.join( - os.path.dirname(__file__), "assets")) + ft.app( + target=scan_page, assets_dir=os.path.join(os.path.dirname(__file__), "assets") + ) def WEB(host_data, port_data, interval_1_data=1, interval_2_data=100): - global host global port global interval_1 @@ -337,5 +422,10 @@ def WEB(host_data, port_data, interval_1_data=1, interval_2_data=100): interval_1 = interval_1_data interval_2 = interval_2_data - ft.app(target=scan_page, view=ft.AppView.WEB_BROWSER, host=host, - port=port, assets_dir=os.path.join(os.path.dirname(__file__), "assets")) + ft.app( + target=scan_page, + view=ft.AppView.WEB_BROWSER, + host=host, + port=port, + assets_dir=os.path.join(os.path.dirname(__file__), "assets"), + ) From 9322479bca0836223a6ae3d7004ca9314ed60b32 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 6 Aug 2023 12:23:32 +0000 Subject: [PATCH 3/7] Restyled by isort --- src/scan/gui.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scan/gui.py b/src/scan/gui.py index e68fdd6..c455387 100644 --- a/src/scan/gui.py +++ b/src/scan/gui.py @@ -4,14 +4,14 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from threading import Thread +import os import time import traceback -import flet as ft +from threading import Thread -from .scan import SCAN, the_statatus_db, the_block_db -import os +import flet as ft +from .scan import SCAN, the_block_db, the_statatus_db network = None host = None From 99fd76df5d05306cdb3085b67d3ae28a42191b1a Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 6 Aug 2023 12:23:33 +0000 Subject: [PATCH 4/7] Restyled by pyment --- src/scan/gui.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/scan/gui.py b/src/scan/gui.py index c455387..e0b6d0e 100644 --- a/src/scan/gui.py +++ b/src/scan/gui.py @@ -26,6 +26,11 @@ def scan_page(page: ft.Page): + """ + + :param page: ft.Page: + + """ global interval_1 global interval_2 global thread_generated @@ -220,6 +225,11 @@ def scan_page(page: ft.Page): ) def close_bs(e): + """ + + :param e: + + """ bs.open = False bs.update() @@ -242,6 +252,12 @@ def close_bs(e): page.overlay.append(bs) def block_situation_tracker_updater(topic, message): + """ + + :param topic: + :param message: + + """ global block_record if block_record != None: first_value = block_record["round_1"] @@ -265,6 +281,11 @@ def block_situation_tracker_updater(topic, message): ) def show_bs(signature): + """ + + :param signature: + + """ bs.open = True the_signature = signature["signature"] from_user = signature["fromUser"] @@ -302,6 +323,7 @@ def show_bs(signature): traceback.print_exc() def block_situation_tracker(): + """ """ global block_record block_record = None try: @@ -321,11 +343,18 @@ def block_situation_tracker(): page.pubsub.send_all_on_topic("block", "block") def threaderblock_situation_tracker(): + """ """ while True: block_situation_tracker() time.sleep(interval_1) def status_situation_tracker_update(topic, message): + """ + + :param topic: + :param message: + + """ global status_record if status_record != None: working = True if status_record["status"] == "Working" else False @@ -374,12 +403,14 @@ def status_situation_tracker_update(topic, message): traceback.print_exc() def status_situation_tracker(): + """ """ global status_record status_record = the_statatus_db.get("status") if status_record != None: page.pubsub.send_all_on_topic("status", "status") def threaderstatus_situation_tracker(): + """ """ while True: status_situation_tracker() time.sleep(interval_2) @@ -401,6 +432,12 @@ def threaderstatus_situation_tracker(): def GUI(interval_1_data=1, interval_2_data=100): + """ + + :param interval_1_data: (Default value = 1) + :param interval_2_data: (Default value = 100) + + """ global interval_1 global interval_2 @@ -412,6 +449,14 @@ def GUI(interval_1_data=1, interval_2_data=100): def WEB(host_data, port_data, interval_1_data=1, interval_2_data=100): + """ + + :param host_data: + :param port_data: + :param interval_1_data: (Default value = 1) + :param interval_2_data: (Default value = 100) + + """ global host global port global interval_1 From 734fd878de6c5f37aca1309250e978532ca97098 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 6 Aug 2023 12:23:33 +0000 Subject: [PATCH 5/7] Restyled by reorder-python-imports --- src/scan/gui.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scan/gui.py b/src/scan/gui.py index e0b6d0e..de4b482 100644 --- a/src/scan/gui.py +++ b/src/scan/gui.py @@ -11,7 +11,9 @@ import flet as ft -from .scan import SCAN, the_block_db, the_statatus_db +from .scan import SCAN +from .scan import the_block_db +from .scan import the_statatus_db network = None host = None From e4965c560c34506ddd0d53da175c419a45ace12d Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 6 Aug 2023 12:23:34 +0000 Subject: [PATCH 6/7] Restyled by whitespace --- src/scan/gui.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/scan/gui.py b/src/scan/gui.py index de4b482..98804da 100644 --- a/src/scan/gui.py +++ b/src/scan/gui.py @@ -30,7 +30,7 @@ def scan_page(page: ft.Page): """ - :param page: ft.Page: + :param page: ft.Page: """ global interval_1 @@ -229,7 +229,7 @@ def scan_page(page: ft.Page): def close_bs(e): """ - :param e: + :param e: """ bs.open = False @@ -256,8 +256,8 @@ def close_bs(e): def block_situation_tracker_updater(topic, message): """ - :param topic: - :param message: + :param topic: + :param message: """ global block_record @@ -285,7 +285,7 @@ def block_situation_tracker_updater(topic, message): def show_bs(signature): """ - :param signature: + :param signature: """ bs.open = True @@ -353,8 +353,8 @@ def threaderblock_situation_tracker(): def status_situation_tracker_update(topic, message): """ - :param topic: - :param message: + :param topic: + :param message: """ global status_record @@ -453,8 +453,8 @@ def GUI(interval_1_data=1, interval_2_data=100): def WEB(host_data, port_data, interval_1_data=1, interval_2_data=100): """ - :param host_data: - :param port_data: + :param host_data: + :param port_data: :param interval_1_data: (Default value = 1) :param interval_2_data: (Default value = 100) From af6f041631df29de8163dfe0f72eb089ad8fae47 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Sun, 6 Aug 2023 12:23:38 +0000 Subject: [PATCH 7/7] Restyled by yapf --- src/scan/gui.py | 221 ++++++++++++++++++++++++------------------------ 1 file changed, 112 insertions(+), 109 deletions(-) diff --git a/src/scan/gui.py b/src/scan/gui.py index 98804da..cf97dad 100644 --- a/src/scan/gui.py +++ b/src/scan/gui.py @@ -86,17 +86,15 @@ def scan_page(page: ft.Page): ft.DataTable( columns=[ ft.DataColumn(ft.Text("Host")), - ft.DataColumn( - ft.Text("Port"), numeric=True - ), + ft.DataColumn(ft.Text("Port"), + numeric=True), ], rows=[ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text("Loading")), - ft.DataCell(ft.Text("0")), - ], - ) + ft.DataRow(cells=[ + ft.DataCell( + ft.Text("Loading")), + ft.DataCell(ft.Text("0")), + ], ) ], ), ], @@ -114,38 +112,35 @@ def scan_page(page: ft.Page): controls=[ ft.Card( content=ft.Container( - content=ft.Column( - [ - ft.Row( - [ - ft.Text( - value="Health", style="headlineMedium" - ) - ], - alignment=ft.MainAxisAlignment.CENTER, - ), # type: ignore - ft.Row( - [ - ft.Text( - "Loading", - style="headlineSmall", - color="#00ff00", - ) - ], - alignment=ft.MainAxisAlignment.CENTER, - ), - ft.Row( - [ - ft.Text( - "Loading", - style="headlineSmall", - color="#00ff00", - ) - ], - alignment=ft.MainAxisAlignment.CENTER, - ), - ] - ), + content=ft.Column([ + ft.Row( + [ + ft.Text(value="Health", + style="headlineMedium") + ], + alignment=ft.MainAxisAlignment.CENTER, + ), # type: ignore + ft.Row( + [ + ft.Text( + "Loading", + style="headlineSmall", + color="#00ff00", + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ), + ft.Row( + [ + ft.Text( + "Loading", + style="headlineSmall", + color="#00ff00", + ) + ], + alignment=ft.MainAxisAlignment.CENTER, + ), + ]), padding=10, ), height=180, @@ -158,20 +153,19 @@ def scan_page(page: ft.Page): controls=[ ft.Card( content=ft.Container( - content=ft.Column( - [ - ft.Row( - [ - ft.Text( - value="Block", style="headlineMedium" - ) - ], - alignment=ft.MainAxisAlignment.CENTER, - ), # type: ignore - ft.Text(value="Loading", style="headlineSmall"), - ft.Text(value="Loading", style="headlineSmall"), - ] - ), + content=ft.Column([ + ft.Row( + [ + ft.Text(value="Block", + style="headlineMedium") + ], + alignment=ft.MainAxisAlignment.CENTER, + ), # type: ignore + ft.Text(value="Loading", + style="headlineSmall"), + ft.Text(value="Loading", + style="headlineSmall"), + ]), padding=20, ), height=180, @@ -190,7 +184,10 @@ def scan_page(page: ft.Page): content=ft.Column( [ ft.Row( - [ft.Text(value="Transactions", style="headlineMedium")], + [ + ft.Text(value="Transactions", + style="headlineMedium") + ], alignment=ft.MainAxisAlignment.CENTER, ), # type: ignore ft.Row( @@ -198,16 +195,17 @@ def scan_page(page: ft.Page): ft.DataTable( width=1200, columns=[ - ft.DataColumn(ft.Text("Signature")), + ft.DataColumn( + ft.Text("Signature")), ft.DataColumn(ft.Text("Fee")), ], rows=[ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text("Loading")), - ft.DataCell(ft.Text("Loading")), - ], - ) + ft.DataRow(cells=[ + ft.DataCell( + ft.Text("Loading")), + ft.DataCell( + ft.Text("Loading")), + ], ) ], ) ], @@ -241,7 +239,10 @@ def close_bs(e): [ ft.Text("This is sheet's content!"), ft.Row( - [ft.ElevatedButton("Close bottom sheet", on_click=close_bs)], + [ + ft.ElevatedButton("Close bottom sheet", + on_click=close_bs) + ], alignment=ft.MainAxisAlignment.CENTER, ), ], @@ -278,9 +279,8 @@ def block_situation_tracker_updater(topic, message): ], alignment=ft.MainAxisAlignment.CENTER, ) # type: ignore - row.controls[2].controls[0].content.content.controls[2] = ft.ProgressBar( - value=value, color="#dbff00" - ) + row.controls[2].controls[0].content.content.controls[ + 2] = ft.ProgressBar(value=value, color="#dbff00") def show_bs(signature): """ @@ -308,15 +308,11 @@ def show_bs(signature): bs.update() tx_row.controls[0].content.content.controls[1].controls[0].rows = [ - ft.DataRow( - cells=[ - ft.DataCell( - ft.Text(i["signature"]), on_tap=lambda e, i=i: show_bs(i) - ), - ft.DataCell(ft.Text(i["transaction_fee"])), - ], - ) - for i in validating_list + ft.DataRow(cells=[ + ft.DataCell(ft.Text(i["signature"]), + on_tap=lambda e, i=i: show_bs(i)), + ft.DataCell(ft.Text(i["transaction_fee"])), + ], ) for i in validating_list ] try: @@ -335,9 +331,7 @@ def block_situation_tracker(): for i in raw_record: list_record.append([float(i), raw_record[i]]) - list_record.sort( - key=lambda x: x[0], - ) + list_record.sort(key=lambda x: x[0], ) block_record = list_record[0][1] except: @@ -362,27 +356,40 @@ def status_situation_tracker_update(topic, message): working = True if status_record["status"] == "Working" else False if not working: - row.controls[1].controls[0].content.content.controls[1] = ft.Row( - [ft.Text("", style="headlineSmall", color="red")], - alignment=ft.MainAxisAlignment.CENTER, - ) # type: ignore - row.controls[1].controls[0].content.content.controls[2] = ft.Row( - [ft.Text("Not Working", style="headlineSmall", color="red")], - alignment=ft.MainAxisAlignment.CENTER, - ) + row.controls[1].controls[0].content.content.controls[ + 1] = ft.Row( + [ft.Text("", style="headlineSmall", color="red")], + alignment=ft.MainAxisAlignment.CENTER, + ) # type: ignore + row.controls[1].controls[0].content.content.controls[ + 2] = ft.Row( + [ + ft.Text("Not Working", + style="headlineSmall", + color="red") + ], + alignment=ft.MainAxisAlignment.CENTER, + ) else: - row.controls[1].controls[0].content.content.controls[1] = ft.Row( - [ - ft.ProgressRing( - width=50, height=50, stroke_width=5, color="#00ff00" - ) - ], - alignment=ft.MainAxisAlignment.CENTER, - ) # type: ignore - row.controls[1].controls[0].content.content.controls[2] = ft.Row( - [ft.Text("Working", style="headlineSmall", color="#00ff00")], - alignment=ft.MainAxisAlignment.CENTER, - ) + row.controls[1].controls[0].content.content.controls[ + 1] = ft.Row( + [ + ft.ProgressRing(width=50, + height=50, + stroke_width=5, + color="#00ff00") + ], + alignment=ft.MainAxisAlignment.CENTER, + ) # type: ignore + row.controls[1].controls[0].content.content.controls[ + 2] = ft.Row( + [ + ft.Text("Working", + style="headlineSmall", + color="#00ff00") + ], + alignment=ft.MainAxisAlignment.CENTER, + ) raw_nodes = status_record["connected_nodes"] nodes = [] @@ -390,13 +397,10 @@ def status_situation_tracker_update(topic, message): nodes.append([i.split(":")[0], i.split(":")[1]]) row.controls[0].controls[0].content.content.controls[1].rows = [ - ft.DataRow( - cells=[ - ft.DataCell(ft.Text(i[0])), - ft.DataCell(ft.Text(i[1])), - ], - ) - for i in nodes + ft.DataRow(cells=[ + ft.DataCell(ft.Text(i[0])), + ft.DataCell(ft.Text(i[1])), + ], ) for i in nodes ] try: @@ -445,9 +449,8 @@ def GUI(interval_1_data=1, interval_2_data=100): interval_1 = interval_1_data interval_2 = interval_2_data - ft.app( - target=scan_page, assets_dir=os.path.join(os.path.dirname(__file__), "assets") - ) + ft.app(target=scan_page, + assets_dir=os.path.join(os.path.dirname(__file__), "assets")) def WEB(host_data, port_data, interval_1_data=1, interval_2_data=100):