From 7201bd442b3fb0bc02ff4280e969df14093e85d8 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Fri, 16 Jun 2023 11:28:34 -0700 Subject: [PATCH 01/16] Add pyproject.toml and copy dependencies from requirements. --- pyproject.toml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..a6537b0 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,17 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" +dependencies = [ + "BlurWindow==1.2.1", + "Cerberus==1.3.4", + "cssutils==2.5.1", + "humanize==4.3.0", + "psutil==5.9.1", + "PyQt6==6.3.1", + "pytz==2022.1", + "pywin32==304", + "PyYAML==6.0", + "tzlocal==4.2", + "watchdog==2.1.9", + "winsdk==1.0.0b6", +] From b76839fe2a4b464177db460d159687d30e4de156 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Fri, 16 Jun 2023 11:31:57 -0700 Subject: [PATCH 02/16] Make __init__.py file in package root. --- src/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/__init__.py diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 From 0dc6927e31397e090a09cb8071aa01422be3c65a Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Fri, 16 Jun 2023 11:43:57 -0700 Subject: [PATCH 03/16] Rename src dir to yasb for packaging. --- {src => yasb}/__init__.py | 0 {src => yasb}/assets/favicon/favicon-152x152.png | Bin {src => yasb}/assets/favicon/favicon-16x16.png | Bin {src => yasb}/assets/favicon/favicon-192x192.png | Bin {src => yasb}/assets/favicon/favicon-32x32.png | Bin {src => yasb}/assets/favicon/favicon-512x512.png | Bin {src => yasb}/assets/favicon/favicon.ico | Bin {src => yasb}/config.yaml | 0 {src => yasb}/core/bar.py | 0 {src => yasb}/core/bar_manager.py | 0 {src => yasb}/core/config.py | 0 {src => yasb}/core/event_enums.py | 0 {src => yasb}/core/event_service.py | 0 {src => yasb}/core/log.py | 0 {src => yasb}/core/tray.py | 0 {src => yasb}/core/utils/alert_dialog.py | 0 {src => yasb}/core/utils/komorebi/client.py | 0 {src => yasb}/core/utils/komorebi/event_listener.py | 0 {src => yasb}/core/utils/utilities.py | 0 {src => yasb}/core/utils/widget_builder.py | 0 .../core/utils/win32/active_window_border.py | 0 {src => yasb}/core/utils/win32/app_bar.py | 0 {src => yasb}/core/utils/win32/event_listener.py | 0 {src => yasb}/core/utils/win32/media_control.py | 0 {src => yasb}/core/utils/win32/utilities.py | 0 {src => yasb}/core/utils/win32/windows.py | 0 {src => yasb}/core/validation/bar.py | 0 {src => yasb}/core/validation/config.py | 0 {src => yasb}/core/validation/widgets/example.py | 0 .../validation/widgets/komorebi/active_layout.py | 0 .../core/validation/widgets/komorebi/workspaces.py | 0 .../core/validation/widgets/yasb/active_window.py | 0 .../core/validation/widgets/yasb/battery.py | 0 {src => yasb}/core/validation/widgets/yasb/clock.py | 0 {src => yasb}/core/validation/widgets/yasb/cpu.py | 0 .../core/validation/widgets/yasb/custom.py | 0 .../core/validation/widgets/yasb/memory.py | 0 {src => yasb}/core/watcher.py | 0 {src => yasb}/core/widgets/base.py | 0 {src => yasb}/core/widgets/example.py | 0 .../core/widgets/komorebi/active_layout.py | 0 {src => yasb}/core/widgets/komorebi/workspaces.py | 0 {src => yasb}/core/widgets/yasb/active_window.py | 0 {src => yasb}/core/widgets/yasb/battery.py | 0 {src => yasb}/core/widgets/yasb/clock.py | 0 {src => yasb}/core/widgets/yasb/cpu.py | 0 {src => yasb}/core/widgets/yasb/custom.py | 0 {src => yasb}/core/widgets/yasb/memory.py | 0 {src => yasb}/main.py | 0 {src => yasb}/settings.py | 0 {src => yasb}/styles.css | 0 51 files changed, 0 insertions(+), 0 deletions(-) rename {src => yasb}/__init__.py (100%) rename {src => yasb}/assets/favicon/favicon-152x152.png (100%) rename {src => yasb}/assets/favicon/favicon-16x16.png (100%) rename {src => yasb}/assets/favicon/favicon-192x192.png (100%) rename {src => yasb}/assets/favicon/favicon-32x32.png (100%) rename {src => yasb}/assets/favicon/favicon-512x512.png (100%) rename {src => yasb}/assets/favicon/favicon.ico (100%) rename {src => yasb}/config.yaml (100%) rename {src => yasb}/core/bar.py (100%) rename {src => yasb}/core/bar_manager.py (100%) rename {src => yasb}/core/config.py (100%) rename {src => yasb}/core/event_enums.py (100%) rename {src => yasb}/core/event_service.py (100%) rename {src => yasb}/core/log.py (100%) rename {src => yasb}/core/tray.py (100%) rename {src => yasb}/core/utils/alert_dialog.py (100%) rename {src => yasb}/core/utils/komorebi/client.py (100%) rename {src => yasb}/core/utils/komorebi/event_listener.py (100%) rename {src => yasb}/core/utils/utilities.py (100%) rename {src => yasb}/core/utils/widget_builder.py (100%) rename {src => yasb}/core/utils/win32/active_window_border.py (100%) rename {src => yasb}/core/utils/win32/app_bar.py (100%) rename {src => yasb}/core/utils/win32/event_listener.py (100%) rename {src => yasb}/core/utils/win32/media_control.py (100%) rename {src => yasb}/core/utils/win32/utilities.py (100%) rename {src => yasb}/core/utils/win32/windows.py (100%) rename {src => yasb}/core/validation/bar.py (100%) rename {src => yasb}/core/validation/config.py (100%) rename {src => yasb}/core/validation/widgets/example.py (100%) rename {src => yasb}/core/validation/widgets/komorebi/active_layout.py (100%) rename {src => yasb}/core/validation/widgets/komorebi/workspaces.py (100%) rename {src => yasb}/core/validation/widgets/yasb/active_window.py (100%) rename {src => yasb}/core/validation/widgets/yasb/battery.py (100%) rename {src => yasb}/core/validation/widgets/yasb/clock.py (100%) rename {src => yasb}/core/validation/widgets/yasb/cpu.py (100%) rename {src => yasb}/core/validation/widgets/yasb/custom.py (100%) rename {src => yasb}/core/validation/widgets/yasb/memory.py (100%) rename {src => yasb}/core/watcher.py (100%) rename {src => yasb}/core/widgets/base.py (100%) rename {src => yasb}/core/widgets/example.py (100%) rename {src => yasb}/core/widgets/komorebi/active_layout.py (100%) rename {src => yasb}/core/widgets/komorebi/workspaces.py (100%) rename {src => yasb}/core/widgets/yasb/active_window.py (100%) rename {src => yasb}/core/widgets/yasb/battery.py (100%) rename {src => yasb}/core/widgets/yasb/clock.py (100%) rename {src => yasb}/core/widgets/yasb/cpu.py (100%) rename {src => yasb}/core/widgets/yasb/custom.py (100%) rename {src => yasb}/core/widgets/yasb/memory.py (100%) rename {src => yasb}/main.py (100%) rename {src => yasb}/settings.py (100%) rename {src => yasb}/styles.css (100%) diff --git a/src/__init__.py b/yasb/__init__.py similarity index 100% rename from src/__init__.py rename to yasb/__init__.py diff --git a/src/assets/favicon/favicon-152x152.png b/yasb/assets/favicon/favicon-152x152.png similarity index 100% rename from src/assets/favicon/favicon-152x152.png rename to yasb/assets/favicon/favicon-152x152.png diff --git a/src/assets/favicon/favicon-16x16.png b/yasb/assets/favicon/favicon-16x16.png similarity index 100% rename from src/assets/favicon/favicon-16x16.png rename to yasb/assets/favicon/favicon-16x16.png diff --git a/src/assets/favicon/favicon-192x192.png b/yasb/assets/favicon/favicon-192x192.png similarity index 100% rename from src/assets/favicon/favicon-192x192.png rename to yasb/assets/favicon/favicon-192x192.png diff --git a/src/assets/favicon/favicon-32x32.png b/yasb/assets/favicon/favicon-32x32.png similarity index 100% rename from src/assets/favicon/favicon-32x32.png rename to yasb/assets/favicon/favicon-32x32.png diff --git a/src/assets/favicon/favicon-512x512.png b/yasb/assets/favicon/favicon-512x512.png similarity index 100% rename from src/assets/favicon/favicon-512x512.png rename to yasb/assets/favicon/favicon-512x512.png diff --git a/src/assets/favicon/favicon.ico b/yasb/assets/favicon/favicon.ico similarity index 100% rename from src/assets/favicon/favicon.ico rename to yasb/assets/favicon/favicon.ico diff --git a/src/config.yaml b/yasb/config.yaml similarity index 100% rename from src/config.yaml rename to yasb/config.yaml diff --git a/src/core/bar.py b/yasb/core/bar.py similarity index 100% rename from src/core/bar.py rename to yasb/core/bar.py diff --git a/src/core/bar_manager.py b/yasb/core/bar_manager.py similarity index 100% rename from src/core/bar_manager.py rename to yasb/core/bar_manager.py diff --git a/src/core/config.py b/yasb/core/config.py similarity index 100% rename from src/core/config.py rename to yasb/core/config.py diff --git a/src/core/event_enums.py b/yasb/core/event_enums.py similarity index 100% rename from src/core/event_enums.py rename to yasb/core/event_enums.py diff --git a/src/core/event_service.py b/yasb/core/event_service.py similarity index 100% rename from src/core/event_service.py rename to yasb/core/event_service.py diff --git a/src/core/log.py b/yasb/core/log.py similarity index 100% rename from src/core/log.py rename to yasb/core/log.py diff --git a/src/core/tray.py b/yasb/core/tray.py similarity index 100% rename from src/core/tray.py rename to yasb/core/tray.py diff --git a/src/core/utils/alert_dialog.py b/yasb/core/utils/alert_dialog.py similarity index 100% rename from src/core/utils/alert_dialog.py rename to yasb/core/utils/alert_dialog.py diff --git a/src/core/utils/komorebi/client.py b/yasb/core/utils/komorebi/client.py similarity index 100% rename from src/core/utils/komorebi/client.py rename to yasb/core/utils/komorebi/client.py diff --git a/src/core/utils/komorebi/event_listener.py b/yasb/core/utils/komorebi/event_listener.py similarity index 100% rename from src/core/utils/komorebi/event_listener.py rename to yasb/core/utils/komorebi/event_listener.py diff --git a/src/core/utils/utilities.py b/yasb/core/utils/utilities.py similarity index 100% rename from src/core/utils/utilities.py rename to yasb/core/utils/utilities.py diff --git a/src/core/utils/widget_builder.py b/yasb/core/utils/widget_builder.py similarity index 100% rename from src/core/utils/widget_builder.py rename to yasb/core/utils/widget_builder.py diff --git a/src/core/utils/win32/active_window_border.py b/yasb/core/utils/win32/active_window_border.py similarity index 100% rename from src/core/utils/win32/active_window_border.py rename to yasb/core/utils/win32/active_window_border.py diff --git a/src/core/utils/win32/app_bar.py b/yasb/core/utils/win32/app_bar.py similarity index 100% rename from src/core/utils/win32/app_bar.py rename to yasb/core/utils/win32/app_bar.py diff --git a/src/core/utils/win32/event_listener.py b/yasb/core/utils/win32/event_listener.py similarity index 100% rename from src/core/utils/win32/event_listener.py rename to yasb/core/utils/win32/event_listener.py diff --git a/src/core/utils/win32/media_control.py b/yasb/core/utils/win32/media_control.py similarity index 100% rename from src/core/utils/win32/media_control.py rename to yasb/core/utils/win32/media_control.py diff --git a/src/core/utils/win32/utilities.py b/yasb/core/utils/win32/utilities.py similarity index 100% rename from src/core/utils/win32/utilities.py rename to yasb/core/utils/win32/utilities.py diff --git a/src/core/utils/win32/windows.py b/yasb/core/utils/win32/windows.py similarity index 100% rename from src/core/utils/win32/windows.py rename to yasb/core/utils/win32/windows.py diff --git a/src/core/validation/bar.py b/yasb/core/validation/bar.py similarity index 100% rename from src/core/validation/bar.py rename to yasb/core/validation/bar.py diff --git a/src/core/validation/config.py b/yasb/core/validation/config.py similarity index 100% rename from src/core/validation/config.py rename to yasb/core/validation/config.py diff --git a/src/core/validation/widgets/example.py b/yasb/core/validation/widgets/example.py similarity index 100% rename from src/core/validation/widgets/example.py rename to yasb/core/validation/widgets/example.py diff --git a/src/core/validation/widgets/komorebi/active_layout.py b/yasb/core/validation/widgets/komorebi/active_layout.py similarity index 100% rename from src/core/validation/widgets/komorebi/active_layout.py rename to yasb/core/validation/widgets/komorebi/active_layout.py diff --git a/src/core/validation/widgets/komorebi/workspaces.py b/yasb/core/validation/widgets/komorebi/workspaces.py similarity index 100% rename from src/core/validation/widgets/komorebi/workspaces.py rename to yasb/core/validation/widgets/komorebi/workspaces.py diff --git a/src/core/validation/widgets/yasb/active_window.py b/yasb/core/validation/widgets/yasb/active_window.py similarity index 100% rename from src/core/validation/widgets/yasb/active_window.py rename to yasb/core/validation/widgets/yasb/active_window.py diff --git a/src/core/validation/widgets/yasb/battery.py b/yasb/core/validation/widgets/yasb/battery.py similarity index 100% rename from src/core/validation/widgets/yasb/battery.py rename to yasb/core/validation/widgets/yasb/battery.py diff --git a/src/core/validation/widgets/yasb/clock.py b/yasb/core/validation/widgets/yasb/clock.py similarity index 100% rename from src/core/validation/widgets/yasb/clock.py rename to yasb/core/validation/widgets/yasb/clock.py diff --git a/src/core/validation/widgets/yasb/cpu.py b/yasb/core/validation/widgets/yasb/cpu.py similarity index 100% rename from src/core/validation/widgets/yasb/cpu.py rename to yasb/core/validation/widgets/yasb/cpu.py diff --git a/src/core/validation/widgets/yasb/custom.py b/yasb/core/validation/widgets/yasb/custom.py similarity index 100% rename from src/core/validation/widgets/yasb/custom.py rename to yasb/core/validation/widgets/yasb/custom.py diff --git a/src/core/validation/widgets/yasb/memory.py b/yasb/core/validation/widgets/yasb/memory.py similarity index 100% rename from src/core/validation/widgets/yasb/memory.py rename to yasb/core/validation/widgets/yasb/memory.py diff --git a/src/core/watcher.py b/yasb/core/watcher.py similarity index 100% rename from src/core/watcher.py rename to yasb/core/watcher.py diff --git a/src/core/widgets/base.py b/yasb/core/widgets/base.py similarity index 100% rename from src/core/widgets/base.py rename to yasb/core/widgets/base.py diff --git a/src/core/widgets/example.py b/yasb/core/widgets/example.py similarity index 100% rename from src/core/widgets/example.py rename to yasb/core/widgets/example.py diff --git a/src/core/widgets/komorebi/active_layout.py b/yasb/core/widgets/komorebi/active_layout.py similarity index 100% rename from src/core/widgets/komorebi/active_layout.py rename to yasb/core/widgets/komorebi/active_layout.py diff --git a/src/core/widgets/komorebi/workspaces.py b/yasb/core/widgets/komorebi/workspaces.py similarity index 100% rename from src/core/widgets/komorebi/workspaces.py rename to yasb/core/widgets/komorebi/workspaces.py diff --git a/src/core/widgets/yasb/active_window.py b/yasb/core/widgets/yasb/active_window.py similarity index 100% rename from src/core/widgets/yasb/active_window.py rename to yasb/core/widgets/yasb/active_window.py diff --git a/src/core/widgets/yasb/battery.py b/yasb/core/widgets/yasb/battery.py similarity index 100% rename from src/core/widgets/yasb/battery.py rename to yasb/core/widgets/yasb/battery.py diff --git a/src/core/widgets/yasb/clock.py b/yasb/core/widgets/yasb/clock.py similarity index 100% rename from src/core/widgets/yasb/clock.py rename to yasb/core/widgets/yasb/clock.py diff --git a/src/core/widgets/yasb/cpu.py b/yasb/core/widgets/yasb/cpu.py similarity index 100% rename from src/core/widgets/yasb/cpu.py rename to yasb/core/widgets/yasb/cpu.py diff --git a/src/core/widgets/yasb/custom.py b/yasb/core/widgets/yasb/custom.py similarity index 100% rename from src/core/widgets/yasb/custom.py rename to yasb/core/widgets/yasb/custom.py diff --git a/src/core/widgets/yasb/memory.py b/yasb/core/widgets/yasb/memory.py similarity index 100% rename from src/core/widgets/yasb/memory.py rename to yasb/core/widgets/yasb/memory.py diff --git a/src/main.py b/yasb/main.py similarity index 100% rename from src/main.py rename to yasb/main.py diff --git a/src/settings.py b/yasb/settings.py similarity index 100% rename from src/settings.py rename to yasb/settings.py diff --git a/src/styles.css b/yasb/styles.css similarity index 100% rename from src/styles.css rename to yasb/styles.css From 99a5177f146aa4a04391c1069792bd796c2fbcec Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Fri, 16 Jun 2023 11:46:52 -0700 Subject: [PATCH 04/16] Fix dependencies entry in pyproject.toml, add name. --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index a6537b0..ea672fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,10 @@ [build-system] requires = ["setuptools"] build-backend = "setuptools.build_meta" + +[project] +name = "yasb" +version = "0.0.1" dependencies = [ "BlurWindow==1.2.1", "Cerberus==1.3.4", From a4855c7880f8cc4e620311611c16b5ff2a640db4 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Fri, 16 Jun 2023 12:01:39 -0700 Subject: [PATCH 05/16] Revert "Rename src dir to yasb for packaging." This reverts commit 0dc6927e31397e090a09cb8071aa01422be3c65a. --- {yasb => src}/__init__.py | 0 {yasb => src}/assets/favicon/favicon-152x152.png | Bin {yasb => src}/assets/favicon/favicon-16x16.png | Bin {yasb => src}/assets/favicon/favicon-192x192.png | Bin {yasb => src}/assets/favicon/favicon-32x32.png | Bin {yasb => src}/assets/favicon/favicon-512x512.png | Bin {yasb => src}/assets/favicon/favicon.ico | Bin {yasb => src}/config.yaml | 0 {yasb => src}/core/bar.py | 0 {yasb => src}/core/bar_manager.py | 0 {yasb => src}/core/config.py | 0 {yasb => src}/core/event_enums.py | 0 {yasb => src}/core/event_service.py | 0 {yasb => src}/core/log.py | 0 {yasb => src}/core/tray.py | 0 {yasb => src}/core/utils/alert_dialog.py | 0 {yasb => src}/core/utils/komorebi/client.py | 0 {yasb => src}/core/utils/komorebi/event_listener.py | 0 {yasb => src}/core/utils/utilities.py | 0 {yasb => src}/core/utils/widget_builder.py | 0 .../core/utils/win32/active_window_border.py | 0 {yasb => src}/core/utils/win32/app_bar.py | 0 {yasb => src}/core/utils/win32/event_listener.py | 0 {yasb => src}/core/utils/win32/media_control.py | 0 {yasb => src}/core/utils/win32/utilities.py | 0 {yasb => src}/core/utils/win32/windows.py | 0 {yasb => src}/core/validation/bar.py | 0 {yasb => src}/core/validation/config.py | 0 {yasb => src}/core/validation/widgets/example.py | 0 .../validation/widgets/komorebi/active_layout.py | 0 .../core/validation/widgets/komorebi/workspaces.py | 0 .../core/validation/widgets/yasb/active_window.py | 0 .../core/validation/widgets/yasb/battery.py | 0 {yasb => src}/core/validation/widgets/yasb/clock.py | 0 {yasb => src}/core/validation/widgets/yasb/cpu.py | 0 .../core/validation/widgets/yasb/custom.py | 0 .../core/validation/widgets/yasb/memory.py | 0 {yasb => src}/core/watcher.py | 0 {yasb => src}/core/widgets/base.py | 0 {yasb => src}/core/widgets/example.py | 0 .../core/widgets/komorebi/active_layout.py | 0 {yasb => src}/core/widgets/komorebi/workspaces.py | 0 {yasb => src}/core/widgets/yasb/active_window.py | 0 {yasb => src}/core/widgets/yasb/battery.py | 0 {yasb => src}/core/widgets/yasb/clock.py | 0 {yasb => src}/core/widgets/yasb/cpu.py | 0 {yasb => src}/core/widgets/yasb/custom.py | 0 {yasb => src}/core/widgets/yasb/memory.py | 0 {yasb => src}/main.py | 0 {yasb => src}/settings.py | 0 {yasb => src}/styles.css | 0 51 files changed, 0 insertions(+), 0 deletions(-) rename {yasb => src}/__init__.py (100%) rename {yasb => src}/assets/favicon/favicon-152x152.png (100%) rename {yasb => src}/assets/favicon/favicon-16x16.png (100%) rename {yasb => src}/assets/favicon/favicon-192x192.png (100%) rename {yasb => src}/assets/favicon/favicon-32x32.png (100%) rename {yasb => src}/assets/favicon/favicon-512x512.png (100%) rename {yasb => src}/assets/favicon/favicon.ico (100%) rename {yasb => src}/config.yaml (100%) rename {yasb => src}/core/bar.py (100%) rename {yasb => src}/core/bar_manager.py (100%) rename {yasb => src}/core/config.py (100%) rename {yasb => src}/core/event_enums.py (100%) rename {yasb => src}/core/event_service.py (100%) rename {yasb => src}/core/log.py (100%) rename {yasb => src}/core/tray.py (100%) rename {yasb => src}/core/utils/alert_dialog.py (100%) rename {yasb => src}/core/utils/komorebi/client.py (100%) rename {yasb => src}/core/utils/komorebi/event_listener.py (100%) rename {yasb => src}/core/utils/utilities.py (100%) rename {yasb => src}/core/utils/widget_builder.py (100%) rename {yasb => src}/core/utils/win32/active_window_border.py (100%) rename {yasb => src}/core/utils/win32/app_bar.py (100%) rename {yasb => src}/core/utils/win32/event_listener.py (100%) rename {yasb => src}/core/utils/win32/media_control.py (100%) rename {yasb => src}/core/utils/win32/utilities.py (100%) rename {yasb => src}/core/utils/win32/windows.py (100%) rename {yasb => src}/core/validation/bar.py (100%) rename {yasb => src}/core/validation/config.py (100%) rename {yasb => src}/core/validation/widgets/example.py (100%) rename {yasb => src}/core/validation/widgets/komorebi/active_layout.py (100%) rename {yasb => src}/core/validation/widgets/komorebi/workspaces.py (100%) rename {yasb => src}/core/validation/widgets/yasb/active_window.py (100%) rename {yasb => src}/core/validation/widgets/yasb/battery.py (100%) rename {yasb => src}/core/validation/widgets/yasb/clock.py (100%) rename {yasb => src}/core/validation/widgets/yasb/cpu.py (100%) rename {yasb => src}/core/validation/widgets/yasb/custom.py (100%) rename {yasb => src}/core/validation/widgets/yasb/memory.py (100%) rename {yasb => src}/core/watcher.py (100%) rename {yasb => src}/core/widgets/base.py (100%) rename {yasb => src}/core/widgets/example.py (100%) rename {yasb => src}/core/widgets/komorebi/active_layout.py (100%) rename {yasb => src}/core/widgets/komorebi/workspaces.py (100%) rename {yasb => src}/core/widgets/yasb/active_window.py (100%) rename {yasb => src}/core/widgets/yasb/battery.py (100%) rename {yasb => src}/core/widgets/yasb/clock.py (100%) rename {yasb => src}/core/widgets/yasb/cpu.py (100%) rename {yasb => src}/core/widgets/yasb/custom.py (100%) rename {yasb => src}/core/widgets/yasb/memory.py (100%) rename {yasb => src}/main.py (100%) rename {yasb => src}/settings.py (100%) rename {yasb => src}/styles.css (100%) diff --git a/yasb/__init__.py b/src/__init__.py similarity index 100% rename from yasb/__init__.py rename to src/__init__.py diff --git a/yasb/assets/favicon/favicon-152x152.png b/src/assets/favicon/favicon-152x152.png similarity index 100% rename from yasb/assets/favicon/favicon-152x152.png rename to src/assets/favicon/favicon-152x152.png diff --git a/yasb/assets/favicon/favicon-16x16.png b/src/assets/favicon/favicon-16x16.png similarity index 100% rename from yasb/assets/favicon/favicon-16x16.png rename to src/assets/favicon/favicon-16x16.png diff --git a/yasb/assets/favicon/favicon-192x192.png b/src/assets/favicon/favicon-192x192.png similarity index 100% rename from yasb/assets/favicon/favicon-192x192.png rename to src/assets/favicon/favicon-192x192.png diff --git a/yasb/assets/favicon/favicon-32x32.png b/src/assets/favicon/favicon-32x32.png similarity index 100% rename from yasb/assets/favicon/favicon-32x32.png rename to src/assets/favicon/favicon-32x32.png diff --git a/yasb/assets/favicon/favicon-512x512.png b/src/assets/favicon/favicon-512x512.png similarity index 100% rename from yasb/assets/favicon/favicon-512x512.png rename to src/assets/favicon/favicon-512x512.png diff --git a/yasb/assets/favicon/favicon.ico b/src/assets/favicon/favicon.ico similarity index 100% rename from yasb/assets/favicon/favicon.ico rename to src/assets/favicon/favicon.ico diff --git a/yasb/config.yaml b/src/config.yaml similarity index 100% rename from yasb/config.yaml rename to src/config.yaml diff --git a/yasb/core/bar.py b/src/core/bar.py similarity index 100% rename from yasb/core/bar.py rename to src/core/bar.py diff --git a/yasb/core/bar_manager.py b/src/core/bar_manager.py similarity index 100% rename from yasb/core/bar_manager.py rename to src/core/bar_manager.py diff --git a/yasb/core/config.py b/src/core/config.py similarity index 100% rename from yasb/core/config.py rename to src/core/config.py diff --git a/yasb/core/event_enums.py b/src/core/event_enums.py similarity index 100% rename from yasb/core/event_enums.py rename to src/core/event_enums.py diff --git a/yasb/core/event_service.py b/src/core/event_service.py similarity index 100% rename from yasb/core/event_service.py rename to src/core/event_service.py diff --git a/yasb/core/log.py b/src/core/log.py similarity index 100% rename from yasb/core/log.py rename to src/core/log.py diff --git a/yasb/core/tray.py b/src/core/tray.py similarity index 100% rename from yasb/core/tray.py rename to src/core/tray.py diff --git a/yasb/core/utils/alert_dialog.py b/src/core/utils/alert_dialog.py similarity index 100% rename from yasb/core/utils/alert_dialog.py rename to src/core/utils/alert_dialog.py diff --git a/yasb/core/utils/komorebi/client.py b/src/core/utils/komorebi/client.py similarity index 100% rename from yasb/core/utils/komorebi/client.py rename to src/core/utils/komorebi/client.py diff --git a/yasb/core/utils/komorebi/event_listener.py b/src/core/utils/komorebi/event_listener.py similarity index 100% rename from yasb/core/utils/komorebi/event_listener.py rename to src/core/utils/komorebi/event_listener.py diff --git a/yasb/core/utils/utilities.py b/src/core/utils/utilities.py similarity index 100% rename from yasb/core/utils/utilities.py rename to src/core/utils/utilities.py diff --git a/yasb/core/utils/widget_builder.py b/src/core/utils/widget_builder.py similarity index 100% rename from yasb/core/utils/widget_builder.py rename to src/core/utils/widget_builder.py diff --git a/yasb/core/utils/win32/active_window_border.py b/src/core/utils/win32/active_window_border.py similarity index 100% rename from yasb/core/utils/win32/active_window_border.py rename to src/core/utils/win32/active_window_border.py diff --git a/yasb/core/utils/win32/app_bar.py b/src/core/utils/win32/app_bar.py similarity index 100% rename from yasb/core/utils/win32/app_bar.py rename to src/core/utils/win32/app_bar.py diff --git a/yasb/core/utils/win32/event_listener.py b/src/core/utils/win32/event_listener.py similarity index 100% rename from yasb/core/utils/win32/event_listener.py rename to src/core/utils/win32/event_listener.py diff --git a/yasb/core/utils/win32/media_control.py b/src/core/utils/win32/media_control.py similarity index 100% rename from yasb/core/utils/win32/media_control.py rename to src/core/utils/win32/media_control.py diff --git a/yasb/core/utils/win32/utilities.py b/src/core/utils/win32/utilities.py similarity index 100% rename from yasb/core/utils/win32/utilities.py rename to src/core/utils/win32/utilities.py diff --git a/yasb/core/utils/win32/windows.py b/src/core/utils/win32/windows.py similarity index 100% rename from yasb/core/utils/win32/windows.py rename to src/core/utils/win32/windows.py diff --git a/yasb/core/validation/bar.py b/src/core/validation/bar.py similarity index 100% rename from yasb/core/validation/bar.py rename to src/core/validation/bar.py diff --git a/yasb/core/validation/config.py b/src/core/validation/config.py similarity index 100% rename from yasb/core/validation/config.py rename to src/core/validation/config.py diff --git a/yasb/core/validation/widgets/example.py b/src/core/validation/widgets/example.py similarity index 100% rename from yasb/core/validation/widgets/example.py rename to src/core/validation/widgets/example.py diff --git a/yasb/core/validation/widgets/komorebi/active_layout.py b/src/core/validation/widgets/komorebi/active_layout.py similarity index 100% rename from yasb/core/validation/widgets/komorebi/active_layout.py rename to src/core/validation/widgets/komorebi/active_layout.py diff --git a/yasb/core/validation/widgets/komorebi/workspaces.py b/src/core/validation/widgets/komorebi/workspaces.py similarity index 100% rename from yasb/core/validation/widgets/komorebi/workspaces.py rename to src/core/validation/widgets/komorebi/workspaces.py diff --git a/yasb/core/validation/widgets/yasb/active_window.py b/src/core/validation/widgets/yasb/active_window.py similarity index 100% rename from yasb/core/validation/widgets/yasb/active_window.py rename to src/core/validation/widgets/yasb/active_window.py diff --git a/yasb/core/validation/widgets/yasb/battery.py b/src/core/validation/widgets/yasb/battery.py similarity index 100% rename from yasb/core/validation/widgets/yasb/battery.py rename to src/core/validation/widgets/yasb/battery.py diff --git a/yasb/core/validation/widgets/yasb/clock.py b/src/core/validation/widgets/yasb/clock.py similarity index 100% rename from yasb/core/validation/widgets/yasb/clock.py rename to src/core/validation/widgets/yasb/clock.py diff --git a/yasb/core/validation/widgets/yasb/cpu.py b/src/core/validation/widgets/yasb/cpu.py similarity index 100% rename from yasb/core/validation/widgets/yasb/cpu.py rename to src/core/validation/widgets/yasb/cpu.py diff --git a/yasb/core/validation/widgets/yasb/custom.py b/src/core/validation/widgets/yasb/custom.py similarity index 100% rename from yasb/core/validation/widgets/yasb/custom.py rename to src/core/validation/widgets/yasb/custom.py diff --git a/yasb/core/validation/widgets/yasb/memory.py b/src/core/validation/widgets/yasb/memory.py similarity index 100% rename from yasb/core/validation/widgets/yasb/memory.py rename to src/core/validation/widgets/yasb/memory.py diff --git a/yasb/core/watcher.py b/src/core/watcher.py similarity index 100% rename from yasb/core/watcher.py rename to src/core/watcher.py diff --git a/yasb/core/widgets/base.py b/src/core/widgets/base.py similarity index 100% rename from yasb/core/widgets/base.py rename to src/core/widgets/base.py diff --git a/yasb/core/widgets/example.py b/src/core/widgets/example.py similarity index 100% rename from yasb/core/widgets/example.py rename to src/core/widgets/example.py diff --git a/yasb/core/widgets/komorebi/active_layout.py b/src/core/widgets/komorebi/active_layout.py similarity index 100% rename from yasb/core/widgets/komorebi/active_layout.py rename to src/core/widgets/komorebi/active_layout.py diff --git a/yasb/core/widgets/komorebi/workspaces.py b/src/core/widgets/komorebi/workspaces.py similarity index 100% rename from yasb/core/widgets/komorebi/workspaces.py rename to src/core/widgets/komorebi/workspaces.py diff --git a/yasb/core/widgets/yasb/active_window.py b/src/core/widgets/yasb/active_window.py similarity index 100% rename from yasb/core/widgets/yasb/active_window.py rename to src/core/widgets/yasb/active_window.py diff --git a/yasb/core/widgets/yasb/battery.py b/src/core/widgets/yasb/battery.py similarity index 100% rename from yasb/core/widgets/yasb/battery.py rename to src/core/widgets/yasb/battery.py diff --git a/yasb/core/widgets/yasb/clock.py b/src/core/widgets/yasb/clock.py similarity index 100% rename from yasb/core/widgets/yasb/clock.py rename to src/core/widgets/yasb/clock.py diff --git a/yasb/core/widgets/yasb/cpu.py b/src/core/widgets/yasb/cpu.py similarity index 100% rename from yasb/core/widgets/yasb/cpu.py rename to src/core/widgets/yasb/cpu.py diff --git a/yasb/core/widgets/yasb/custom.py b/src/core/widgets/yasb/custom.py similarity index 100% rename from yasb/core/widgets/yasb/custom.py rename to src/core/widgets/yasb/custom.py diff --git a/yasb/core/widgets/yasb/memory.py b/src/core/widgets/yasb/memory.py similarity index 100% rename from yasb/core/widgets/yasb/memory.py rename to src/core/widgets/yasb/memory.py diff --git a/yasb/main.py b/src/main.py similarity index 100% rename from yasb/main.py rename to src/main.py diff --git a/yasb/settings.py b/src/settings.py similarity index 100% rename from yasb/settings.py rename to src/settings.py diff --git a/yasb/styles.css b/src/styles.css similarity index 100% rename from yasb/styles.css rename to src/styles.css From 839336b2e086102db7459412abee7440c86886c8 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Fri, 16 Jun 2023 12:11:00 -0700 Subject: [PATCH 06/16] Add __main__.py for module script. --- src/__main__.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/__main__.py diff --git a/src/__main__.py b/src/__main__.py new file mode 100644 index 0000000..d241970 --- /dev/null +++ b/src/__main__.py @@ -0,0 +1,5 @@ +from . import main + +if __name__ == '__main__': + main.init_logger() + main.main() From a41edb15d7c7d22737bc7f18880fc50859caee1b Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Tue, 20 Jun 2023 16:08:48 -0700 Subject: [PATCH 07/16] Conform to src-layout. Move contents of ./src to ./src/yasb so that we get a module named yasb. --- src/{ => yasb}/__init__.py | 0 src/{ => yasb}/__main__.py | 0 src/{ => yasb}/assets/favicon/favicon-152x152.png | Bin src/{ => yasb}/assets/favicon/favicon-16x16.png | Bin src/{ => yasb}/assets/favicon/favicon-192x192.png | Bin src/{ => yasb}/assets/favicon/favicon-32x32.png | Bin src/{ => yasb}/assets/favicon/favicon-512x512.png | Bin src/{ => yasb}/assets/favicon/favicon.ico | Bin src/{ => yasb}/config.yaml | 0 src/{ => yasb}/core/bar.py | 0 src/{ => yasb}/core/bar_manager.py | 0 src/{ => yasb}/core/config.py | 0 src/{ => yasb}/core/event_enums.py | 0 src/{ => yasb}/core/event_service.py | 0 src/{ => yasb}/core/log.py | 0 src/{ => yasb}/core/tray.py | 0 src/{ => yasb}/core/utils/alert_dialog.py | 0 src/{ => yasb}/core/utils/komorebi/client.py | 0 .../core/utils/komorebi/event_listener.py | 0 src/{ => yasb}/core/utils/utilities.py | 0 src/{ => yasb}/core/utils/widget_builder.py | 0 .../core/utils/win32/active_window_border.py | 0 src/{ => yasb}/core/utils/win32/app_bar.py | 0 src/{ => yasb}/core/utils/win32/event_listener.py | 0 src/{ => yasb}/core/utils/win32/media_control.py | 0 src/{ => yasb}/core/utils/win32/utilities.py | 0 src/{ => yasb}/core/utils/win32/windows.py | 0 src/{ => yasb}/core/validation/bar.py | 0 src/{ => yasb}/core/validation/config.py | 0 src/{ => yasb}/core/validation/widgets/example.py | 0 .../validation/widgets/komorebi/active_layout.py | 0 .../core/validation/widgets/komorebi/workspaces.py | 0 .../core/validation/widgets/yasb/active_window.py | 0 .../core/validation/widgets/yasb/battery.py | 0 .../core/validation/widgets/yasb/clock.py | 0 src/{ => yasb}/core/validation/widgets/yasb/cpu.py | 0 .../core/validation/widgets/yasb/custom.py | 0 .../core/validation/widgets/yasb/memory.py | 0 src/{ => yasb}/core/watcher.py | 0 src/{ => yasb}/core/widgets/base.py | 0 src/{ => yasb}/core/widgets/example.py | 0 .../core/widgets/komorebi/active_layout.py | 0 src/{ => yasb}/core/widgets/komorebi/workspaces.py | 0 src/{ => yasb}/core/widgets/yasb/active_window.py | 0 src/{ => yasb}/core/widgets/yasb/battery.py | 0 src/{ => yasb}/core/widgets/yasb/clock.py | 0 src/{ => yasb}/core/widgets/yasb/cpu.py | 0 src/{ => yasb}/core/widgets/yasb/custom.py | 0 src/{ => yasb}/core/widgets/yasb/memory.py | 0 src/{ => yasb}/main.py | 0 src/{ => yasb}/settings.py | 0 src/{ => yasb}/styles.css | 0 52 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => yasb}/__init__.py (100%) rename src/{ => yasb}/__main__.py (100%) rename src/{ => yasb}/assets/favicon/favicon-152x152.png (100%) rename src/{ => yasb}/assets/favicon/favicon-16x16.png (100%) rename src/{ => yasb}/assets/favicon/favicon-192x192.png (100%) rename src/{ => yasb}/assets/favicon/favicon-32x32.png (100%) rename src/{ => yasb}/assets/favicon/favicon-512x512.png (100%) rename src/{ => yasb}/assets/favicon/favicon.ico (100%) rename src/{ => yasb}/config.yaml (100%) rename src/{ => yasb}/core/bar.py (100%) rename src/{ => yasb}/core/bar_manager.py (100%) rename src/{ => yasb}/core/config.py (100%) rename src/{ => yasb}/core/event_enums.py (100%) rename src/{ => yasb}/core/event_service.py (100%) rename src/{ => yasb}/core/log.py (100%) rename src/{ => yasb}/core/tray.py (100%) rename src/{ => yasb}/core/utils/alert_dialog.py (100%) rename src/{ => yasb}/core/utils/komorebi/client.py (100%) rename src/{ => yasb}/core/utils/komorebi/event_listener.py (100%) rename src/{ => yasb}/core/utils/utilities.py (100%) rename src/{ => yasb}/core/utils/widget_builder.py (100%) rename src/{ => yasb}/core/utils/win32/active_window_border.py (100%) rename src/{ => yasb}/core/utils/win32/app_bar.py (100%) rename src/{ => yasb}/core/utils/win32/event_listener.py (100%) rename src/{ => yasb}/core/utils/win32/media_control.py (100%) rename src/{ => yasb}/core/utils/win32/utilities.py (100%) rename src/{ => yasb}/core/utils/win32/windows.py (100%) rename src/{ => yasb}/core/validation/bar.py (100%) rename src/{ => yasb}/core/validation/config.py (100%) rename src/{ => yasb}/core/validation/widgets/example.py (100%) rename src/{ => yasb}/core/validation/widgets/komorebi/active_layout.py (100%) rename src/{ => yasb}/core/validation/widgets/komorebi/workspaces.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/active_window.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/battery.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/clock.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/cpu.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/custom.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/memory.py (100%) rename src/{ => yasb}/core/watcher.py (100%) rename src/{ => yasb}/core/widgets/base.py (100%) rename src/{ => yasb}/core/widgets/example.py (100%) rename src/{ => yasb}/core/widgets/komorebi/active_layout.py (100%) rename src/{ => yasb}/core/widgets/komorebi/workspaces.py (100%) rename src/{ => yasb}/core/widgets/yasb/active_window.py (100%) rename src/{ => yasb}/core/widgets/yasb/battery.py (100%) rename src/{ => yasb}/core/widgets/yasb/clock.py (100%) rename src/{ => yasb}/core/widgets/yasb/cpu.py (100%) rename src/{ => yasb}/core/widgets/yasb/custom.py (100%) rename src/{ => yasb}/core/widgets/yasb/memory.py (100%) rename src/{ => yasb}/main.py (100%) rename src/{ => yasb}/settings.py (100%) rename src/{ => yasb}/styles.css (100%) diff --git a/src/__init__.py b/src/yasb/__init__.py similarity index 100% rename from src/__init__.py rename to src/yasb/__init__.py diff --git a/src/__main__.py b/src/yasb/__main__.py similarity index 100% rename from src/__main__.py rename to src/yasb/__main__.py diff --git a/src/assets/favicon/favicon-152x152.png b/src/yasb/assets/favicon/favicon-152x152.png similarity index 100% rename from src/assets/favicon/favicon-152x152.png rename to src/yasb/assets/favicon/favicon-152x152.png diff --git a/src/assets/favicon/favicon-16x16.png b/src/yasb/assets/favicon/favicon-16x16.png similarity index 100% rename from src/assets/favicon/favicon-16x16.png rename to src/yasb/assets/favicon/favicon-16x16.png diff --git a/src/assets/favicon/favicon-192x192.png b/src/yasb/assets/favicon/favicon-192x192.png similarity index 100% rename from src/assets/favicon/favicon-192x192.png rename to src/yasb/assets/favicon/favicon-192x192.png diff --git a/src/assets/favicon/favicon-32x32.png b/src/yasb/assets/favicon/favicon-32x32.png similarity index 100% rename from src/assets/favicon/favicon-32x32.png rename to src/yasb/assets/favicon/favicon-32x32.png diff --git a/src/assets/favicon/favicon-512x512.png b/src/yasb/assets/favicon/favicon-512x512.png similarity index 100% rename from src/assets/favicon/favicon-512x512.png rename to src/yasb/assets/favicon/favicon-512x512.png diff --git a/src/assets/favicon/favicon.ico b/src/yasb/assets/favicon/favicon.ico similarity index 100% rename from src/assets/favicon/favicon.ico rename to src/yasb/assets/favicon/favicon.ico diff --git a/src/config.yaml b/src/yasb/config.yaml similarity index 100% rename from src/config.yaml rename to src/yasb/config.yaml diff --git a/src/core/bar.py b/src/yasb/core/bar.py similarity index 100% rename from src/core/bar.py rename to src/yasb/core/bar.py diff --git a/src/core/bar_manager.py b/src/yasb/core/bar_manager.py similarity index 100% rename from src/core/bar_manager.py rename to src/yasb/core/bar_manager.py diff --git a/src/core/config.py b/src/yasb/core/config.py similarity index 100% rename from src/core/config.py rename to src/yasb/core/config.py diff --git a/src/core/event_enums.py b/src/yasb/core/event_enums.py similarity index 100% rename from src/core/event_enums.py rename to src/yasb/core/event_enums.py diff --git a/src/core/event_service.py b/src/yasb/core/event_service.py similarity index 100% rename from src/core/event_service.py rename to src/yasb/core/event_service.py diff --git a/src/core/log.py b/src/yasb/core/log.py similarity index 100% rename from src/core/log.py rename to src/yasb/core/log.py diff --git a/src/core/tray.py b/src/yasb/core/tray.py similarity index 100% rename from src/core/tray.py rename to src/yasb/core/tray.py diff --git a/src/core/utils/alert_dialog.py b/src/yasb/core/utils/alert_dialog.py similarity index 100% rename from src/core/utils/alert_dialog.py rename to src/yasb/core/utils/alert_dialog.py diff --git a/src/core/utils/komorebi/client.py b/src/yasb/core/utils/komorebi/client.py similarity index 100% rename from src/core/utils/komorebi/client.py rename to src/yasb/core/utils/komorebi/client.py diff --git a/src/core/utils/komorebi/event_listener.py b/src/yasb/core/utils/komorebi/event_listener.py similarity index 100% rename from src/core/utils/komorebi/event_listener.py rename to src/yasb/core/utils/komorebi/event_listener.py diff --git a/src/core/utils/utilities.py b/src/yasb/core/utils/utilities.py similarity index 100% rename from src/core/utils/utilities.py rename to src/yasb/core/utils/utilities.py diff --git a/src/core/utils/widget_builder.py b/src/yasb/core/utils/widget_builder.py similarity index 100% rename from src/core/utils/widget_builder.py rename to src/yasb/core/utils/widget_builder.py diff --git a/src/core/utils/win32/active_window_border.py b/src/yasb/core/utils/win32/active_window_border.py similarity index 100% rename from src/core/utils/win32/active_window_border.py rename to src/yasb/core/utils/win32/active_window_border.py diff --git a/src/core/utils/win32/app_bar.py b/src/yasb/core/utils/win32/app_bar.py similarity index 100% rename from src/core/utils/win32/app_bar.py rename to src/yasb/core/utils/win32/app_bar.py diff --git a/src/core/utils/win32/event_listener.py b/src/yasb/core/utils/win32/event_listener.py similarity index 100% rename from src/core/utils/win32/event_listener.py rename to src/yasb/core/utils/win32/event_listener.py diff --git a/src/core/utils/win32/media_control.py b/src/yasb/core/utils/win32/media_control.py similarity index 100% rename from src/core/utils/win32/media_control.py rename to src/yasb/core/utils/win32/media_control.py diff --git a/src/core/utils/win32/utilities.py b/src/yasb/core/utils/win32/utilities.py similarity index 100% rename from src/core/utils/win32/utilities.py rename to src/yasb/core/utils/win32/utilities.py diff --git a/src/core/utils/win32/windows.py b/src/yasb/core/utils/win32/windows.py similarity index 100% rename from src/core/utils/win32/windows.py rename to src/yasb/core/utils/win32/windows.py diff --git a/src/core/validation/bar.py b/src/yasb/core/validation/bar.py similarity index 100% rename from src/core/validation/bar.py rename to src/yasb/core/validation/bar.py diff --git a/src/core/validation/config.py b/src/yasb/core/validation/config.py similarity index 100% rename from src/core/validation/config.py rename to src/yasb/core/validation/config.py diff --git a/src/core/validation/widgets/example.py b/src/yasb/core/validation/widgets/example.py similarity index 100% rename from src/core/validation/widgets/example.py rename to src/yasb/core/validation/widgets/example.py diff --git a/src/core/validation/widgets/komorebi/active_layout.py b/src/yasb/core/validation/widgets/komorebi/active_layout.py similarity index 100% rename from src/core/validation/widgets/komorebi/active_layout.py rename to src/yasb/core/validation/widgets/komorebi/active_layout.py diff --git a/src/core/validation/widgets/komorebi/workspaces.py b/src/yasb/core/validation/widgets/komorebi/workspaces.py similarity index 100% rename from src/core/validation/widgets/komorebi/workspaces.py rename to src/yasb/core/validation/widgets/komorebi/workspaces.py diff --git a/src/core/validation/widgets/yasb/active_window.py b/src/yasb/core/validation/widgets/yasb/active_window.py similarity index 100% rename from src/core/validation/widgets/yasb/active_window.py rename to src/yasb/core/validation/widgets/yasb/active_window.py diff --git a/src/core/validation/widgets/yasb/battery.py b/src/yasb/core/validation/widgets/yasb/battery.py similarity index 100% rename from src/core/validation/widgets/yasb/battery.py rename to src/yasb/core/validation/widgets/yasb/battery.py diff --git a/src/core/validation/widgets/yasb/clock.py b/src/yasb/core/validation/widgets/yasb/clock.py similarity index 100% rename from src/core/validation/widgets/yasb/clock.py rename to src/yasb/core/validation/widgets/yasb/clock.py diff --git a/src/core/validation/widgets/yasb/cpu.py b/src/yasb/core/validation/widgets/yasb/cpu.py similarity index 100% rename from src/core/validation/widgets/yasb/cpu.py rename to src/yasb/core/validation/widgets/yasb/cpu.py diff --git a/src/core/validation/widgets/yasb/custom.py b/src/yasb/core/validation/widgets/yasb/custom.py similarity index 100% rename from src/core/validation/widgets/yasb/custom.py rename to src/yasb/core/validation/widgets/yasb/custom.py diff --git a/src/core/validation/widgets/yasb/memory.py b/src/yasb/core/validation/widgets/yasb/memory.py similarity index 100% rename from src/core/validation/widgets/yasb/memory.py rename to src/yasb/core/validation/widgets/yasb/memory.py diff --git a/src/core/watcher.py b/src/yasb/core/watcher.py similarity index 100% rename from src/core/watcher.py rename to src/yasb/core/watcher.py diff --git a/src/core/widgets/base.py b/src/yasb/core/widgets/base.py similarity index 100% rename from src/core/widgets/base.py rename to src/yasb/core/widgets/base.py diff --git a/src/core/widgets/example.py b/src/yasb/core/widgets/example.py similarity index 100% rename from src/core/widgets/example.py rename to src/yasb/core/widgets/example.py diff --git a/src/core/widgets/komorebi/active_layout.py b/src/yasb/core/widgets/komorebi/active_layout.py similarity index 100% rename from src/core/widgets/komorebi/active_layout.py rename to src/yasb/core/widgets/komorebi/active_layout.py diff --git a/src/core/widgets/komorebi/workspaces.py b/src/yasb/core/widgets/komorebi/workspaces.py similarity index 100% rename from src/core/widgets/komorebi/workspaces.py rename to src/yasb/core/widgets/komorebi/workspaces.py diff --git a/src/core/widgets/yasb/active_window.py b/src/yasb/core/widgets/yasb/active_window.py similarity index 100% rename from src/core/widgets/yasb/active_window.py rename to src/yasb/core/widgets/yasb/active_window.py diff --git a/src/core/widgets/yasb/battery.py b/src/yasb/core/widgets/yasb/battery.py similarity index 100% rename from src/core/widgets/yasb/battery.py rename to src/yasb/core/widgets/yasb/battery.py diff --git a/src/core/widgets/yasb/clock.py b/src/yasb/core/widgets/yasb/clock.py similarity index 100% rename from src/core/widgets/yasb/clock.py rename to src/yasb/core/widgets/yasb/clock.py diff --git a/src/core/widgets/yasb/cpu.py b/src/yasb/core/widgets/yasb/cpu.py similarity index 100% rename from src/core/widgets/yasb/cpu.py rename to src/yasb/core/widgets/yasb/cpu.py diff --git a/src/core/widgets/yasb/custom.py b/src/yasb/core/widgets/yasb/custom.py similarity index 100% rename from src/core/widgets/yasb/custom.py rename to src/yasb/core/widgets/yasb/custom.py diff --git a/src/core/widgets/yasb/memory.py b/src/yasb/core/widgets/yasb/memory.py similarity index 100% rename from src/core/widgets/yasb/memory.py rename to src/yasb/core/widgets/yasb/memory.py diff --git a/src/main.py b/src/yasb/main.py similarity index 100% rename from src/main.py rename to src/yasb/main.py diff --git a/src/settings.py b/src/yasb/settings.py similarity index 100% rename from src/settings.py rename to src/yasb/settings.py diff --git a/src/styles.css b/src/yasb/styles.css similarity index 100% rename from src/styles.css rename to src/yasb/styles.css From 72b1a9a1e9f706ea40d83c774b926235a298e095 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Tue, 20 Jun 2023 16:10:29 -0700 Subject: [PATCH 08/16] Revert "Conform to src-layout." This reverts commit a41edb15d7c7d22737bc7f18880fc50859caee1b. --- src/{yasb => }/__init__.py | 0 src/{yasb => }/__main__.py | 0 src/{yasb => }/assets/favicon/favicon-152x152.png | Bin src/{yasb => }/assets/favicon/favicon-16x16.png | Bin src/{yasb => }/assets/favicon/favicon-192x192.png | Bin src/{yasb => }/assets/favicon/favicon-32x32.png | Bin src/{yasb => }/assets/favicon/favicon-512x512.png | Bin src/{yasb => }/assets/favicon/favicon.ico | Bin src/{yasb => }/config.yaml | 0 src/{yasb => }/core/bar.py | 0 src/{yasb => }/core/bar_manager.py | 0 src/{yasb => }/core/config.py | 0 src/{yasb => }/core/event_enums.py | 0 src/{yasb => }/core/event_service.py | 0 src/{yasb => }/core/log.py | 0 src/{yasb => }/core/tray.py | 0 src/{yasb => }/core/utils/alert_dialog.py | 0 src/{yasb => }/core/utils/komorebi/client.py | 0 .../core/utils/komorebi/event_listener.py | 0 src/{yasb => }/core/utils/utilities.py | 0 src/{yasb => }/core/utils/widget_builder.py | 0 .../core/utils/win32/active_window_border.py | 0 src/{yasb => }/core/utils/win32/app_bar.py | 0 src/{yasb => }/core/utils/win32/event_listener.py | 0 src/{yasb => }/core/utils/win32/media_control.py | 0 src/{yasb => }/core/utils/win32/utilities.py | 0 src/{yasb => }/core/utils/win32/windows.py | 0 src/{yasb => }/core/validation/bar.py | 0 src/{yasb => }/core/validation/config.py | 0 src/{yasb => }/core/validation/widgets/example.py | 0 .../validation/widgets/komorebi/active_layout.py | 0 .../core/validation/widgets/komorebi/workspaces.py | 0 .../core/validation/widgets/yasb/active_window.py | 0 .../core/validation/widgets/yasb/battery.py | 0 .../core/validation/widgets/yasb/clock.py | 0 src/{yasb => }/core/validation/widgets/yasb/cpu.py | 0 .../core/validation/widgets/yasb/custom.py | 0 .../core/validation/widgets/yasb/memory.py | 0 src/{yasb => }/core/watcher.py | 0 src/{yasb => }/core/widgets/base.py | 0 src/{yasb => }/core/widgets/example.py | 0 .../core/widgets/komorebi/active_layout.py | 0 src/{yasb => }/core/widgets/komorebi/workspaces.py | 0 src/{yasb => }/core/widgets/yasb/active_window.py | 0 src/{yasb => }/core/widgets/yasb/battery.py | 0 src/{yasb => }/core/widgets/yasb/clock.py | 0 src/{yasb => }/core/widgets/yasb/cpu.py | 0 src/{yasb => }/core/widgets/yasb/custom.py | 0 src/{yasb => }/core/widgets/yasb/memory.py | 0 src/{yasb => }/main.py | 0 src/{yasb => }/settings.py | 0 src/{yasb => }/styles.css | 0 52 files changed, 0 insertions(+), 0 deletions(-) rename src/{yasb => }/__init__.py (100%) rename src/{yasb => }/__main__.py (100%) rename src/{yasb => }/assets/favicon/favicon-152x152.png (100%) rename src/{yasb => }/assets/favicon/favicon-16x16.png (100%) rename src/{yasb => }/assets/favicon/favicon-192x192.png (100%) rename src/{yasb => }/assets/favicon/favicon-32x32.png (100%) rename src/{yasb => }/assets/favicon/favicon-512x512.png (100%) rename src/{yasb => }/assets/favicon/favicon.ico (100%) rename src/{yasb => }/config.yaml (100%) rename src/{yasb => }/core/bar.py (100%) rename src/{yasb => }/core/bar_manager.py (100%) rename src/{yasb => }/core/config.py (100%) rename src/{yasb => }/core/event_enums.py (100%) rename src/{yasb => }/core/event_service.py (100%) rename src/{yasb => }/core/log.py (100%) rename src/{yasb => }/core/tray.py (100%) rename src/{yasb => }/core/utils/alert_dialog.py (100%) rename src/{yasb => }/core/utils/komorebi/client.py (100%) rename src/{yasb => }/core/utils/komorebi/event_listener.py (100%) rename src/{yasb => }/core/utils/utilities.py (100%) rename src/{yasb => }/core/utils/widget_builder.py (100%) rename src/{yasb => }/core/utils/win32/active_window_border.py (100%) rename src/{yasb => }/core/utils/win32/app_bar.py (100%) rename src/{yasb => }/core/utils/win32/event_listener.py (100%) rename src/{yasb => }/core/utils/win32/media_control.py (100%) rename src/{yasb => }/core/utils/win32/utilities.py (100%) rename src/{yasb => }/core/utils/win32/windows.py (100%) rename src/{yasb => }/core/validation/bar.py (100%) rename src/{yasb => }/core/validation/config.py (100%) rename src/{yasb => }/core/validation/widgets/example.py (100%) rename src/{yasb => }/core/validation/widgets/komorebi/active_layout.py (100%) rename src/{yasb => }/core/validation/widgets/komorebi/workspaces.py (100%) rename src/{yasb => }/core/validation/widgets/yasb/active_window.py (100%) rename src/{yasb => }/core/validation/widgets/yasb/battery.py (100%) rename src/{yasb => }/core/validation/widgets/yasb/clock.py (100%) rename src/{yasb => }/core/validation/widgets/yasb/cpu.py (100%) rename src/{yasb => }/core/validation/widgets/yasb/custom.py (100%) rename src/{yasb => }/core/validation/widgets/yasb/memory.py (100%) rename src/{yasb => }/core/watcher.py (100%) rename src/{yasb => }/core/widgets/base.py (100%) rename src/{yasb => }/core/widgets/example.py (100%) rename src/{yasb => }/core/widgets/komorebi/active_layout.py (100%) rename src/{yasb => }/core/widgets/komorebi/workspaces.py (100%) rename src/{yasb => }/core/widgets/yasb/active_window.py (100%) rename src/{yasb => }/core/widgets/yasb/battery.py (100%) rename src/{yasb => }/core/widgets/yasb/clock.py (100%) rename src/{yasb => }/core/widgets/yasb/cpu.py (100%) rename src/{yasb => }/core/widgets/yasb/custom.py (100%) rename src/{yasb => }/core/widgets/yasb/memory.py (100%) rename src/{yasb => }/main.py (100%) rename src/{yasb => }/settings.py (100%) rename src/{yasb => }/styles.css (100%) diff --git a/src/yasb/__init__.py b/src/__init__.py similarity index 100% rename from src/yasb/__init__.py rename to src/__init__.py diff --git a/src/yasb/__main__.py b/src/__main__.py similarity index 100% rename from src/yasb/__main__.py rename to src/__main__.py diff --git a/src/yasb/assets/favicon/favicon-152x152.png b/src/assets/favicon/favicon-152x152.png similarity index 100% rename from src/yasb/assets/favicon/favicon-152x152.png rename to src/assets/favicon/favicon-152x152.png diff --git a/src/yasb/assets/favicon/favicon-16x16.png b/src/assets/favicon/favicon-16x16.png similarity index 100% rename from src/yasb/assets/favicon/favicon-16x16.png rename to src/assets/favicon/favicon-16x16.png diff --git a/src/yasb/assets/favicon/favicon-192x192.png b/src/assets/favicon/favicon-192x192.png similarity index 100% rename from src/yasb/assets/favicon/favicon-192x192.png rename to src/assets/favicon/favicon-192x192.png diff --git a/src/yasb/assets/favicon/favicon-32x32.png b/src/assets/favicon/favicon-32x32.png similarity index 100% rename from src/yasb/assets/favicon/favicon-32x32.png rename to src/assets/favicon/favicon-32x32.png diff --git a/src/yasb/assets/favicon/favicon-512x512.png b/src/assets/favicon/favicon-512x512.png similarity index 100% rename from src/yasb/assets/favicon/favicon-512x512.png rename to src/assets/favicon/favicon-512x512.png diff --git a/src/yasb/assets/favicon/favicon.ico b/src/assets/favicon/favicon.ico similarity index 100% rename from src/yasb/assets/favicon/favicon.ico rename to src/assets/favicon/favicon.ico diff --git a/src/yasb/config.yaml b/src/config.yaml similarity index 100% rename from src/yasb/config.yaml rename to src/config.yaml diff --git a/src/yasb/core/bar.py b/src/core/bar.py similarity index 100% rename from src/yasb/core/bar.py rename to src/core/bar.py diff --git a/src/yasb/core/bar_manager.py b/src/core/bar_manager.py similarity index 100% rename from src/yasb/core/bar_manager.py rename to src/core/bar_manager.py diff --git a/src/yasb/core/config.py b/src/core/config.py similarity index 100% rename from src/yasb/core/config.py rename to src/core/config.py diff --git a/src/yasb/core/event_enums.py b/src/core/event_enums.py similarity index 100% rename from src/yasb/core/event_enums.py rename to src/core/event_enums.py diff --git a/src/yasb/core/event_service.py b/src/core/event_service.py similarity index 100% rename from src/yasb/core/event_service.py rename to src/core/event_service.py diff --git a/src/yasb/core/log.py b/src/core/log.py similarity index 100% rename from src/yasb/core/log.py rename to src/core/log.py diff --git a/src/yasb/core/tray.py b/src/core/tray.py similarity index 100% rename from src/yasb/core/tray.py rename to src/core/tray.py diff --git a/src/yasb/core/utils/alert_dialog.py b/src/core/utils/alert_dialog.py similarity index 100% rename from src/yasb/core/utils/alert_dialog.py rename to src/core/utils/alert_dialog.py diff --git a/src/yasb/core/utils/komorebi/client.py b/src/core/utils/komorebi/client.py similarity index 100% rename from src/yasb/core/utils/komorebi/client.py rename to src/core/utils/komorebi/client.py diff --git a/src/yasb/core/utils/komorebi/event_listener.py b/src/core/utils/komorebi/event_listener.py similarity index 100% rename from src/yasb/core/utils/komorebi/event_listener.py rename to src/core/utils/komorebi/event_listener.py diff --git a/src/yasb/core/utils/utilities.py b/src/core/utils/utilities.py similarity index 100% rename from src/yasb/core/utils/utilities.py rename to src/core/utils/utilities.py diff --git a/src/yasb/core/utils/widget_builder.py b/src/core/utils/widget_builder.py similarity index 100% rename from src/yasb/core/utils/widget_builder.py rename to src/core/utils/widget_builder.py diff --git a/src/yasb/core/utils/win32/active_window_border.py b/src/core/utils/win32/active_window_border.py similarity index 100% rename from src/yasb/core/utils/win32/active_window_border.py rename to src/core/utils/win32/active_window_border.py diff --git a/src/yasb/core/utils/win32/app_bar.py b/src/core/utils/win32/app_bar.py similarity index 100% rename from src/yasb/core/utils/win32/app_bar.py rename to src/core/utils/win32/app_bar.py diff --git a/src/yasb/core/utils/win32/event_listener.py b/src/core/utils/win32/event_listener.py similarity index 100% rename from src/yasb/core/utils/win32/event_listener.py rename to src/core/utils/win32/event_listener.py diff --git a/src/yasb/core/utils/win32/media_control.py b/src/core/utils/win32/media_control.py similarity index 100% rename from src/yasb/core/utils/win32/media_control.py rename to src/core/utils/win32/media_control.py diff --git a/src/yasb/core/utils/win32/utilities.py b/src/core/utils/win32/utilities.py similarity index 100% rename from src/yasb/core/utils/win32/utilities.py rename to src/core/utils/win32/utilities.py diff --git a/src/yasb/core/utils/win32/windows.py b/src/core/utils/win32/windows.py similarity index 100% rename from src/yasb/core/utils/win32/windows.py rename to src/core/utils/win32/windows.py diff --git a/src/yasb/core/validation/bar.py b/src/core/validation/bar.py similarity index 100% rename from src/yasb/core/validation/bar.py rename to src/core/validation/bar.py diff --git a/src/yasb/core/validation/config.py b/src/core/validation/config.py similarity index 100% rename from src/yasb/core/validation/config.py rename to src/core/validation/config.py diff --git a/src/yasb/core/validation/widgets/example.py b/src/core/validation/widgets/example.py similarity index 100% rename from src/yasb/core/validation/widgets/example.py rename to src/core/validation/widgets/example.py diff --git a/src/yasb/core/validation/widgets/komorebi/active_layout.py b/src/core/validation/widgets/komorebi/active_layout.py similarity index 100% rename from src/yasb/core/validation/widgets/komorebi/active_layout.py rename to src/core/validation/widgets/komorebi/active_layout.py diff --git a/src/yasb/core/validation/widgets/komorebi/workspaces.py b/src/core/validation/widgets/komorebi/workspaces.py similarity index 100% rename from src/yasb/core/validation/widgets/komorebi/workspaces.py rename to src/core/validation/widgets/komorebi/workspaces.py diff --git a/src/yasb/core/validation/widgets/yasb/active_window.py b/src/core/validation/widgets/yasb/active_window.py similarity index 100% rename from src/yasb/core/validation/widgets/yasb/active_window.py rename to src/core/validation/widgets/yasb/active_window.py diff --git a/src/yasb/core/validation/widgets/yasb/battery.py b/src/core/validation/widgets/yasb/battery.py similarity index 100% rename from src/yasb/core/validation/widgets/yasb/battery.py rename to src/core/validation/widgets/yasb/battery.py diff --git a/src/yasb/core/validation/widgets/yasb/clock.py b/src/core/validation/widgets/yasb/clock.py similarity index 100% rename from src/yasb/core/validation/widgets/yasb/clock.py rename to src/core/validation/widgets/yasb/clock.py diff --git a/src/yasb/core/validation/widgets/yasb/cpu.py b/src/core/validation/widgets/yasb/cpu.py similarity index 100% rename from src/yasb/core/validation/widgets/yasb/cpu.py rename to src/core/validation/widgets/yasb/cpu.py diff --git a/src/yasb/core/validation/widgets/yasb/custom.py b/src/core/validation/widgets/yasb/custom.py similarity index 100% rename from src/yasb/core/validation/widgets/yasb/custom.py rename to src/core/validation/widgets/yasb/custom.py diff --git a/src/yasb/core/validation/widgets/yasb/memory.py b/src/core/validation/widgets/yasb/memory.py similarity index 100% rename from src/yasb/core/validation/widgets/yasb/memory.py rename to src/core/validation/widgets/yasb/memory.py diff --git a/src/yasb/core/watcher.py b/src/core/watcher.py similarity index 100% rename from src/yasb/core/watcher.py rename to src/core/watcher.py diff --git a/src/yasb/core/widgets/base.py b/src/core/widgets/base.py similarity index 100% rename from src/yasb/core/widgets/base.py rename to src/core/widgets/base.py diff --git a/src/yasb/core/widgets/example.py b/src/core/widgets/example.py similarity index 100% rename from src/yasb/core/widgets/example.py rename to src/core/widgets/example.py diff --git a/src/yasb/core/widgets/komorebi/active_layout.py b/src/core/widgets/komorebi/active_layout.py similarity index 100% rename from src/yasb/core/widgets/komorebi/active_layout.py rename to src/core/widgets/komorebi/active_layout.py diff --git a/src/yasb/core/widgets/komorebi/workspaces.py b/src/core/widgets/komorebi/workspaces.py similarity index 100% rename from src/yasb/core/widgets/komorebi/workspaces.py rename to src/core/widgets/komorebi/workspaces.py diff --git a/src/yasb/core/widgets/yasb/active_window.py b/src/core/widgets/yasb/active_window.py similarity index 100% rename from src/yasb/core/widgets/yasb/active_window.py rename to src/core/widgets/yasb/active_window.py diff --git a/src/yasb/core/widgets/yasb/battery.py b/src/core/widgets/yasb/battery.py similarity index 100% rename from src/yasb/core/widgets/yasb/battery.py rename to src/core/widgets/yasb/battery.py diff --git a/src/yasb/core/widgets/yasb/clock.py b/src/core/widgets/yasb/clock.py similarity index 100% rename from src/yasb/core/widgets/yasb/clock.py rename to src/core/widgets/yasb/clock.py diff --git a/src/yasb/core/widgets/yasb/cpu.py b/src/core/widgets/yasb/cpu.py similarity index 100% rename from src/yasb/core/widgets/yasb/cpu.py rename to src/core/widgets/yasb/cpu.py diff --git a/src/yasb/core/widgets/yasb/custom.py b/src/core/widgets/yasb/custom.py similarity index 100% rename from src/yasb/core/widgets/yasb/custom.py rename to src/core/widgets/yasb/custom.py diff --git a/src/yasb/core/widgets/yasb/memory.py b/src/core/widgets/yasb/memory.py similarity index 100% rename from src/yasb/core/widgets/yasb/memory.py rename to src/core/widgets/yasb/memory.py diff --git a/src/yasb/main.py b/src/main.py similarity index 100% rename from src/yasb/main.py rename to src/main.py diff --git a/src/yasb/settings.py b/src/settings.py similarity index 100% rename from src/yasb/settings.py rename to src/settings.py diff --git a/src/yasb/styles.css b/src/styles.css similarity index 100% rename from src/yasb/styles.css rename to src/styles.css From e6d2a6eb5c64449b531e4ed0a78ed33639c9f9e0 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Tue, 20 Jun 2023 16:15:38 -0700 Subject: [PATCH 09/16] Revert "Revert "Conform to src-layout."" This reverts commit 72b1a9a1e9f706ea40d83c774b926235a298e095. --- src/{ => yasb}/__init__.py | 0 src/{ => yasb}/__main__.py | 0 src/{ => yasb}/assets/favicon/favicon-152x152.png | Bin src/{ => yasb}/assets/favicon/favicon-16x16.png | Bin src/{ => yasb}/assets/favicon/favicon-192x192.png | Bin src/{ => yasb}/assets/favicon/favicon-32x32.png | Bin src/{ => yasb}/assets/favicon/favicon-512x512.png | Bin src/{ => yasb}/assets/favicon/favicon.ico | Bin src/{ => yasb}/config.yaml | 0 src/{ => yasb}/core/bar.py | 0 src/{ => yasb}/core/bar_manager.py | 0 src/{ => yasb}/core/config.py | 0 src/{ => yasb}/core/event_enums.py | 0 src/{ => yasb}/core/event_service.py | 0 src/{ => yasb}/core/log.py | 0 src/{ => yasb}/core/tray.py | 0 src/{ => yasb}/core/utils/alert_dialog.py | 0 src/{ => yasb}/core/utils/komorebi/client.py | 0 .../core/utils/komorebi/event_listener.py | 0 src/{ => yasb}/core/utils/utilities.py | 0 src/{ => yasb}/core/utils/widget_builder.py | 0 .../core/utils/win32/active_window_border.py | 0 src/{ => yasb}/core/utils/win32/app_bar.py | 0 src/{ => yasb}/core/utils/win32/event_listener.py | 0 src/{ => yasb}/core/utils/win32/media_control.py | 0 src/{ => yasb}/core/utils/win32/utilities.py | 0 src/{ => yasb}/core/utils/win32/windows.py | 0 src/{ => yasb}/core/validation/bar.py | 0 src/{ => yasb}/core/validation/config.py | 0 src/{ => yasb}/core/validation/widgets/example.py | 0 .../validation/widgets/komorebi/active_layout.py | 0 .../core/validation/widgets/komorebi/workspaces.py | 0 .../core/validation/widgets/yasb/active_window.py | 0 .../core/validation/widgets/yasb/battery.py | 0 .../core/validation/widgets/yasb/clock.py | 0 src/{ => yasb}/core/validation/widgets/yasb/cpu.py | 0 .../core/validation/widgets/yasb/custom.py | 0 .../core/validation/widgets/yasb/memory.py | 0 src/{ => yasb}/core/watcher.py | 0 src/{ => yasb}/core/widgets/base.py | 0 src/{ => yasb}/core/widgets/example.py | 0 .../core/widgets/komorebi/active_layout.py | 0 src/{ => yasb}/core/widgets/komorebi/workspaces.py | 0 src/{ => yasb}/core/widgets/yasb/active_window.py | 0 src/{ => yasb}/core/widgets/yasb/battery.py | 0 src/{ => yasb}/core/widgets/yasb/clock.py | 0 src/{ => yasb}/core/widgets/yasb/cpu.py | 0 src/{ => yasb}/core/widgets/yasb/custom.py | 0 src/{ => yasb}/core/widgets/yasb/memory.py | 0 src/{ => yasb}/main.py | 0 src/{ => yasb}/settings.py | 0 src/{ => yasb}/styles.css | 0 52 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => yasb}/__init__.py (100%) rename src/{ => yasb}/__main__.py (100%) rename src/{ => yasb}/assets/favicon/favicon-152x152.png (100%) rename src/{ => yasb}/assets/favicon/favicon-16x16.png (100%) rename src/{ => yasb}/assets/favicon/favicon-192x192.png (100%) rename src/{ => yasb}/assets/favicon/favicon-32x32.png (100%) rename src/{ => yasb}/assets/favicon/favicon-512x512.png (100%) rename src/{ => yasb}/assets/favicon/favicon.ico (100%) rename src/{ => yasb}/config.yaml (100%) rename src/{ => yasb}/core/bar.py (100%) rename src/{ => yasb}/core/bar_manager.py (100%) rename src/{ => yasb}/core/config.py (100%) rename src/{ => yasb}/core/event_enums.py (100%) rename src/{ => yasb}/core/event_service.py (100%) rename src/{ => yasb}/core/log.py (100%) rename src/{ => yasb}/core/tray.py (100%) rename src/{ => yasb}/core/utils/alert_dialog.py (100%) rename src/{ => yasb}/core/utils/komorebi/client.py (100%) rename src/{ => yasb}/core/utils/komorebi/event_listener.py (100%) rename src/{ => yasb}/core/utils/utilities.py (100%) rename src/{ => yasb}/core/utils/widget_builder.py (100%) rename src/{ => yasb}/core/utils/win32/active_window_border.py (100%) rename src/{ => yasb}/core/utils/win32/app_bar.py (100%) rename src/{ => yasb}/core/utils/win32/event_listener.py (100%) rename src/{ => yasb}/core/utils/win32/media_control.py (100%) rename src/{ => yasb}/core/utils/win32/utilities.py (100%) rename src/{ => yasb}/core/utils/win32/windows.py (100%) rename src/{ => yasb}/core/validation/bar.py (100%) rename src/{ => yasb}/core/validation/config.py (100%) rename src/{ => yasb}/core/validation/widgets/example.py (100%) rename src/{ => yasb}/core/validation/widgets/komorebi/active_layout.py (100%) rename src/{ => yasb}/core/validation/widgets/komorebi/workspaces.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/active_window.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/battery.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/clock.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/cpu.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/custom.py (100%) rename src/{ => yasb}/core/validation/widgets/yasb/memory.py (100%) rename src/{ => yasb}/core/watcher.py (100%) rename src/{ => yasb}/core/widgets/base.py (100%) rename src/{ => yasb}/core/widgets/example.py (100%) rename src/{ => yasb}/core/widgets/komorebi/active_layout.py (100%) rename src/{ => yasb}/core/widgets/komorebi/workspaces.py (100%) rename src/{ => yasb}/core/widgets/yasb/active_window.py (100%) rename src/{ => yasb}/core/widgets/yasb/battery.py (100%) rename src/{ => yasb}/core/widgets/yasb/clock.py (100%) rename src/{ => yasb}/core/widgets/yasb/cpu.py (100%) rename src/{ => yasb}/core/widgets/yasb/custom.py (100%) rename src/{ => yasb}/core/widgets/yasb/memory.py (100%) rename src/{ => yasb}/main.py (100%) rename src/{ => yasb}/settings.py (100%) rename src/{ => yasb}/styles.css (100%) diff --git a/src/__init__.py b/src/yasb/__init__.py similarity index 100% rename from src/__init__.py rename to src/yasb/__init__.py diff --git a/src/__main__.py b/src/yasb/__main__.py similarity index 100% rename from src/__main__.py rename to src/yasb/__main__.py diff --git a/src/assets/favicon/favicon-152x152.png b/src/yasb/assets/favicon/favicon-152x152.png similarity index 100% rename from src/assets/favicon/favicon-152x152.png rename to src/yasb/assets/favicon/favicon-152x152.png diff --git a/src/assets/favicon/favicon-16x16.png b/src/yasb/assets/favicon/favicon-16x16.png similarity index 100% rename from src/assets/favicon/favicon-16x16.png rename to src/yasb/assets/favicon/favicon-16x16.png diff --git a/src/assets/favicon/favicon-192x192.png b/src/yasb/assets/favicon/favicon-192x192.png similarity index 100% rename from src/assets/favicon/favicon-192x192.png rename to src/yasb/assets/favicon/favicon-192x192.png diff --git a/src/assets/favicon/favicon-32x32.png b/src/yasb/assets/favicon/favicon-32x32.png similarity index 100% rename from src/assets/favicon/favicon-32x32.png rename to src/yasb/assets/favicon/favicon-32x32.png diff --git a/src/assets/favicon/favicon-512x512.png b/src/yasb/assets/favicon/favicon-512x512.png similarity index 100% rename from src/assets/favicon/favicon-512x512.png rename to src/yasb/assets/favicon/favicon-512x512.png diff --git a/src/assets/favicon/favicon.ico b/src/yasb/assets/favicon/favicon.ico similarity index 100% rename from src/assets/favicon/favicon.ico rename to src/yasb/assets/favicon/favicon.ico diff --git a/src/config.yaml b/src/yasb/config.yaml similarity index 100% rename from src/config.yaml rename to src/yasb/config.yaml diff --git a/src/core/bar.py b/src/yasb/core/bar.py similarity index 100% rename from src/core/bar.py rename to src/yasb/core/bar.py diff --git a/src/core/bar_manager.py b/src/yasb/core/bar_manager.py similarity index 100% rename from src/core/bar_manager.py rename to src/yasb/core/bar_manager.py diff --git a/src/core/config.py b/src/yasb/core/config.py similarity index 100% rename from src/core/config.py rename to src/yasb/core/config.py diff --git a/src/core/event_enums.py b/src/yasb/core/event_enums.py similarity index 100% rename from src/core/event_enums.py rename to src/yasb/core/event_enums.py diff --git a/src/core/event_service.py b/src/yasb/core/event_service.py similarity index 100% rename from src/core/event_service.py rename to src/yasb/core/event_service.py diff --git a/src/core/log.py b/src/yasb/core/log.py similarity index 100% rename from src/core/log.py rename to src/yasb/core/log.py diff --git a/src/core/tray.py b/src/yasb/core/tray.py similarity index 100% rename from src/core/tray.py rename to src/yasb/core/tray.py diff --git a/src/core/utils/alert_dialog.py b/src/yasb/core/utils/alert_dialog.py similarity index 100% rename from src/core/utils/alert_dialog.py rename to src/yasb/core/utils/alert_dialog.py diff --git a/src/core/utils/komorebi/client.py b/src/yasb/core/utils/komorebi/client.py similarity index 100% rename from src/core/utils/komorebi/client.py rename to src/yasb/core/utils/komorebi/client.py diff --git a/src/core/utils/komorebi/event_listener.py b/src/yasb/core/utils/komorebi/event_listener.py similarity index 100% rename from src/core/utils/komorebi/event_listener.py rename to src/yasb/core/utils/komorebi/event_listener.py diff --git a/src/core/utils/utilities.py b/src/yasb/core/utils/utilities.py similarity index 100% rename from src/core/utils/utilities.py rename to src/yasb/core/utils/utilities.py diff --git a/src/core/utils/widget_builder.py b/src/yasb/core/utils/widget_builder.py similarity index 100% rename from src/core/utils/widget_builder.py rename to src/yasb/core/utils/widget_builder.py diff --git a/src/core/utils/win32/active_window_border.py b/src/yasb/core/utils/win32/active_window_border.py similarity index 100% rename from src/core/utils/win32/active_window_border.py rename to src/yasb/core/utils/win32/active_window_border.py diff --git a/src/core/utils/win32/app_bar.py b/src/yasb/core/utils/win32/app_bar.py similarity index 100% rename from src/core/utils/win32/app_bar.py rename to src/yasb/core/utils/win32/app_bar.py diff --git a/src/core/utils/win32/event_listener.py b/src/yasb/core/utils/win32/event_listener.py similarity index 100% rename from src/core/utils/win32/event_listener.py rename to src/yasb/core/utils/win32/event_listener.py diff --git a/src/core/utils/win32/media_control.py b/src/yasb/core/utils/win32/media_control.py similarity index 100% rename from src/core/utils/win32/media_control.py rename to src/yasb/core/utils/win32/media_control.py diff --git a/src/core/utils/win32/utilities.py b/src/yasb/core/utils/win32/utilities.py similarity index 100% rename from src/core/utils/win32/utilities.py rename to src/yasb/core/utils/win32/utilities.py diff --git a/src/core/utils/win32/windows.py b/src/yasb/core/utils/win32/windows.py similarity index 100% rename from src/core/utils/win32/windows.py rename to src/yasb/core/utils/win32/windows.py diff --git a/src/core/validation/bar.py b/src/yasb/core/validation/bar.py similarity index 100% rename from src/core/validation/bar.py rename to src/yasb/core/validation/bar.py diff --git a/src/core/validation/config.py b/src/yasb/core/validation/config.py similarity index 100% rename from src/core/validation/config.py rename to src/yasb/core/validation/config.py diff --git a/src/core/validation/widgets/example.py b/src/yasb/core/validation/widgets/example.py similarity index 100% rename from src/core/validation/widgets/example.py rename to src/yasb/core/validation/widgets/example.py diff --git a/src/core/validation/widgets/komorebi/active_layout.py b/src/yasb/core/validation/widgets/komorebi/active_layout.py similarity index 100% rename from src/core/validation/widgets/komorebi/active_layout.py rename to src/yasb/core/validation/widgets/komorebi/active_layout.py diff --git a/src/core/validation/widgets/komorebi/workspaces.py b/src/yasb/core/validation/widgets/komorebi/workspaces.py similarity index 100% rename from src/core/validation/widgets/komorebi/workspaces.py rename to src/yasb/core/validation/widgets/komorebi/workspaces.py diff --git a/src/core/validation/widgets/yasb/active_window.py b/src/yasb/core/validation/widgets/yasb/active_window.py similarity index 100% rename from src/core/validation/widgets/yasb/active_window.py rename to src/yasb/core/validation/widgets/yasb/active_window.py diff --git a/src/core/validation/widgets/yasb/battery.py b/src/yasb/core/validation/widgets/yasb/battery.py similarity index 100% rename from src/core/validation/widgets/yasb/battery.py rename to src/yasb/core/validation/widgets/yasb/battery.py diff --git a/src/core/validation/widgets/yasb/clock.py b/src/yasb/core/validation/widgets/yasb/clock.py similarity index 100% rename from src/core/validation/widgets/yasb/clock.py rename to src/yasb/core/validation/widgets/yasb/clock.py diff --git a/src/core/validation/widgets/yasb/cpu.py b/src/yasb/core/validation/widgets/yasb/cpu.py similarity index 100% rename from src/core/validation/widgets/yasb/cpu.py rename to src/yasb/core/validation/widgets/yasb/cpu.py diff --git a/src/core/validation/widgets/yasb/custom.py b/src/yasb/core/validation/widgets/yasb/custom.py similarity index 100% rename from src/core/validation/widgets/yasb/custom.py rename to src/yasb/core/validation/widgets/yasb/custom.py diff --git a/src/core/validation/widgets/yasb/memory.py b/src/yasb/core/validation/widgets/yasb/memory.py similarity index 100% rename from src/core/validation/widgets/yasb/memory.py rename to src/yasb/core/validation/widgets/yasb/memory.py diff --git a/src/core/watcher.py b/src/yasb/core/watcher.py similarity index 100% rename from src/core/watcher.py rename to src/yasb/core/watcher.py diff --git a/src/core/widgets/base.py b/src/yasb/core/widgets/base.py similarity index 100% rename from src/core/widgets/base.py rename to src/yasb/core/widgets/base.py diff --git a/src/core/widgets/example.py b/src/yasb/core/widgets/example.py similarity index 100% rename from src/core/widgets/example.py rename to src/yasb/core/widgets/example.py diff --git a/src/core/widgets/komorebi/active_layout.py b/src/yasb/core/widgets/komorebi/active_layout.py similarity index 100% rename from src/core/widgets/komorebi/active_layout.py rename to src/yasb/core/widgets/komorebi/active_layout.py diff --git a/src/core/widgets/komorebi/workspaces.py b/src/yasb/core/widgets/komorebi/workspaces.py similarity index 100% rename from src/core/widgets/komorebi/workspaces.py rename to src/yasb/core/widgets/komorebi/workspaces.py diff --git a/src/core/widgets/yasb/active_window.py b/src/yasb/core/widgets/yasb/active_window.py similarity index 100% rename from src/core/widgets/yasb/active_window.py rename to src/yasb/core/widgets/yasb/active_window.py diff --git a/src/core/widgets/yasb/battery.py b/src/yasb/core/widgets/yasb/battery.py similarity index 100% rename from src/core/widgets/yasb/battery.py rename to src/yasb/core/widgets/yasb/battery.py diff --git a/src/core/widgets/yasb/clock.py b/src/yasb/core/widgets/yasb/clock.py similarity index 100% rename from src/core/widgets/yasb/clock.py rename to src/yasb/core/widgets/yasb/clock.py diff --git a/src/core/widgets/yasb/cpu.py b/src/yasb/core/widgets/yasb/cpu.py similarity index 100% rename from src/core/widgets/yasb/cpu.py rename to src/yasb/core/widgets/yasb/cpu.py diff --git a/src/core/widgets/yasb/custom.py b/src/yasb/core/widgets/yasb/custom.py similarity index 100% rename from src/core/widgets/yasb/custom.py rename to src/yasb/core/widgets/yasb/custom.py diff --git a/src/core/widgets/yasb/memory.py b/src/yasb/core/widgets/yasb/memory.py similarity index 100% rename from src/core/widgets/yasb/memory.py rename to src/yasb/core/widgets/yasb/memory.py diff --git a/src/main.py b/src/yasb/main.py similarity index 100% rename from src/main.py rename to src/yasb/main.py diff --git a/src/settings.py b/src/yasb/settings.py similarity index 100% rename from src/settings.py rename to src/yasb/settings.py diff --git a/src/styles.css b/src/yasb/styles.css similarity index 100% rename from src/styles.css rename to src/yasb/styles.css From b0bd5f9456c44ec6fa7d46111cc2d6dff373de93 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Tue, 20 Jun 2023 18:18:23 -0700 Subject: [PATCH 10/16] Add __init__ files for each submodule. --- src/yasb/core/__init__.py | 0 src/yasb/core/utils/__init__.py | 0 src/yasb/core/validation/__init__.py | 0 src/yasb/core/widgets/__init__.py | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/yasb/core/__init__.py create mode 100644 src/yasb/core/utils/__init__.py create mode 100644 src/yasb/core/validation/__init__.py create mode 100644 src/yasb/core/widgets/__init__.py diff --git a/src/yasb/core/__init__.py b/src/yasb/core/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/yasb/core/utils/__init__.py b/src/yasb/core/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/yasb/core/validation/__init__.py b/src/yasb/core/validation/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/yasb/core/widgets/__init__.py b/src/yasb/core/widgets/__init__.py new file mode 100644 index 0000000..e69de29 From 0592fc64616975ecc3343ac09cbf5069bd419d72 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Wed, 21 Jun 2023 12:11:30 -0700 Subject: [PATCH 11/16] Replace relative import `core` with `yasb.core`. --- src/yasb/core/bar.py | 8 ++++---- src/yasb/core/bar_manager.py | 10 +++++----- src/yasb/core/config.py | 6 +++--- src/yasb/core/event_service.py | 2 +- src/yasb/core/log.py | 4 ++-- src/yasb/core/tray.py | 4 ++-- src/yasb/core/utils/alert_dialog.py | 2 +- src/yasb/core/utils/komorebi/event_listener.py | 6 +++--- src/yasb/core/utils/widget_builder.py | 4 ++-- src/yasb/core/utils/win32/active_window_border.py | 8 ++++---- src/yasb/core/utils/win32/event_listener.py | 4 ++-- src/yasb/core/utils/win32/windows.py | 2 +- src/yasb/core/validation/config.py | 2 +- src/yasb/core/watcher.py | 6 +++--- src/yasb/core/widgets/example.py | 4 ++-- src/yasb/core/widgets/komorebi/active_layout.py | 14 +++++++------- src/yasb/core/widgets/komorebi/workspaces.py | 14 +++++++------- src/yasb/core/widgets/yasb/active_window.py | 14 +++++++------- src/yasb/core/widgets/yasb/battery.py | 4 ++-- src/yasb/core/widgets/yasb/clock.py | 4 ++-- src/yasb/core/widgets/yasb/cpu.py | 4 ++-- src/yasb/core/widgets/yasb/custom.py | 4 ++-- src/yasb/core/widgets/yasb/memory.py | 4 ++-- src/yasb/main.py | 10 +++++----- 24 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/yasb/core/bar.py b/src/yasb/core/bar.py index 0486246..e12be3e 100644 --- a/src/yasb/core/bar.py +++ b/src/yasb/core/bar.py @@ -1,14 +1,14 @@ import logging -from settings import APP_BAR_TITLE +from yasb.settings import APP_BAR_TITLE from PyQt6.QtWidgets import QApplication, QWidget, QHBoxLayout, QGridLayout, QFrame from PyQt6.QtGui import QScreen from PyQt6.QtCore import Qt, QRect -from core.utils.utilities import is_valid_percentage_str, percent_to_float -from core.validation.bar import BAR_DEFAULTS +from yasb.core.utils.utilities import is_valid_percentage_str, percent_to_float +from yasb.core.validation.bar import BAR_DEFAULTS from BlurWindow.blurWindow import GlobalBlur try: - from core.utils.win32 import app_bar + from yasb.core.utils.win32 import app_bar IMPORT_APP_BAR_MANAGER_SUCCESSFUL = True except ImportError: IMPORT_APP_BAR_MANAGER_SUCCESSFUL = False diff --git a/src/yasb/core/bar_manager.py b/src/yasb/core/bar_manager.py index 4c37182..ba0b4b2 100644 --- a/src/yasb/core/bar_manager.py +++ b/src/yasb/core/bar_manager.py @@ -4,11 +4,11 @@ from PyQt6.QtWidgets import QApplication from PyQt6.QtGui import QScreen from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot -from core.bar import Bar -from core.utils.widget_builder import WidgetBuilder -from core.utils.utilities import get_screen_by_name -from core.event_service import EventService -from core.config import get_stylesheet, get_config +from yasb.core.bar import Bar +from yasb.core.utils.widget_builder import WidgetBuilder +from yasb.core.utils.utilities import get_screen_by_name +from yasb.core.event_service import EventService +from yasb.core.config import get_stylesheet, get_config from copy import deepcopy diff --git a/src/yasb/core/config.py b/src/yasb/core/config.py index 8ace95e..1efd6c1 100644 --- a/src/yasb/core/config.py +++ b/src/yasb/core/config.py @@ -1,11 +1,11 @@ import logging -import settings +from yasb import settings from os import path from sys import argv, exit from pathlib import Path from typing import Union -from core.validation.config import CONFIG_SCHEMA -from core.utils.alert_dialog import raise_info_alert +from yasb.core.validation.config import CONFIG_SCHEMA +from yasb.core.utils.alert_dialog import raise_info_alert from cssutils import CSSParser from cerberus import Validator, schema from yaml.parser import ParserError diff --git a/src/yasb/core/event_service.py b/src/yasb/core/event_service.py index 4a32b58..d8925e7 100644 --- a/src/yasb/core/event_service.py +++ b/src/yasb/core/event_service.py @@ -3,7 +3,7 @@ from PyQt6.QtCore import QObject, pyqtSignal from typing import Any -from core.event_enums import Event +from yasb.core.event_enums import Event @functools.lru_cache() diff --git a/src/yasb/core/log.py b/src/yasb/core/log.py index 9ad71a8..00099bb 100644 --- a/src/yasb/core/log.py +++ b/src/yasb/core/log.py @@ -1,7 +1,7 @@ import logging from os.path import join -from settings import DEFAULT_LOG_FILENAME, APP_NAME, APP_NAME_FULL -from core.config import get_config_dir +from yasb.settings import DEFAULT_LOG_FILENAME, APP_NAME, APP_NAME_FULL +from yasb.core.config import get_config_dir LOG_PATH = join(get_config_dir(), DEFAULT_LOG_FILENAME) LOG_FORMAT = "%(asctime)s %(levelname)s %(filename)s: %(message)s" diff --git a/src/yasb/core/tray.py b/src/yasb/core/tray.py index a56ae6f..2f495ad 100644 --- a/src/yasb/core/tray.py +++ b/src/yasb/core/tray.py @@ -3,8 +3,8 @@ from PyQt6.QtWidgets import QSystemTrayIcon, QMenu from PyQt6.QtGui import QIcon from PyQt6.QtCore import QCoreApplication, QSize -from core.bar_manager import BarManager -from settings import GITHUB_URL, FAVICON_PATH, APP_NAME, APP_NAME_FULL +from yasb.core.bar_manager import BarManager +from yasb.settings import GITHUB_URL, FAVICON_PATH, APP_NAME, APP_NAME_FULL class TrayIcon(QSystemTrayIcon): diff --git a/src/yasb/core/utils/alert_dialog.py b/src/yasb/core/utils/alert_dialog.py index ce11273..045ad21 100644 --- a/src/yasb/core/utils/alert_dialog.py +++ b/src/yasb/core/utils/alert_dialog.py @@ -1,6 +1,6 @@ import sys import traceback -from settings import APP_NAME +from yasb.settings import APP_NAME from PyQt6.QtWidgets import QMessageBox, QTextEdit, QSizePolicy from PyQt6.QtCore import Qt diff --git a/src/yasb/core/utils/komorebi/event_listener.py b/src/yasb/core/utils/komorebi/event_listener.py index 845f01a..88708ce 100644 --- a/src/yasb/core/utils/komorebi/event_listener.py +++ b/src/yasb/core/utils/komorebi/event_listener.py @@ -5,9 +5,9 @@ import win32pipe import win32file from PyQt6.QtCore import QThread -from core.event_enums import KomorebiEvent -from core.event_service import EventService -from core.utils.komorebi.client import KomorebiClient +from yasb.core.event_enums import KomorebiEvent +from yasb.core.event_service import EventService +from yasb.core.utils.komorebi.client import KomorebiClient KOMOREBI_PIPE_BUFF_SIZE = 64 * 1024 KOMOREBI_PIPE_NAME = "yasb" diff --git a/src/yasb/core/utils/widget_builder.py b/src/yasb/core/utils/widget_builder.py index 4a3e757..21361ea 100644 --- a/src/yasb/core/utils/widget_builder.py +++ b/src/yasb/core/utils/widget_builder.py @@ -5,8 +5,8 @@ from typing import Optional from cerberus import Validator from importlib import import_module -from core.utils.alert_dialog import raise_info_alert -from settings import DEFAULT_CONFIG_FILENAME +from yasb.core.utils.alert_dialog import raise_info_alert +from yasb.settings import DEFAULT_CONFIG_FILENAME class WidgetBuilder(QObject): diff --git a/src/yasb/core/utils/win32/active_window_border.py b/src/yasb/core/utils/win32/active_window_border.py index 7f81a70..f23cc2f 100644 --- a/src/yasb/core/utils/win32/active_window_border.py +++ b/src/yasb/core/utils/win32/active_window_border.py @@ -1,10 +1,10 @@ import logging from PyQt6.QtWidgets import QWidget, QFrame from PyQt6.QtCore import pyqtSignal, Qt -from core.event_service import EventService -from core.utils.win32.windows import WinEvent -from core.bar import BAR_WM_TITLE -from core.utils.win32.utilities import get_hwnd_info, get_window_extended_frame_bounds, is_window_maximised +from yasb.core.event_service import EventService +from yasb.core.utils.win32.windows import WinEvent +from yasb.core.bar import BAR_WM_TITLE +from yasb.core.utils.win32.utilities import get_hwnd_info, get_window_extended_frame_bounds, is_window_maximised IGNORED_CLASSES = [ 'WorkerW', diff --git a/src/yasb/core/utils/win32/event_listener.py b/src/yasb/core/utils/win32/event_listener.py index 95c47bf..562e24a 100644 --- a/src/yasb/core/utils/win32/event_listener.py +++ b/src/yasb/core/utils/win32/event_listener.py @@ -3,8 +3,8 @@ import logging from PyQt6.QtCore import QThread from win32gui import GetForegroundWindow -from core.utils.win32.windows import WinEventProcType, WinEvent, user32, ole32, msg -from core.event_service import EventService +from yasb.core.utils.win32.windows import WinEventProcType, WinEvent, user32, ole32, msg +from yasb.core.event_service import EventService class SystemEventListener(QThread): diff --git a/src/yasb/core/utils/win32/windows.py b/src/yasb/core/utils/win32/windows.py index 5bc825a..89c2222 100644 --- a/src/yasb/core/utils/win32/windows.py +++ b/src/yasb/core/utils/win32/windows.py @@ -1,5 +1,5 @@ import ctypes.wintypes -from core.event_enums import Event +from yasb.core.event_enums import Event user32 = ctypes.windll.user32 user32.SetWinEventHook.restype = ctypes.wintypes.HANDLE diff --git a/src/yasb/core/validation/config.py b/src/yasb/core/validation/config.py index 5d61b59..8326848 100644 --- a/src/yasb/core/validation/config.py +++ b/src/yasb/core/validation/config.py @@ -1,4 +1,4 @@ -from core.validation.bar import BAR_SCHEMA, BAR_DEFAULTS +from yasb.core.validation.bar import BAR_SCHEMA, BAR_DEFAULTS CONFIG_SCHEMA = { 'watch_config': { diff --git a/src/yasb/core/watcher.py b/src/yasb/core/watcher.py index fa0eeaf..ca73943 100644 --- a/src/yasb/core/watcher.py +++ b/src/yasb/core/watcher.py @@ -1,10 +1,10 @@ import logging from os.path import basename -from core.config import get_config_dir -from settings import DEFAULT_STYLES_FILENAME, DEFAULT_CONFIG_FILENAME +from yasb.core.config import get_config_dir +from yasb.settings import DEFAULT_STYLES_FILENAME, DEFAULT_CONFIG_FILENAME from watchdog.observers import Observer from watchdog.events import PatternMatchingEventHandler, FileModifiedEvent -from core.bar_manager import BarManager +from yasb.core.bar_manager import BarManager class FileModifiedEventHandler(PatternMatchingEventHandler): diff --git a/src/yasb/core/widgets/example.py b/src/yasb/core/widgets/example.py index 2628ee0..96495e2 100644 --- a/src/yasb/core/widgets/example.py +++ b/src/yasb/core/widgets/example.py @@ -1,5 +1,5 @@ -from core.widgets.base import BaseWidget -from core.validation.widgets.example import EXAMPLE_VALIDATION_SCHEMA +from yasb.core.widgets.base import BaseWidget +from yasb.core.validation.widgets.example import EXAMPLE_VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/core/widgets/komorebi/active_layout.py b/src/yasb/core/widgets/komorebi/active_layout.py index ac690c0..40cbe22 100644 --- a/src/yasb/core/widgets/komorebi/active_layout.py +++ b/src/yasb/core/widgets/komorebi/active_layout.py @@ -2,15 +2,15 @@ from collections import deque from PyQt6.QtWidgets import QWidget, QLabel from PyQt6.QtCore import pyqtSignal -from core.utils.win32.utilities import get_monitor_hwnd -from core.event_service import EventService -from core.event_enums import KomorebiEvent -from core.widgets.base import BaseWidget -from core.utils.komorebi.client import KomorebiClient -from core.validation.widgets.komorebi.active_layout import VALIDATION_SCHEMA +from yasb.core.utils.win32.utilities import get_monitor_hwnd +from yasb.core.event_service import EventService +from yasb.core.event_enums import KomorebiEvent +from yasb.core.widgets.base import BaseWidget +from yasb.core.utils.komorebi.client import KomorebiClient +from yasb.core.validation.widgets.komorebi.active_layout import VALIDATION_SCHEMA try: - from core.utils.komorebi.event_listener import KomorebiEventListener + from yasb.core.utils.komorebi.event_listener import KomorebiEventListener except ImportError: KomorebiEventListener = None logging.warning("Failed to load Komorebi Event Listener") diff --git a/src/yasb/core/widgets/komorebi/workspaces.py b/src/yasb/core/widgets/komorebi/workspaces.py index dd0c47e..1074ca7 100644 --- a/src/yasb/core/widgets/komorebi/workspaces.py +++ b/src/yasb/core/widgets/komorebi/workspaces.py @@ -3,15 +3,15 @@ from PyQt6.QtCore import pyqtSignal from typing import Literal from contextlib import suppress -from core.utils.win32.utilities import get_monitor_hwnd -from core.event_service import EventService -from core.event_enums import KomorebiEvent -from core.widgets.base import BaseWidget -from core.utils.komorebi.client import KomorebiClient -from core.validation.widgets.komorebi.workspaces import VALIDATION_SCHEMA +from yasb.core.utils.win32.utilities import get_monitor_hwnd +from yasb.core.event_service import EventService +from yasb.core.event_enums import KomorebiEvent +from yasb.core.widgets.base import BaseWidget +from yasb.core.utils.komorebi.client import KomorebiClient +from yasb.core.validation.widgets.komorebi.workspaces import VALIDATION_SCHEMA try: - from core.utils.komorebi.event_listener import KomorebiEventListener + from yasb.core.utils.komorebi.event_listener import KomorebiEventListener except ImportError: KomorebiEventListener = None logging.warning("Failed to load Komorebi Event Listener") diff --git a/src/yasb/core/widgets/yasb/active_window.py b/src/yasb/core/widgets/yasb/active_window.py index 645294d..e9569ad 100644 --- a/src/yasb/core/widgets/yasb/active_window.py +++ b/src/yasb/core/widgets/yasb/active_window.py @@ -1,12 +1,12 @@ import logging -from settings import APP_BAR_TITLE -from core.utils.win32.windows import WinEvent -from core.widgets.base import BaseWidget -from core.event_service import EventService +from yasb.settings import APP_BAR_TITLE +from yasb.core.utils.win32.windows import WinEvent +from yasb.core.widgets.base import BaseWidget +from yasb.core.event_service import EventService from PyQt6.QtCore import pyqtSignal from PyQt6.QtWidgets import QLabel -from core.validation.widgets.yasb.active_window import VALIDATION_SCHEMA -from core.utils.win32.utilities import get_hwnd_info +from yasb.core.validation.widgets.yasb.active_window import VALIDATION_SCHEMA +from yasb.core.utils.win32.utilities import get_hwnd_info IGNORED_TITLES = ['', ' '] IGNORED_CLASSES = ['WorkerW'] @@ -20,7 +20,7 @@ ] try: - from core.utils.win32.event_listener import SystemEventListener + from yasb.core.utils.win32.event_listener import SystemEventListener except ImportError: SystemEventListener = None logging.warning("Failed to load Win32 System Event Listener") diff --git a/src/yasb/core/widgets/yasb/battery.py b/src/yasb/core/widgets/yasb/battery.py index dc42d80..6b04b84 100644 --- a/src/yasb/core/widgets/yasb/battery.py +++ b/src/yasb/core/widgets/yasb/battery.py @@ -1,8 +1,8 @@ import psutil import humanize from datetime import timedelta -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.battery import VALIDATION_SCHEMA +from yasb.core.widgets.base import BaseWidget +from yasb.core.validation.widgets.yasb.battery import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel from typing import Union diff --git a/src/yasb/core/widgets/yasb/clock.py b/src/yasb/core/widgets/yasb/clock.py index 15b52bb..4b62f81 100644 --- a/src/yasb/core/widgets/yasb/clock.py +++ b/src/yasb/core/widgets/yasb/clock.py @@ -1,7 +1,7 @@ import re import pytz -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.clock import VALIDATION_SCHEMA +from yasb.core.widgets.base import BaseWidget +from yasb.core.validation.widgets.yasb.clock import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel from datetime import datetime from tzlocal import get_localzone_name diff --git a/src/yasb/core/widgets/yasb/cpu.py b/src/yasb/core/widgets/yasb/cpu.py index f5d2ba1..d401dcc 100644 --- a/src/yasb/core/widgets/yasb/cpu.py +++ b/src/yasb/core/widgets/yasb/cpu.py @@ -1,7 +1,7 @@ import psutil from collections import deque -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.cpu import VALIDATION_SCHEMA +from yasb.core.widgets.base import BaseWidget +from yasb.core.validation.widgets.yasb.cpu import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/core/widgets/yasb/custom.py b/src/yasb/core/widgets/yasb/custom.py index 223e03b..f41924a 100644 --- a/src/yasb/core/widgets/yasb/custom.py +++ b/src/yasb/core/widgets/yasb/custom.py @@ -1,8 +1,8 @@ import subprocess import json from PyQt6.QtWidgets import QLabel -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.custom import VALIDATION_SCHEMA +from yasb.core.widgets.base import BaseWidget +from yasb.core.validation.widgets.yasb.custom import VALIDATION_SCHEMA class CustomWidget(BaseWidget): diff --git a/src/yasb/core/widgets/yasb/memory.py b/src/yasb/core/widgets/yasb/memory.py index c3d6b0e..0fb6a81 100644 --- a/src/yasb/core/widgets/yasb/memory.py +++ b/src/yasb/core/widgets/yasb/memory.py @@ -1,8 +1,8 @@ import logging import psutil from humanize import naturalsize -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.memory import VALIDATION_SCHEMA +from yasb.core.widgets.base import BaseWidget +from yasb.core.validation.widgets.yasb.memory import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/main.py b/src/yasb/main.py index b32a2e9..e7f2582 100644 --- a/src/yasb/main.py +++ b/src/yasb/main.py @@ -1,10 +1,10 @@ from sys import argv, exit from PyQt6.QtWidgets import QApplication -from core.bar_manager import BarManager -from core.config import get_config_and_stylesheet -from core.log import init_logger -from core.tray import TrayIcon -from core.watcher import create_observer +from yasb.core.bar_manager import BarManager +from yasb.core.config import get_config_and_stylesheet +from yasb.core.log import init_logger +from yasb.core.tray import TrayIcon +from yasb.core.watcher import create_observer def main(): From 9ba782604e4b0a750aec4b1d663aa0f35d9a9932 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Wed, 21 Jun 2023 12:12:01 -0700 Subject: [PATCH 12/16] Add yasb.main as a executable script. --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index ea672fa..e8a4d40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,3 +19,5 @@ dependencies = [ "watchdog==2.1.9", "winsdk==1.0.0b6", ] +[project.scripts] +yasb = "yasb:main" From 60c456ccbbeba2ac0de8f7da008c3eefd677dc20 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Thu, 22 Jun 2023 13:23:41 -0700 Subject: [PATCH 13/16] Change to relative imports. Done with the help of abs2rel, so a lot was automated. --- src/yasb/core/bar.py | 6 +++--- src/yasb/core/bar_manager.py | 10 +++++----- src/yasb/core/config.py | 6 +++--- src/yasb/core/event_service.py | 2 +- src/yasb/core/log.py | 4 ++-- src/yasb/core/tray.py | 4 ++-- src/yasb/core/utils/alert_dialog.py | 2 +- src/yasb/core/utils/komorebi/event_listener.py | 6 +++--- src/yasb/core/utils/widget_builder.py | 4 ++-- src/yasb/core/utils/win32/active_window_border.py | 8 ++++---- src/yasb/core/utils/win32/event_listener.py | 4 ++-- src/yasb/core/utils/win32/windows.py | 2 +- src/yasb/core/validation/config.py | 2 +- src/yasb/core/watcher.py | 6 +++--- src/yasb/core/widgets/example.py | 4 ++-- src/yasb/core/widgets/komorebi/active_layout.py | 14 +++++++------- src/yasb/core/widgets/komorebi/workspaces.py | 14 +++++++------- src/yasb/core/widgets/yasb/active_window.py | 14 +++++++------- src/yasb/core/widgets/yasb/battery.py | 4 ++-- src/yasb/core/widgets/yasb/clock.py | 4 ++-- src/yasb/core/widgets/yasb/cpu.py | 4 ++-- src/yasb/core/widgets/yasb/custom.py | 4 ++-- src/yasb/core/widgets/yasb/memory.py | 4 ++-- src/yasb/main.py | 10 +++++----- 24 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/yasb/core/bar.py b/src/yasb/core/bar.py index 0486246..283f186 100644 --- a/src/yasb/core/bar.py +++ b/src/yasb/core/bar.py @@ -1,10 +1,10 @@ import logging -from settings import APP_BAR_TITLE +from ..settings import APP_BAR_TITLE from PyQt6.QtWidgets import QApplication, QWidget, QHBoxLayout, QGridLayout, QFrame from PyQt6.QtGui import QScreen from PyQt6.QtCore import Qt, QRect -from core.utils.utilities import is_valid_percentage_str, percent_to_float -from core.validation.bar import BAR_DEFAULTS +from .utils.utilities import is_valid_percentage_str, percent_to_float +from .validation.bar import BAR_DEFAULTS from BlurWindow.blurWindow import GlobalBlur try: diff --git a/src/yasb/core/bar_manager.py b/src/yasb/core/bar_manager.py index 4c37182..61b6bf3 100644 --- a/src/yasb/core/bar_manager.py +++ b/src/yasb/core/bar_manager.py @@ -4,11 +4,11 @@ from PyQt6.QtWidgets import QApplication from PyQt6.QtGui import QScreen from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot -from core.bar import Bar -from core.utils.widget_builder import WidgetBuilder -from core.utils.utilities import get_screen_by_name -from core.event_service import EventService -from core.config import get_stylesheet, get_config +from .bar import Bar +from .utils.widget_builder import WidgetBuilder +from .utils.utilities import get_screen_by_name +from .event_service import EventService +from .config import get_stylesheet, get_config from copy import deepcopy diff --git a/src/yasb/core/config.py b/src/yasb/core/config.py index 8ace95e..d050399 100644 --- a/src/yasb/core/config.py +++ b/src/yasb/core/config.py @@ -1,11 +1,11 @@ import logging -import settings +from .. import settings from os import path from sys import argv, exit from pathlib import Path from typing import Union -from core.validation.config import CONFIG_SCHEMA -from core.utils.alert_dialog import raise_info_alert +from .validation.config import CONFIG_SCHEMA +from .utils.alert_dialog import raise_info_alert from cssutils import CSSParser from cerberus import Validator, schema from yaml.parser import ParserError diff --git a/src/yasb/core/event_service.py b/src/yasb/core/event_service.py index 4a32b58..35fc0f1 100644 --- a/src/yasb/core/event_service.py +++ b/src/yasb/core/event_service.py @@ -3,7 +3,7 @@ from PyQt6.QtCore import QObject, pyqtSignal from typing import Any -from core.event_enums import Event +from .event_enums import Event @functools.lru_cache() diff --git a/src/yasb/core/log.py b/src/yasb/core/log.py index 9ad71a8..9fc540d 100644 --- a/src/yasb/core/log.py +++ b/src/yasb/core/log.py @@ -1,7 +1,7 @@ import logging from os.path import join -from settings import DEFAULT_LOG_FILENAME, APP_NAME, APP_NAME_FULL -from core.config import get_config_dir +from ..settings import DEFAULT_LOG_FILENAME, APP_NAME, APP_NAME_FULL +from .config import get_config_dir LOG_PATH = join(get_config_dir(), DEFAULT_LOG_FILENAME) LOG_FORMAT = "%(asctime)s %(levelname)s %(filename)s: %(message)s" diff --git a/src/yasb/core/tray.py b/src/yasb/core/tray.py index a56ae6f..f26434a 100644 --- a/src/yasb/core/tray.py +++ b/src/yasb/core/tray.py @@ -3,8 +3,8 @@ from PyQt6.QtWidgets import QSystemTrayIcon, QMenu from PyQt6.QtGui import QIcon from PyQt6.QtCore import QCoreApplication, QSize -from core.bar_manager import BarManager -from settings import GITHUB_URL, FAVICON_PATH, APP_NAME, APP_NAME_FULL +from .bar_manager import BarManager +from ..settings import GITHUB_URL, FAVICON_PATH, APP_NAME, APP_NAME_FULL class TrayIcon(QSystemTrayIcon): diff --git a/src/yasb/core/utils/alert_dialog.py b/src/yasb/core/utils/alert_dialog.py index ce11273..3b6aa77 100644 --- a/src/yasb/core/utils/alert_dialog.py +++ b/src/yasb/core/utils/alert_dialog.py @@ -1,6 +1,6 @@ import sys import traceback -from settings import APP_NAME +from ...settings import APP_NAME from PyQt6.QtWidgets import QMessageBox, QTextEdit, QSizePolicy from PyQt6.QtCore import Qt diff --git a/src/yasb/core/utils/komorebi/event_listener.py b/src/yasb/core/utils/komorebi/event_listener.py index 845f01a..7ef9b17 100644 --- a/src/yasb/core/utils/komorebi/event_listener.py +++ b/src/yasb/core/utils/komorebi/event_listener.py @@ -5,9 +5,9 @@ import win32pipe import win32file from PyQt6.QtCore import QThread -from core.event_enums import KomorebiEvent -from core.event_service import EventService -from core.utils.komorebi.client import KomorebiClient +from ...event_enums import KomorebiEvent +from ...event_service import EventService +from .client import KomorebiClient KOMOREBI_PIPE_BUFF_SIZE = 64 * 1024 KOMOREBI_PIPE_NAME = "yasb" diff --git a/src/yasb/core/utils/widget_builder.py b/src/yasb/core/utils/widget_builder.py index 4a3e757..f925a96 100644 --- a/src/yasb/core/utils/widget_builder.py +++ b/src/yasb/core/utils/widget_builder.py @@ -5,8 +5,8 @@ from typing import Optional from cerberus import Validator from importlib import import_module -from core.utils.alert_dialog import raise_info_alert -from settings import DEFAULT_CONFIG_FILENAME +from .alert_dialog import raise_info_alert +from ...settings import DEFAULT_CONFIG_FILENAME class WidgetBuilder(QObject): diff --git a/src/yasb/core/utils/win32/active_window_border.py b/src/yasb/core/utils/win32/active_window_border.py index 7f81a70..b64dfa2 100644 --- a/src/yasb/core/utils/win32/active_window_border.py +++ b/src/yasb/core/utils/win32/active_window_border.py @@ -1,10 +1,10 @@ import logging from PyQt6.QtWidgets import QWidget, QFrame from PyQt6.QtCore import pyqtSignal, Qt -from core.event_service import EventService -from core.utils.win32.windows import WinEvent -from core.bar import BAR_WM_TITLE -from core.utils.win32.utilities import get_hwnd_info, get_window_extended_frame_bounds, is_window_maximised +from ...event_service import EventService +from .windows import WinEvent +from ...bar import BAR_WM_TITLE +from .utilities import get_hwnd_info, get_window_extended_frame_bounds, is_window_maximised IGNORED_CLASSES = [ 'WorkerW', diff --git a/src/yasb/core/utils/win32/event_listener.py b/src/yasb/core/utils/win32/event_listener.py index 95c47bf..c54d2dd 100644 --- a/src/yasb/core/utils/win32/event_listener.py +++ b/src/yasb/core/utils/win32/event_listener.py @@ -3,8 +3,8 @@ import logging from PyQt6.QtCore import QThread from win32gui import GetForegroundWindow -from core.utils.win32.windows import WinEventProcType, WinEvent, user32, ole32, msg -from core.event_service import EventService +from .windows import WinEventProcType, WinEvent, user32, ole32, msg +from ...event_service import EventService class SystemEventListener(QThread): diff --git a/src/yasb/core/utils/win32/windows.py b/src/yasb/core/utils/win32/windows.py index 5bc825a..4bf1396 100644 --- a/src/yasb/core/utils/win32/windows.py +++ b/src/yasb/core/utils/win32/windows.py @@ -1,5 +1,5 @@ import ctypes.wintypes -from core.event_enums import Event +from ...event_enums import Event user32 = ctypes.windll.user32 user32.SetWinEventHook.restype = ctypes.wintypes.HANDLE diff --git a/src/yasb/core/validation/config.py b/src/yasb/core/validation/config.py index 5d61b59..417a4da 100644 --- a/src/yasb/core/validation/config.py +++ b/src/yasb/core/validation/config.py @@ -1,4 +1,4 @@ -from core.validation.bar import BAR_SCHEMA, BAR_DEFAULTS +from .bar import BAR_SCHEMA, BAR_DEFAULTS CONFIG_SCHEMA = { 'watch_config': { diff --git a/src/yasb/core/watcher.py b/src/yasb/core/watcher.py index fa0eeaf..2886364 100644 --- a/src/yasb/core/watcher.py +++ b/src/yasb/core/watcher.py @@ -1,10 +1,10 @@ import logging from os.path import basename -from core.config import get_config_dir -from settings import DEFAULT_STYLES_FILENAME, DEFAULT_CONFIG_FILENAME +from .config import get_config_dir +from ..settings import DEFAULT_STYLES_FILENAME, DEFAULT_CONFIG_FILENAME from watchdog.observers import Observer from watchdog.events import PatternMatchingEventHandler, FileModifiedEvent -from core.bar_manager import BarManager +from .bar_manager import BarManager class FileModifiedEventHandler(PatternMatchingEventHandler): diff --git a/src/yasb/core/widgets/example.py b/src/yasb/core/widgets/example.py index 2628ee0..9ce2516 100644 --- a/src/yasb/core/widgets/example.py +++ b/src/yasb/core/widgets/example.py @@ -1,5 +1,5 @@ -from core.widgets.base import BaseWidget -from core.validation.widgets.example import EXAMPLE_VALIDATION_SCHEMA +from .base import BaseWidget +from ..validation.widgets.example import EXAMPLE_VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/core/widgets/komorebi/active_layout.py b/src/yasb/core/widgets/komorebi/active_layout.py index ac690c0..74de4c5 100644 --- a/src/yasb/core/widgets/komorebi/active_layout.py +++ b/src/yasb/core/widgets/komorebi/active_layout.py @@ -2,15 +2,15 @@ from collections import deque from PyQt6.QtWidgets import QWidget, QLabel from PyQt6.QtCore import pyqtSignal -from core.utils.win32.utilities import get_monitor_hwnd -from core.event_service import EventService -from core.event_enums import KomorebiEvent -from core.widgets.base import BaseWidget -from core.utils.komorebi.client import KomorebiClient -from core.validation.widgets.komorebi.active_layout import VALIDATION_SCHEMA +from ...utils.win32.utilities import get_monitor_hwnd +from ...event_service import EventService +from ...event_enums import KomorebiEvent +from ..base import BaseWidget +from ...utils.komorebi.client import KomorebiClient +from ...validation.widgets.komorebi.active_layout import VALIDATION_SCHEMA try: - from core.utils.komorebi.event_listener import KomorebiEventListener + from ...utils.komorebi.event_listener import KomorebiEventListener except ImportError: KomorebiEventListener = None logging.warning("Failed to load Komorebi Event Listener") diff --git a/src/yasb/core/widgets/komorebi/workspaces.py b/src/yasb/core/widgets/komorebi/workspaces.py index dd0c47e..39d6a2a 100644 --- a/src/yasb/core/widgets/komorebi/workspaces.py +++ b/src/yasb/core/widgets/komorebi/workspaces.py @@ -3,15 +3,15 @@ from PyQt6.QtCore import pyqtSignal from typing import Literal from contextlib import suppress -from core.utils.win32.utilities import get_monitor_hwnd -from core.event_service import EventService -from core.event_enums import KomorebiEvent -from core.widgets.base import BaseWidget -from core.utils.komorebi.client import KomorebiClient -from core.validation.widgets.komorebi.workspaces import VALIDATION_SCHEMA +from ...utils.win32.utilities import get_monitor_hwnd +from ...event_service import EventService +from ...event_enums import KomorebiEvent +from ..base import BaseWidget +from ...utils.komorebi.client import KomorebiClient +from ...validation.widgets.komorebi.workspaces import VALIDATION_SCHEMA try: - from core.utils.komorebi.event_listener import KomorebiEventListener + from ...utils.komorebi.event_listener import KomorebiEventListener except ImportError: KomorebiEventListener = None logging.warning("Failed to load Komorebi Event Listener") diff --git a/src/yasb/core/widgets/yasb/active_window.py b/src/yasb/core/widgets/yasb/active_window.py index 645294d..335eac4 100644 --- a/src/yasb/core/widgets/yasb/active_window.py +++ b/src/yasb/core/widgets/yasb/active_window.py @@ -1,12 +1,12 @@ import logging -from settings import APP_BAR_TITLE -from core.utils.win32.windows import WinEvent -from core.widgets.base import BaseWidget -from core.event_service import EventService +from ....settings import APP_BAR_TITLE +from ...utils.win32.windows import WinEvent +from ..base import BaseWidget +from ...event_service import EventService from PyQt6.QtCore import pyqtSignal from PyQt6.QtWidgets import QLabel -from core.validation.widgets.yasb.active_window import VALIDATION_SCHEMA -from core.utils.win32.utilities import get_hwnd_info +from ...validation.widgets.yasb.active_window import VALIDATION_SCHEMA +from ...utils.win32.utilities import get_hwnd_info IGNORED_TITLES = ['', ' '] IGNORED_CLASSES = ['WorkerW'] @@ -20,7 +20,7 @@ ] try: - from core.utils.win32.event_listener import SystemEventListener + from ...utils.win32.event_listener import SystemEventListener except ImportError: SystemEventListener = None logging.warning("Failed to load Win32 System Event Listener") diff --git a/src/yasb/core/widgets/yasb/battery.py b/src/yasb/core/widgets/yasb/battery.py index dc42d80..1f93ad7 100644 --- a/src/yasb/core/widgets/yasb/battery.py +++ b/src/yasb/core/widgets/yasb/battery.py @@ -1,8 +1,8 @@ import psutil import humanize from datetime import timedelta -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.battery import VALIDATION_SCHEMA +from ..base import BaseWidget +from ...validation.widgets.yasb.battery import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel from typing import Union diff --git a/src/yasb/core/widgets/yasb/clock.py b/src/yasb/core/widgets/yasb/clock.py index 15b52bb..601664a 100644 --- a/src/yasb/core/widgets/yasb/clock.py +++ b/src/yasb/core/widgets/yasb/clock.py @@ -1,7 +1,7 @@ import re import pytz -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.clock import VALIDATION_SCHEMA +from ..base import BaseWidget +from ...validation.widgets.yasb.clock import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel from datetime import datetime from tzlocal import get_localzone_name diff --git a/src/yasb/core/widgets/yasb/cpu.py b/src/yasb/core/widgets/yasb/cpu.py index f5d2ba1..81363bf 100644 --- a/src/yasb/core/widgets/yasb/cpu.py +++ b/src/yasb/core/widgets/yasb/cpu.py @@ -1,7 +1,7 @@ import psutil from collections import deque -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.cpu import VALIDATION_SCHEMA +from ..base import BaseWidget +from ...validation.widgets.yasb.cpu import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/core/widgets/yasb/custom.py b/src/yasb/core/widgets/yasb/custom.py index 223e03b..db29b52 100644 --- a/src/yasb/core/widgets/yasb/custom.py +++ b/src/yasb/core/widgets/yasb/custom.py @@ -1,8 +1,8 @@ import subprocess import json from PyQt6.QtWidgets import QLabel -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.custom import VALIDATION_SCHEMA +from ..base import BaseWidget +from ...validation.widgets.yasb.custom import VALIDATION_SCHEMA class CustomWidget(BaseWidget): diff --git a/src/yasb/core/widgets/yasb/memory.py b/src/yasb/core/widgets/yasb/memory.py index c3d6b0e..cb7b9da 100644 --- a/src/yasb/core/widgets/yasb/memory.py +++ b/src/yasb/core/widgets/yasb/memory.py @@ -1,8 +1,8 @@ import logging import psutil from humanize import naturalsize -from core.widgets.base import BaseWidget -from core.validation.widgets.yasb.memory import VALIDATION_SCHEMA +from ..base import BaseWidget +from ...validation.widgets.yasb.memory import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/main.py b/src/yasb/main.py index b32a2e9..307d316 100644 --- a/src/yasb/main.py +++ b/src/yasb/main.py @@ -1,10 +1,10 @@ from sys import argv, exit from PyQt6.QtWidgets import QApplication -from core.bar_manager import BarManager -from core.config import get_config_and_stylesheet -from core.log import init_logger -from core.tray import TrayIcon -from core.watcher import create_observer +from .core.bar_manager import BarManager +from .core.config import get_config_and_stylesheet +from .core.log import init_logger +from .core.tray import TrayIcon +from .core.watcher import create_observer def main(): From 110134a3c90c898caf635cfd627e76c6aa3e3705 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Thu, 22 Jun 2023 13:28:24 -0700 Subject: [PATCH 14/16] Revert "Replace relative import `core` with `yasb.core`." This reverts commit 0592fc64616975ecc3343ac09cbf5069bd419d72. --- src/yasb/core/bar.py | 8 ++++---- src/yasb/core/bar_manager.py | 10 +++++----- src/yasb/core/config.py | 6 +++--- src/yasb/core/event_service.py | 2 +- src/yasb/core/log.py | 4 ++-- src/yasb/core/tray.py | 4 ++-- src/yasb/core/utils/alert_dialog.py | 2 +- src/yasb/core/utils/komorebi/event_listener.py | 6 +++--- src/yasb/core/utils/widget_builder.py | 4 ++-- src/yasb/core/utils/win32/active_window_border.py | 8 ++++---- src/yasb/core/utils/win32/event_listener.py | 4 ++-- src/yasb/core/utils/win32/windows.py | 2 +- src/yasb/core/validation/config.py | 2 +- src/yasb/core/watcher.py | 6 +++--- src/yasb/core/widgets/example.py | 4 ++-- src/yasb/core/widgets/komorebi/active_layout.py | 14 +++++++------- src/yasb/core/widgets/komorebi/workspaces.py | 14 +++++++------- src/yasb/core/widgets/yasb/active_window.py | 14 +++++++------- src/yasb/core/widgets/yasb/battery.py | 4 ++-- src/yasb/core/widgets/yasb/clock.py | 4 ++-- src/yasb/core/widgets/yasb/cpu.py | 4 ++-- src/yasb/core/widgets/yasb/custom.py | 4 ++-- src/yasb/core/widgets/yasb/memory.py | 4 ++-- src/yasb/main.py | 10 +++++----- 24 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/yasb/core/bar.py b/src/yasb/core/bar.py index e12be3e..0486246 100644 --- a/src/yasb/core/bar.py +++ b/src/yasb/core/bar.py @@ -1,14 +1,14 @@ import logging -from yasb.settings import APP_BAR_TITLE +from settings import APP_BAR_TITLE from PyQt6.QtWidgets import QApplication, QWidget, QHBoxLayout, QGridLayout, QFrame from PyQt6.QtGui import QScreen from PyQt6.QtCore import Qt, QRect -from yasb.core.utils.utilities import is_valid_percentage_str, percent_to_float -from yasb.core.validation.bar import BAR_DEFAULTS +from core.utils.utilities import is_valid_percentage_str, percent_to_float +from core.validation.bar import BAR_DEFAULTS from BlurWindow.blurWindow import GlobalBlur try: - from yasb.core.utils.win32 import app_bar + from core.utils.win32 import app_bar IMPORT_APP_BAR_MANAGER_SUCCESSFUL = True except ImportError: IMPORT_APP_BAR_MANAGER_SUCCESSFUL = False diff --git a/src/yasb/core/bar_manager.py b/src/yasb/core/bar_manager.py index ba0b4b2..4c37182 100644 --- a/src/yasb/core/bar_manager.py +++ b/src/yasb/core/bar_manager.py @@ -4,11 +4,11 @@ from PyQt6.QtWidgets import QApplication from PyQt6.QtGui import QScreen from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot -from yasb.core.bar import Bar -from yasb.core.utils.widget_builder import WidgetBuilder -from yasb.core.utils.utilities import get_screen_by_name -from yasb.core.event_service import EventService -from yasb.core.config import get_stylesheet, get_config +from core.bar import Bar +from core.utils.widget_builder import WidgetBuilder +from core.utils.utilities import get_screen_by_name +from core.event_service import EventService +from core.config import get_stylesheet, get_config from copy import deepcopy diff --git a/src/yasb/core/config.py b/src/yasb/core/config.py index 1efd6c1..8ace95e 100644 --- a/src/yasb/core/config.py +++ b/src/yasb/core/config.py @@ -1,11 +1,11 @@ import logging -from yasb import settings +import settings from os import path from sys import argv, exit from pathlib import Path from typing import Union -from yasb.core.validation.config import CONFIG_SCHEMA -from yasb.core.utils.alert_dialog import raise_info_alert +from core.validation.config import CONFIG_SCHEMA +from core.utils.alert_dialog import raise_info_alert from cssutils import CSSParser from cerberus import Validator, schema from yaml.parser import ParserError diff --git a/src/yasb/core/event_service.py b/src/yasb/core/event_service.py index d8925e7..4a32b58 100644 --- a/src/yasb/core/event_service.py +++ b/src/yasb/core/event_service.py @@ -3,7 +3,7 @@ from PyQt6.QtCore import QObject, pyqtSignal from typing import Any -from yasb.core.event_enums import Event +from core.event_enums import Event @functools.lru_cache() diff --git a/src/yasb/core/log.py b/src/yasb/core/log.py index 00099bb..9ad71a8 100644 --- a/src/yasb/core/log.py +++ b/src/yasb/core/log.py @@ -1,7 +1,7 @@ import logging from os.path import join -from yasb.settings import DEFAULT_LOG_FILENAME, APP_NAME, APP_NAME_FULL -from yasb.core.config import get_config_dir +from settings import DEFAULT_LOG_FILENAME, APP_NAME, APP_NAME_FULL +from core.config import get_config_dir LOG_PATH = join(get_config_dir(), DEFAULT_LOG_FILENAME) LOG_FORMAT = "%(asctime)s %(levelname)s %(filename)s: %(message)s" diff --git a/src/yasb/core/tray.py b/src/yasb/core/tray.py index 2f495ad..a56ae6f 100644 --- a/src/yasb/core/tray.py +++ b/src/yasb/core/tray.py @@ -3,8 +3,8 @@ from PyQt6.QtWidgets import QSystemTrayIcon, QMenu from PyQt6.QtGui import QIcon from PyQt6.QtCore import QCoreApplication, QSize -from yasb.core.bar_manager import BarManager -from yasb.settings import GITHUB_URL, FAVICON_PATH, APP_NAME, APP_NAME_FULL +from core.bar_manager import BarManager +from settings import GITHUB_URL, FAVICON_PATH, APP_NAME, APP_NAME_FULL class TrayIcon(QSystemTrayIcon): diff --git a/src/yasb/core/utils/alert_dialog.py b/src/yasb/core/utils/alert_dialog.py index 045ad21..ce11273 100644 --- a/src/yasb/core/utils/alert_dialog.py +++ b/src/yasb/core/utils/alert_dialog.py @@ -1,6 +1,6 @@ import sys import traceback -from yasb.settings import APP_NAME +from settings import APP_NAME from PyQt6.QtWidgets import QMessageBox, QTextEdit, QSizePolicy from PyQt6.QtCore import Qt diff --git a/src/yasb/core/utils/komorebi/event_listener.py b/src/yasb/core/utils/komorebi/event_listener.py index 88708ce..845f01a 100644 --- a/src/yasb/core/utils/komorebi/event_listener.py +++ b/src/yasb/core/utils/komorebi/event_listener.py @@ -5,9 +5,9 @@ import win32pipe import win32file from PyQt6.QtCore import QThread -from yasb.core.event_enums import KomorebiEvent -from yasb.core.event_service import EventService -from yasb.core.utils.komorebi.client import KomorebiClient +from core.event_enums import KomorebiEvent +from core.event_service import EventService +from core.utils.komorebi.client import KomorebiClient KOMOREBI_PIPE_BUFF_SIZE = 64 * 1024 KOMOREBI_PIPE_NAME = "yasb" diff --git a/src/yasb/core/utils/widget_builder.py b/src/yasb/core/utils/widget_builder.py index 21361ea..4a3e757 100644 --- a/src/yasb/core/utils/widget_builder.py +++ b/src/yasb/core/utils/widget_builder.py @@ -5,8 +5,8 @@ from typing import Optional from cerberus import Validator from importlib import import_module -from yasb.core.utils.alert_dialog import raise_info_alert -from yasb.settings import DEFAULT_CONFIG_FILENAME +from core.utils.alert_dialog import raise_info_alert +from settings import DEFAULT_CONFIG_FILENAME class WidgetBuilder(QObject): diff --git a/src/yasb/core/utils/win32/active_window_border.py b/src/yasb/core/utils/win32/active_window_border.py index f23cc2f..7f81a70 100644 --- a/src/yasb/core/utils/win32/active_window_border.py +++ b/src/yasb/core/utils/win32/active_window_border.py @@ -1,10 +1,10 @@ import logging from PyQt6.QtWidgets import QWidget, QFrame from PyQt6.QtCore import pyqtSignal, Qt -from yasb.core.event_service import EventService -from yasb.core.utils.win32.windows import WinEvent -from yasb.core.bar import BAR_WM_TITLE -from yasb.core.utils.win32.utilities import get_hwnd_info, get_window_extended_frame_bounds, is_window_maximised +from core.event_service import EventService +from core.utils.win32.windows import WinEvent +from core.bar import BAR_WM_TITLE +from core.utils.win32.utilities import get_hwnd_info, get_window_extended_frame_bounds, is_window_maximised IGNORED_CLASSES = [ 'WorkerW', diff --git a/src/yasb/core/utils/win32/event_listener.py b/src/yasb/core/utils/win32/event_listener.py index 562e24a..95c47bf 100644 --- a/src/yasb/core/utils/win32/event_listener.py +++ b/src/yasb/core/utils/win32/event_listener.py @@ -3,8 +3,8 @@ import logging from PyQt6.QtCore import QThread from win32gui import GetForegroundWindow -from yasb.core.utils.win32.windows import WinEventProcType, WinEvent, user32, ole32, msg -from yasb.core.event_service import EventService +from core.utils.win32.windows import WinEventProcType, WinEvent, user32, ole32, msg +from core.event_service import EventService class SystemEventListener(QThread): diff --git a/src/yasb/core/utils/win32/windows.py b/src/yasb/core/utils/win32/windows.py index 89c2222..5bc825a 100644 --- a/src/yasb/core/utils/win32/windows.py +++ b/src/yasb/core/utils/win32/windows.py @@ -1,5 +1,5 @@ import ctypes.wintypes -from yasb.core.event_enums import Event +from core.event_enums import Event user32 = ctypes.windll.user32 user32.SetWinEventHook.restype = ctypes.wintypes.HANDLE diff --git a/src/yasb/core/validation/config.py b/src/yasb/core/validation/config.py index 8326848..5d61b59 100644 --- a/src/yasb/core/validation/config.py +++ b/src/yasb/core/validation/config.py @@ -1,4 +1,4 @@ -from yasb.core.validation.bar import BAR_SCHEMA, BAR_DEFAULTS +from core.validation.bar import BAR_SCHEMA, BAR_DEFAULTS CONFIG_SCHEMA = { 'watch_config': { diff --git a/src/yasb/core/watcher.py b/src/yasb/core/watcher.py index ca73943..fa0eeaf 100644 --- a/src/yasb/core/watcher.py +++ b/src/yasb/core/watcher.py @@ -1,10 +1,10 @@ import logging from os.path import basename -from yasb.core.config import get_config_dir -from yasb.settings import DEFAULT_STYLES_FILENAME, DEFAULT_CONFIG_FILENAME +from core.config import get_config_dir +from settings import DEFAULT_STYLES_FILENAME, DEFAULT_CONFIG_FILENAME from watchdog.observers import Observer from watchdog.events import PatternMatchingEventHandler, FileModifiedEvent -from yasb.core.bar_manager import BarManager +from core.bar_manager import BarManager class FileModifiedEventHandler(PatternMatchingEventHandler): diff --git a/src/yasb/core/widgets/example.py b/src/yasb/core/widgets/example.py index 96495e2..2628ee0 100644 --- a/src/yasb/core/widgets/example.py +++ b/src/yasb/core/widgets/example.py @@ -1,5 +1,5 @@ -from yasb.core.widgets.base import BaseWidget -from yasb.core.validation.widgets.example import EXAMPLE_VALIDATION_SCHEMA +from core.widgets.base import BaseWidget +from core.validation.widgets.example import EXAMPLE_VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/core/widgets/komorebi/active_layout.py b/src/yasb/core/widgets/komorebi/active_layout.py index 40cbe22..ac690c0 100644 --- a/src/yasb/core/widgets/komorebi/active_layout.py +++ b/src/yasb/core/widgets/komorebi/active_layout.py @@ -2,15 +2,15 @@ from collections import deque from PyQt6.QtWidgets import QWidget, QLabel from PyQt6.QtCore import pyqtSignal -from yasb.core.utils.win32.utilities import get_monitor_hwnd -from yasb.core.event_service import EventService -from yasb.core.event_enums import KomorebiEvent -from yasb.core.widgets.base import BaseWidget -from yasb.core.utils.komorebi.client import KomorebiClient -from yasb.core.validation.widgets.komorebi.active_layout import VALIDATION_SCHEMA +from core.utils.win32.utilities import get_monitor_hwnd +from core.event_service import EventService +from core.event_enums import KomorebiEvent +from core.widgets.base import BaseWidget +from core.utils.komorebi.client import KomorebiClient +from core.validation.widgets.komorebi.active_layout import VALIDATION_SCHEMA try: - from yasb.core.utils.komorebi.event_listener import KomorebiEventListener + from core.utils.komorebi.event_listener import KomorebiEventListener except ImportError: KomorebiEventListener = None logging.warning("Failed to load Komorebi Event Listener") diff --git a/src/yasb/core/widgets/komorebi/workspaces.py b/src/yasb/core/widgets/komorebi/workspaces.py index 1074ca7..dd0c47e 100644 --- a/src/yasb/core/widgets/komorebi/workspaces.py +++ b/src/yasb/core/widgets/komorebi/workspaces.py @@ -3,15 +3,15 @@ from PyQt6.QtCore import pyqtSignal from typing import Literal from contextlib import suppress -from yasb.core.utils.win32.utilities import get_monitor_hwnd -from yasb.core.event_service import EventService -from yasb.core.event_enums import KomorebiEvent -from yasb.core.widgets.base import BaseWidget -from yasb.core.utils.komorebi.client import KomorebiClient -from yasb.core.validation.widgets.komorebi.workspaces import VALIDATION_SCHEMA +from core.utils.win32.utilities import get_monitor_hwnd +from core.event_service import EventService +from core.event_enums import KomorebiEvent +from core.widgets.base import BaseWidget +from core.utils.komorebi.client import KomorebiClient +from core.validation.widgets.komorebi.workspaces import VALIDATION_SCHEMA try: - from yasb.core.utils.komorebi.event_listener import KomorebiEventListener + from core.utils.komorebi.event_listener import KomorebiEventListener except ImportError: KomorebiEventListener = None logging.warning("Failed to load Komorebi Event Listener") diff --git a/src/yasb/core/widgets/yasb/active_window.py b/src/yasb/core/widgets/yasb/active_window.py index e9569ad..645294d 100644 --- a/src/yasb/core/widgets/yasb/active_window.py +++ b/src/yasb/core/widgets/yasb/active_window.py @@ -1,12 +1,12 @@ import logging -from yasb.settings import APP_BAR_TITLE -from yasb.core.utils.win32.windows import WinEvent -from yasb.core.widgets.base import BaseWidget -from yasb.core.event_service import EventService +from settings import APP_BAR_TITLE +from core.utils.win32.windows import WinEvent +from core.widgets.base import BaseWidget +from core.event_service import EventService from PyQt6.QtCore import pyqtSignal from PyQt6.QtWidgets import QLabel -from yasb.core.validation.widgets.yasb.active_window import VALIDATION_SCHEMA -from yasb.core.utils.win32.utilities import get_hwnd_info +from core.validation.widgets.yasb.active_window import VALIDATION_SCHEMA +from core.utils.win32.utilities import get_hwnd_info IGNORED_TITLES = ['', ' '] IGNORED_CLASSES = ['WorkerW'] @@ -20,7 +20,7 @@ ] try: - from yasb.core.utils.win32.event_listener import SystemEventListener + from core.utils.win32.event_listener import SystemEventListener except ImportError: SystemEventListener = None logging.warning("Failed to load Win32 System Event Listener") diff --git a/src/yasb/core/widgets/yasb/battery.py b/src/yasb/core/widgets/yasb/battery.py index 6b04b84..dc42d80 100644 --- a/src/yasb/core/widgets/yasb/battery.py +++ b/src/yasb/core/widgets/yasb/battery.py @@ -1,8 +1,8 @@ import psutil import humanize from datetime import timedelta -from yasb.core.widgets.base import BaseWidget -from yasb.core.validation.widgets.yasb.battery import VALIDATION_SCHEMA +from core.widgets.base import BaseWidget +from core.validation.widgets.yasb.battery import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel from typing import Union diff --git a/src/yasb/core/widgets/yasb/clock.py b/src/yasb/core/widgets/yasb/clock.py index 4b62f81..15b52bb 100644 --- a/src/yasb/core/widgets/yasb/clock.py +++ b/src/yasb/core/widgets/yasb/clock.py @@ -1,7 +1,7 @@ import re import pytz -from yasb.core.widgets.base import BaseWidget -from yasb.core.validation.widgets.yasb.clock import VALIDATION_SCHEMA +from core.widgets.base import BaseWidget +from core.validation.widgets.yasb.clock import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel from datetime import datetime from tzlocal import get_localzone_name diff --git a/src/yasb/core/widgets/yasb/cpu.py b/src/yasb/core/widgets/yasb/cpu.py index d401dcc..f5d2ba1 100644 --- a/src/yasb/core/widgets/yasb/cpu.py +++ b/src/yasb/core/widgets/yasb/cpu.py @@ -1,7 +1,7 @@ import psutil from collections import deque -from yasb.core.widgets.base import BaseWidget -from yasb.core.validation.widgets.yasb.cpu import VALIDATION_SCHEMA +from core.widgets.base import BaseWidget +from core.validation.widgets.yasb.cpu import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/core/widgets/yasb/custom.py b/src/yasb/core/widgets/yasb/custom.py index f41924a..223e03b 100644 --- a/src/yasb/core/widgets/yasb/custom.py +++ b/src/yasb/core/widgets/yasb/custom.py @@ -1,8 +1,8 @@ import subprocess import json from PyQt6.QtWidgets import QLabel -from yasb.core.widgets.base import BaseWidget -from yasb.core.validation.widgets.yasb.custom import VALIDATION_SCHEMA +from core.widgets.base import BaseWidget +from core.validation.widgets.yasb.custom import VALIDATION_SCHEMA class CustomWidget(BaseWidget): diff --git a/src/yasb/core/widgets/yasb/memory.py b/src/yasb/core/widgets/yasb/memory.py index 0fb6a81..c3d6b0e 100644 --- a/src/yasb/core/widgets/yasb/memory.py +++ b/src/yasb/core/widgets/yasb/memory.py @@ -1,8 +1,8 @@ import logging import psutil from humanize import naturalsize -from yasb.core.widgets.base import BaseWidget -from yasb.core.validation.widgets.yasb.memory import VALIDATION_SCHEMA +from core.widgets.base import BaseWidget +from core.validation.widgets.yasb.memory import VALIDATION_SCHEMA from PyQt6.QtWidgets import QLabel diff --git a/src/yasb/main.py b/src/yasb/main.py index e7f2582..b32a2e9 100644 --- a/src/yasb/main.py +++ b/src/yasb/main.py @@ -1,10 +1,10 @@ from sys import argv, exit from PyQt6.QtWidgets import QApplication -from yasb.core.bar_manager import BarManager -from yasb.core.config import get_config_and_stylesheet -from yasb.core.log import init_logger -from yasb.core.tray import TrayIcon -from yasb.core.watcher import create_observer +from core.bar_manager import BarManager +from core.config import get_config_and_stylesheet +from core.log import init_logger +from core.tray import TrayIcon +from core.watcher import create_observer def main(): From 7f74c091a11c0faaa7399129a342073e7e280c67 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Fri, 23 Jun 2023 11:32:28 -0700 Subject: [PATCH 15/16] Correct the entry point to call main in yasb.main. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e8a4d40..732a5f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,4 +20,4 @@ dependencies = [ "winsdk==1.0.0b6", ] [project.scripts] -yasb = "yasb:main" +yasb = "yasb:main.main" From ca7a48a4fc54b38df9c3f0338b56ca42f358fb93 Mon Sep 17 00:00:00 2001 From: Henry Limm Date: Mon, 26 Jun 2023 11:07:00 -0700 Subject: [PATCH 16/16] Move init_logger() within main() with optional disable. --- src/yasb/__main__.py | 3 +-- src/yasb/main.py | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/yasb/__main__.py b/src/yasb/__main__.py index d241970..75a9adf 100644 --- a/src/yasb/__main__.py +++ b/src/yasb/__main__.py @@ -1,5 +1,4 @@ from . import main if __name__ == '__main__': - main.init_logger() - main.main() + main.main(log=True) diff --git a/src/yasb/main.py b/src/yasb/main.py index 307d316..e25d4c3 100644 --- a/src/yasb/main.py +++ b/src/yasb/main.py @@ -7,7 +7,9 @@ from .core.watcher import create_observer -def main(): +def main(log=True): + if log: + init_logger() config, stylesheet = get_config_and_stylesheet() app = QApplication(argv) @@ -39,5 +41,4 @@ def main(): if __name__ == "__main__": - init_logger() - main() + main(log=True)