Merge pull request #1 from cibere/v0.0.2

V0.0.2

Author: cibere

assets/error.png

@@ -5,12 +5,16 @@
 sys.path.append(parent_folder_path)
 sys.path.append(os.path.join(parent_folder_path, "lib"))
 sys.path.append(os.path.join(parent_folder_path, "venv", "lib", "site-packages"))
-sys.path.append(os.path.join(parent_folder_path, "venv", "lib", "site-packages", "win32", "lib"))
-sys.path.append(os.path.join(parent_folder_path, "venv", "lib", "site-packages", "win32"))
+sys.path.append(
+    os.path.join(parent_folder_path, "venv", "lib", "site-packages", "win32", "lib")
+)
+sys.path.append(
+    os.path.join(parent_folder_path, "venv", "lib", "site-packages", "win32")
+)
 sys.path.append(os.path.join(parent_folder_path, "lib", "win32", "lib"))
 sys.path.append(os.path.join(parent_folder_path, "lib", "win32"))
 
 from plugin.plugin import ScreenBrightnessPlugin
 
 if __name__ == "__main__":
-    ScreenBrightnessPlugin().run()
+    ScreenBrightnessPlugin().run()

main.py

@@ -4,7 +4,7 @@
     "Name": "ScreenBrightness",
     "Description": "Control the brightness of your monitors within flow",
     "Author": "cibere",
-    "Version": "0.0.1",
+    "Version": "0.0.2",
     "Language": "python_v2",
     "Website": "https://github.com/cibere/Flow.Launcher.Plugin.ScreenBrightness",
     "IcoPath": "assets/app.png",

plugin.json

@@ -1,5 +1,6 @@
-from flogin._types import SearchHandlerCondition
 from flogin import Query
+from flogin._types import SearchHandlerCondition
+
 
 class MultiAnyCondition:
     r"""A builtin search condition to check for multiple conditions.
@@ -23,4 +24,4 @@ def __call__(self, query: Query) -> bool:
                 query.condition_data = condition
                 return True
 
-        return False
+        return False

plugin/conds.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from flogin import Query, Result, SearchHandler, PlainTextCondition, ProgressBar
+from flogin import PlainTextCondition, ProgressBar, Query, Result, SearchHandler
 
 from ..plugin import ScreenBrightnessPlugin
 
@@ -13,4 +13,9 @@ async def callback(self, query: Query):
         assert self.plugin
 
         for value, monitor in self.plugin.get_brightnesses():
-            yield Result("", sub=f"Monitor: {monitor} | Brightness: {value}%", icon="assets/app.png", progress_bar=ProgressBar(value, "#f7f309"))
+            yield Result(
+                "",
+                sub=f"Monitor: {monitor} | Brightness: {value}%",
+                icon="assets/app.png",
+                progress_bar=ProgressBar(value, "#f7f309"),
+            )

plugin/handlers/get.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
-from flogin import Query, Result, SearchHandler, ExecuteResponse, RegexCondition
-from flogin.jsonrpc.results import ResultConstructorArgs
-from typing import Unpack
-from ..plugin import ScreenBrightnessPlugin
 import re
+from flogin import Query, Result, SearchHandler
+
+from ..plugin import ScreenBrightnessPlugin
+
 
 class InvalidSetBrightnessHandler(SearchHandler[ScreenBrightnessPlugin]):
     async def callback(self, query: Query[re.Match]):
-        return Result("Invalid Brightness Value. Brightness value must be a valid whole number from 0 to 100.", icon="assets/app.png")
+        return Result(
+            "Invalid Brightness Value. Brightness value must be a valid whole number from 0 to 100.",
+            icon="assets/error.png",
+        )

plugin/handlers/invalid.py

@@ -1,28 +1,53 @@
 from __future__ import annotations
 
-from flogin import Query, Result, SearchHandler, ExecuteResponse, PlainTextCondition, MultiCondition
-from flogin.jsonrpc.results import ResultConstructorArgs
-from typing import Unpack
-from ..plugin import ScreenBrightnessPlugin
 import re
+from typing import Unpack
+
+import screen_brightness_control as sbc
+from flogin import (
+    ExecuteResponse,
+    PlainTextCondition,
+    Query,
+    Result,
+    SearchHandler,
+)
+from flogin.jsonrpc.results import ResultConstructorArgs
+
 from ..conds import MultiAnyCondition
+from ..plugin import ScreenBrightnessPlugin
+
 
 class SetBrightnessResult(Result[ScreenBrightnessPlugin]):
-    def __init__(self, value: int, kw: str, **kwargs: Unpack[ResultConstructorArgs]):
+    def __init__(
+        self,
+        value: int,
+        monitor: str | None,
+        kw: str,
+        **kwargs: Unpack[ResultConstructorArgs],
+    ):
         super().__init__(**kwargs)
 
         self.value = value
         self.kw = kw
+        self.monitor = monitor
 
     async def callback(self):
         assert self.plugin
 
-        self.plugin.set_brightness(self.value)
-        await self.plugin.api.show_notification("ScreenBrightness", f"Successfully set screen brightness to {self.value}%.")
+        self.plugin.set_brightness(self.value, monitor=self.monitor)
+        await self.plugin.api.show_notification(
+            "ScreenBrightness",
+            (
+                f"Successfully set the brightness of your {self.monitor} display to {self.value}%."
+                if self.monitor
+                else f"Successfully set the brightness of all of your displays to {self.value}%."
+            ),
+        )
         await self.plugin.api.change_query(f"{self.kw} ")
-        
+
         return ExecuteResponse(False)
 
+
 class SetBrightnessHandler(SearchHandler[ScreenBrightnessPlugin]):
     def __init__(self):
         cond = MultiAnyCondition(*[PlainTextCondition(str(i + 1)) for i in range(100)])
@@ -33,5 +58,21 @@ async def callback(self, query: Query[re.Match]):
         assert self.plugin
 
         value = int(query.text.strip())
-        
-        return SetBrightnessResult(value, title=f"Set brightness to {value}%?", icon="assets/app.png", kw=query.keyword)
+
+        yield SetBrightnessResult(
+            value,
+            None,
+            title=f"Set brightness to {value}% for all of your displays?",
+            icon="assets/app.png",
+            kw=query.keyword,
+            score=10,
+        )
+
+        for monitor in sbc.list_monitors():
+            yield SetBrightnessResult(
+                value,
+                monitor,
+                title=f"Set brightness to {value}% for {monitor}?",
+                icon="assets/app.png",
+                kw=query.keyword,
+            )

plugin/handlers/set.py

@@ -1,8 +1,10 @@
+from typing import Iterable
+
+import screen_brightness_control as sbc
 from flogin import Plugin
 
 from .settings import ScreenBrightnessSettings
-from typing import Iterable
-import screen_brightness_control as sbc
+
 
 class ScreenBrightnessPlugin(Plugin[ScreenBrightnessSettings]):
     def __init__(self) -> None:
@@ -11,11 +13,15 @@ def __init__(self) -> None:
         from .handlers.get import GetBrightnessHandler
         from .handlers.invalid import InvalidSetBrightnessHandler
         from .handlers.set import SetBrightnessHandler
-        
-        self.register_search_handlers(SetBrightnessHandler(), GetBrightnessHandler(), InvalidSetBrightnessHandler())
-    
+
+        self.register_search_handlers(
+            SetBrightnessHandler(),
+            GetBrightnessHandler(),
+            InvalidSetBrightnessHandler(),
+        )
+
     def get_brightnesses(self) -> Iterable[tuple[int, str]]:
         return zip(sbc.get_brightness(), sbc.list_monitors())
-    
-    def set_brightness(self, value: int) -> None:
-        sbc.set_brightness(value)
+
+    def set_brightness(self, value: int, monitor: int | str | None = None) -> None:
+        sbc.set_brightness(value, display=monitor)

plugin/plugin.py

@@ -1,5 +1,4 @@
 from flogin import Settings
 
 
-class ScreenBrightnessSettings(Settings):
-    ...
+class ScreenBrightnessSettings(Settings): ...

plugin/settings.py

@@ -1,8 +1,6 @@
 # Flow.Launcher.Plugin.ScreenBrightness
 Lets you easily and quickly the brightness of all of your monitors
 
-**Coming Soon**: Setting the brightness of individual monitors. I am hung up on the design, so it will come eventually.
-
 ## Useage
 
 An empty query will get you the current brightness levels. From there, type in the new value, and click on the option.