From cf8696de8fc19b7bfe4126eafac15b585bfc9406 Mon Sep 17 00:00:00 2001 From: JessicaTegner Date: Thu, 30 Mar 2023 02:08:05 +0200 Subject: [PATCH 1/2] Change deck view format string --- ygo/deck_editor.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ygo/deck_editor.py b/ygo/deck_editor.py index 1727770..083027f 100644 --- a/ygo/deck_editor.py +++ b/ygo/deck_editor.py @@ -98,9 +98,9 @@ def list_decks(self, selector = DECK.OWNED, name = '', banlist = ''): other_decks = decks - public_decks = natsort.natsorted(public_decks, key = lambda d: str(d.id) + ": " + d.account.name + "/" + d.name) - owned_decks = natsort.natsorted(owned_decks, key = lambda d: str(d.id) + ": " + d.name) - other_decks = natsort.natsorted(other_decks, key = lambda d: str(d.id) + ": " + d.account.name + "/" + d.name) + public_decks = natsort.natsorted(public_decks, key = lambda d: d.account.name + "/" + d.name) + owned_decks = natsort.natsorted(owned_decks, key = lambda d: d.name) + other_decks = natsort.natsorted(other_decks, key = lambda d: d.account.name + "/" + d.name) if len(public_decks): @@ -119,7 +119,7 @@ def list_decks(self, selector = DECK.OWNED, name = '', banlist = ''): banlist_text = pl._("compatible with {0} banlist").format(b.name) break - pl.notify(pl._("{deck_id}: {deckname} ({banlist})").format(deck_id=deck.id, deckname=deck.account.name + "/" + deck.name, banlist=banlist_text)) + pl.notify(pl._("{deckname} - {deck_id} ({banlist})").format(deck_id=deck.id, deckname=deck.account.name + "/" + deck.name, banlist=banlist_text)) if len(owned_decks): @@ -143,7 +143,7 @@ def list_decks(self, selector = DECK.OWNED, name = '', banlist = ''): banlist_text = pl._("compatible with {0} banlist").format(b.name) break - pl.notify(pl._("{deck_id}: {deckname} ({privacy}) ({banlist})").format(deck_id=deck.id, deckname=deck.name, privacy=privacy, banlist=banlist_text)) + pl.notify(pl._("{deckname} - {deck_id} ({privacy}) ({banlist})").format(deck_id=deck.id, deckname=deck.name, privacy=privacy, banlist=banlist_text)) if len(other_decks): From 43458262990c6fd68477eeace7a18e72890bc276 Mon Sep 17 00:00:00 2001 From: JessicaTegner Date: Thu, 30 Mar 2023 02:12:41 +0200 Subject: [PATCH 2/2] Changed format string --- ygo/deck_editor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ygo/deck_editor.py b/ygo/deck_editor.py index 083027f..6ae6e69 100644 --- a/ygo/deck_editor.py +++ b/ygo/deck_editor.py @@ -119,7 +119,7 @@ def list_decks(self, selector = DECK.OWNED, name = '', banlist = ''): banlist_text = pl._("compatible with {0} banlist").format(b.name) break - pl.notify(pl._("{deckname} - {deck_id} ({banlist})").format(deck_id=deck.id, deckname=deck.account.name + "/" + deck.name, banlist=banlist_text)) + pl.notify(pl._("{deckname}: {deck_id} ({banlist})").format(deck_id=deck.id, deckname=deck.account.name + "/" + deck.name, banlist=banlist_text)) if len(owned_decks): @@ -143,7 +143,7 @@ def list_decks(self, selector = DECK.OWNED, name = '', banlist = ''): banlist_text = pl._("compatible with {0} banlist").format(b.name) break - pl.notify(pl._("{deckname} - {deck_id} ({privacy}) ({banlist})").format(deck_id=deck.id, deckname=deck.name, privacy=privacy, banlist=banlist_text)) + pl.notify(pl._("{deckname}: {deck_id} ({privacy}) ({banlist})").format(deck_id=deck.id, deckname=deck.name, privacy=privacy, banlist=banlist_text)) if len(other_decks): @@ -167,7 +167,7 @@ def list_decks(self, selector = DECK.OWNED, name = '', banlist = ''): banlist_text = pl._("compatible with {0} banlist").format(b.name) break - pl.notify(pl._("{deckname} ({privacy}) ({banlist})").format(deckname=deck.account.name + "/" + deck.name, privacy=privacy, banlist=banlist_text)) + pl.notify(pl._("{deckname}: {deck_id} ({privacy}) ({banlist})").format(deck_id=deck.id, deckname=deck.account.name + "/" + deck.name, privacy=privacy, banlist=banlist_text)) pl.notify(pl._("{shown} decks shown, {filtered} decks filtered").format(shown = len(public_decks) + len(owned_decks) + len(other_decks), filtered = filtered_decks))