From 4db505f6272f40685e55fdd84620db1b370793dd Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Fri, 10 Jun 2022 20:36:28 +0100 Subject: [PATCH 01/28] Make version_newer_avaliable optional (#1748) --- connector/systembridgeconnector/models/system.py | 6 ++++-- schemas/data/system.json | 4 +--- shared/systembridgeshared/models/system.py | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/connector/systembridgeconnector/models/system.py b/connector/systembridgeconnector/models/system.py index 486f7c26b..00bba124d 100644 --- a/connector/systembridgeconnector/models/system.py +++ b/connector/systembridgeconnector/models/system.py @@ -3,6 +3,8 @@ from __future__ import annotations +from typing import Optional + from pydantic import BaseModel, Field @@ -22,7 +24,7 @@ class LastUpdated(BaseModel): uuid: float version: float version_latest: float - version_newer_available: float + version_newer_available: Optional[float] = None class System(BaseModel): @@ -41,5 +43,5 @@ class System(BaseModel): uuid: str version: str version_latest: str - version_newer_available: bool + version_newer_available: Optional[bool] = None last_updated: LastUpdated = Field(..., description="Last updated") diff --git a/schemas/data/system.json b/schemas/data/system.json index e87d52a74..998e16187 100644 --- a/schemas/data/system.json +++ b/schemas/data/system.json @@ -94,8 +94,7 @@ "uptime", "uuid", "version", - "version_latest", - "version_newer_available" + "version_latest" ] } }, @@ -112,7 +111,6 @@ "uuid", "version", "version_latest", - "version_newer_available", "last_updated" ] } diff --git a/shared/systembridgeshared/models/system.py b/shared/systembridgeshared/models/system.py index 486f7c26b..00bba124d 100644 --- a/shared/systembridgeshared/models/system.py +++ b/shared/systembridgeshared/models/system.py @@ -3,6 +3,8 @@ from __future__ import annotations +from typing import Optional + from pydantic import BaseModel, Field @@ -22,7 +24,7 @@ class LastUpdated(BaseModel): uuid: float version: float version_latest: float - version_newer_available: float + version_newer_available: Optional[float] = None class System(BaseModel): @@ -41,5 +43,5 @@ class System(BaseModel): uuid: str version: str version_latest: str - version_newer_available: bool + version_newer_available: Optional[bool] = None last_updated: LastUpdated = Field(..., description="Last updated") From 5b4056499b934038000d02156f249391bd2976d7 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Fri, 10 Jun 2022 20:45:22 +0100 Subject: [PATCH 02/28] version_latest optional --- connector/systembridgeconnector/models/system.py | 4 ++-- connector/systembridgeconnector/version.py | 2 +- schemas/data/system.json | 4 +--- shared/systembridgeshared/models/system.py | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/connector/systembridgeconnector/models/system.py b/connector/systembridgeconnector/models/system.py index 00bba124d..ebd6e4873 100644 --- a/connector/systembridgeconnector/models/system.py +++ b/connector/systembridgeconnector/models/system.py @@ -23,7 +23,7 @@ class LastUpdated(BaseModel): uptime: float uuid: float version: float - version_latest: float + version_latest: Optional[float] = None version_newer_available: Optional[float] = None @@ -42,6 +42,6 @@ class System(BaseModel): uptime: float uuid: str version: str - version_latest: str + version_latest: Optional[str] = None version_newer_available: Optional[bool] = None last_updated: LastUpdated = Field(..., description="Last updated") diff --git a/connector/systembridgeconnector/version.py b/connector/systembridgeconnector/version.py index 8803dfbe8..e8dd28337 100644 --- a/connector/systembridgeconnector/version.py +++ b/connector/systembridgeconnector/version.py @@ -70,7 +70,7 @@ async def check_version_3(self) -> str | None: system = System(**response) if ( system - and system.version + and system.version is not None and parse_version(system.version) >= parse_version("3.0.0") ): return system.version diff --git a/schemas/data/system.json b/schemas/data/system.json index 998e16187..6a89aa641 100644 --- a/schemas/data/system.json +++ b/schemas/data/system.json @@ -93,8 +93,7 @@ "platform_version", "uptime", "uuid", - "version", - "version_latest" + "version" ] } }, @@ -110,7 +109,6 @@ "uptime", "uuid", "version", - "version_latest", "last_updated" ] } diff --git a/shared/systembridgeshared/models/system.py b/shared/systembridgeshared/models/system.py index 00bba124d..ebd6e4873 100644 --- a/shared/systembridgeshared/models/system.py +++ b/shared/systembridgeshared/models/system.py @@ -23,7 +23,7 @@ class LastUpdated(BaseModel): uptime: float uuid: float version: float - version_latest: float + version_latest: Optional[float] = None version_newer_available: Optional[float] = None @@ -42,6 +42,6 @@ class System(BaseModel): uptime: float uuid: str version: str - version_latest: str + version_latest: Optional[str] = None version_newer_available: Optional[bool] = None last_updated: LastUpdated = Field(..., description="Last updated") From 3b59147d46f43ae0a9ae17009cf1c2d23fc9a25f Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 19:57:06 +0000 Subject: [PATCH 03/28] Bump systembridgeconnector version to 3.1.5.dev1 --- connector/systembridgeconnector/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/systembridgeconnector/_version.py b/connector/systembridgeconnector/_version.py index 14bb7a338..6ec42623b 100644 --- a/connector/systembridgeconnector/_version.py +++ b/connector/systembridgeconnector/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeconnector", 3, 1, 5, dev=0) +__version__ = Version("systembridgeconnector", 3, 1, 5, dev=1) __all__ = ["__version__"] From 0cd6f11e963907502d988db7796cd71a8b407c47 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 19:57:55 +0000 Subject: [PATCH 04/28] Bump systembridgeshared version to 3.1.5.dev1 --- shared/systembridgeshared/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/systembridgeshared/_version.py b/shared/systembridgeshared/_version.py index 217a686a9..9897611e7 100644 --- a/shared/systembridgeshared/_version.py +++ b/shared/systembridgeshared/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeshared", 3, 1, 5, dev=0) +__version__ = Version("systembridgeshared", 3, 1, 5, dev=1) __all__ = ["__version__"] From cfb926ac9dfb5171692b07ecdcc3c5dab1035e97 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 19:58:49 +0000 Subject: [PATCH 05/28] Bump systembridgebackend version to 3.1.5.dev1 --- backend/systembridgebackend/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/systembridgebackend/_version.py b/backend/systembridgebackend/_version.py index 81e63713b..e47673335 100644 --- a/backend/systembridgebackend/_version.py +++ b/backend/systembridgebackend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgebackend", 3, 1, 5, dev=0) +__version__ = Version("systembridgebackend", 3, 1, 5, dev=1) __all__ = ["__version__"] From 929d31da7247864a58f03015428a501920b439cc Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 19:59:35 +0000 Subject: [PATCH 06/28] Bump systembridgecli version to 3.1.5.dev1 --- cli/systembridgecli/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/systembridgecli/_version.py b/cli/systembridgecli/_version.py index f3af72250..46d1ac987 100644 --- a/cli/systembridgecli/_version.py +++ b/cli/systembridgecli/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgecli", 3, 1, 5, dev=0) +__version__ = Version("systembridgecli", 3, 1, 5, dev=1) __all__ = ["__version__"] From a171b0c390da987964a2c5f8f121eb9054eb137f Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:00:31 +0000 Subject: [PATCH 07/28] Bump systembridgefrontend version to 3.1.5.dev1 --- frontend/systembridgefrontend/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/systembridgefrontend/_version.py b/frontend/systembridgefrontend/_version.py index 01d9df67c..bc8822307 100644 --- a/frontend/systembridgefrontend/_version.py +++ b/frontend/systembridgefrontend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgefrontend", 3, 1, 5, dev=0) +__version__ = Version("systembridgefrontend", 3, 1, 5, dev=1) __all__ = ["__version__"] From 6067251562e5da59812ad1546fb3e3288ed9852d Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:01:23 +0000 Subject: [PATCH 08/28] Bump systembridgegui version to 3.1.5.dev1 --- gui/systembridgegui/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/systembridgegui/_version.py b/gui/systembridgegui/_version.py index 22a027e61..b60203230 100644 --- a/gui/systembridgegui/_version.py +++ b/gui/systembridgegui/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgegui", 3, 1, 5, dev=0) +__version__ = Version("systembridgegui", 3, 1, 5, dev=1) __all__ = ["__version__"] From 8da170f6406feb14adc88e31487b4ebe1e4cdcd0 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:02:14 +0000 Subject: [PATCH 09/28] Bump systembridgewindowssensors version to 3.1.5.dev1 --- windowssensors/systembridgewindowssensors/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windowssensors/systembridgewindowssensors/_version.py b/windowssensors/systembridgewindowssensors/_version.py index 31c0e44a6..2519f13b5 100644 --- a/windowssensors/systembridgewindowssensors/_version.py +++ b/windowssensors/systembridgewindowssensors/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgewindowssensors", 3, 1, 5, dev=0) +__version__ = Version("systembridgewindowssensors", 3, 1, 5, dev=1) __all__ = ["__version__"] From 62219730fb4e91b5da7c98f2cc36c27abac40c95 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Fri, 10 Jun 2022 21:04:16 +0100 Subject: [PATCH 10/28] Battery optional --- connector/systembridgeconnector/models/battery.py | 12 +++++++----- schemas/data/battery.json | 6 ++---- shared/systembridgeshared/models/battery.py | 12 +++++++----- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/connector/systembridgeconnector/models/battery.py b/connector/systembridgeconnector/models/battery.py index 0351fbb92..b3eadeb97 100644 --- a/connector/systembridgeconnector/models/battery.py +++ b/connector/systembridgeconnector/models/battery.py @@ -3,6 +3,8 @@ from __future__ import annotations +from typing import Optional + from pydantic import BaseModel, Extra, Field @@ -14,8 +16,8 @@ class LastUpdated(BaseModel): class Config: extra = Extra.allow - is_charging: float - percentage: float + is_charging: Optional[float] = None + percentage: Optional[float] = None class Battery(BaseModel): @@ -26,6 +28,6 @@ class Battery(BaseModel): class Config: extra = Extra.allow - is_charging: bool - percentage: float - last_updated: LastUpdated = Field(..., description="Last updated") + is_charging: Optional[bool] = None + percentage: Optional[float] = None + last_updated: Optional[LastUpdated] = Field(None, description="Last updated") diff --git a/schemas/data/battery.json b/schemas/data/battery.json index b58f4066a..fe4122ea5 100644 --- a/schemas/data/battery.json +++ b/schemas/data/battery.json @@ -22,10 +22,8 @@ }, "additionalProperties": { "type": "number" - }, - "required": ["is_charging", "percentage"] + } } }, - "additionalProperties": {}, - "required": ["is_charging", "percentage", "last_updated"] + "additionalProperties": {} } diff --git a/shared/systembridgeshared/models/battery.py b/shared/systembridgeshared/models/battery.py index 0351fbb92..b3eadeb97 100644 --- a/shared/systembridgeshared/models/battery.py +++ b/shared/systembridgeshared/models/battery.py @@ -3,6 +3,8 @@ from __future__ import annotations +from typing import Optional + from pydantic import BaseModel, Extra, Field @@ -14,8 +16,8 @@ class LastUpdated(BaseModel): class Config: extra = Extra.allow - is_charging: float - percentage: float + is_charging: Optional[float] = None + percentage: Optional[float] = None class Battery(BaseModel): @@ -26,6 +28,6 @@ class Battery(BaseModel): class Config: extra = Extra.allow - is_charging: bool - percentage: float - last_updated: LastUpdated = Field(..., description="Last updated") + is_charging: Optional[bool] = None + percentage: Optional[float] = None + last_updated: Optional[LastUpdated] = Field(None, description="Last updated") From c5a45369d3d240468ae9331e0fd50eff1e711bb9 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:05:52 +0000 Subject: [PATCH 11/28] Bump systembridgeconnector version to 3.1.5.dev2 --- connector/systembridgeconnector/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/systembridgeconnector/_version.py b/connector/systembridgeconnector/_version.py index 6ec42623b..4c85ddd09 100644 --- a/connector/systembridgeconnector/_version.py +++ b/connector/systembridgeconnector/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeconnector", 3, 1, 5, dev=1) +__version__ = Version("systembridgeconnector", 3, 1, 5, dev=2) __all__ = ["__version__"] From 14e0f3f1a5c8449416775492034764b39fba9ad9 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:06:43 +0000 Subject: [PATCH 12/28] Bump systembridgeshared version to 3.1.5.dev2 --- shared/systembridgeshared/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/systembridgeshared/_version.py b/shared/systembridgeshared/_version.py index 9897611e7..076b01b5b 100644 --- a/shared/systembridgeshared/_version.py +++ b/shared/systembridgeshared/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeshared", 3, 1, 5, dev=1) +__version__ = Version("systembridgeshared", 3, 1, 5, dev=2) __all__ = ["__version__"] From e61bd78acf75115d41b5fc2c9b022e79a36a22fb Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:07:32 +0000 Subject: [PATCH 13/28] Bump systembridgebackend version to 3.1.5.dev2 --- backend/systembridgebackend/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/systembridgebackend/_version.py b/backend/systembridgebackend/_version.py index e47673335..c431a7ff5 100644 --- a/backend/systembridgebackend/_version.py +++ b/backend/systembridgebackend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgebackend", 3, 1, 5, dev=1) +__version__ = Version("systembridgebackend", 3, 1, 5, dev=2) __all__ = ["__version__"] From 9a838b598ac112866034f2b92e669136aec8c7bf Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:08:23 +0000 Subject: [PATCH 14/28] Bump systembridgecli version to 3.1.5.dev2 --- cli/systembridgecli/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/systembridgecli/_version.py b/cli/systembridgecli/_version.py index 46d1ac987..6acfe8d86 100644 --- a/cli/systembridgecli/_version.py +++ b/cli/systembridgecli/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgecli", 3, 1, 5, dev=1) +__version__ = Version("systembridgecli", 3, 1, 5, dev=2) __all__ = ["__version__"] From cb69ed5658392df38878a79276aa9be17ce1f9b1 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:09:30 +0000 Subject: [PATCH 15/28] Bump systembridgefrontend version to 3.1.5.dev2 --- frontend/systembridgefrontend/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/systembridgefrontend/_version.py b/frontend/systembridgefrontend/_version.py index bc8822307..61e8696a9 100644 --- a/frontend/systembridgefrontend/_version.py +++ b/frontend/systembridgefrontend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgefrontend", 3, 1, 5, dev=1) +__version__ = Version("systembridgefrontend", 3, 1, 5, dev=2) __all__ = ["__version__"] From bbac4fcac010e61b0abdc867e024254d7273a4cb Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:10:29 +0000 Subject: [PATCH 16/28] Bump systembridgegui version to 3.1.5.dev2 --- gui/systembridgegui/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/systembridgegui/_version.py b/gui/systembridgegui/_version.py index b60203230..3a419ea5f 100644 --- a/gui/systembridgegui/_version.py +++ b/gui/systembridgegui/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgegui", 3, 1, 5, dev=1) +__version__ = Version("systembridgegui", 3, 1, 5, dev=2) __all__ = ["__version__"] From 83797c2f5b33bd46812d47ecf6d7af6d356f30ab Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 20:11:17 +0000 Subject: [PATCH 17/28] Bump systembridgewindowssensors version to 3.1.5.dev2 --- windowssensors/systembridgewindowssensors/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windowssensors/systembridgewindowssensors/_version.py b/windowssensors/systembridgewindowssensors/_version.py index 2519f13b5..d2f2d0476 100644 --- a/windowssensors/systembridgewindowssensors/_version.py +++ b/windowssensors/systembridgewindowssensors/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgewindowssensors", 3, 1, 5, dev=1) +__version__ = Version("systembridgewindowssensors", 3, 1, 5, dev=2) __all__ = ["__version__"] From fffa360add5a60ae425ea14e28318d1895a09afa Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Fri, 10 Jun 2022 22:32:32 +0100 Subject: [PATCH 18/28] Make cpu optionals optional (#1749) --- connector/systembridgeconnector/models/cpu.py | 22 ++++++++++--------- schemas/data/cpu.json | 12 +--------- shared/systembridgeshared/models/cpu.py | 22 ++++++++++--------- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/connector/systembridgeconnector/models/cpu.py b/connector/systembridgeconnector/models/cpu.py index 667fdc3c5..f963e3ce4 100644 --- a/connector/systembridgeconnector/models/cpu.py +++ b/connector/systembridgeconnector/models/cpu.py @@ -3,6 +3,8 @@ from __future__ import annotations +from typing import Optional + from pydantic import BaseModel, Extra, Field @@ -27,15 +29,15 @@ class Config: times_user: float times_system: float times_idle: float - times_interrupt: float - times_dpc: float + times_interrupt: Optional[float] = None + times_dpc: Optional[float] = None times_percent_user: float times_percent_system: float times_percent_idle: float - times_percent_interrupt: float - times_percent_dpc: float + times_percent_interrupt: Optional[float] = None + times_percent_dpc: Optional[float] = None usage: float - voltage: float + voltage: Optional[float] = None class Cpu(BaseModel): @@ -59,13 +61,13 @@ class Config: times_user: float times_system: float times_idle: float - times_interrupt: float - times_dpc: float + times_interrupt: Optional[float] = None + times_dpc: Optional[float] = None times_percent_user: float times_percent_system: float times_percent_idle: float - times_percent_interrupt: float - times_percent_dpc: float + times_percent_interrupt: Optional[float] = None + times_percent_dpc: Optional[float] = None usage: float - voltage: float + voltage: Optional[float] = None last_updated: LastUpdated = Field(..., description="Last updated") diff --git a/schemas/data/cpu.json b/schemas/data/cpu.json index e8e6b37e7..52d0e0e83 100644 --- a/schemas/data/cpu.json +++ b/schemas/data/cpu.json @@ -157,15 +157,10 @@ "times_user", "times_system", "times_idle", - "times_interrupt", - "times_dpc", "times_percent_user", "times_percent_system", "times_percent_idle", - "times_percent_interrupt", - "times_percent_dpc", - "usage", - "voltage" + "usage" ] } }, @@ -186,15 +181,10 @@ "times_user", "times_system", "times_idle", - "times_interrupt", - "times_dpc", "times_percent_user", "times_percent_system", "times_percent_idle", - "times_percent_interrupt", - "times_percent_dpc", "usage", - "voltage", "last_updated" ] } diff --git a/shared/systembridgeshared/models/cpu.py b/shared/systembridgeshared/models/cpu.py index 667fdc3c5..f963e3ce4 100644 --- a/shared/systembridgeshared/models/cpu.py +++ b/shared/systembridgeshared/models/cpu.py @@ -3,6 +3,8 @@ from __future__ import annotations +from typing import Optional + from pydantic import BaseModel, Extra, Field @@ -27,15 +29,15 @@ class Config: times_user: float times_system: float times_idle: float - times_interrupt: float - times_dpc: float + times_interrupt: Optional[float] = None + times_dpc: Optional[float] = None times_percent_user: float times_percent_system: float times_percent_idle: float - times_percent_interrupt: float - times_percent_dpc: float + times_percent_interrupt: Optional[float] = None + times_percent_dpc: Optional[float] = None usage: float - voltage: float + voltage: Optional[float] = None class Cpu(BaseModel): @@ -59,13 +61,13 @@ class Config: times_user: float times_system: float times_idle: float - times_interrupt: float - times_dpc: float + times_interrupt: Optional[float] = None + times_dpc: Optional[float] = None times_percent_user: float times_percent_system: float times_percent_idle: float - times_percent_interrupt: float - times_percent_dpc: float + times_percent_interrupt: Optional[float] = None + times_percent_dpc: Optional[float] = None usage: float - voltage: float + voltage: Optional[float] = None last_updated: LastUpdated = Field(..., description="Last updated") From 75f7a8503ab27e4a184df8e33ff231f20d42eb01 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 21:34:00 +0000 Subject: [PATCH 19/28] Bump systembridgeconnector version to 3.1.5.dev3 --- connector/systembridgeconnector/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/systembridgeconnector/_version.py b/connector/systembridgeconnector/_version.py index 4c85ddd09..263fe60f0 100644 --- a/connector/systembridgeconnector/_version.py +++ b/connector/systembridgeconnector/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeconnector", 3, 1, 5, dev=2) +__version__ = Version("systembridgeconnector", 3, 1, 5, dev=3) __all__ = ["__version__"] From 7439788a2ebb9454324afc562dd9897eaf1f7857 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 21:34:41 +0000 Subject: [PATCH 20/28] Bump systembridgeshared version to 3.1.5.dev3 --- shared/systembridgeshared/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/systembridgeshared/_version.py b/shared/systembridgeshared/_version.py index 076b01b5b..99ab4bf9d 100644 --- a/shared/systembridgeshared/_version.py +++ b/shared/systembridgeshared/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeshared", 3, 1, 5, dev=2) +__version__ = Version("systembridgeshared", 3, 1, 5, dev=3) __all__ = ["__version__"] From adf29aadc9fcf956c1f074798b73cd9727e2d10f Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 21:35:21 +0000 Subject: [PATCH 21/28] Bump systembridgebackend version to 3.1.5.dev3 --- backend/systembridgebackend/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/systembridgebackend/_version.py b/backend/systembridgebackend/_version.py index c431a7ff5..79db67660 100644 --- a/backend/systembridgebackend/_version.py +++ b/backend/systembridgebackend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgebackend", 3, 1, 5, dev=2) +__version__ = Version("systembridgebackend", 3, 1, 5, dev=3) __all__ = ["__version__"] From 3f551370563a7237d664d9c08772077211e5a945 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 21:36:09 +0000 Subject: [PATCH 22/28] Bump systembridgecli version to 3.1.5.dev3 --- cli/systembridgecli/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/systembridgecli/_version.py b/cli/systembridgecli/_version.py index 6acfe8d86..68b2f5648 100644 --- a/cli/systembridgecli/_version.py +++ b/cli/systembridgecli/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgecli", 3, 1, 5, dev=2) +__version__ = Version("systembridgecli", 3, 1, 5, dev=3) __all__ = ["__version__"] From 56373a59ebaaa2b1211c3ba5cb542856700b0b00 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 21:36:55 +0000 Subject: [PATCH 23/28] Bump systembridgefrontend version to 3.1.5.dev3 --- frontend/systembridgefrontend/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/systembridgefrontend/_version.py b/frontend/systembridgefrontend/_version.py index 61e8696a9..02f0c93d5 100644 --- a/frontend/systembridgefrontend/_version.py +++ b/frontend/systembridgefrontend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgefrontend", 3, 1, 5, dev=2) +__version__ = Version("systembridgefrontend", 3, 1, 5, dev=3) __all__ = ["__version__"] From 1547e8ce3ceab1e0976d7b1b8a73fbdebfbedd29 Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 21:37:38 +0000 Subject: [PATCH 24/28] Bump systembridgegui version to 3.1.5.dev3 --- gui/systembridgegui/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/systembridgegui/_version.py b/gui/systembridgegui/_version.py index 3a419ea5f..c49114cf7 100644 --- a/gui/systembridgegui/_version.py +++ b/gui/systembridgegui/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgegui", 3, 1, 5, dev=2) +__version__ = Version("systembridgegui", 3, 1, 5, dev=3) __all__ = ["__version__"] From 852255b7216d9ac63a71e052a9cb346286fcb0ac Mon Sep 17 00:00:00 2001 From: timmo001 Date: Fri, 10 Jun 2022 21:38:25 +0000 Subject: [PATCH 25/28] Bump systembridgewindowssensors version to 3.1.5.dev3 --- windowssensors/systembridgewindowssensors/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windowssensors/systembridgewindowssensors/_version.py b/windowssensors/systembridgewindowssensors/_version.py index d2f2d0476..1e954103c 100644 --- a/windowssensors/systembridgewindowssensors/_version.py +++ b/windowssensors/systembridgewindowssensors/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgewindowssensors", 3, 1, 5, dev=2) +__version__ = Version("systembridgewindowssensors", 3, 1, 5, dev=3) __all__ = ["__version__"] From 7ef87a1cdc6bfec95f58be876bc34508b42999af Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Fri, 10 Jun 2022 22:50:21 +0100 Subject: [PATCH 26/28] Version 3.1.5 --- backend/systembridgebackend/_version.py | 2 +- cli/systembridgecli/_version.py | 2 +- connector/systembridgeconnector/_version.py | 2 +- frontend/systembridgefrontend/_version.py | 2 +- gui/systembridgegui/_version.py | 2 +- shared/systembridgeshared/_version.py | 2 +- windowssensors/systembridgewindowssensors/_version.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/systembridgebackend/_version.py b/backend/systembridgebackend/_version.py index 79db67660..c37d0c715 100644 --- a/backend/systembridgebackend/_version.py +++ b/backend/systembridgebackend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgebackend", 3, 1, 5, dev=3) +__version__ = Version("systembridgebackend", 3, 1, 5) __all__ = ["__version__"] diff --git a/cli/systembridgecli/_version.py b/cli/systembridgecli/_version.py index 68b2f5648..cfa9c1ae2 100644 --- a/cli/systembridgecli/_version.py +++ b/cli/systembridgecli/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgecli", 3, 1, 5, dev=3) +__version__ = Version("systembridgecli", 3, 1, 5) __all__ = ["__version__"] diff --git a/connector/systembridgeconnector/_version.py b/connector/systembridgeconnector/_version.py index 263fe60f0..67d0a7d00 100644 --- a/connector/systembridgeconnector/_version.py +++ b/connector/systembridgeconnector/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeconnector", 3, 1, 5, dev=3) +__version__ = Version("systembridgeconnector", 3, 1, 5) __all__ = ["__version__"] diff --git a/frontend/systembridgefrontend/_version.py b/frontend/systembridgefrontend/_version.py index 02f0c93d5..8d452825f 100644 --- a/frontend/systembridgefrontend/_version.py +++ b/frontend/systembridgefrontend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgefrontend", 3, 1, 5, dev=3) +__version__ = Version("systembridgefrontend", 3, 1, 5) __all__ = ["__version__"] diff --git a/gui/systembridgegui/_version.py b/gui/systembridgegui/_version.py index c49114cf7..9592cf83c 100644 --- a/gui/systembridgegui/_version.py +++ b/gui/systembridgegui/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgegui", 3, 1, 5, dev=3) +__version__ = Version("systembridgegui", 3, 1, 5) __all__ = ["__version__"] diff --git a/shared/systembridgeshared/_version.py b/shared/systembridgeshared/_version.py index 99ab4bf9d..20536ec77 100644 --- a/shared/systembridgeshared/_version.py +++ b/shared/systembridgeshared/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeshared", 3, 1, 5, dev=3) +__version__ = Version("systembridgeshared", 3, 1, 5) __all__ = ["__version__"] diff --git a/windowssensors/systembridgewindowssensors/_version.py b/windowssensors/systembridgewindowssensors/_version.py index 1e954103c..d2f1c31c3 100644 --- a/windowssensors/systembridgewindowssensors/_version.py +++ b/windowssensors/systembridgewindowssensors/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgewindowssensors", 3, 1, 5, dev=3) +__version__ = Version("systembridgewindowssensors", 3, 1, 5) __all__ = ["__version__"] From 731bb0e2510fd8a53925f480553c9953b149999b Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Fri, 10 Jun 2022 22:56:35 +0100 Subject: [PATCH 27/28] Handle file not found error for files (#1747) * Handle file not found error for files * Fix * Fix --- backend/systembridgebackend/server/media.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/backend/systembridgebackend/server/media.py b/backend/systembridgebackend/server/media.py index e893a4759..1721b79f0 100644 --- a/backend/systembridgebackend/server/media.py +++ b/backend/systembridgebackend/server/media.py @@ -1,4 +1,6 @@ """System Bridge: Server Handler - Media""" +from __future__ import annotations + import mimetypes import os @@ -39,21 +41,24 @@ def get_files( path: str, ) -> list[dict]: """Get files from path""" - files = [] + files_info = [] for filename in os.listdir(path): - files.append( - get_file(BASE_DIRECTORIES[base_path], os.path.join(path, filename)) - ) + file_info = get_file(BASE_DIRECTORIES[base_path], os.path.join(path, filename)) + if file_info is not None: + files_info.append(file_info) - return files + return files_info def get_file( base_path: str, filepath: str, -) -> dict: +) -> dict | None: """Get file from path""" - stat = os.stat(filepath) + try: + stat = os.stat(filepath) + except FileNotFoundError: + return None mime_type = None if os.path.isfile(filepath): From eab6d19ab558d893381e4c8dd3145b401bcbdcf6 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Fri, 10 Jun 2022 23:00:32 +0100 Subject: [PATCH 28/28] Version 3.1.6.dev0 --- backend/systembridgebackend/_version.py | 2 +- cli/systembridgecli/_version.py | 2 +- connector/systembridgeconnector/_version.py | 2 +- frontend/systembridgefrontend/_version.py | 2 +- gui/systembridgegui/_version.py | 2 +- shared/systembridgeshared/_version.py | 2 +- windowssensors/systembridgewindowssensors/_version.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/systembridgebackend/_version.py b/backend/systembridgebackend/_version.py index c37d0c715..99c528fad 100644 --- a/backend/systembridgebackend/_version.py +++ b/backend/systembridgebackend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgebackend", 3, 1, 5) +__version__ = Version("systembridgebackend", 3, 1, 6, dev=0) __all__ = ["__version__"] diff --git a/cli/systembridgecli/_version.py b/cli/systembridgecli/_version.py index cfa9c1ae2..81b97b1a8 100644 --- a/cli/systembridgecli/_version.py +++ b/cli/systembridgecli/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgecli", 3, 1, 5) +__version__ = Version("systembridgecli", 3, 1, 6, dev=0) __all__ = ["__version__"] diff --git a/connector/systembridgeconnector/_version.py b/connector/systembridgeconnector/_version.py index 67d0a7d00..0708b7e5d 100644 --- a/connector/systembridgeconnector/_version.py +++ b/connector/systembridgeconnector/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeconnector", 3, 1, 5) +__version__ = Version("systembridgeconnector", 3, 1, 6, dev=0) __all__ = ["__version__"] diff --git a/frontend/systembridgefrontend/_version.py b/frontend/systembridgefrontend/_version.py index 8d452825f..7edd4d26d 100644 --- a/frontend/systembridgefrontend/_version.py +++ b/frontend/systembridgefrontend/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgefrontend", 3, 1, 5) +__version__ = Version("systembridgefrontend", 3, 1, 6, dev=0) __all__ = ["__version__"] diff --git a/gui/systembridgegui/_version.py b/gui/systembridgegui/_version.py index 9592cf83c..150db8368 100644 --- a/gui/systembridgegui/_version.py +++ b/gui/systembridgegui/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgegui", 3, 1, 5) +__version__ = Version("systembridgegui", 3, 1, 6, dev=0) __all__ = ["__version__"] diff --git a/shared/systembridgeshared/_version.py b/shared/systembridgeshared/_version.py index 20536ec77..daf588e6e 100644 --- a/shared/systembridgeshared/_version.py +++ b/shared/systembridgeshared/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgeshared", 3, 1, 5) +__version__ = Version("systembridgeshared", 3, 1, 6, dev=0) __all__ = ["__version__"] diff --git a/windowssensors/systembridgewindowssensors/_version.py b/windowssensors/systembridgewindowssensors/_version.py index d2f1c31c3..5ba50482b 100644 --- a/windowssensors/systembridgewindowssensors/_version.py +++ b/windowssensors/systembridgewindowssensors/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("systembridgewindowssensors", 3, 1, 5) +__version__ = Version("systembridgewindowssensors", 3, 1, 6, dev=0) __all__ = ["__version__"]