jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2025-04-05 03:53:01 +02:00
Code Issues Wiki Activity Actions

fix: installed mods race condition (#167)

Browse source
This commit is contained in:
aclist 2024-11-28 17:43:03 +09:00
parent 885c3bc7e7
commit e28a75cfd9
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Changelog # Changelog
## [5.6.0-beta.6] 2024-11-28
### Fixed
- Race condition when checking for installed mods
## [5.6.0-beta.5] 2024-11-21 ## [5.6.0-beta.5] 2024-11-21
### Added ### Added
- Highlight stale mods in mods list - Highlight stale mods in mods list

4
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -o pipefail set -o pipefail
version=5.6.0-beta.5 version=5.6.0-beta.6
#CONSTANTS #CONSTANTS
aid=221100 aid=221100
@ -569,7 +569,7 @@ fetch_helpers_by_sum(){
[[ -f "$config_file" ]] && source "$config_file" [[ -f "$config_file" ]] && source "$config_file"
declare -A sums declare -A sums
sums=( sums=(
["ui.py"]="a5896c88510e8b4b2f1fec06aed0c96a" ["ui.py"]="1c6e5b996eccd891a3e56930e28246da"
["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="9a0ad94df22e24fe41e93a689de7d03e" ["funcs"]="9a0ad94df22e24fe41e93a689de7d03e"

25
helpers/ui.py
View file

@ -1421,12 +1421,12 @@ class TreeView(Gtk.TreeView):
# suppress button panel if store is empty # suppress button panel if store is empty
if isinstance(panel_last_child, ModSelectionPanel): if isinstance(panel_last_child, ModSelectionPanel):
if total_mods == 0: if total_mods == 0:
# nb. do not forcibly remove previously added widgets # do not forcibly remove previously added widgets when reloading in-place
grid.sel_panel.set_visible(False) grid.sel_panel.set_visible(False)
grid.show_all()
right_panel.set_filter_visibility(False) right_panel.set_filter_visibility(False)
else:
grid.sel_panel.set_visible(True)
grid.sel_panel.set_visible(True)
self.set_model(mod_store) self.set_model(mod_store)
self.grab_focus() self.grab_focus()
size = locale.format_string('%.3f', total_size, grouping=True) size = locale.format_string('%.3f', total_size, grouping=True)
@ -1437,6 +1437,7 @@ class TreeView(Gtk.TreeView):
toggle_signal(self, self, '_on_keypress', True) toggle_signal(self, self, '_on_keypress', True)
self._focus_first_row() self._focus_first_row()
if total_mods == 0: if total_mods == 0:
logger.info("Nothing to do, spawning notice dialog")
spawn_dialog(self.get_outer_window(), data.stdout, Popup.NOTIFY) spawn_dialog(self.get_outer_window(), data.stdout, Popup.NOTIFY)
widgets = relative_widget(self) widgets = relative_widget(self)
@ -1447,18 +1448,18 @@ class TreeView(Gtk.TreeView):
# suppress errors if no mods available on system # suppress errors if no mods available on system
if data.returncode == 1: if data.returncode == 1:
logger.info("Failed to find mods on local system")
total_mods = 0 total_mods = 0
total_size = 0 total_size = 0
GLib.idle_add(load) GLib.idle_add(load)
return 1 else:
# show button panel missing (prevents duplication when reloading in-place)
# show button panel missing (prevents duplication when reloading in-place) if not isinstance(panel_last_child, ModSelectionPanel):
if not isinstance(panel_last_child, ModSelectionPanel): grid.sel_panel.set_visible(True)
grid.sel_panel.set_visible(True) result = parse_mod_rows(data)
result = parse_mod_rows(data) total_size = result[0]
total_size = result[0] total_mods = result[1]
total_mods = result[1] GLib.idle_add(load)
GLib.idle_add(load)
def _on_col_width_changed(self, col, width): def _on_col_width_changed(self, col, width):