feat: add GUI components and utility functions for speed test application

AlexTkDev · AlexTkDev · commit 741e9ab87d1f · 2025-04-15T00:08:10.000+03:00
diff --git a/main.py b/main.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+"""
+Entry point for macOS_application_speedtest application.
+"""
+import sys
+import os
+
+# Add the project root directory to Python path
+current_dir = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, current_dir)
+
+# Import the main function from the package
+from speedtest_app.alexs_speedtest import main
+
+if __name__ == "__main__":
+    main()
diff --git a/speedtest_app/alexs_speedtest.py b/speedtest_app/alexs_speedtest.py
@@ -5,8 +5,8 @@
 from tkinter import messagebox
 from tkinter import ttk
 import speedtest as st
-import network_adapter_information
-from test_history import save_test_results, view_history, plot_history
+from speedtest_app import network_adapter_information
+from speedtest_app.test_history import save_test_results, view_history, plot_history
 
 
 # Настройка логирования
@@ -30,7 +30,6 @@ def setup_logging():
 # Инициализация логгера
 logger = setup_logging()
 
-
 # Get the history file path in the Documents folder
 def get_history_path():
     """Returns the path to the history file in the Documents folder."""
diff --git a/speedtest_app/gui/__init__.py b/speedtest_app/gui/__init__.py
@@ -0,0 +1,238 @@
+"""
+GUI components for macOS_application_speedtest_for_python.
+"""
+import tkinter as tk
+from tkinter import ttk, messagebox, Menu
+import logging
+
+logger = logging.getLogger("SpeedTest")
+
+
+class ResultsFrame(tk.Frame):
+    """Frame for displaying speed test results."""
+
+    def __init__(self, master, **kwargs):
+        super().__init__(master, **kwargs)
+
+        # Create labels for results
+        self.result_title = tk.Label(self, text="Test Results", font=("Helvetica", 14, "bold"))
+        self.result_title.pack(pady=(10, 5))
+
+        # Download speed result
+        self.download_frame = tk.Frame(self)
+        self.download_frame.pack(fill="x", pady=2)
+
+        self.download_label = tk.Label(self.download_frame, text="Download Speed:", width=15,
+                                       anchor="w")
+        self.download_label.pack(side="left", padx=5)
+
+        self.download_value = tk.Label(self.download_frame, text="-- Mbps", width=15, anchor="e")
+        self.download_value.pack(side="left", padx=5)
+
+        # Upload speed result
+        self.upload_frame = tk.Frame(self)
+        self.upload_frame.pack(fill="x", pady=2)
+
+        self.upload_label = tk.Label(self.upload_frame, text="Upload Speed:", width=15, anchor="w")
+        self.upload_label.pack(side="left", padx=5)
+
+        self.upload_value = tk.Label(self.upload_frame, text="-- Mbps", width=15, anchor="e")
+        self.upload_value.pack(side="left", padx=5)
+
+        # Ping result
+        self.ping_frame = tk.Frame(self)
+        self.ping_frame.pack(fill="x", pady=2)
+
+        self.ping_label = tk.Label(self.ping_frame, text="Ping:", width=15, anchor="w")
+        self.ping_label.pack(side="left", padx=5)
+
+        self.ping_value = tk.Label(self.ping_frame, text="-- ms", width=15, anchor="e")
+        self.ping_value.pack(side="left", padx=5)
+
+        # Timestamp
+        self.timestamp_frame = tk.Frame(self)
+        self.timestamp_frame.pack(fill="x", pady=2)
+
+        self.timestamp_label = tk.Label(self.timestamp_frame, text="Test Time:", width=15,
+                                        anchor="w")
+        self.timestamp_label.pack(side="left", padx=5)
+
+        self.timestamp_value = tk.Label(self.timestamp_frame, text="--", width=25, anchor="e")
+        self.timestamp_value.pack(side="left", padx=5)
+
+        # Initially hide
+        self.pack_forget()
+
+    def update_results(self, download, upload, ping, timestamp):
+        """Updates the result values."""
+        self.download_value.config(text=f"{download} Mbps")
+        self.upload_value.config(text=f"{upload} Mbps")
+        self.ping_value.config(text=f"{ping} ms")
+        self.timestamp_value.config(text=timestamp)
+        self.pack(fill="both", expand=True, pady=10)
+
+    def clear(self):
+        """Clears the result values."""
+        self.download_value.config(text="-- Mbps")
+        self.upload_value.config(text="-- Mbps")
+        self.ping_value.config(text="-- ms")
+        self.timestamp_value.config(text="--")
+
+
+class SettingsWindow:
+    """Window for application settings."""
+
+    def __init__(self, parent, settings, save_callback):
+        self.parent = parent
+        self.settings = settings
+        self.save_callback = save_callback
+
+        # Create a new window
+        self.window = tk.Toplevel(parent)
+        self.window.title("Settings")
+        self.window.geometry("400x300")
+        self.window.resizable(False, False)
+        self.window.transient(parent)
+        self.window.grab_set()
+
+        # Center on parent
+        x = parent.winfo_x() + (parent.winfo_width() // 2) - (400 // 2)
+        y = parent.winfo_y() + (parent.winfo_height() // 2) - (300 // 2)
+        self.window.geometry(f"+{x}+{y}")
+
+        # Create a frame for settings
+        self.frame = tk.Frame(self.window, padx=20, pady=20)
+        self.frame.pack(fill="both", expand=True)
+
+        # Auto save results
+        self.auto_save_var = tk.BooleanVar(value=settings.get("auto_save_results", True))
+        self.auto_save_check = ttk.Checkbutton(
+            self.frame,
+            text="Automatically save test results",
+            variable=self.auto_save_var
+        )
+        self.auto_save_check.pack(anchor="w", pady=5)
+
+        # Show network info
+        self.show_network_var = tk.BooleanVar(value=settings.get("show_network_info", True))
+        self.show_network_check = ttk.Checkbutton(
+            self.frame,
+            text="Show network adapter information",
+            variable=self.show_network_var
+        )
+        self.show_network_check.pack(anchor="w", pady=5)
+
+        # Dark mode option
+        self.dark_mode_var = tk.BooleanVar(value=settings.get("dark_mode", False))
+        self.dark_mode_check = ttk.Checkbutton(
+            self.frame,
+            text="Dark mode (requires restart)",
+            variable=self.dark_mode_var
+        )
+        self.dark_mode_check.pack(anchor="w", pady=5)
+
+        # Create buttons
+        self.button_frame = tk.Frame(self.window)
+        self.button_frame.pack(fill="x", padx=20, pady=20)
+
+        self.save_button = ttk.Button(
+            self.button_frame,
+            text="Save",
+            command=self.save_settings
+        )
+        self.save_button.pack(side="right", padx=5)
+
+        self.cancel_button = ttk.Button(
+            self.button_frame,
+            text="Cancel",
+            command=self.window.destroy
+        )
+        self.cancel_button.pack(side="right", padx=5)
+
+    def save_settings(self):
+        """Saves the settings and closes the window."""
+        self.settings["auto_save_results"] = self.auto_save_var.get()
+        self.settings["show_network_info"] = self.show_network_var.get()
+        self.settings["dark_mode"] = self.dark_mode_var.get()
+
+        if self.save_callback:
+            self.save_callback(self.settings)
+
+        self.window.destroy()
+
+
+def create_menu(root, settings_callback, about_callback):
+    """Creates the application menu bar."""
+    menubar = Menu(root)
+
+    # File menu
+    file_menu = Menu(menubar, tearoff=0)
+    file_menu.add_command(label="Settings", command=settings_callback)
+    file_menu.add_separator()
+    file_menu.add_command(label="Exit", command=root.quit)
+    menubar.add_cascade(label="File", menu=file_menu)
+
+    # Tools menu
+    tools_menu = Menu(menubar, tearoff=0)
+    tools_menu.add_command(label="Export All History", command=lambda: messagebox.showinfo(
+        "Feature Coming Soon", "This feature will be available in the next update."
+    ))
+    tools_menu.add_command(label="Clear History", command=lambda: messagebox.showinfo(
+        "Feature Coming Soon", "This feature will be available in the next update."
+    ))
+    menubar.add_cascade(label="Tools", menu=tools_menu)
+
+    # Help menu
+    help_menu = Menu(menubar, tearoff=0)
+    help_menu.add_command(label="View Help", command=lambda: messagebox.showinfo(
+        "Help",
+        "For help and documentation, please visit: https://github.com/AlexTkDev/"
+        "macOS_application_speedtest_for_python"
+    ))
+    help_menu.add_separator()
+    help_menu.add_command(label="About", command=about_callback)
+    menubar.add_cascade(label="Help", menu=help_menu)
+
+    root.config(menu=menubar)
+
+    return menubar
+
+
+def show_about_dialog(parent):
+    """Shows the About dialog."""
+    from speedtest_app import __version__
+
+    about_window = tk.Toplevel(parent)
+    about_window.title("About Internet Speed Test")
+    about_window.geometry("300x200")
+    about_window.resizable(False, False)
+    about_window.transient(parent)
+    about_window.grab_set()
+
+    # Center on parent
+    x = parent.winfo_x() + (parent.winfo_width() // 2) - (300 // 2)
+    y = parent.winfo_y() + (parent.winfo_height() // 2) - (200 // 2)
+    about_window.geometry(f"+{x}+{y}")
+
+    # App name and version
+    app_name = tk.Label(about_window, text="Internet Speed Test", font=("Helvetica", 16, "bold"))
+    app_name.pack(pady=(20, 5))
+
+    version = tk.Label(about_window, text=f"Version {__version__}")
+    version.pack()
+
+    # Separator
+    separator = ttk.Separator(about_window, orient="horizontal")
+    separator.pack(fill="x", padx=20, pady=10)
+
+    # Developer info
+    dev_info = tk.Label(about_window, text="Developed by Aleksandr")
+    dev_info.pack()
+
+    # Copyright info
+    copyright_info = tk.Label(about_window, text="© 2024 Aleksandr. MIT License")
+    copyright_info.pack()
+
+    # Close button
+    close_button = ttk.Button(about_window, text="Close", command=about_window.destroy)
+    close_button.pack(pady=20)
diff --git a/speedtest_app/tests/test_network_adapter.py b/speedtest_app/tests/test_network_adapter.py
@@ -7,8 +7,8 @@
 class TestNetworkAdapter(unittest.TestCase):
     """Tests for the network_adapter_information module."""
 
-    @patch('network_adapter_information.platform')
-    @patch('network_adapter_information.psutil')
+    @patch('speedtest_app.network_adapter_information.platform')
+    @patch('speedtest_app.network_adapter_information.psutil')
     def test_get_network_info_success(self, mock_psutil, mock_platform):
         """Test successful retrieval of network information."""
         # Setup mocks
@@ -25,12 +25,12 @@ def test_get_network_info_success(self, mock_psutil, mock_platform):
 
         # Mock network interfaces
         mock_address_en0_ip = MagicMock(family=socket.AF_INET, address="192.168.1.10",
-                                        netmask="255.255.255.0")
+                                    netmask="255.255.255.0")
         mock_address_en0_mac = MagicMock(family=socket.AF_LINK, address="00:11:22:33:44:55")
         mock_address_en0_ipv6 = MagicMock(family=socket.AF_INET6, address="fe80::1")
 
         mock_address_lo0_ip = MagicMock(family=socket.AF_INET, address="127.0.0.1",
-                                        netmask="255.0.0.0")
+                                    netmask="255.0.0.0")
         mock_address_lo0_mac = MagicMock(family=socket.AF_LINK, address="00:00:00:00:00:00")
 
         mock_interfaces = {
diff --git a/speedtest_app/tests/test_test_history.py b/speedtest_app/tests/test_test_history.py
@@ -4,7 +4,7 @@
 import tempfile
 import shutil
 from unittest.mock import patch, MagicMock
-import test_history
+from speedtest_app import test_history
 
 
 class TestHistory(unittest.TestCase):
@@ -22,7 +22,9 @@ def tearDown(self):
     def test_save_test_results_new_file(self):
         """Test saving test results to a new file."""
         # Call function with test data
-        test_history.save_test_results(100.5, 50.2, 20.1, self.history_path)
+        test_history.save_test_results(
+            100.5, 50.2, 20.1, self.history_path
+        )
 
         # Verify file was created and contains correct data
         self.assertTrue(os.path.exists(self.history_path))
@@ -48,7 +50,9 @@ def test_save_test_results_existing_file(self):
             json.dump(initial_data, f)
 
         # Call function with new test data
-        test_history.save_test_results(100.5, 50.2, 20.1, self.history_path)
+        test_history.save_test_results(
+            100.5, 50.2, 20.1, self.history_path
+        )
 
         # Verify file contains both entries
         with open(self.history_path, 'r', encoding='utf-8') as f:
@@ -65,7 +69,9 @@ def test_save_test_results_invalid_json(self):
             f.write("This is not valid JSON")
 
         # Call function (should handle the error and create a new file)
-        test_history.save_test_results(100.5, 50.2, 20.1, self.history_path)
+        test_history.save_test_results(
+            100.5, 50.2, 20.1, self.history_path
+        )
 
         # Verify file contains valid data now
         with open(self.history_path, 'r', encoding='utf-8') as f:
@@ -98,4 +104,4 @@ def test_plot_history_no_file(self, mock_messagebox):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()
diff --git a/speedtest_app/utils/__init__.py b/speedtest_app/utils/__init__.py
