GUI WIP

Author: GiovanH

gui.py

@@ -1,7 +1,9 @@
+from collections import OrderedDict
 from dataclasses import dataclass
 import os
+import webbrowser
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Literal, Optional, TypeAlias, Union
 
 from roa import RoaCategoriesFile, RoaCategory, RoaEntry, RoaOrderFile
 
@@ -12,6 +14,8 @@
 
 ROA_DIR = Path(f"{os.environ['LOCALAPPDATA']}/RivalsofAether/workshop")
 
+Direction: TypeAlias = Union[Literal[1], Literal[-1]]
+
 @dataclass
 class ListboxItem():
     label: str
@@ -42,23 +46,45 @@ def __init__(
 
         self.items: list[ListboxItem] = []
 
+        myscroll = tk.Scrollbar(self)
+        myscroll.pack(side = tk.RIGHT, fill = tk.Y)
+
         self.listbox = tk.Listbox(
             self,
             relief=tk.GROOVE,
             selectmode=selectmode,
-            exportselection=False
+            exportselection=False,
+            yscrollcommand = myscroll.set
         )
 
-        self.listbox.grid(sticky=tk.NSEW)
+        myscroll.config(command = self.listbox.yview)
+
+        self.listbox.pack(side=tk.TOP, fill=tk.Y, expand=1)
 
     def set_items(self, items: list[ListboxItem]):
         self.items = items
-        print(items)
         self.listbox.configure(state=tk.NORMAL)
         self.listbox.delete(0, self.listbox.size())
         for i in self.items:
             self.listbox.insert(tk.END, i.label)
 
+    def move_selected_items(self, sel_indexes, direction: Direction) -> list[ListboxItem]:
+        selected_items = [self.items[si] for si in sel_indexes]
+        if direction == 1:
+            selected_items = reversed(selected_items)
+        for item in selected_items:
+            i = self.items.index(item)
+            if (i+direction) < 0 or (i+direction) >= len(self.items):
+                continue
+
+            self.items[i], self.items[i+direction] = self.items[i+direction], self.items[i]
+
+            self.listbox.delete(i)
+            self.listbox.insert(i+direction, item.label)
+
+            self.listbox.selection_set(i+direction)
+
+        return self.items
 
 
 class CharacterManager(tk.Tk):
@@ -92,11 +118,10 @@ def widget_buttons_middle(self) -> tk.Frame:
         frame = tk.Frame(self)
         y = Counter()
 
-        btn_export = ttk.Button(frame, text="Export to ROA",
-                              command=self.save_state_to_roas)
+        btn_export = ttk.Button(
+            frame, text="Export to ROA",
+            command=self.save_state_to_roas)
         btn_export.grid(row=y.inc(), sticky=tk.EW)
-        btn_two = ttk.Button(frame, text="2")
-        btn_two.grid(row=y.inc(), sticky=tk.EW)
 
         return frame
 
@@ -107,39 +132,63 @@ def widget_buttons_cats(self) -> tk.Frame:
         # btn_open = ttk.Button(frame, text="Open", command=self.open_selected_category)
         # btn_open.grid(row=y.inc(), sticky=tk.EW)
 
-        btn_2 = ttk.Button(frame, text="2")
-        btn_2.grid(row=y.inc(), sticky=tk.EW)
+        frame_updown = tk.Frame(frame)
+
+        btn_move_up = ttk.Button(frame_updown, text="^", command=self.fac_move_selected_cat(-1))
+        btn_move_up.grid(row=0, column=0)
+
+        btn_move_down = ttk.Button(frame_updown, text="v", command=self.fac_move_selected_cat(1))
+        btn_move_down.grid(row=0, column=1)
 
-        btn_move_up = ttk.Button(frame, text="^")
-        btn_move_up.grid(row=y.inc(), sticky=tk.EW)
+        frame_updown.grid(row=y.inc(), sticky=tk.EW)
 
-        btn_move_up = ttk.Button(frame, text="v")
-        btn_move_up.grid(row=y.inc(), sticky=tk.EW)
+        btn_add = ttk.Button(frame, text="TODO Add")
+        btn_add.grid(row=y.inc(), sticky=tk.EW)
+
+        btn_del = ttk.Button(frame, text="TODO Delete")
+        btn_del.grid(row=y.inc(), sticky=tk.EW)
+
+        btn_rename = ttk.Button(frame, text="TODO Rename")
+        btn_rename.grid(row=y.inc(), sticky=tk.EW)
 
         return frame
 
     def widget_buttons_chars(self) -> tk.Frame:
         frame = tk.Frame(self)
         y = Counter()
 
+        frame_updown = tk.Frame(frame)
         btn_move_up = ttk.Button(
-            frame, text="^",
+            frame_updown, text="^",
             command=self.fac_move_selected_chars(-1)
         )
-        btn_move_up.grid(row=y.inc(), sticky=tk.EW)
+        btn_move_up.grid(row=0, column=0)
 
         btn_move_down = ttk.Button(
-            frame, text="v",
+            frame_updown, text="v",
             command=self.fac_move_selected_chars(1)
         )
-        btn_move_down.grid(row=y.inc(), sticky=tk.EW)
+        btn_move_down.grid(row=0, column=1)
+
+        frame_updown.grid(row=y.inc(), sticky=tk.EW)
 
         btn_sort_alpha = ttk.Button(
             frame, text="Sort: A-Z",
             command=self.fac_sort_chars_by(sort_name)
         )
         btn_sort_alpha.grid(row=y.inc(), sticky=tk.EW)
 
+        btn_char_info = ttk.Button(
+            frame, text="Open in Steam",
+            command=self.open_info
+        )
+        btn_char_info.grid(row=y.inc(), sticky=tk.EW)
+
+        btn_char_movecat = ttk.Button(
+            frame, text="TODO Move to...",
+            # command=
+        )
+        btn_char_movecat.grid(row=y.inc(), sticky=tk.EW)
         return frame
 
     def initwindow(self) -> None:
@@ -159,17 +208,16 @@ def initwindow(self) -> None:
 
         self.list_cats.listbox.bind('<<ListboxSelect>>', self.open_selected_category)
 
-
         frame_buttons_mid: tk.Frame = self.widget_buttons_middle()
         frame_buttons_mid.grid(row=0, column=1)
 
         self.list_chars: ItemListFrame = ItemListFrame(self, selectmode=tk.MULTIPLE)
-        self.list_chars.grid(row=0, column=2)
+        self.list_chars.grid(row=0, column=2, sticky=tk.NS)
         frame_buttons_chars: tk.Frame = self.widget_buttons_chars()
         frame_buttons_chars.grid(row=1, column=2)
 
         lab_context_label = ttk.Label(self, textvariable=self.text_status, relief=tk.GROOVE)
-        lab_context_label.grid(row=2, column=0, columnspan=3, sticky="EW")
+        lab_context_label.grid(row=2, column=0, columnspan=3, sticky=tk.SW)
 
     # State management
     def gen_listitems_categories(self) -> list[ListboxItem]:
@@ -194,14 +242,13 @@ def save_state_to_roas(self, event=None) -> None:
             if len(char_list) < 1:
                 continue
             new_cat = RoaCategory(len(characters), label.encode('utf-8'))
-            print(new_cat)
             categories_roa.categories.append(new_cat)
             for char in char_list:
                 try:
                     characters.append(char)
                 except KeyError:
                     if label == '_removed': continue
-                    print("Couldn't find", char)
+                    self.log(f"Couldn't find {char}")
                     raise
 
         order_roa.groups['characters'] = characters
@@ -246,26 +293,37 @@ def do_sort(event=None):
 
         return do_sort
 
-    def fac_move_selected_chars(self, direction: int) -> Callable[..., None]:
+    def fac_move_selected_chars(self, direction: Direction) -> Callable[..., None]:
         def do_move(event=None):
-            c = self.get_selected_category()
-            print(self.nested_state[c])
-
-            # Reorder nested state
+            category = self.get_selected_category()
             sel_indexes = self.list_chars.listbox.curselection()
-            selected_items = [self.nested_state[c][si] for si in sel_indexes]
-            for item in selected_items:
-                i = self.nested_state[c].index(item)
-                self.nested_state[c][i], self.nested_state[c][i+direction] = self.nested_state[c][i+direction], self.nested_state[c][i]
-                self.log(f"Moved {item!r} from {i} to {i+direction}")
+            reordered_items: list[ListboxItem] = self.list_chars.move_selected_items(sel_indexes, direction)
+            self.nested_state[category] = [i.value for i in reordered_items]
+            assert self.list_chars.items == self.gen_listboxitems_chars(category)
+        return do_move
+
+    def fac_move_selected_cat(self, direction: Direction) -> Callable[..., None]:
+        def do_move(event=None):
+            (sel_index,) = self.list_cats.listbox.curselection()
+            if (sel_index+direction) < 0 or (sel_index+direction) >= len(self.nested_state.keys()):
+                return
+            reordered_items: list[ListboxItem] = self.list_cats.move_selected_items([sel_index], direction)
 
-            # TODO: Edit list inplace
-            self.open_category(c)
-            print(self.nested_state[c])
-            assert self.list_chars.items == self.gen_listboxitems_chars(c)
+            tups = list(self.nested_state.items())
+            tups[sel_index], tups[sel_index+direction] = tups[sel_index+direction], tups[sel_index]
+            self.nested_state = OrderedDict(tups)
 
+            self.log(f"New key order: {self.nested_state.keys()}")
+            assert reordered_items == self.gen_listitems_categories()
         return do_move
 
+    def open_info(self, event=None):
+        sel_index, *_ = self.list_chars.listbox.curselection()
+        char: RoaEntry = self.list_chars.items[sel_index].value
+        url = f"steam://openurl/https://steamcommunity.com/sharedfiles/filedetails/?id={char.id}"
+        webbrowser.open(url, autoraise=True)
+
+
 if __name__ == '__main__':
     order_roa = RoaOrderFile(ROA_DIR / 'order.roa')
     categories_roa = RoaCategoriesFile(ROA_DIR / 'categories.roa')

yaml_sync.py

@@ -1,4 +1,4 @@
-from collections import defaultdict
+from collections import OrderedDict, defaultdict
 import itertools
 import os
 import pprint
@@ -38,7 +38,7 @@ def set_groups_by_alpha(order_roa, categories_roa):
 
 
 def roa_zip_chars(order_roa: RoaOrderFile, categories_roa: RoaCategoriesFile) -> dict[str, list[RoaEntry]]:
-    data = defaultdict(list)
+    data: dict = defaultdict(list)
     category = ''
 
     cats_by_index = {
@@ -50,7 +50,10 @@ def roa_zip_chars(order_roa: RoaOrderFile, categories_roa: RoaCategoriesFile) ->
         category = cats_by_index.get(i, category)
         data[category].append(c)
 
-    return dict(data)
+    return OrderedDict([
+        (k, v)
+        for k, v in data.items()
+    ])
 
 def load_yaml_state(order_roa: RoaOrderFile, categories_roa: RoaCategoriesFile):
     yaml_state: dict[str, list[str]] = {}