Compare commits

..
Author SHA1 Message Date
aclist 17dedd79a7 chore: audit legacy strings file, first pass 2026-11-21 20:48:44 +09:00
aclist ede064858e chore: abstract keybindings strings 2026-11-21 20:48:25 +09:00
21 changed files with 248 additions and 460 deletions

No files matched your search

-3
View File
@@ -58,7 +58,6 @@
- Validate mods via Mod page to pull in updates
- Support for Nasdara (Badlands) DLC
- Load offline mods
- Support Snap package version of Steam
### Changed
- Conform to PEP 440 versioning for beta versions
@@ -102,8 +101,6 @@
- Steam Flatpak cannot run DZGUI as a non-Steam game
- Collisions between native Steam and Steam Flatpak clients
- Sticky toggle signal on radio buttons when reloading Options
- Handle missing mods directory if not installed previously
- Filters not blocked by keyboard keys when filters are disabled
### Developer-facing
- Options -> Dev page
+1 -1
View File
@@ -15,7 +15,7 @@ author = 'aclist'
extensions = []
templates_path = ['_templates']
exclude_patterns = [] # type: ignore[var-annotated]
exclude_patterns = []
-5
View File
@@ -35,10 +35,6 @@ def get_local_mod_path(steam_path: Path) -> Path:
def get_local_mods(workshop_path: Path) -> list[Path]:
# NOTE: user may not have staged mods before
if workshop_path.is_dir() is False:
logger.debug("Mod directory not yet present, returning empty list")
return []
mods = [file for file in workshop_path.iterdir() if file.is_dir()]
return mods
@@ -127,7 +123,6 @@ def remove_stale_signatures(
path = lookup(config, Preferences.DEFAULT)
steam_path = Path(path)
if ids is None:
local_ids = get_local_mod_ids(steam_path)
+11 -23
View File
@@ -12,7 +12,9 @@ from typing import Any, Generator, Union
from warnings import deprecated
from dzgui.api.acf import ACF
from dzgui.config.xdg import get_real_home
from dzgui.const.endpoints import VALIDATE
from dzgui.init.prereqs import has_any_client
from dzgui.init.prereqs import has_flatpak_client, has_steam_client
from dzgui.const.constants import (
APPID_DAYZ,
APPID_DAYZ_EXP,
@@ -25,7 +27,6 @@ from dzgui.const.constants import (
FLATPAK_STEAM_PATH,
LIBRARYFOLDERS_PATH,
REQUEST_TIMEOUT,
SNAP_STEAM_PATH,
UBUNTU_STEAM_PATH,
VDF_PATH,
)
@@ -34,10 +35,7 @@ from dzgui.const.endpoints import (
STEAM_PUBLISHED_FILES,
STEAM_SUB,
STEAM_UNSUB,
VALIDATE,
)
from dzgui.init.prereqs import has_any_client
from dzgui.init.prereqs import has_flatpak_client, has_steam_client
from dzgui.strings import wizard
from dzgui.strings.errors import api_validation_error, workshop_endpoint_error
from dzgui.util.bash import concat_bash_args
@@ -66,36 +64,26 @@ class VDFLoadError(Exception):
def get_steam_paths() -> list[tuple[Path, str]]:
paths = []
if has_any_client():
HOME = get_real_home()
HOME = Path.home()
env = os.environ.get("XDG_DATA_HOME")
if env is not None:
XDG_DATA_HOME = Path(env)
DEFAULT_PATH = XDG_DATA_HOME.joinpath("Steam")
default_label = wizard.desc_custom_path
XDG_DATA_HOME = env
else:
DEFAULT_PATH = HOME.joinpath(DEFAULT_STEAM_PATH)
default_label = wizard.desc_default_path
XDG_DATA_HOME = DEFAULT_STEAM_PATH
DEFAULT_PATH = HOME.joinpath(XDG_DATA_HOME)
FLATPAK_PATH = HOME.joinpath(FLATPAK_STEAM_PATH)
UBUNTU_PATH = HOME.joinpath(UBUNTU_STEAM_PATH)
DEBIAN_PATH = HOME.joinpath(DEBIAN_STEAM_PATH)
SNAP_PATH = HOME.joinpath(SNAP_STEAM_PATH)
human = {
DEFAULT_PATH: default_label,
DEFAULT_PATH: wizard.desc_default_path,
FLATPAK_PATH: wizard.desc_flatpak_path,
UBUNTU_PATH: wizard.desc_ubuntu_path,
SNAP_PATH: wizard.desc_snap_path,
DEBIAN_PATH: wizard.desc_debian_path,
}
for path in (
DEFAULT_PATH,
FLATPAK_PATH,
UBUNTU_PATH,
SNAP_PATH,
DEBIAN_PATH,
):
for path in DEFAULT_PATH, FLATPAK_PATH, UBUNTU_PATH, DEBIAN_PATH:
if path is FLATPAK_PATH and has_flatpak_client() is False:
continue
if path is not FLATPAK_PATH and has_steam_client() is False:
@@ -497,11 +485,11 @@ def is_dayz_downloading(steam_path: Path, appid: int) -> bool:
def get_app_path(folders_path: Path, appid: int) -> Path:
app_path = None
try:
with open(folders_path / LIBRARYFOLDERS_PATH) as f:
folders = vdf.load(f)
except Exception as e:
logger.debug(e)
except Exception:
raise VDFLoadError("Failed to parse libraryfolders")
for obj in folders["libraryfolders"]:
+1 -3
View File
@@ -3,7 +3,6 @@ import textwrap
from pathlib import Path
from dzgui.config.xdg import get_real_home
from dzgui.util.dirs import copy_dzgui_to_xdg_data, find_icon_resource, make_parents
@@ -37,8 +36,7 @@ def write_desktop_file(exe_path: Path) -> Path:
def write_desktop_shortcut(desktop_file: Path) -> None:
# NOTE: necessarily depends on the above (UI blocks creation without XDG entry first)
home = get_real_home()
link = home.joinpath("Desktop/dzgui.desktop")
link = Path.home().joinpath("Desktop/dzgui.desktop")
make_parents(link)
if link.exists():
link.unlink()
+6 -9
View File
@@ -6,8 +6,10 @@ from dataclasses import dataclass
from dzgui.const.constants import (
APP_NAME_LOWER,
DEBUG_LOG,
FLATPAK_ROOT_PATH,
SYSTEM_LOG,
)
from dzgui.init.proc import is_sandboxed
@dataclass(slots=True, frozen=True)
@@ -48,17 +50,9 @@ def is_writeable(path_str: str) -> bool:
file.unlink()
return True
def get_real_home() -> Path:
home = Path.home()
if resolved := os.environ.get("SNAP_REAL_HOME"): # Snap
home = Path(resolved)
elif resolved := os.environ.get("HOME"): # Flatpak
home = Path(resolved)
return home
def get_xdg_paths() -> dict[str, Path]:
home = get_real_home()
home = Path.home()
xdg_paths = {
"XDG_CONFIG_HOME": home / ".config",
"XDG_STATE_HOME": home / ".local" / "state",
@@ -68,6 +62,9 @@ def get_xdg_paths() -> dict[str, Path]:
resolved_paths = {}
for path in xdg_paths:
real_path = os.environ.get(path)
if real_path is not None and is_sandboxed():
search_string = FLATPAK_ROOT_PATH + "/"
real_path = real_path.replace(search_string, "")
if real_path is not None and is_writeable(real_path):
new_path = Path(real_path)
else:
-1
View File
@@ -60,7 +60,6 @@ DEFAULT_STEAM_PATH = ".local/share/Steam"
FLATPAK_ROOT_PATH = ".var/app/com.valvesoftware.Steam"
FLATPAK_STEAM_PATH = FLATPAK_ROOT_PATH + "/data/Steam"
UBUNTU_STEAM_PATH = ".steam/steam"
SNAP_STEAM_PATH = "snap/steam/common/" + DEFAULT_STEAM_PATH
DEBIAN_STEAM_PATH = ".steam/debian-installation"
LOG_FILTERS = ("CRITICAL", "WARNING", "INFO", "DEBUG")
+4 -7
View File
@@ -12,15 +12,13 @@ from dzgui.const.constants import (
LEGACY_IPS_PATH,
)
from dzgui.config.convert import rc2json
from dzgui.config.xdg import get_real_home
from dzgui.util._json import read_json, write_json
logger = logging.getLogger(APP_NAME)
def migrate_legacy_conf(config: Path) -> Any:
home = get_real_home()
old_conf = home / LEGACY_CONFIG_PATH
old_conf = Path.home() / LEGACY_CONFIG_PATH
j = rc2json(old_conf)
return json.loads(j)
@@ -46,8 +44,7 @@ def convert_cols_file(res: Path) -> Any | None:
def migrate_cols_file(res: Path) -> None:
# NOTE: filename "dzg.columns.json" is API 7 spec
home = get_real_home()
old_res = home / LEGACY_COLS_PATH
old_res = Path.home() / LEGACY_COLS_PATH
if old_res.is_file():
j = convert_cols_file(old_res)
if j is not None:
@@ -55,7 +52,7 @@ def migrate_cols_file(res: Path) -> None:
def copy_state_files(state_path: Path) -> None:
home = get_real_home()
home = Path.home()
legacy = home / ".local/state/dzgui"
to_copy = [
"dzg.res.json",
@@ -74,7 +71,7 @@ def copy_state_files(state_path: Path) -> None:
def copy_ipdb(ips_path: Path) -> None:
home = get_real_home()
home = Path.home()
legacy = home / LEGACY_IPS_PATH
if ips_path == legacy:
return
+2 -2
View File
@@ -3,13 +3,13 @@ import shutil
import subprocess
from dzgui.const.constants import APP_NAME, FLATPAK_APPID, FLATPAK_CMD, STEAM_CMD
from dzgui.init.proc import is_flatpak_sandbox
from dzgui.init.proc import is_sandboxed
logger = logging.getLogger(APP_NAME)
def has_flatpak_client() -> bool:
if is_flatpak_sandbox():
if is_sandboxed():
return True
try:
res = subprocess.run(
+6 -27
View File
@@ -27,40 +27,19 @@ def is_steam_running(cmd: str) -> bool:
raise TypeError("Not a valid Steam client selection")
def is_snap_sandbox() -> bool:
return bool(os.environ.get("SNAP"))
def is_flatpak_sandbox() -> bool:
def is_sandboxed() -> bool:
return bool(os.environ.get("FLATPAK_ID"))
def is_sandboxed() -> bool:
if is_snap_sandbox() or is_flatpak_sandbox():
return True
return False
def get_flatpak_output() -> list[str] | None:
try:
proc = subprocess.check_output(
[FLATPAK_CMD, "ps", "--columns=application"], text=True
)
lines = proc.splitlines()
return lines
except Exception as e:
logger.debug(e)
return None
def is_flatpak_steam_running() -> bool:
if is_flatpak_sandbox():
if is_sandboxed():
return True
if has_cmd(FLATPAK_CMD) is False:
return False
lines = get_flatpak_output()
if lines is None:
return False
proc = subprocess.check_output(
[FLATPAK_CMD, "ps", "--columns=application"], text=True
)
lines = proc.splitlines()
if FLATPAK_APPID in lines:
return True
return False
+41
View File
@@ -0,0 +1,41 @@
navigation = {
"Enter/space/double click": "select row item",
"Down arrow": "move down a row/scroll down",
"Up arrow": "move up a row/scroll up",
"Right arrow": "jump to sidebar from main area",
"Left arrow": "jump to main area from sidebar",
"Tab": "cycle forward through elements",
"Shift-tab": "cycle backward through elements",
"ESC/Enter": "close dialogs",
"?": "show/hide this dialog",
"Ctrl-q": "Quit",
}
servers = {
"Enter/space/double-click": "connect to server",
"Right-click/Ctrl-l": "additional context menus",
"Ctrl-r": "refresh players",
"Ctrl-f": "jump to keyword search field",
"Ctrl-m": "jump to maps field",
"Ctrl-d": "select default LAN port",
"Ctrl-n": "select custom LAN port",
"Ctrl-u": "connect to server from preconnect dialog",
"Ctrl-i": "jump to IP insert field",
"n": "navigate to next tab",
"p": "navigate to previous tab",
"ESC": "return to table",
"1-9": "toggle filter 1-9 on/off",
"0": "toggle filter 10",
"Minus": "toggle filter 11",
"Backslash": "toggle filter 12",
"Apostrophe": "toggle filter 13",
}
vim = {
"j": "Move down a row/scroll up",
"k": "Move up a row/scroll down",
"h": "Jump to main area from sidebar",
"l": "Jump to sidebar from main area",
"g": "Jump to first row/top of page",
"G": "Jump to last row/bottom of page",
}
key_contexts = ["Servers", "Navigation", "Vim-style keys"]
key_header = "Keybindings"
+5 -5
View File
@@ -3,7 +3,7 @@ title_intro = "Welcome"
blurb_intro = """
This wizard will help you set up some common config options before launching the application.
"""
error_sandbox = "Setup cannot be run from inside a sandboxed version of Steam (Snap/Flatpak).\nPlease launch the application directly first."
error_sandbox = "Setup cannot be run from inside Flatpak sandbox.\nPlease launch the application directly."
welcome = "Welcome to {0}!"
### SteamPathPage
@@ -12,15 +12,15 @@ blurb_steam_path = """
DZGUI needs to find the location to your default Steam installation.
This will be used to determine whether (and where) DayZ is installed.
"""
desc_custom_path = "This is the expected Steam path <b>if you set a custom XDG_DATA_HOME directory.</b>"
desc_default_path = "This is the default Steam path on <b>most distributions</b>."
desc_flatpak_path = (
"This is the default Steam path if you are using <b>Flatpak Steam</b>."
)
desc_ubuntu_path = "This is the default Steam path on <b>Ubuntu-based systems</b>."
desc_snap_path = "This is the default Steam path on <b>systems using Snap packages</b>."
desc_debian_path = "This is the default Steam path on <b>Debian-based systems</b>."
no_valid_paths = "No valid Steam path or Steam command found on system. Please install Steam to continue."
no_valid_paths = (
"No valid Steam path or Steam command found on system. Please install Steam to continue."
)
button_scan = "Scan for Steam"
### ConfigMigrationPage
@@ -73,7 +73,7 @@ checkbox_steam_shortcut = (
"This creates a standalone copy of DZGUI and adds it to Steam. "
"You <b>must restart Steam</b> for the shortcut to appear. This will not replace or update existing shortcuts. "
"If you update DZGUI when it is launched via Steam, updates will be applied to the Steam version. "
"Not available if you selected the Snap client as your Steam default."
"Not available if you selected the Flatpak client as your Steam default."
),
)
checkbox_start_menu = (
+2 -3
View File
@@ -10,9 +10,8 @@ from dzgui.const.constants import APP_NAME, APP_NAME_LOWER, IMAGES_PATH
logger = logging.getLogger(APP_NAME)
def make_parents(path: "Path", descend: bool = False) -> None:
p = path if descend else path.parent
p.mkdir(parents=True, exist_ok=True)
def make_parents(path: "Path") -> None:
path.parent.mkdir(parents=True, exist_ok=True)
def copy_dzgui_to_xdg_data(exe_path: Path) -> None:
+162 -249
View File
@@ -1,186 +1,36 @@
from dataclasses import dataclass
from dzgui.const.constants import SYSTEM_LOG
@dataclass(slots=True, frozen=True)
class DevelopersPage:
header: str
paths_label: str
prefs_label: str
columns: list[str]
@dataclass(slots=True, frozen=True)
class ServerLabels:
browser: str
saved: str
recent: str
lan: str
# General
dialog_header = "DZGUI - Dialog"
dz = "DayZ"
dz_exp = "DayZ Experimental"
delimiter = "␞"
# GenericDialog
main_menu = "Return to main menu"
exit_app = "Exit"
modlist = "Modlist"
input_required = "User input required"
confirm = "Confirmation"
notice = "Notice"
wait = "Please wait"
restart_required = "App relaunch required"
# Wait dialogs
ping = "Ping"
mod = "Mod"
_id = "ID"
# ContextMenu
add_note = "Add note"
edit_note = "Edit note"
show_mods = "Show server-side mods"
show_details = "Show server details"
refresh_players = "Refresh player count"
open_workshop = "Open in Steam Workshop"
unsub_mod = "Unsubscribe mod"
validate_mod = "Validate mod"
copy_name = "Copy name to clipboard"
copy_ip = "Copy IP to clipboard"
copy_log = "Copy record(s) to clipboard"
add = "Add to Saved Servers"
add_fav = "Set as favorite"
remove = "Remove from Saved Servers"
remove_history = "Remove from history"
connect = "Connect"
# Columns
server_mod_cols = ["Mod", "ID", "Installed"]
mod_cols = ["Mod", "Symlink", "ID", "Size (MiB)", "Color"]
log_cols = ["Timestamp", "Flag", "Traceback", "Message"]
browser_cols = [
"Name",
"Map",
"View",
"Gametime",
"Players",
"Max",
"Queue",
"IP",
"Qport",
"Ping",
]
# DetailsDialog
workshop = "Enter/double click a row to open in Steam Workshop."
# LanDialog
default_port = "Use default query port (27016)"
custom_port = "Enter custom query port"
scan_servers = "Scan LAN servers"
select_port = "Select the query port"
# Errors
error_heading = "Error"
config_not_found = "DZGUI configuration file not found. Please exit and restart."
cannot_acquire_lock = "DZGUI is already open."
something_wrong = "Something went wrong. See the detailed error below."
steam_key_missing = "No Steam API key is set."
malformed_mods = "Found mods on system, but was unable to parse results."
steam_missing = "Local Steam installation is not set, possibly malformed config file."
build_corrupted = (
"Steam settings or DayZ installation may be corrupted. Try restarting Steam."
)
server_timeout = "Timed out when querying server(s). Check IP or try again later."
server_error = (
"Error while contacting server, possibly timed out. Please wait and try again."
)
server_protected = (
"This server is password-protected and you will be "
"prompted when connecting. Do you want to proceed?"
)
@dataclass(slots=True, frozen=True)
class AtomicButton:
refresh: str
refresh_tooltip: str
copy: str
keys: str
keys_tooltip: str
# KeybindingsDialog
navigation = {
"Enter/space/double click": "select row item",
"Down arrow": "move down a row/scroll down",
"Up arrow": "move up a row/scroll up",
"Right arrow": "jump to sidebar from main area",
"Left arrow": "jump to main area from sidebar",
"Tab": "cycle forward through elements",
"Shift-tab": "cycle backward through elements",
"ESC/Enter": "close dialogs",
"?": "show/hide this dialog",
"Ctrl-q": "Quit",
}
servers = {
"Enter/space/double-click": "connect to server",
"Right-click/Ctrl-l": "additional context menus",
"Ctrl-r": "refresh players",
"Ctrl-f": "jump to keyword search field",
"Ctrl-m": "jump to maps field",
"Ctrl-d": "select default LAN port",
"Ctrl-n": "select custom LAN port",
"Ctrl-u": "connect to server from preconnect dialog",
"Ctrl-i": "jump to IP insert field",
"n": "navigate to next tab",
"p": "navigate to previous tab",
"ESC": "return to table",
"1-9": "toggle filter 1-9 on/off",
"0": "toggle filter 10",
"Minus": "toggle filter 11",
"Backslash": "toggle filter 12",
"Apostrophe": "toggle filter 13",
}
vim = {
"j": "Move down a row/scroll up",
"k": "Move up a row/scroll down",
"h": "Jump to main area from sidebar",
"l": "Jump to sidebar from main area",
"g": "Jump to first row/top of page",
"G": "Jump to last row/bottom of page",
}
key_contexts = ["Servers", "Navigation", "Vim-style keys"]
key_header = "Keybindings"
# ModSelectionPanel
# labels
label_main_menu = "Main menu"
# buttons
ping_servers = "Ping servers"
ping_tooltip = (
"Refresh the ping for visible servers.\n" "Available once per unique filter context"
)
# statusbar_helptext = "Select a row to see its detailed description"
# statusbar_helptext = "No server metadata to list."
# use e.g. filters.1pp
filter_1pp = "1PP"
filter_3pp = "3PP"
filter_day = "Day"
filter_night = "Night"
filter_empty = "Empty"
filter_full = "Full"
filter_lowpop = "Low pop"
filter_nonascii = "Non-ASCII"
filter_duplicate = "Duplicate"
filter_official = "Official"
filter_unofficial = "Unofficial"
filter_modded = "Modded"
filter_unmodded = "Unmodded"
# state
unknown = "Unknown"
none_provided = "None provided"
disabled = "Disabled"
enabled = "Enabled"
null = "-"
unspecified = "not specified"
# DLC
dlc_frostline = "Frostline"
dlc_badlands = "Badlands"
dlc_none = "None"
# platform
windows = "Windows"
linux = "Linux"
# misc
self_workshop = "Open Steam workshop"
settings_updated = "Settings updated!"
@dataclass(slots=True, frozen=True)
class Flags:
description: str
version: str
uninstall: str
debug: str
map_count: str
@dataclass(slots=True, frozen=True)
class ModPanelStrings:
@@ -280,12 +130,6 @@ class Options:
manual_dl: str
auto_dl: str
update: str
install_mode: str
force_update: str
dl_eventbox: str
force_eventbox: str
self_update: str
no_self_update: str
api_key: str
prefs: str
mods: str
@@ -293,7 +137,140 @@ class Options:
branch: str
stable: str
testing: str
manual_sub_msg: str
# General
dialog_header = "DZGUI - Dialog"
dz = "DayZ"
dz_exp = "DayZ Experimental"
delimiter = "␞"
# GenericDialog
main_menu = "Return to main menu"
exit_app = "Exit"
modlist = "Modlist"
input_required = "User input required"
confirm = "Confirmation"
notice = "Notice"
wait = "Please wait"
restart_required = "App relaunch required"
# Wait dialogs
ping = "Ping"
mod = "Mod"
_id = "ID"
# ContextMenu
add_note = "Add note"
edit_note = "Edit note"
show_mods = "Show server-side mods"
show_details = "Show server details"
refresh_players = "Refresh player count"
open_workshop = "Open in Steam Workshop"
unsub_mod = "Unsubscribe mod"
validate_mod = "Validate mod"
copy_name = "Copy name to clipboard"
copy_ip = "Copy IP to clipboard"
copy_log = "Copy record(s) to clipboard"
add = "Add to Saved Servers"
add_fav = "Set as favorite"
remove = "Remove from Saved Servers"
remove_history = "Remove from history"
connect = "Connect"
# Columns
server_mod_cols = ["Mod", "ID", "Installed"]
mod_cols = ["Mod", "Symlink", "ID", "Size (MiB)", "Color"]
log_cols = ["Timestamp", "Flag", "Traceback", "Message"]
browser_cols = [
"Name",
"Map",
"View",
"Gametime",
"Players",
"Max",
"Queue",
"IP",
"Qport",
"Ping",
]
# DetailsDialog
workshop = "Enter/double click a row to open in Steam Workshop."
# LanDialog
default_port = "Use default query port (27016)"
custom_port = "Enter custom query port"
scan_servers = "Scan LAN servers"
select_port = "Select the query port"
# Errors
error_heading = "Error"
config_not_found = "DZGUI configuration file not found. Please exit and restart."
cannot_acquire_lock = "DZGUI is already open."
something_wrong = "Something went wrong. See the detailed error below."
steam_key_missing = "No Steam API key is set."
malformed_mods = "Found mods on system, but was unable to parse results."
steam_missing = "Local Steam installation is not set, possibly malformed config file."
build_corrupted = (
"Steam settings or DayZ installation may be corrupted. Try restarting Steam."
)
server_timeout = "Timed out when querying server(s). Check IP or try again later."
server_error = (
"Error while contacting server, possibly timed out. Please wait and try again."
)
server_protected = (
"This server is password-protected and you will be "
"prompted when connecting. Do you want to proceed?"
)
# labels
label_main_menu = "Main menu"
# buttons
ping_servers = "Ping servers"
ping_tooltip = (
"Refresh the ping for visible servers.\n" "Available once per unique filter context"
)
# use e.g. filters.1pp
filter_1pp = "1PP"
filter_3pp = "3PP"
filter_day = "Day"
filter_night = "Night"
filter_empty = "Empty"
filter_full = "Full"
filter_lowpop = "Low pop"
filter_nonascii = "Non-ASCII"
filter_duplicate = "Duplicate"
filter_official = "Official"
filter_unofficial = "Unofficial"
filter_modded = "Modded"
filter_unmodded = "Unmodded"
# state
unknown = "Unknown"
none_provided = "None provided"
disabled = "Disabled"
enabled = "Enabled"
null = "-"
unspecified = "not specified"
# DLC
dlc_frostline = "Frostline"
dlc_badlands = "Badlands"
dlc_none = "None"
# platform
windows = "Windows"
linux = "Linux"
# misc
self_workshop = "Open Steam workshop"
settings_updated = "Settings updated!"
init = Init(
@@ -371,20 +348,6 @@ options = Options(
manual_dl="Manual",
auto_dl="Auto",
update="Update",
install_mode="Mod install mode",
force_update="Force update local mods",
dl_eventbox=(
"Manual: prompt to subscribe to mods in Steam. " "Auto: unmanned downloads."
),
force_eventbox="Synchronize all local mods. Automatic mode must be enabled.",
self_update=(
"Stable: only contains stable features. "
"Testing: pre-release beta, contains new features."
),
no_self_update=(
"In-app updates are disabled when DZGUI is "
"installed globally (e.g., via package manager)."
),
api_key="API Key",
prefs="Preferences",
mods="Mods",
@@ -392,13 +355,6 @@ options = Options(
branch="DZGUI branch",
stable="Stable",
testing="Testing",
manual_sub_msg="""When switching from MANUAL to AUTO mod install mode,
DZGUI will manage mod installation and deletion for you.
To prevent conflicts with Steam Workshop subscriptions and old mods from being downloaded
when Steam updates, you should unsubscribe from any existing Workshop mods you manually subscribed to.
Open your Profile, then 'Workshop Items' and select 'Unsubscribe from all'
on the right-hand side.
""",
)
dialog = Dialog(
@@ -445,14 +401,6 @@ no_mods = "No local mods found."
no_servers = "No server metadata to list."
@dataclass(slots=True, frozen=True)
class Flags:
description: str
version: str
uninstall: str
debug: str
map_count: str
flags = Flags(
description="DayZ server browser and mod manager",
@@ -463,28 +411,11 @@ flags = Flags(
)
@dataclass(slots=True, frozen=True)
class FilePicker:
title: str
placeholder: str
picker = FilePicker(
title="Save diagnostic log to file",
placeholder=SYSTEM_LOG,
)
api_error = (
"API key validation error or timeout. See 'Help > Show debug log' for details."
)
@dataclass(slots=True, frozen=True)
class DevelopersPage:
header: str
paths_label: str
prefs_label: str
columns: list[str]
developers = DevelopersPage(
@@ -495,14 +426,6 @@ developers = DevelopersPage(
)
@dataclass(slots=True, frozen=True)
class ServerLabels:
browser: str
saved: str
recent: str
lan: str
server_labels = ServerLabels(
browser="Server Browser",
saved="Saved Servers",
@@ -511,19 +434,9 @@ server_labels = ServerLabels(
)
distance_suffix = "Distance: calculating..."
dialog_error = "ERROR"
@dataclass(slots=True, frozen=True)
class AtomicButton:
refresh: str
refresh_tooltip: str
copy: str
keys: str
keys_tooltip: str
atomic_buttons = AtomicButton(
refresh="Refresh",
refresh_tooltip="Refresh server data",
-2
View File
@@ -35,8 +35,6 @@ def rebuild_symlinks(config: Path) -> None:
expunge_link(file)
workshop = get_local_mod_path(steam_path)
if workshop.is_dir() is False:
return
# NOTE: create symlinks for missing mods
for mod_id in get_local_mod_ids(steam_path):
uid = str(mod_id)
+1 -8
View File
@@ -14,10 +14,8 @@ from dzgui.const.constants import (
HERO_PATH,
FLATPAK_ROOT_PATH,
LEGACY_CONFIG_PATH,
SNAP_STEAM_PATH,
TMP_PATH,
)
from dzgui.config.xdg import get_real_home
from dzgui.const.boilerplate import config_boilerplate
from dzgui.const.endpoints import STEAM_API_SETUP
from dzgui.config import freedesktop
@@ -508,8 +506,7 @@ class Assistant(Gtk.Assistant):
self.pages: dict[EnumeratedWizardPage, int] = {}
home = get_real_home()
legacy_path = home.joinpath(LEGACY_CONFIG_PATH)
legacy_path = Path.home().joinpath(LEGACY_CONFIG_PATH)
self.has_legacy_config = legacy_path.is_file()
for page in (
self.page_intro,
@@ -702,7 +699,6 @@ class ShortcutCreationPage(OptionalPageMixin, EnumeratedWizardPage): # type: ig
self.add_start(self.checks_area)
self.show_all()
self.connect("map", self._on_map)
def _on_start_menu_toggled(self, button: Gtk.CheckButton) -> None:
@@ -713,9 +709,6 @@ class ShortcutCreationPage(OptionalPageMixin, EnumeratedWizardPage): # type: ig
def set_steam_path(self, path: Path) -> None:
self.steam_path = path
if SNAP_STEAM_PATH in str(self.steam_path):
self.steam_checkbox.set_active(False)
self.steam_checkbox.set_sensitive(False)
def is_steam_checkbox_active(self) -> bool:
return self.steam_checkbox.get_active()
+6 -4
View File
@@ -1,7 +1,7 @@
from typing import TYPE_CHECKING
from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
from dzgui.util.strings import navigation, servers, vim, key_header, key_contexts
from dzgui.strings import keybindings
from dzgui.util.css import add_class
import gi
@@ -26,10 +26,12 @@ class Keybindings(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore
self.controller = controller
self.box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
label = Gtk.Label(label=key_header)
label = Gtk.Label(label=keybindings.key_header)
add_class(label, "page-heading")
grid = self.build_grid([servers, navigation, vim])
grid = self.build_grid(
[keybindings.servers, keybindings.navigation, keybindings.vim]
)
self.box.add(label)
self.box.add(grid)
self.add(self.box)
@@ -94,7 +96,7 @@ class Keybindings(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore
row, column = 1, 1
w, h = 1, 1
sidebar = self.build_sidebar(key_contexts)
sidebar = self.build_sidebar(keybindings.key_contexts)
separator = Gtk.Separator()
keys_box = self.build_keys(items)
-12
View File
@@ -1,12 +0,0 @@
"libraryfolders"
{
"0"
{
"path" ""
"label" ""
"apps"
{
"221100" "11111"
}
}
}
-43
View File
@@ -1,43 +0,0 @@
import pytest
import tempfile
from pathlib import Path
from typing import TYPE_CHECKING
from dzgui.api.steam import get_steam_paths
if TYPE_CHECKING:
from _pytest.monkeypatch import MonkeyPatch
def test_custom_xdg_path(monkeypatch: "MonkeyPatch") -> None:
tmp = tempfile.TemporaryDirectory(delete=False).name
custom_path = Path(tmp).joinpath("xdg_data_home")
monkeypatch.setenv("XDG_DATA_HOME", str(custom_path))
vdf_path = custom_path.joinpath("Steam/steamapps")
vdf_path.mkdir(parents=True, exist_ok=True)
vdf_path.joinpath("libraryfolders.vdf").touch()
resolved_paths = get_steam_paths()
expect = custom_path.joinpath("Steam")
assert any(expect in el for el in resolved_paths)
def test_default_xdg_path() -> None:
resolved_paths = get_steam_paths()
expect = Path.home().joinpath(".local/share/Steam")
assert any(expect in el for el in resolved_paths)
def test_ubuntu_path() -> None:
resolved_paths = get_steam_paths()
expect = Path.home().joinpath(".steam/steam")
assert any(expect in el for el in resolved_paths)
@pytest.mark.flatpak
def test_flatpak_path() -> None:
resolved_paths = get_steam_paths()
expect = Path.home().joinpath(".var/app/com.valvesoftware.Steam/data/steam")
assert any(expect in el for el in resolved_paths)
-23
View File
@@ -1,23 +0,0 @@
import pytest
import tempfile
from pathlib import Path
from typing import TYPE_CHECKING
from dzgui.config.xdg import get_xdg_paths
if TYPE_CHECKING:
from _pytest.monkeypatch import MonkeyPatch
@pytest.mark.parametrize("env", ["SNAP_REAL_HOME", "HOME"])
def test_sandbox_home_resolution(monkeypatch: "MonkeyPatch", env: str) -> None:
with tempfile.NamedTemporaryFile(delete=False) as f:
monkeypatch.setenv(env, f.name)
paths = get_xdg_paths()
assert paths["XDG_CONFIG_HOME"] == Path(f.name).joinpath(".config/dzgui")
def test_home_fallback() -> None:
paths = get_xdg_paths()
assert paths["XDG_CONFIG_HOME"] == Path.home().joinpath(".config/dzgui")
-30
View File
@@ -1,30 +0,0 @@
import pytest
import vdf
from pathlib import Path
from dzgui.api.mods import get_local_mod_ids
from dzgui.util.dirs import make_parents
from tests.fixtures import fixture_path
@pytest.fixture
def libraryfolders() -> Path:
return fixture_path("api/steamapps/libraryfolders.vdf")
def test_missing_mod_dir(tmp_path, libraryfolders: Path) -> None:
"""
Updates fixture file key with tmp path value serializes to file,
then tests for missing mod directory returning an empty list
"""
folders = tmp_path.joinpath("steamapps/libraryfolders.vdf")
workshop = tmp_path.joinpath("steamapps/workshop/content")
make_parents(folders)
make_parents(workshop, descend=True)
with open(libraryfolders, "r") as f:
data = vdf.load(f)
data["libraryfolders"]["0"]["path"] = tmp_path
with open(folders, "w") as f:
vdf.dump(data, f, pretty=True)
ids = get_local_mod_ids(tmp_path)
assert len(ids) == 0