Merge pull request #270 from JessicaTegner/master

Changed format string of deck list
tspivey · Mar 30, 2023 · 8d8c7cd · 8d8c7cd
2 parents 7083da6 + 4345826
commit 8d8c7cd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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):
 
@@ -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))