Make project imports compliant with regular python tooling

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
 
 

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
 
 

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")

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")

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):

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()}"

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")

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):

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
 
 

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")

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):

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")

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)

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
 
 

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):

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 

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
 
 

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
 
 

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")

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
 
 

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))