Cleanups
This commit is contained in:
@@ -66,11 +66,11 @@ class game(Gtk.Box):
|
||||
self.event_contoller_motion.connect("leave", self.hide_play)
|
||||
self.menu_button.get_popover().connect("notify::visible", self.hide_play)
|
||||
|
||||
def show_play(self, _widget, *args):
|
||||
def show_play(self, _widget, *_unused):
|
||||
self.play_revealer.set_reveal_child(True)
|
||||
self.title_revealer.set_reveal_child(False)
|
||||
|
||||
def hide_play(self, _widget, *args):
|
||||
def hide_play(self, _widget, *_unused):
|
||||
if not self.menu_button.get_active():
|
||||
self.play_revealer.set_reveal_child(False)
|
||||
self.title_revealer.set_reveal_child(True)
|
||||
|
||||
@@ -24,9 +24,8 @@ from gi.repository import Gio
|
||||
|
||||
|
||||
def run_command(executable):
|
||||
subprocess.Popen(
|
||||
with subprocess.Popen(
|
||||
["flatpak-spawn --host " + executable], shell=True, start_new_session=True
|
||||
)
|
||||
|
||||
if Gio.Settings.new("hu.kramo.Cartridges").get_boolean("exit-after-launch"):
|
||||
sys.exit()
|
||||
):
|
||||
if Gio.Settings.new("hu.kramo.Cartridges").get_boolean("exit-after-launch"):
|
||||
sys.exit()
|
||||
|
||||
@@ -30,7 +30,9 @@ def toggle_hidden(game):
|
||||
with open(os.path.join(games_dir, game + ".json"), "r") as open_file:
|
||||
data = json.loads(open_file.read())
|
||||
open_file.close()
|
||||
|
||||
data["hidden"] = not data["hidden"]
|
||||
|
||||
with open(os.path.join(games_dir, game + ".json"), "w") as open_file:
|
||||
data["hidden"] = not data["hidden"]
|
||||
open_file.write(json.dumps(data, indent=4))
|
||||
open_file.close()
|
||||
|
||||
@@ -222,12 +222,11 @@ class CartridgesWindow(Adw.ApplicationWindow):
|
||||
|
||||
if (datetime.datetime.today() - date).days == 0:
|
||||
return _("Today")
|
||||
elif (datetime.datetime.today() - date).days == 1:
|
||||
if (datetime.datetime.today() - date).days == 1:
|
||||
return _("Yesterday")
|
||||
elif (datetime.datetime.today() - date).days < 8:
|
||||
if (datetime.datetime.today() - date).days < 8:
|
||||
return GLib.DateTime.new_from_unix_utc(timestamp).format("%A")
|
||||
else:
|
||||
return GLib.DateTime.new_from_unix_utc(timestamp).format("%x")
|
||||
return GLib.DateTime.new_from_unix_utc(timestamp).format("%x")
|
||||
|
||||
def show_overview(self, _widget, game_id):
|
||||
current_game = self.games[game_id]
|
||||
@@ -263,53 +262,47 @@ class CartridgesWindow(Adw.ApplicationWindow):
|
||||
name2 = child2.get_first_child().name.lower()
|
||||
if name1 > name2:
|
||||
return 1
|
||||
elif name1 < name2:
|
||||
if name1 < name2:
|
||||
return -1
|
||||
else:
|
||||
if child1.get_first_child().game_id > child2.get_first_child().game_id:
|
||||
return 1
|
||||
else:
|
||||
return -1
|
||||
if child1.get_first_child().game_id > child2.get_first_child().game_id:
|
||||
return 1
|
||||
return -1
|
||||
|
||||
def z_a_sort(self, child1, child2):
|
||||
name1 = child1.get_first_child().name.lower()
|
||||
name2 = child2.get_first_child().name.lower()
|
||||
if name1 > name2:
|
||||
return -1
|
||||
elif name1 < name2:
|
||||
if name1 < name2:
|
||||
return 1
|
||||
else:
|
||||
return self.a_z_sort(child1, child2)
|
||||
return self.a_z_sort(child1, child2)
|
||||
|
||||
def newest_sort(self, child1, child2):
|
||||
time1 = self.games[child1.get_first_child().game_id].added
|
||||
time2 = self.games[child2.get_first_child().game_id].added
|
||||
if time1 > time2:
|
||||
return -1
|
||||
elif time1 < time2:
|
||||
if time1 < time2:
|
||||
return 1
|
||||
else:
|
||||
return self.a_z_sort(child1, child2)
|
||||
return self.a_z_sort(child1, child2)
|
||||
|
||||
def oldest_sort(self, child1, child2):
|
||||
time1 = self.games[child1.get_first_child().game_id].added
|
||||
time2 = self.games[child2.get_first_child().game_id].added
|
||||
if time1 > time2:
|
||||
return 1
|
||||
elif time1 < time2:
|
||||
if time1 < time2:
|
||||
return -1
|
||||
else:
|
||||
return self.a_z_sort(child1, child2)
|
||||
return self.a_z_sort(child1, child2)
|
||||
|
||||
def last_played_sort(self, child1, child2):
|
||||
time1 = self.games[child1.get_first_child().game_id].last_played
|
||||
time2 = self.games[child2.get_first_child().game_id].last_played
|
||||
if time1 > time2:
|
||||
return -1
|
||||
elif time1 < time2:
|
||||
if time1 < time2:
|
||||
return 1
|
||||
else:
|
||||
return self.a_z_sort(child1, child2)
|
||||
return self.a_z_sort(child1, child2)
|
||||
|
||||
def on_go_back_action(self, _widget, _unused, _x=None, _y=None):
|
||||
if self.stack.get_visible_child() == self.hidden_library_view:
|
||||
@@ -389,7 +382,7 @@ class CartridgesWindow(Adw.ApplicationWindow):
|
||||
if self.stack.get_visible_child() == self.overview:
|
||||
self.on_go_back_action(None, None)
|
||||
return
|
||||
elif self.stack.get_visible_child() == self.library_view:
|
||||
if self.stack.get_visible_child() == self.library_view:
|
||||
search_bar = self.search_bar
|
||||
search_entry = self.search_entry
|
||||
search_button = self.search_button
|
||||
|
||||
Reference in New Issue
Block a user