Added gtk demo app

pkgs/clan-cli/clan_cli/__init__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from types import ModuleType
 from typing import Any, Optional, Sequence
 
-from . import config, flakes, machines, secrets, vms, webui
+from . import config, flakes, gtkui, machines, secrets, vms, webui
 from .custom_logger import setup_logging
 from .dirs import get_clan_flake_toplevel
 from .ssh import cli as ssh_cli
@@ -64,6 +64,9 @@ def create_parser(prog: Optional[str] = None) -> argparse.ArgumentParser:
 
     subparsers = parser.add_subparsers()
 
+    parser_gtkui = subparsers.add_parser("gtkui", help="start gtkui")
+    gtkui.register_parser(parser_gtkui)
+
     parser_flake = subparsers.add_parser(
         "flakes", help="create a clan flake inside the current directory"
     )

pkgs/clan-cli/clan_cli/async_cmd.py

@@ -1,9 +1,8 @@
 import asyncio
 import logging
-import deal
 import shlex
 from pathlib import Path
-from typing import Any, Callable, Coroutine, Dict, NamedTuple, Optional, Awaitable
+from typing import Any, Callable, Coroutine, Dict, NamedTuple, Optional
 
 from .custom_logger import get_caller
 from .errors import ClanError
@@ -16,8 +15,8 @@ class CmdOut(NamedTuple):
     stderr: str
     cwd: Optional[Path] = None
 
-@deal.raises(ClanError)
-async def run(cmd: list[str], cwd: Optional[Path] = None) -> Awaitable[CmdOut]:
+
+async def run(cmd: list[str], cwd: Optional[Path] = None) -> CmdOut:
     cwd_res = None
     if cwd is not None:
         if not cwd.exists():
@@ -52,7 +51,6 @@ stdout:
     return CmdOut(stdout.decode("utf-8"), stderr.decode("utf-8"), cwd=cwd)
 
 
-@deal.raises(ClanError)
 def runforcli(
     func: Callable[..., Coroutine[Any, Any, Dict[str, CmdOut]]], *args: Any
 ) -> None:

pkgs/clan-cli/clan_cli/gtkui/__init__.py

@@ -0,0 +1,10 @@
+import argparse
+from typing import Callable, Optional
+
+start_app: Optional[Callable] = None
+
+from .app import start_app
+
+
+def register_parser(parser: argparse.ArgumentParser) -> None:
+    parser.set_defaults(func=start_app)

pkgs/clan-cli/clan_cli/gtkui/app.glade

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.40.0 -->
+<interface>
+  <requires lib="gtk+" version="3.24"/>
+  <object class="GtkApplicationWindow" id="main-window">
+    <property name="can-focus">False</property>
+    <child>
+      <object class="GtkFixed">
+        <property name="name">asdasd</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <child>
+          <object class="GtkButton" id="help_button">
+            <property name="label" translatable="yes">May I help you?</property>
+            <property name="name">asdasd</property>
+            <property name="width-request">100</property>
+            <property name="height-request">80</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image-position">top</property>
+            <signal name="clicked" handler="on_help_button_clicked" object="coffee_label" swapped="no"/>
+          </object>
+          <packing>
+            <property name="x">21</property>
+            <property name="y">21</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="coffee_label">
+            <property name="width-request">100</property>
+            <property name="height-request">80</property>
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Get me some coffe! </property>
+            <property name="width-chars">0</property>
+          </object>
+          <packing>
+            <property name="x">178</property>
+            <property name="y">120</property>
+          </packing>
+        </child>
+        <style>
+          <class name="asdasd"/>
+        </style>
+      </object>
+    </child>
+  </object>
+</interface>

pkgs/clan-cli/clan_cli/gtkui/app.glade~

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.40.0 -->
+<interface>
+  <requires lib="gtk+" version="3.24"/>
+  <object class="GtkApplicationWindow" id="main-window">
+    <property name="can-focus">False</property>
+    <child>
+      <object class="GtkFixed">
+        <property name="name">asdasd</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <child>
+          <object class="GtkButton" id="help_button">
+            <property name="label" translatable="yes">May I help you?</property>
+            <property name="name">asdasd</property>
+            <property name="width-request">100</property>
+            <property name="height-request">80</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image-position">top</property>
+            <signal name="clicked" handler="on_help_button_clicked" object="coffee_label" swapped="no"/>
+          </object>
+          <packing>
+            <property name="x">21</property>
+            <property name="y">21</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="coffee_label">
+            <property name="width-request">100</property>
+            <property name="height-request">80</property>
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Get me some coffe! </property>
+            <property name="width-chars">0</property>
+          </object>
+          <packing>
+            <property name="x">178</property>
+            <property name="y">120</property>
+          </packing>
+        </child>
+        <style>
+          <class name="asdasd"/>
+        </style>
+      </object>
+    </child>
+  </object>
+</interface>

pkgs/clan-cli/clan_cli/gtkui/app.py

@@ -0,0 +1,19 @@
+# !/usr/bin/env python3
+
+import argparse  # noqa
+from pathlib import Path  # noqa
+
+import gi  # noqa
+
+gi.require_version("Gtk", "3.0")  # noqa
+from gi.repository import Gtk  # noqa
+
+
+def start_app(args: argparse.Namespace) -> None:
+    builder = Gtk.Builder()
+    glade_file = Path(__file__).parent / "app.glade"
+    builder.add_from_file(str(glade_file))
+    window = builder.get_object("main-window")
+    window.show_all()
+
+    Gtk.main()

pkgs/clan-cli/clan_cli/nix.py

@@ -2,11 +2,14 @@ import json
 import os
 import subprocess
 import tempfile
-import deal
 from pathlib import Path
 from typing import Any
 
+import deal
+
 from .dirs import nixpkgs_flake, nixpkgs_source
+from .errors import ClanError
+
 
 @deal.raises(ClanError)
 def nix_command(flags: list[str]) -> list[str]:
@@ -25,6 +28,7 @@ def nix_flake_show(flake_url: str | Path) -> list[str]:
         ]
     )
 
+
 @deal.raises(ClanError)
 def nix_build(
     flags: list[str],
@@ -41,6 +45,7 @@ def nix_build(
         + flags
     )
 
+
 @deal.raises(ClanError)
 def nix_config() -> dict[str, Any]:
     cmd = nix_command(["show-config", "--json"])
@@ -51,6 +56,7 @@ def nix_config() -> dict[str, Any]:
         config[key] = value["value"]
     return config
 
+
 @deal.raises(ClanError)
 def nix_eval(flags: list[str]) -> list[str]:
     default_flags = nix_command(
@@ -78,6 +84,7 @@ def nix_eval(flags: list[str]) -> list[str]:
             )
     return default_flags + flags
 
+
 @deal.raises(ClanError)
 def nix_shell(packages: list[str], cmd: list[str]) -> list[str]:
     # we cannot use nix-shell inside the nix sandbox

pkgs/clan-cli/clan_cli/task_manager.py

@@ -186,6 +186,7 @@ def get_task(uuid: UUID) -> BaseTask:
 
 T = TypeVar("T", bound="BaseTask")
 
+
 @deal.raises(ClanError)
 def create_task(task_type: Type[T], *args: Any) -> T:
     global POOL