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

clan-vm-manager: Fix regression part2

Browse Source
This commit is contained in:
Qubasa
2024-11-28 19:01:41 +01:00
parent 167f753bd3
commit cf2ddfc191
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ class ClanURI:
if machine_name: if machine_name:
uri += f"#{machine_name}" uri += f"#{machine_name}"
# users might copy whitespace along with the uri # Users might copy whitespace along with the URI
uri = uri.strip() uri = uri.strip()
# Check if the URI starts with clan:// # Check if the URI starts with clan://
@@ -90,6 +90,12 @@ class ClanURI:
if uri.startswith(prefix): if uri.startswith(prefix):
uri = uri[len(prefix) :] uri = uri[len(prefix) :]
# Fix missing colon (caused by browsers like Firefox)
if "//" in uri and ":" not in uri.split("//", 1)[0]:
# If there's a `//` but no colon before it, add one before the `//`
parts = uri.split("//", 1)
uri = f"{parts[0]}://{parts[1]}"
# Parse the URI into components # Parse the URI into components
# url://netloc/path;parameters?query#fragment # url://netloc/path;parameters?query#fragment
components: urllib.parse.ParseResult = urllib.parse.urlparse(uri) components: urllib.parse.ParseResult = urllib.parse.urlparse(uri)

7
pkgs/clan-cli/tests/test_clan_uri.py
View File

@@ -18,6 +18,13 @@ def test_get_url() -> None:
assert uri.get_url() == "/home/user/Downloads" assert uri.get_url() == "/home/user/Downloads"
def test_firefox_strip_uri() -> None:
uri = ClanURI.from_str("clan://https//git.clan.lol/clan/democlan")
assert uri.get_url() == "https://git.clan.lol/clan/democlan"
uri = ClanURI.from_str("clan://git+https//git.clan.lol/clan/democlan.git")
assert uri.get_url() == "git+https://git.clan.lol/clan/democlan.git"
def test_local_uri() -> None: def test_local_uri() -> None:
# Create a ClanURI object from a local URI # Create a ClanURI object from a local URI
uri = ClanURI.from_str("clan://file:///home/user/Downloads") uri = ClanURI.from_str("clan://file:///home/user/Downloads")

19
pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py
View File

@@ -14,7 +14,7 @@ from clan_vm_manager.views.logs import Logs
gi.require_version("Adw", "1") gi.require_version("Adw", "1")
from gi.repository import Adw, Gio, GLib from gi.repository import Adw, Gio, GLib, Gtk
from clan_vm_manager.components.trayicon import TrayIcon from clan_vm_manager.components.trayicon import TrayIcon
@@ -46,14 +46,15 @@ class MainWindow(Adw.ApplicationWindow):
# Initialize all views # Initialize all views
stack_view = ViewStack.use().view stack_view = ViewStack.use().view
# clamp = Adw.Clamp() # @hsjobeki: Do not remove clamp it is needed to limit the width
# clamp.set_child(stack_view) clamp = Adw.Clamp()
# clamp.set_maximum_size(1000) clamp.set_child(stack_view)
clamp.set_maximum_size(1000)
# scroll = Gtk.ScrolledWindow() scroll = Gtk.ScrolledWindow()
# scroll.set_propagate_natural_height(True) scroll.set_propagate_natural_height(True)
# scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
# scroll.set_child(clamp) scroll.set_child(clamp)
stack_view.add_named(ClanList(config), "list") stack_view.add_named(ClanList(config), "list")
stack_view.add_named(Details(), "details") stack_view.add_named(Details(), "details")
@@ -61,7 +62,7 @@ class MainWindow(Adw.ApplicationWindow):
stack_view.set_visible_child_name(config.initial_view) stack_view.set_visible_child_name(config.initial_view)
view.set_content(stack_view) view.set_content(scroll)
self.connect("destroy", self.on_destroy) self.connect("destroy", self.on_destroy)