diff --git a/src/change_version_page/change_version_page.py b/src/change_version_page/change_version_page.py index 8dc02fe..154db83 100644 --- a/src/change_version_page/change_version_page.py +++ b/src/change_version_page/change_version_page.py @@ -1,8 +1,8 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .error_toast import ErrorToast -from .host_info import HostInfo -from .loading_status import LoadingStatus -from .change_version_worker import ChangeVersionWorker +from src.gtk.error_toast import ErrorToast +from src.host_info import HostInfo +from src.gtk.loading_status import LoadingStatus +from src.change_version_page.change_version_worker import ChangeVersionWorker import subprocess diff --git a/src/change_version_page/change_version_worker.py b/src/change_version_page/change_version_worker.py index b4741a0..a1fee6f 100644 --- a/src/change_version_page/change_version_worker.py +++ b/src/change_version_page/change_version_worker.py @@ -1,5 +1,5 @@ from gi.repository import GLib, Gio -from .host_info import HostInfo +from src.host_info import HostInfo import subprocess, re diff --git a/src/const.py.in b/src/const.py similarity index 100% rename from src/const.py.in rename to src/const.py diff --git a/src/gtk/attempt_install_dialog.py b/src/gtk/attempt_install_dialog.py index 45504e2..bde6d40 100644 --- a/src/gtk/attempt_install_dialog.py +++ b/src/gtk/attempt_install_dialog.py @@ -1,6 +1,6 @@ from gi.repository import Adw, Gtk -from .host_info import HostInfo -from .error_toast import ErrorToast +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/attempt_install_dialog.ui") diff --git a/src/gtk/installation_chooser.py b/src/gtk/installation_chooser.py index 54be3b1..eef716b 100644 --- a/src/gtk/installation_chooser.py +++ b/src/gtk/installation_chooser.py @@ -1,5 +1,5 @@ from gi.repository import Adw, Gtk -from .host_info import HostInfo +from src.host_info import HostInfo @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/installation_chooser.ui") diff --git a/src/gtk/sidebar_button.py b/src/gtk/sidebar_button.py index b5f1d75..d5601cd 100644 --- a/src/gtk/sidebar_button.py +++ b/src/gtk/sidebar_button.py @@ -1,5 +1,5 @@ from gi.repository import Gtk -from .host_info import HostInfo +from src.host_info import HostInfo class SidebarButton(Gtk.Button): diff --git a/src/host_info.py b/src/host_info.py index a08be3e..a033641 100644 --- a/src/host_info.py +++ b/src/host_info.py @@ -1,5 +1,5 @@ from gi.repository import Gio, Gtk, GLib, Gdk -from .error_toast import ErrorToast +from src.gtk.error_toast import ErrorToast import subprocess, os, pathlib home = f"{pathlib.Path.home()}" diff --git a/src/install_page/install_page.py b/src/install_page/install_page.py index 329a5e1..84b2d8c 100644 --- a/src/install_page/install_page.py +++ b/src/install_page/install_page.py @@ -1,11 +1,11 @@ from gi.repository import Adw, Gtk, GLib -from .host_info import HostInfo -from .select_page import SelectPage -from .pending_page import PendingPage -from .sidebar_button import SidebarButton -from .loading_status import LoadingStatus -from .package_install_worker import PackageInstallWorker -from .error_toast import ErrorToast +from src.host_info import HostInfo +from src.install_page.select_page import SelectPage +from src.install_page.pending_page import PendingPage +from src.gtk.sidebar_button import SidebarButton +from src.gtk.loading_status import LoadingStatus +from src.package_install_worker import PackageInstallWorker +from src.gtk.error_toast import ErrorToast @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/install_page.ui") diff --git a/src/install_page/pending_page.py b/src/install_page/pending_page.py index 4c2eecf..2d42a79 100644 --- a/src/install_page/pending_page.py +++ b/src/install_page/pending_page.py @@ -1,6 +1,6 @@ from gi.repository import Adw, Gtk -from .host_info import HostInfo -from .result_row import ResultRow +from src.host_info import HostInfo +from src.install_page.result_row import ResultRow class AddedGroup(Adw.PreferencesGroup): diff --git a/src/install_page/results_page.py b/src/install_page/results_page.py index 84bb00a..cf2b9c4 100644 --- a/src/install_page/results_page.py +++ b/src/install_page/results_page.py @@ -1,8 +1,8 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .result_row import ResultRow -from .loading_status import LoadingStatus -from .error_toast import ErrorToast +from src.host_info import HostInfo +from src.install_page.result_row import ResultRow +from src.gtk.loading_status import LoadingStatus +from src.gtk.error_toast import ErrorToast import subprocess diff --git a/src/install_page/select_page.py b/src/install_page/select_page.py index 92cbe8e..737630f 100644 --- a/src/install_page/select_page.py +++ b/src/install_page/select_page.py @@ -1,9 +1,9 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast -from .results_page import ResultsPage -from .sidebar_button import SidebarButton -from .file_install_dialog import FileInstallDialog +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast +from src.install_page.results_page import ResultsPage +from src.gtk.sidebar_button import SidebarButton +from src.install_page.file_install_dialog import FileInstallDialog @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/select_page.ui") diff --git a/src/main.py b/src/main.py index 76c8340..b645363 100644 --- a/src/main.py +++ b/src/main.py @@ -27,9 +27,9 @@ gi.require_version("Adw", "1") gi.require_version("Flatpak", "1.0") from gi.repository import Gtk, Gio, Adw, GLib, Flatpak -from .window import WarehouseWindow -from .const import Config -from .error_toast import ErrorToast +from src.main_window.window import WarehouseWindow +from src.const import Config +from src.gtk.error_toast import ErrorToast class WarehouseApplication(Adw.Application): diff --git a/src/main_window/window.py b/src/main_window/window.py index 6c037f1..a735500 100644 --- a/src/main_window/window.py +++ b/src/main_window/window.py @@ -17,14 +17,14 @@ # SPDX-License-Identifier: GPL-3.0-only from gi.repository import Adw, Gdk, Gio, Gtk -from .host_info import HostInfo -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 .error_toast import ErrorToast -from .const import Config +from src.host_info import HostInfo +from src.packages_page.packages_page import PackagesPage +from src.remotes_page.remotes_page import RemotesPage +from src.user_data_page.user_data_page import UserDataPage +from src.snapshot_page.snapshot_page import SnapshotPage +from src.install_page.install_page import InstallPage +from src.gtk.error_toast import ErrorToast +from src.const import Config @Gtk.Template(resource_path="/io/github/flattool/Warehouse/main_window/window.ui") diff --git a/src/meson.build b/src/meson.build index 3b6a47a..c831d4e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,5 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -moduledir = join_paths(pkgdatadir, 'Warehouse') +moduledir = join_paths(pkgdatadir, 'src') gnome = import('gnome') blueprints = custom_target('blueprints', @@ -61,7 +61,7 @@ conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir'))) conf.set('pkgdatadir', pkgdatadir) configure_file( - input: 'warehouse.in', + input: 'warehouse.py', output: 'warehouse', configuration: conf, install: true, @@ -69,6 +69,15 @@ configure_file( install_mode: 'r-xr--r--' ) +configure_file( + input: 'const.py', + output: 'const.py', + configuration: conf, + install: true, + install_dir: moduledir, + install_mode: 'r-xr--r--', +) + warehouse_sources = [ '__init__.py', 'main.py', @@ -107,13 +116,4 @@ warehouse_sources = [ '../data/style.css', ] -configure_file( - input: 'const.py.in', - output: 'const.py', - configuration: conf, - install: true, - install_dir: moduledir, - install_mode: 'r-xr--r--', -) - -install_data(warehouse_sources, install_dir: moduledir) +install_data(warehouse_sources, install_dir: moduledir, preserve_path: true) diff --git a/src/package_install_worker.py b/src/package_install_worker.py index 0c045e4..2510e0e 100644 --- a/src/package_install_worker.py +++ b/src/package_install_worker.py @@ -1,5 +1,5 @@ from gi.repository import Gio, GLib -from .host_info import HostInfo +from src.host_info import HostInfo import subprocess, re diff --git a/src/packages_page/filters_page.py b/src/packages_page/filters_page.py index de3630b..be0129e 100644 --- a/src/packages_page/filters_page.py +++ b/src/packages_page/filters_page.py @@ -1,5 +1,5 @@ from gi.repository import Adw, Gtk, Gio -from .host_info import HostInfo +from src.host_info import HostInfo class FilterRow(Adw.ActionRow): diff --git a/src/packages_page/packages_page.py b/src/packages_page/packages_page.py index 7d2638e..89f6753 100644 --- a/src/packages_page/packages_page.py +++ b/src/packages_page/packages_page.py @@ -1,14 +1,14 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .app_row import AppRow -from .error_toast import ErrorToast -from .properties_page import PropertiesPage -from .filters_page import FiltersPage -from .sidebar_button import SidebarButton +from src.host_info import HostInfo +from src.gtk.app_row import AppRow +from src.gtk.error_toast import ErrorToast +from src.properties_page.properties_page import PropertiesPage +from src.packages_page.filters_page import FiltersPage +from src.gtk.sidebar_button import SidebarButton from .uninstall_dialog import UninstallDialog -from .loading_status import LoadingStatus -from .package_install_worker import PackageInstallWorker -from .change_version_worker import ChangeVersionWorker +from src.gtk.loading_status import LoadingStatus +from src.package_install_worker import PackageInstallWorker +from src.change_version_page.change_version_worker import ChangeVersionWorker import subprocess, os diff --git a/src/properties_page/properties_page.py b/src/properties_page/properties_page.py index 292342a..b7e0b05 100644 --- a/src/properties_page/properties_page.py +++ b/src/properties_page/properties_page.py @@ -1,10 +1,10 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .error_toast import ErrorToast -from .host_info import HostInfo -from .change_version_page import ChangeVersionPage -from .uninstall_dialog import UninstallDialog -from .loading_status import LoadingStatus -from .package_install_worker import PackageInstallWorker +from src.gtk.error_toast import ErrorToast +from src.host_info import HostInfo +from src.change_version_page.change_version_page import ChangeVersionPage +from src.packages_page.uninstall_dialog import UninstallDialog +from src.gtk.loading_status import LoadingStatus +from src.package_install_worker import PackageInstallWorker import subprocess, os diff --git a/src/remotes_page/add_remote_dialog.py b/src/remotes_page/add_remote_dialog.py index 574383d..e58c2c6 100644 --- a/src/remotes_page/add_remote_dialog.py +++ b/src/remotes_page/add_remote_dialog.py @@ -1,8 +1,8 @@ from gi.repository import Adw, Gtk, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast -from .loading_status import LoadingStatus -from .installation_chooser import InstallationChooser +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast +from src.gtk.loading_status import LoadingStatus +from src.gtk.installation_chooser import InstallationChooser import subprocess, re diff --git a/src/remotes_page/remote_row.py b/src/remotes_page/remote_row.py index 5e07022..f57935b 100644 --- a/src/remotes_page/remote_row.py +++ b/src/remotes_page/remote_row.py @@ -1,6 +1,6 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast import subprocess diff --git a/src/remotes_page/remotes_page.py b/src/remotes_page/remotes_page.py index e6ec497..6d2cc97 100644 --- a/src/remotes_page/remotes_page.py +++ b/src/remotes_page/remotes_page.py @@ -1,9 +1,9 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast -from .remote_row import RemoteRow -from .add_remote_dialog import AddRemoteDialog -from .loading_status import LoadingStatus +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast +from src.remotes_page.remote_row import RemoteRow +from src.remotes_page.add_remote_dialog import AddRemoteDialog +from src.gtk.loading_status import LoadingStatus import subprocess diff --git a/src/snapshot_page/new_snapshot_dialog.py b/src/snapshot_page/new_snapshot_dialog.py index cb1ff66..65fe1da 100644 --- a/src/snapshot_page/new_snapshot_dialog.py +++ b/src/snapshot_page/new_snapshot_dialog.py @@ -1,8 +1,8 @@ from gi.repository import Adw, Gtk, GLib -from .host_info import HostInfo -from .loading_status import LoadingStatus -from .app_row import AppRow -from .tar_worker import TarWorker +from src.host_info import HostInfo +from src.gtk.loading_status import LoadingStatus +from src.gtk.app_row import AppRow +from src.snapshot_page.tar_worker import TarWorker import os, time diff --git a/src/snapshot_page/snapshot_box.py b/src/snapshot_page/snapshot_box.py index 64788a9..de7a012 100644 --- a/src/snapshot_page/snapshot_box.py +++ b/src/snapshot_page/snapshot_box.py @@ -1,7 +1,7 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast -from .tar_worker import TarWorker +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast +from src.snapshot_page.tar_worker import TarWorker import os, subprocess, json diff --git a/src/snapshot_page/snapshot_page.py b/src/snapshot_page/snapshot_page.py index 6a1c26a..8db8cdf 100644 --- a/src/snapshot_page/snapshot_page.py +++ b/src/snapshot_page/snapshot_page.py @@ -1,13 +1,13 @@ 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 -from .sidebar_button import SidebarButton -from .loading_status import LoadingStatus -from .new_snapshot_dialog import NewSnapshotDialog -from .tar_worker import TarWorker -from .attempt_install_dialog import AttemptInstallDialog +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast +from src.gtk.app_row import AppRow +from src.snapshot_page.snapshots_list_page import SnapshotsListPage +from src.gtk.sidebar_button import SidebarButton +from src.gtk.loading_status import LoadingStatus +from src.snapshot_page.new_snapshot_dialog import NewSnapshotDialog +from src.snapshot_page.tar_worker import TarWorker +from src.gtk.attempt_install_dialog import AttemptInstallDialog import os, subprocess diff --git a/src/snapshot_page/snapshots_list_page.py b/src/snapshot_page/snapshots_list_page.py index fb4f1eb..67f5140 100644 --- a/src/snapshot_page/snapshots_list_page.py +++ b/src/snapshot_page/snapshots_list_page.py @@ -1,8 +1,8 @@ from gi.repository import Adw, Gtk, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast -from .snapshot_box import SnapshotBox -from .loading_status import LoadingStatus +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast +from src.snapshot_page.snapshot_box import SnapshotBox +from src.gtk.loading_status import LoadingStatus from .new_snapshot_dialog import NewSnapshotDialog import os diff --git a/src/snapshot_page/tar_worker.py b/src/snapshot_page/tar_worker.py index a6e3e08..6d86b38 100644 --- a/src/snapshot_page/tar_worker.py +++ b/src/snapshot_page/tar_worker.py @@ -1,6 +1,6 @@ from gi.repository import GLib, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast import os, subprocess, json diff --git a/src/user_data_page/data_box.py b/src/user_data_page/data_box.py index 3631b11..467e59f 100644 --- a/src/user_data_page/data_box.py +++ b/src/user_data_page/data_box.py @@ -1,7 +1,7 @@ from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast -from .attempt_install_dialog import AttemptInstallDialog +from src.host_info import HostInfo +from src.gtk.error_toast import ErrorToast +from src.gtk.attempt_install_dialog import AttemptInstallDialog import subprocess diff --git a/src/user_data_page/data_subpage.py b/src/user_data_page/data_subpage.py index 0725db7..7243ec4 100644 --- a/src/user_data_page/data_subpage.py +++ b/src/user_data_page/data_subpage.py @@ -1,7 +1,7 @@ from gi.repository import Gtk, GLib, Gio -from .host_info import HostInfo -from .data_box import DataBox -from .loading_status import LoadingStatus +from src.host_info import HostInfo +from src.user_data_page.data_box import DataBox +from src.gtk.loading_status import LoadingStatus @Gtk.Template(resource_path="/io/github/flattool/Warehouse/user_data_page/data_subpage.ui") diff --git a/src/user_data_page/user_data_page.py b/src/user_data_page/user_data_page.py index eb5c391..243f27e 100644 --- a/src/user_data_page/user_data_page.py +++ b/src/user_data_page/user_data_page.py @@ -1,10 +1,10 @@ from gi.repository import Adw, Gtk, Gio -from .error_toast import ErrorToast -from .data_subpage import DataSubpage -from .host_info import HostInfo -from .sidebar_button import SidebarButton -from .loading_status import LoadingStatus -from .attempt_install_dialog import AttemptInstallDialog +from src.gtk.error_toast import ErrorToast +from src.user_data_page.data_subpage import DataSubpage +from src.host_info import HostInfo +from src.gtk.sidebar_button import SidebarButton +from src.gtk.loading_status import LoadingStatus +from src.gtk.attempt_install_dialog import AttemptInstallDialog import os, subprocess diff --git a/src/warehouse.in b/src/warehouse.py similarity index 97% rename from src/warehouse.in rename to src/warehouse.py index 1f2ee63..b2fb566 100755 --- a/src/warehouse.in +++ b/src/warehouse.py @@ -42,5 +42,5 @@ if __name__ == '__main__': resource = Gio.Resource.load(os.path.join(pkgdatadir, 'warehouse.gresource')) resource._register() - from Warehouse import main + from src import main sys.exit(main.main(VERSION))