diff --git a/cardvault/application.py b/cardvault/application.py index d442842..edc2840 100644 --- a/cardvault/application.py +++ b/cardvault/application.py @@ -110,7 +110,7 @@ class Application: supertypes = " - " + " ".join(card.subtypes) types = " ".join(card.types) + supertypes builder.get_object("cardTypes").set_text(types) - # Rarityget_card_image + # Rarity builder.get_object("cardRarity").set_text(card.rarity if card.rarity else "") # Release builder.get_object("cardReleaseDate").set_text(card.release_date if card.release_date else "") @@ -150,7 +150,7 @@ class Application: window.show_all() - def eval_key_pressed(widget,event): + def eval_key_pressed(widget, event): key, modifier = Gtk.accelerator_parse('Escape') keyval = event.keyval if keyval == key: diff --git a/cardvault/handlers.py b/cardvault/handlers.py index 6002dc6..51ebb24 100644 --- a/cardvault/handlers.py +++ b/cardvault/handlers.py @@ -165,6 +165,10 @@ class Handlers(SearchHandlers, LibraryHandlers, WantsHandlers): e = time.time() util.log("Finished in {}s".format(round(e - s, 3)), util.LogLevel.Info) + if self.cancel_token: + GObject.idle_add(self.download_canceled) + return + self.app.db_delete_card_data() GObject.idle_add(self.load_show_insert_ui, "Saving data to disk...")