luxick/cardvault
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly cancel download thread.

Browse Source
This commit is contained in:
luxick
2017-07-26 14:03:59 +02:00
parent 154745dd94
commit 35b89e4c35
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cardvault/application.py
View File

@@ -110,7 +110,7 @@ class Application:
supertypes = " - " + " ".join(card.subtypes) supertypes = " - " + " ".join(card.subtypes)
types = " ".join(card.types) + supertypes types = " ".join(card.types) + supertypes
builder.get_object("cardTypes").set_text(types) builder.get_object("cardTypes").set_text(types)
# Rarityget_card_image # Rarity
builder.get_object("cardRarity").set_text(card.rarity if card.rarity else "") builder.get_object("cardRarity").set_text(card.rarity if card.rarity else "")
# Release # Release
builder.get_object("cardReleaseDate").set_text(card.release_date if card.release_date else "") builder.get_object("cardReleaseDate").set_text(card.release_date if card.release_date else "")
@@ -150,7 +150,7 @@ class Application:
window.show_all() window.show_all()
def eval_key_pressed(widget,event): def eval_key_pressed(widget, event):
key, modifier = Gtk.accelerator_parse('Escape') key, modifier = Gtk.accelerator_parse('Escape')
keyval = event.keyval keyval = event.keyval
if keyval == key: if keyval == key:

4
cardvault/handlers.py
View File

@@ -165,6 +165,10 @@ class Handlers(SearchHandlers, LibraryHandlers, WantsHandlers):
e = time.time() e = time.time()
util.log("Finished in {}s".format(round(e - s, 3)), util.LogLevel.Info) 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() self.app.db_delete_card_data()
GObject.idle_add(self.load_show_insert_ui, "Saving data to disk...") GObject.idle_add(self.load_show_insert_ui, "Saving data to disk...")