From 7471864b32d54cf6dbf0df68ae21696f0aea7183 Mon Sep 17 00:00:00 2001 From: Heliguy Date: Sun, 27 Oct 2024 22:46:52 -0400 Subject: [PATCH] Remove unused imports and variables --- src/change_version_page/change_version_page.py | 2 +- src/change_version_page/change_version_worker.py | 2 +- src/gtk/app_row.py | 1 - src/gtk/loading_status.py | 1 - src/install_page/result_row.py | 1 - src/install_page/select_page.py | 2 -- src/main.py | 1 - src/main_window/window.py | 13 ++----------- src/packages_page/packages_page.py | 2 +- src/snapshot_page/new_snapshot_dialog.py | 1 - src/snapshot_page/snapshot_box.py | 2 +- src/snapshot_page/snapshot_page.py | 5 +---- src/snapshot_page/tar_worker.py | 2 +- src/user_data_page/data_subpage.py | 1 - src/user_data_page/user_data_page.py | 3 +-- 15 files changed, 9 insertions(+), 30 deletions(-) diff --git a/src/change_version_page/change_version_page.py b/src/change_version_page/change_version_page.py index 7ff7f06..4e39193 100644 --- a/src/change_version_page/change_version_page.py +++ b/src/change_version_page/change_version_page.py @@ -3,7 +3,7 @@ from .error_toast import ErrorToast from .host_info import HostInfo from .loading_status import LoadingStatus from .change_version_worker import ChangeVersionWorker -import subprocess, os +import subprocess @Gtk.Template(resource_path="/io/github/flattool/Warehouse/change_version_page/change_version_page.ui") class ChangeVersionPage(Adw.NavigationPage): diff --git a/src/change_version_page/change_version_worker.py b/src/change_version_page/change_version_worker.py index 8aa32e6..23d96a7 100644 --- a/src/change_version_page/change_version_worker.py +++ b/src/change_version_page/change_version_worker.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import GLib, Gio from .host_info import HostInfo import subprocess, re diff --git a/src/gtk/app_row.py b/src/gtk/app_row.py index 44c4343..d3d8b3f 100644 --- a/src/gtk/app_row.py +++ b/src/gtk/app_row.py @@ -1,5 +1,4 @@ from gi.repository import Adw, Gtk, GLib -from .host_info import HostInfo @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/app_row.ui") class AppRow(Adw.ActionRow): diff --git a/src/gtk/loading_status.py b/src/gtk/loading_status.py index 0cbd978..8f93472 100644 --- a/src/gtk/loading_status.py +++ b/src/gtk/loading_status.py @@ -1,5 +1,4 @@ from gi.repository import Gtk, GLib -from .host_info import HostInfo @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/loading_status.ui") class LoadingStatus(Gtk.ScrolledWindow): diff --git a/src/install_page/result_row.py b/src/install_page/result_row.py index df7c4c0..8c266c5 100644 --- a/src/install_page/result_row.py +++ b/src/install_page/result_row.py @@ -1,6 +1,5 @@ from gi.repository import Adw, Gtk, GLib from enum import Enum -import os @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/result_row.ui") class ResultRow(Adw.ActionRow): diff --git a/src/install_page/select_page.py b/src/install_page/select_page.py index c34f7e4..d080159 100644 --- a/src/install_page/select_page.py +++ b/src/install_page/select_page.py @@ -87,5 +87,3 @@ class SelectPage(Adw.NavigationPage): self.add_remote_row.connect("activated", lambda *_: HostInfo.main_window.activate_row(HostInfo.main_window.remotes_row)) self.nav_view.connect("popped", self.results_page.on_back) self.open_row.connect("activated", self.on_open) - - # Apply diff --git a/src/main.py b/src/main.py index 3f83190..1e94238 100644 --- a/src/main.py +++ b/src/main.py @@ -26,7 +26,6 @@ gi.require_version("Gtk", "4.0") gi.require_version("Adw", "1") from gi.repository import Gtk, Gio, Adw, GLib -from .host_info import HostInfo from .window import WarehouseWindow from .const import Config from .error_toast import ErrorToast diff --git a/src/main_window/window.py b/src/main_window/window.py index e500660..f9a9d34 100644 --- a/src/main_window/window.py +++ b/src/main_window/window.py @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: GPL-3.0-only -from gi.repository import Adw, Gdk, Gio, GLib, Gtk +from gi.repository import Adw, Gdk, Gio, Gtk from .host_info import HostInfo from .packages_page import PackagesPage from .remotes_page import RemotesPage @@ -230,8 +230,6 @@ class WarehouseWindow(Adw.ApplicationWindow): self.settings.bind("window-height", self, "default-height", Gio.SettingsBindFlags.DEFAULT) self.settings.bind("is-maximized", self, "maximized", Gio.SettingsBindFlags.DEFAULT) self.settings.bind("is-fullscreen", self, "fullscreened", Gio.SettingsBindFlags.DEFAULT) - # self.scrolled_window.add_controller(file_drop) - # self.main_split.set_content(PackagesPage(self)) if Config.DEVEL: self.add_css_class("devel") @@ -240,15 +238,8 @@ class WarehouseWindow(Adw.ApplicationWindow): file_drop.connect("enter", self.on_drop_enter) file_drop.connect("leave", self.on_drop_leave) event_controller.connect("key-pressed", self.key_handler) - # file_drop.connect("drop", self.drop_callback) self.refresh_button.connect("clicked", self.refresh_handler) - # self.activate_row(self.user_data_row) - # self.main_split.set_show_sidebar(self.settings.get_boolean("sidebar-shown")) - # GLib.idle_add(lambda *_: self.main_split.set_show_sidebar(False)) - # print(self.settings.get_boolean("sidebar-shown")) - # self.main_split.connect("notify::show-sidebar", self.save_sidebar_state) - + # Apply again self.start_loading() HostInfo.get_flatpaks(callback=self.end_loading) - # GLib.idle_add(lambda *_: self.main_split.set_show_sidebar(False)) diff --git a/src/packages_page/packages_page.py b/src/packages_page/packages_page.py index 3969cfb..0824b8b 100644 --- a/src/packages_page/packages_page.py +++ b/src/packages_page/packages_page.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Gdk +from gi.repository import Adw, Gtk, GLib, Gio from .host_info import HostInfo from .app_row import AppRow from .error_toast import ErrorToast diff --git a/src/snapshot_page/new_snapshot_dialog.py b/src/snapshot_page/new_snapshot_dialog.py index 0be4539..7145b6e 100644 --- a/src/snapshot_page/new_snapshot_dialog.py +++ b/src/snapshot_page/new_snapshot_dialog.py @@ -1,6 +1,5 @@ from gi.repository import Adw, Gtk, GLib from .host_info import HostInfo -from .error_toast import ErrorToast from .loading_status import LoadingStatus from .app_row import AppRow from .tar_worker import TarWorker diff --git a/src/snapshot_page/snapshot_box.py b/src/snapshot_page/snapshot_box.py index 08879bb..4a179d8 100644 --- a/src/snapshot_page/snapshot_box.py +++ b/src/snapshot_page/snapshot_box.py @@ -2,7 +2,7 @@ from gi.repository import Adw, Gtk, GLib, Gio from .host_info import HostInfo from .error_toast import ErrorToast from .tar_worker import TarWorker -import os, subprocess, json, re +import os, subprocess, json @Gtk.Template(resource_path="/io/github/flattool/Warehouse/snapshot_page/snapshot_box.ui") class SnapshotBox(Gtk.Box): diff --git a/src/snapshot_page/snapshot_page.py b/src/snapshot_page/snapshot_page.py index be71bd8..a4486c8 100644 --- a/src/snapshot_page/snapshot_page.py +++ b/src/snapshot_page/snapshot_page.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Gdk +from gi.repository import Adw, Gtk, GLib, Gio from .host_info import HostInfo from .error_toast import ErrorToast from .app_row import AppRow @@ -223,7 +223,6 @@ class SnapshotPage(Adw.BreakpointBin): GLib.idle_add(lambda *_: self.stack.set_visible_child(self.scrolled_window)) GLib.idle_add(lambda *_: self.status_stack.set_visible_child(self.split_view)) - data_path = f"{HostInfo.home}/.var/app" data_exists = False for package in HostInfo.flatpaks: if package.info['id'] == "io.github.flattool.Warehouse": @@ -450,12 +449,10 @@ class SnapshotPage(Adw.BreakpointBin): id_to_tar = self.get_snapshots_from_entry(app_ids) for app_id in id_to_tar: biggest = 0 - biggest_tar = "" for tar in id_to_tar[app_id]: epoch = int(tar.split('_')[0]) if epoch > biggest: biggest = epoch - biggest_tar = tar id_to_tar[app_id] = tar diff --git a/src/snapshot_page/tar_worker.py b/src/snapshot_page/tar_worker.py index acda0c9..d230112 100644 --- a/src/snapshot_page/tar_worker.py +++ b/src/snapshot_page/tar_worker.py @@ -1,7 +1,7 @@ from gi.repository import GLib, Gio from .host_info import HostInfo from .error_toast import ErrorToast -import os, tarfile, subprocess, json +import os, subprocess, json class TarWorker: def compress_thread(self, *args): diff --git a/src/user_data_page/data_subpage.py b/src/user_data_page/data_subpage.py index c08a75e..1034075 100644 --- a/src/user_data_page/data_subpage.py +++ b/src/user_data_page/data_subpage.py @@ -1,6 +1,5 @@ from gi.repository import Gtk, GLib, Gio from .host_info import HostInfo -from .error_toast import ErrorToast from .data_box import DataBox from .loading_status import LoadingStatus diff --git a/src/user_data_page/user_data_page.py b/src/user_data_page/user_data_page.py index cd7610b..3ad49bb 100644 --- a/src/user_data_page/user_data_page.py +++ b/src/user_data_page/user_data_page.py @@ -1,6 +1,5 @@ -from gi.repository import Adw, Gtk, Gio, Gdk +from gi.repository import Adw, Gtk, Gio from .error_toast import ErrorToast -from .data_box import DataBox from .data_subpage import DataSubpage from .host_info import HostInfo from .sidebar_button import SidebarButton