refactor: clean up code and improve variable naming
- Removed unnecessary blank lines in cx_setup.py. - Reformatted conditional checks in meshchat.py for better readability. - Updated callback variable names in NomadnetDownloader for clarity. - Adjusted version string formatting in version.py for consistency. - Reordered import statements in prepare_frontend_dir.py for better organization.
This commit is contained in:
@@ -45,4 +45,3 @@ setup(
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1116,7 +1116,11 @@ class ReticulumMeshChat:
|
|||||||
interfaces[interface_name] = interface_details
|
interfaces[interface_name] = interface_details
|
||||||
|
|
||||||
# handle SerialInterface, KISSInterface, and AX25KISSInterface
|
# handle SerialInterface, KISSInterface, and AX25KISSInterface
|
||||||
if interface_type in ("SerialInterface", "KISSInterface", "AX25KISSInterface"):
|
if interface_type in (
|
||||||
|
"SerialInterface",
|
||||||
|
"KISSInterface",
|
||||||
|
"AX25KISSInterface",
|
||||||
|
):
|
||||||
# ensure port provided
|
# ensure port provided
|
||||||
interface_port = data.get("port")
|
interface_port = data.get("port")
|
||||||
if interface_port is None or interface_port == "":
|
if interface_port is None or interface_port == "":
|
||||||
@@ -5051,8 +5055,8 @@ class NomadnetDownloader:
|
|||||||
self.path = path
|
self.path = path
|
||||||
self.data = data
|
self.data = data
|
||||||
self.timeout = timeout
|
self.timeout = timeout
|
||||||
self.on_download_success = on_download_success
|
self._download_success_callback = on_download_success
|
||||||
self.on_download_failure = on_download_failure
|
self._download_failure_callback = on_download_failure
|
||||||
self.on_progress_update = on_progress_update
|
self.on_progress_update = on_progress_update
|
||||||
self.request_receipt = None
|
self.request_receipt = None
|
||||||
self.is_cancelled = False
|
self.is_cancelled = False
|
||||||
@@ -5077,7 +5081,7 @@ class NomadnetDownloader:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
# notify that download was cancelled
|
# notify that download was cancelled
|
||||||
self.on_download_failure("cancelled")
|
self._download_failure_callback("cancelled")
|
||||||
|
|
||||||
# setup link to destination and request download
|
# setup link to destination and request download
|
||||||
async def download(
|
async def download(
|
||||||
@@ -5117,7 +5121,7 @@ class NomadnetDownloader:
|
|||||||
|
|
||||||
# if we still don't have a path, we can't establish a link, so bail out
|
# if we still don't have a path, we can't establish a link, so bail out
|
||||||
if not RNS.Transport.has_path(self.destination_hash):
|
if not RNS.Transport.has_path(self.destination_hash):
|
||||||
self.on_download_failure("Could not find path to destination.")
|
self._download_failure_callback("Could not find path to destination.")
|
||||||
return
|
return
|
||||||
|
|
||||||
# check if cancelled before establishing link
|
# check if cancelled before establishing link
|
||||||
@@ -5153,7 +5157,7 @@ class NomadnetDownloader:
|
|||||||
|
|
||||||
# if we still haven't established a link, bail out
|
# if we still haven't established a link, bail out
|
||||||
if link.status is not RNS.Link.ACTIVE:
|
if link.status is not RNS.Link.ACTIVE:
|
||||||
self.on_download_failure("Could not establish link to destination.")
|
self._download_failure_callback("Could not establish link to destination.")
|
||||||
|
|
||||||
# link to destination was established, we should now request the download
|
# link to destination was established, we should now request the download
|
||||||
def link_established(self, link):
|
def link_established(self, link):
|
||||||
@@ -5176,11 +5180,11 @@ class NomadnetDownloader:
|
|||||||
|
|
||||||
# handle successful download
|
# handle successful download
|
||||||
def on_response(self, request_receipt: RNS.RequestReceipt):
|
def on_response(self, request_receipt: RNS.RequestReceipt):
|
||||||
self.on_download_success(request_receipt)
|
self._download_success_callback(request_receipt)
|
||||||
|
|
||||||
# handle failure
|
# handle failure
|
||||||
def on_failed(self, request_receipt=None):
|
def on_failed(self, request_receipt=None):
|
||||||
self.on_download_failure("request_failed")
|
self._download_failure_callback("request_failed")
|
||||||
|
|
||||||
# handle download progress
|
# handle download progress
|
||||||
def on_progress(self, request_receipt):
|
def on_progress(self, request_receipt):
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
"""
|
"""Auto-generated helper so Python tooling and the Electron build
|
||||||
Auto-generated helper so Python tooling and the Electron build
|
|
||||||
share the same version string.
|
share the same version string.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = '2.41.0'
|
__version__ = "2.41.0"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
from pathlib import Path
|
|
||||||
import shutil
|
import shutil
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
TARGET = Path("meshchatx") / "public"
|
TARGET = Path("meshchatx") / "public"
|
||||||
|
|
||||||
@@ -12,4 +12,3 @@ if TARGET.exists():
|
|||||||
shutil.rmtree(TARGET)
|
shutil.rmtree(TARGET)
|
||||||
|
|
||||||
TARGET.mkdir(parents=True, exist_ok=True)
|
TARGET.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user