yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Fixed clan uri. Expand user, then resolve' (#773) from Qubasa-main into main

Browse Source
This commit is contained in:
clan-bot
2024-01-30 05:20:52 +00:00
parent ab91edf21f 07bec607bc
commit 059988b6ac
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/clan-cli/clan_cli/clan_uri.py
View File

@@ -98,10 +98,9 @@ class ClanURI:
self._components.query, self._components.query,
self._components.fragment, self._components.fragment,
) )
match comb: match comb:
case ("file", "", path, "", "", "") | ("", "", path, "", "", ""): # type: ignore case ("file", "", path, "", "", "") | ("", "", path, "", "", _): # type: ignore
self.scheme = ClanScheme.LOCAL.value(Path(path).resolve()) # type: ignore self.scheme = ClanScheme.LOCAL.value(Path(path).expanduser().resolve()) # type: ignore
case _: case _:
self.scheme = ClanScheme.REMOTE.value(self._components.geturl()) # type: ignore self.scheme = ClanScheme.REMOTE.value(self._components.geturl()) # type: ignore

3
pkgs/clan-cli/clan_cli/history/add.py
View File

@@ -3,6 +3,7 @@ import argparse
import dataclasses import dataclasses
import datetime import datetime
import json import json
import logging
from typing import Any from typing import Any
from clan_cli.flakes.inspect import FlakeConfig, inspect_flake from clan_cli.flakes.inspect import FlakeConfig, inspect_flake
@@ -12,6 +13,8 @@ from ..dirs import user_history_file
from ..errors import ClanError from ..errors import ClanError
from ..locked_open import read_history_file, write_history_file from ..locked_open import read_history_file, write_history_file
log = logging.getLogger(__name__)
class EnhancedJSONEncoder(json.JSONEncoder): class EnhancedJSONEncoder(json.JSONEncoder):
def default(self, o: Any) -> Any: def default(self, o: Any) -> Any:

4
pkgs/clan-vm-manager/clan_vm_manager/views/list.py
View File

@@ -191,4 +191,6 @@ class ClanList(Gtk.Box):
switch.set_state(vm.is_running()) switch.set_state(vm.is_running())
if not vm.is_running() and vm.process.proc.exitcode != 0: if not vm.is_running() and vm.process.proc.exitcode != 0:
self.show_error_dialog(vm.read_log()) print("VM exited with error. Exitcode:", vm.process.proc.exitcode)
# print(vm.read_log())
# self.show_error_dialog(vm.read_log())