clan-app: Finish flash view. clan-cli: Flash cli now verifies if language and keymap are valid.

pkgs/clan-cli/clan_cli/api/cli.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+
+from clan_cli.api import API
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Debug the API.")
+    args = parser.parse_args()
+
+    schema = API.to_json_schema()
+    print(json.dumps(schema, indent=4))

pkgs/clan-cli/clan_cli/api/directory.py

@@ -12,24 +12,26 @@ from . import API
 
 @dataclass
 class FileFilter:
-    title: str | None
-    mime_types: list[str] | None
-    patterns: list[str] | None
-    suffixes: list[str] | None
+    title: str | None = field(default=None)
+    mime_types: list[str] | None = field(default=None)
+    patterns: list[str] | None = field(default=None)
+    suffixes: list[str] | None = field(default=None)
 
 
 @dataclass
 class FileRequest:
     # Mode of the os dialog window
-    mode: Literal["open_file", "select_folder", "save"]
+    mode: Literal["open_file", "select_folder", "save", "open_multiple_files"]
     # Title of the os dialog window
-    title: str | None = None
+    title: str | None = field(default=None)
     # Pre-applied filters for the file dialog
-    filters: FileFilter | None = None
+    filters: FileFilter | None = field(default=None)
+    initial_file: str | None = field(default=None)
+    initial_folder: str | None = field(default=None)
 
 
 @API.register_abstract
-def open_file(file_request: FileRequest) -> str | None:
+def open_file(file_request: FileRequest) -> list[str] | None:
     """
     Abstract api method to open a file dialog window.
     It must return the name of the selected file or None if no file was selected.
@@ -88,6 +90,7 @@ def get_directory(current_path: str) -> Directory:
 @dataclass
 class BlkInfo:
     name: str
+    path: str
     rm: str
     size: str
     ro: bool
@@ -103,6 +106,7 @@ class Blockdevices:
 def blk_from_dict(data: dict) -> BlkInfo:
     return BlkInfo(
         name=data["name"],
+        path=data["path"],
         rm=data["rm"],
         size=data["size"],
         ro=data["ro"],
@@ -117,7 +121,10 @@ def show_block_devices() -> Blockdevices:
     Abstract api method to show block devices.
     It must return a list of block devices.
     """
-    cmd = nix_shell(["nixpkgs#util-linux"], ["lsblk", "--json"])
+    cmd = nix_shell(
+        ["nixpkgs#util-linux"],
+        ["lsblk", "--json", "--output", "PATH,NAME,RM,SIZE,RO,MOUNTPOINTS,TYPE"],
+    )
     proc = run_no_stdout(cmd)
     res = proc.stdout.strip()
 

pkgs/clan-cli/clan_cli/api/serde.py

@@ -237,7 +237,7 @@ def from_dict(t: type[T], data: dict[str, Any], path: list[str] = []) -> T:
         if field_name not in field_values:
             formatted_path = " ".join(path)
             raise ClanError(
-                f"Required field missing: '{field_name}' in {t} {formatted_path}, got Value: {data}"
+                f"Default value missing for: '{field_name}' in {t} {formatted_path}, got Value: {data}"
             )
 
     return t(**field_values)  # type: ignore