morgan/warehouse
1
0
Fork 0
mirror of https://github.com/morgan9e/warehouse synced 2026-04-14 00:04:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

Sync current work

Browse Source
This commit is contained in:
Heliguy
2024-08-18 16:26:43 -04:00
parent 6bbbcef530
commit ab6ed8bad9
7 changed files with 269 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/icons/arrow-turn-down-right-symbolic.svg Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 11.015625 14 c 0.261719 -0.003906 0.515625 -0.113281 0.703125 -0.300781 l 2.917969 -3 c 0.375 -0.390625 0.375 -1.007813 0 -1.398438 l -2.917969 -3 c -0.386719 -0.394531 -1.019531 -0.402343 -1.414062 -0.015625 c -0.398438 0.382813 -0.40625 1.015625 -0.019532 1.414063 l 1.265625 1.300781 h -4.550781 c -1.527344 0 -2.996094 -1.441406 -3 -3 v -4 c 0 -0.550781 -0.449219 -1 -1 -1 s -1 0.449219 -1 1 v 4 c 0.003906 2.683594 2.347656 5 5 5 h 4.550781 l -1.265625 1.300781 c -0.386718 0.398438 -0.378906 1.03125 0.019532 1.417969 c 0.1875 0.183594 0.445312 0.285156 0.710937 0.28125 z m 0 0" fill="#222222" fill-rule="evenodd"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 766 B

2
data/icons/minus-large-symbolic.svg Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 1 7 h 14 v 2 h -14 z m 0 0" fill="#222222"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 188 B

163
src/install_page/install_page.blp Normal file
View File

@@ -0,0 +1,163 @@
using Gtk 4.0;
using Adw 1;
template $InstallPage : Adw.BreakpointBin {
width-request: 1;
height-request: 1;
Adw.Breakpoint bp1 {
condition ("max-width: 600")
setters {
split_view.collapsed: true;
split_view.show-content: false;
}
}
Adw.ToastOverlay toast_overlay {
Adw.NavigationSplitView split_view {
sidebar-width-fraction: 0.5;
max-sidebar-width: 999999999;
sidebar:
Adw.NavigationPage sidebar_navpage {
title: _("Search for Packages");
Gtk.Stack sb_stack {
Adw.ToolbarView no_remotes {
visible: false;
[top]
Adw.HeaderBar {
show-title: false;
}
Adw.StatusPage {
icon-name: "error-symbolic";
title: _("No Remotes Found");
description: _("Warehouse cannot see the current remotes or your system has no remotes added");
Button open_remotes_page_button {
label: _("Add Remotes");
halign: center;
styles ["pill"]
}
}
}
Adw.NavigationView sb_page_view {
Adw.NavigationPage {
title: _("Install Packages");
Adw.ToolbarView {
[top]
Adw.HeaderBar {
}
Adw.PreferencesPage {
Adw.PreferencesGroup remotes_group {
title: "Choose a Remote";
description: "Choose a remote to search for packages in";
}
}
}
}
Adw.NavigationPage results {
title: _("Search REMOTE");
Adw.ToolbarView sidebar_tbv {
[top]
Adw.HeaderBar header_bar {
show-back-button: false;
[start]
ToggleButton sidebar_button {
icon-name: "dock-left-symbolic";
tooltip-text: _("Show Sidebar");
}
[start]
Button back_button {
icon-name: "left-large-symbolic";
tooltip-text: _("Back");
}
}
[top]
Adw.Clamp {
maximum-size: 577;
Box {
margin-top: 3;
margin-bottom: 3;
margin-start: 6;
margin-end: 6;
styles ["linked"]
Gtk.SearchEntry search_entry {
search-delay: 700;
halign: fill;
hexpand: true;
placeholder-text: _("Search for Packages");
}
Button search_apply_button {
icon-name: "right-large-symbolic";
}
}
}
ScrolledWindow {
Adw.Clamp {
ListBox results_list {
styles["boxed-list"]
valign: start;
selection-mode: none;
margin-start: 12;
margin-end: 12;
margin-top: 12;
margin-bottom: 12;
}
}
}
}
}
}
}
}
;
content:
Adw.NavigationPage results_page {
title: _("Pending Packages");
Adw.ToolbarView {
[top]
Adw.HeaderBar {
[start]
Button clear_button {
label: _("Remove All");
}
}
[bottom]
Box {
homogeneous: true;
styles ["toolbar"]
Button remove_all_button {
styles ["raised"]
Adw.ButtonContent {
can-shrink: true;
icon-name: "minus-large-symbolic";
label: _("Remove All");
}
}
Button open_button {
styles ["raised"]
Adw.ButtonContent {
can-shrink: true;
icon-name: "folder-open-symbolic";
label: _("Add File");
}
}
Button install_button {
styles ["raised", "suggested-action"]
Adw.ButtonContent {
can-shrink: true;
icon-name: "arrow-pointing-at-line-down-symbolic";
label: _("Install");
}
}
}
}
}
;
}
}
}

94
src/install_page/install_page.py Normal file
View File

@@ -0,0 +1,94 @@
from gi.repository import Adw, Gtk, GLib, Gio
from .host_info import HostInfo
from .error_toast import ErrorToast
from .app_row import AppRow
from .snapshots_list_page import SnapshotsListPage
import os, subprocess
@Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/install_page.ui")
class InstallPage(Adw.BreakpointBin):
__gtype_name__ = "InstallPage"
gtc = Gtk.Template.Child
remotes_group = gtc()
sb_page_view = gtc()
results = gtc()
back_button = gtc()
search_entry = gtc()
search_apply_button = gtc()
results_list = gtc()
# Referred to in the main window
# It is used to determine if a new page should be made or not
# This must be set to the created object from within the class's __init__ method
instance = None
current_installation = ""
current_remote = None
def start_loading(self):
pass
def end_loading(self):
for installation in HostInfo.installations:
for remote in HostInfo.remotes[installation]:
if remote.disabled:
continue
row = Adw.ActionRow(title=remote.title, subtitle=_("Installation: {}").format(installation), activatable=True)
row.add_suffix(Gtk.Image(icon_name="right-large-symbolic"))
row.connect("activated", self.remote_selected, installation, remote)
self.remotes_group.add(row)
def remote_selected(self, row, installation, remote):
self.current_installation = installation
self.current_remote = remote
self.results.set_title(_("Search {}").format(remote.title))
self.sb_page_view.push(self.results)
self.search_entry.set_text("firefox")
self.search_entry.grab_focus()
def on_search(self, _):
text = self.search_entry.get_text().strip().lower().replace(" ", "")
if not text:
return
results = []
def thread(*args):
installation = ""
self.results_list.remove_all()
if self.current_installation == "user" or self.current_installation == "system":
installation = f"--{self.current_installation}"
else:
installation = f"--installation={self.current_installation}"
try:
output = subprocess.run(['flatpak-spawn', '--host', 'flatpak', 'search', '--columns=all', installation, text], text=True, check=True, capture_output=True).stdout.split("\n")
for line in output:
info = line.split("\t")
if len(info) != 6:
continue
name = GLib.markup_escape_text(info[0])
description = GLib.markup_escape_text(info[1])
app_id = GLib.markup_escape_text(info[2])
version = GLib.markup_escape_text(info[3])
branch = GLib.markup_escape_text(info[4])
remotes = GLib.markup_escape_text(info[5])
row = Adw.ActionRow(title=name, subtitle=app_id)
self.results_list.append(row)
except Exception as e:
print(e)
except subprocess.CalledProcessError as cpe:
print(cpe)
thread()
def __init__(self, main_window, **kwargs):
super().__init__(**kwargs)
self.instance = self
self.back_button.connect("clicked", lambda *_: self.sb_page_view.pop())
# self.search_entry.connect("search-changed", self.on_search)
self.search_entry.connect("activate", self.on_search)
self.search_apply_button.connect("clicked", self.on_search)

5
src/main_window/window.py
View File

@@ -28,6 +28,7 @@ from .packages_page import PackagesPage
from .remotes_page import RemotesPage
from .user_data_page import UserDataPage
from .snapshot_page import SnapshotPage
from .install_page import InstallPage
from .const import Config
from .error_toast import ErrorToast
@@ -100,7 +101,7 @@ class WarehouseWindow(Adw.ApplicationWindow):
self.remotes_row: RemotesPage(main_window=self),
self.user_data_row: UserDataPage(main_window=self),
self.snapshots_row: SnapshotPage(main_window=self),
# self.install_row: None,
self.install_row: InstallPage(main_window=self),
}
for _, page in self.pages.items():
@@ -123,7 +124,7 @@ class WarehouseWindow(Adw.ApplicationWindow):
# file_drop.connect("drop", self.drop_callback)
self.refresh_button.connect("clicked", self.refresh_handler)
self.activate_row(self.packages_row)
self.activate_row(self.install_row)
self.main_split.set_show_sidebar(True)
self.start_loading()

2
src/meson.build
View File

@@ -20,6 +20,7 @@ blueprints = custom_target('blueprints',
'snapshot_page/snapshot_page.blp',
'snapshot_page/snapshots_list_page.blp',
'snapshot_page/snapshot_box.blp',
'install_page/install_page.blp',
),
output: '.',
command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
@@ -78,6 +79,7 @@ warehouse_sources = [
'snapshot_page/snapshot_page.py',
'snapshot_page/snapshots_list_page.py',
'snapshot_page/snapshot_box.py',
'install_page/install_page.py',
'../data/style.css',
]

3
src/warehouse.gresource.xml
View File

@@ -18,6 +18,7 @@
<file preprocess="xml-stripblanks">snapshot_page/snapshot_page.ui</file>
<file preprocess="xml-stripblanks">snapshot_page/snapshots_list_page.ui</file>
<file preprocess="xml-stripblanks">snapshot_page/snapshot_box.ui</file>
<file preprocess="xml-stripblanks">install_page/install_page.ui</file>
<!-- <file preprocess="xml-stripblanks">../data/io.github.flattool.Warehouse.metainfo.xml.in</file> -->
</gresource>
<gresource prefix="/io/github/flattool/Warehouse/icons/scalable/actions/">
@@ -65,5 +66,7 @@
<file preprocess="xml-stripblanks" alias="font-x-generic-symbolic.svg">../data/icons/font-x-generic-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="tag-outline-symbolic.svg">../data/icons/tag-outline-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="harddisk-symbolic.svg">../data/icons/harddisk-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="arrow-turn-down-right-symbolic.svg">../data/icons/arrow-turn-down-right-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="minus-large-symbolic.svg">../data/icons/minus-large-symbolic.svg</file>
</gresource>
</gresources>