DavHau/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

Merge pull request 'partiall working run VM' (#600) from Qubasa-main into main

Browse Source
This commit is contained in:
clan-bot 2023-12-01 23:18:34 +00:00
commit c346e9e613
2 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/clan-vm-manager/clan_vm_manager/models.py
View File

@ -1,9 +1,11 @@
import asyncio
from collections import OrderedDict
from dataclasses import dataclass
from pathlib import Path
from typing import Any
import clan_cli
from clan_cli import vms
from gi.repository import GdkPixbuf
@ -38,6 +40,15 @@ class VMBase:
}
)
def run(self) -> None:
print(f"Running VM {self.name}")
vm = asyncio.run(
vms.run.inspect_vm(flake_url=self._path, flake_attr="defaultVM")
)
task = vms.run.run_vm(vm)
for line in task.log_lines():
print(line, end="")
@dataclass(frozen=True)
class VM(VMBase):
@ -71,19 +82,22 @@ def list_vms() -> list[VM]:
),
VM(
icon=assets / "placeholder.jpeg",
name="Demo Clan",
name="Placeholder Clan",
url="clan://demo.lol",
_path=Path(__file__).parent.parent / "test_democlan",
running=False,
),
]
# TODO: list_history() should return a list of dicts, not a list of paths
# Execute `clan flakes add <path>` to democlan for this to work
for path in clan_cli.flakes.history.list_history():
new_vm = {
"icon": assets / "placeholder.jpeg",
"name": "Placeholder Clan",
"url": "clan://placeholder.lol",
"path": path,
"name": "Demo Clan",
"url": "clan://demo.lol",
"_path": path,
"running": False,
}
vms.append(VM(**new_vm))
return vms

69
pkgs/clan-vm-manager/clan_vm_manager/ui/clan_select_list.py
View File

@ -2,15 +2,19 @@ from collections.abc import Callable
from gi.repository import GdkPixbuf, Gtk
from ..models import VM, VMBase, list_vms
from ..models import VMBase, list_vms
class ClanSelectPage(Gtk.Box):
def __init__(self) -> None:
super().__init__(orientation=Gtk.Orientation.VERTICAL, expand=True)
# TODO: We should use somekind of useState hook here
# that updates the list of VMs when the user changes something
vms = list_vms()
self.selected_vm: VMBase | None = None
list_hooks = {
"on_cell_toggled": self.on_cell_toggled,
"on_select_row": self.on_select_row,
@ -27,6 +31,7 @@ class ClanSelectPage(Gtk.Box):
def on_start_clicked(self, widget: Gtk.Widget) -> None:
print("Start clicked")
self.selected_vm.run()
def on_stop_clicked(self, widget: Gtk.Widget) -> None:
print("Stop clicked")
@ -36,28 +41,14 @@ class ClanSelectPage(Gtk.Box):
def on_cell_toggled(self, vm: VMBase) -> None:
print(f"on_cell_toggled: {vm}")
# # Get the current value from the model
# current_value = self.list_store[path][1]
# print(f"current_value: {current_value}")
# # Toggle the value
# self.list_store[path][1] = not current_value
# # Print the updated value
# print("Switched", path, "to", self.list_store[path][1])
def on_select_row(self, vm: VMBase) -> None:
print(f"on_select_row: {vm}")
self.selected_vm = vm
def on_select_row(self, selection: Gtk.TreeSelection) -> None:
model, row = selection.get_selected()
if row is not None:
print(f"Selected {model[row][1]}")
def on_double_click(
self, tree_view: Gtk.TreeView, path: Gtk.TreePath, column: Gtk.TreeViewColumn
) -> None:
# Get the selection object of the tree view
selection = tree_view.get_selection()
model, row = selection.get_selected()
if row is not None:
print(f"Double clicked {model[row][1]}")
def on_double_click(self, vm: VMBase) -> None:
print(f"on_double_click: {vm}")
vm.run()
class ClanSelectButtons(Gtk.Box):
@ -72,10 +63,10 @@ class ClanSelectButtons(Gtk.Box):
orientation=Gtk.Orientation.HORIZONTAL, margin_bottom=10, margin_top=10
)
button = Gtk.Button(label="Join", margin_left=10)
button = Gtk.Button(label="Start", margin_left=10)
button.connect("clicked", on_start_clicked)
self.add(button)
button = Gtk.Button(label="Leave", margin_left=10)
button = Gtk.Button(label="Stop", margin_left=10)
button.connect("clicked", on_stop_clicked)
self.add(button)
button = Gtk.Button(label="Edit", margin_left=10)
@ -87,20 +78,25 @@ class ClanSelectList(Gtk.Box):
def __init__(
self,
*,
vms: list[VM],
vms: list[VMBase],
on_cell_toggled: Callable[[VMBase, str], None],
on_select_row: Callable[[Gtk.TreeSelection], None],
on_double_click: Callable[[Gtk.TreeSelection], None],
on_select_row: Callable[[VMBase], None],
on_double_click: Callable[[VMBase], None],
) -> None:
super().__init__(expand=True)
self.vms = vms
self.on_cell_toggled = on_cell_toggled
self.list_store = Gtk.ListStore(*VM.name_to_type_map().values())
self.on_select_row = on_select_row
self.on_double_click = on_double_click
store_types = VMBase.name_to_type_map().values()
self.list_store = Gtk.ListStore(*store_types)
for vm in vms:
items = list(vm.list_data().values())
items[0] = GdkPixbuf.Pixbuf.new_from_file_at_scale(
filename=items[0], width=64, height=64, preserve_aspect_ratio=True
)
self.list_store.append(items)
self.tree_view = Gtk.TreeView(self.list_store, expand=True)
@ -141,12 +137,27 @@ class ClanSelectList(Gtk.Box):
self.tree_view.append_column(col)
selection = self.tree_view.get_selection()
selection.connect("changed", on_select_row)
self.tree_view.connect("row-activated", on_double_click)
selection.connect("changed", self._on_select_row)
self.tree_view.connect("row-activated", self._on_double_click)
self.set_border_width(10)
self.add(self.tree_view)
def _on_select_row(self, selection: Gtk.TreeSelection) -> None:
model, row = selection.get_selected()
if row is not None:
print(f"Selected {model[row][1]}")
self.on_select_row(VMBase(*model[row]))
def _on_double_click(
self, tree_view: Gtk.TreeView, path: Gtk.TreePath, column: Gtk.TreeViewColumn
) -> None:
# Get the selection object of the tree view
selection = tree_view.get_selection()
model, row = selection.get_selected()
if row is not None:
self.on_double_click(VMBase(*model[row]))
def _on_cell_toggled(self, widget: Gtk.CellRendererToggle, path: str) -> None:
row = self.list_store[path]
vm = VMBase(*row)