From ee0c07befc95218f9de5095094cc87bbc61166cd Mon Sep 17 00:00:00 2001
From: kramo <93832451+kra-mo@users.noreply.github.com>
Date: Wed, 5 Apr 2023 00:08:30 +0200
Subject: [PATCH] SteamGridDB cleanups

---
 data/gtk/preferences.blp             |  3 +--
 data/hu.kramo.Cartridges.gschema.xml |  2 +-
 src/preferences.py                   | 11 ++++++++++-
 src/utils/steamgriddb.py             |  6 +++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/data/gtk/preferences.blp b/data/gtk/preferences.blp
index 9ea0503..e2bf52f 100644
--- a/data/gtk/preferences.blp
+++ b/data/gtk/preferences.blp
@@ -210,7 +210,6 @@ template PreferencesWindow : Adw.PreferencesWindow {
 
     Adw.PreferencesGroup sgdb_key_group {
       title: _("Authentication");
-      description: _("An API Key is required to use SteamGridDB. You can generate one <a href=\"https://www.steamgriddb.com/profile/preferences/api\">here</a>.");
       
       Adw.EntryRow sgdb_key_entry_row {
         title: _("API Key");
@@ -221,7 +220,7 @@ template PreferencesWindow : Adw.PreferencesWindow {
       title: _("Behavior");
 
       Adw.ActionRow {
-        title: _("Download Images Automatically");
+        title: _("Use SteamGridDB");
         subtitle: _("Download images when adding or importing games");
 
         Switch sgdb_download_switch {
diff --git a/data/hu.kramo.Cartridges.gschema.xml b/data/hu.kramo.Cartridges.gschema.xml
index e4363ac..20d116a 100644
--- a/data/hu.kramo.Cartridges.gschema.xml
+++ b/data/hu.kramo.Cartridges.gschema.xml
@@ -61,7 +61,7 @@
     <key name="sgdb-key" type="s">
       <default>""</default>
     </key>
-    <key name="sgdb-import" type="b">
+    <key name="sgdb" type="b">
       <default>false</default>
     </key>
     <key name="sgdb-prefer" type="b">
diff --git a/src/preferences.py b/src/preferences.py
index fc01057..56eaae6 100644
--- a/src/preferences.py
+++ b/src/preferences.py
@@ -114,6 +114,7 @@ class PreferencesWindow(Adw.PreferencesWindow):
     itch_expander_row = Gtk.Template.Child()
     itch_file_chooser_button = Gtk.Template.Child()
 
+    sgdb_key_group = Gtk.Template.Child()
     sgdb_key_entry_row = Gtk.Template.Child()
     sgdb_download_switch = Gtk.Template.Child()
     sgdb_prefer_switch = Gtk.Template.Child()
@@ -303,7 +304,7 @@ class PreferencesWindow(Adw.PreferencesWindow):
 
         # SteamGridDB
         self.schema.bind(
-            "sgdb-import",
+            "sgdb",
             self.sgdb_download_switch,
             "active",
             Gio.SettingsBindFlags.DEFAULT,
@@ -322,6 +323,14 @@ class PreferencesWindow(Adw.PreferencesWindow):
         self.sgdb_key_entry_row.set_text(self.schema.get_string("sgdb-key"))
         self.sgdb_key_entry_row.connect("changed", sgdb_key_changed)
 
+        self.sgdb_key_group.set_description(
+            _(
+                "An API Key is required to use SteamGridDB. You can generate one {}here{}."
+            ).format(
+                '<a href="https://www.steamgriddb.com/profile/preferences/api">', "</a>"
+            )
+        )
+
     def choose_folder(self, _widget, function):
         self.file_chooser.select_folder(self.parent_widget, None, function, None)
 
diff --git a/src/utils/steamgriddb.py b/src/utils/steamgriddb.py
index a939d8d..27fc76a 100644
--- a/src/utils/steamgriddb.py
+++ b/src/utils/steamgriddb.py
@@ -29,9 +29,9 @@ class SGDBSave:
             Gio.Task.new(None, None, self.task_done).run_in_thread(create_func(game))
 
     def update_cover(self, task, game):
-        if self.parent_widget.schema.get_boolean("sgdb-prefer") or (
-            self.parent_widget.schema.get_boolean("sgdb-import")
-            and not (
+        if self.parent_widget.schema.get_boolean("sgdb") and (
+            self.parent_widget.schema.get_boolean("sgdb-prefer")
+            or not (
                 self.parent_widget.data_dir
                 / "cartridges"
                 / "covers"