mirror of
https://github.com/aclist/dztui.git
synced 2026-11-16 23:01:53 +01:00
Compare commits
36
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45c412e1ad | ||
|
|
a32c99b3eb | ||
|
|
da474e274f | ||
|
|
d694aa56e8 | ||
|
|
6adecbedaa | ||
|
|
e935276e32 | ||
|
|
047b9dbbf6 | ||
|
|
d5c9f24ad5 | ||
|
|
f486cc506f | ||
|
|
307792ba5b | ||
|
|
f7d95d5407 | ||
|
|
8b09622fe5 | ||
|
|
7f6d61083c | ||
|
|
3e7b49203a | ||
|
|
269ef18a48 | ||
|
|
35623b6456 | ||
|
|
b9cb7ec973 | ||
|
|
e29433b388 | ||
|
|
170990ee1d | ||
|
|
1dbbd5977d | ||
|
|
c267b1bbc7 | ||
|
|
d0b3a723c6 | ||
|
|
535bc505f7 | ||
|
|
f2375feeec | ||
|
|
1b9448735d | ||
|
|
d5693b07fb | ||
|
|
7a6f4a2bb9 | ||
|
|
ba92d15085 | ||
|
|
65e04c2fc4 | ||
|
|
0907f5a474 | ||
|
|
bfa83c3f94 | ||
|
|
aef48e515b | ||
|
|
e6ebeaeb5e | ||
|
|
88c740105a | ||
|
|
b98a6f95a6 | ||
|
|
87d76e83ba |
No files matched your search
+3
-7
@@ -57,6 +57,7 @@
|
|||||||
- List timestamp of last DayZ client update
|
- List timestamp of last DayZ client update
|
||||||
- Validate mods via Mod page to pull in updates
|
- Validate mods via Mod page to pull in updates
|
||||||
- Support for Nasdara (Badlands) DLC
|
- Support for Nasdara (Badlands) DLC
|
||||||
|
- Load offline mods
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
- Conform to PEP 440 versioning for beta versions
|
- Conform to PEP 440 versioning for beta versions
|
||||||
@@ -99,16 +100,11 @@
|
|||||||
- Current keyword filter not being applied when refreshing table
|
- Current keyword filter not being applied when refreshing table
|
||||||
- Steam Flatpak cannot run DZGUI as a non-Steam game
|
- Steam Flatpak cannot run DZGUI as a non-Steam game
|
||||||
- Collisions between native Steam and Steam Flatpak clients
|
- Collisions between native Steam and Steam Flatpak clients
|
||||||
|
- Sticky toggle signal on radio buttons when reloading Options
|
||||||
### Unreleased
|
|
||||||
- Load offline mods
|
|
||||||
- Local documentation
|
|
||||||
- Raw debug command in context menu
|
|
||||||
|
|
||||||
### Developer-facing
|
### Developer-facing
|
||||||
- Add pyproject.toml file
|
|
||||||
- Show deprecation warnings
|
|
||||||
- Options -> Dev page
|
- Options -> Dev page
|
||||||
|
- Raw debug command in preconnect menu
|
||||||
|
|
||||||
## [6.0.5] 2026-05-17
|
## [6.0.5] 2026-05-17
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
+2
-3
@@ -8,7 +8,7 @@ If you are a developer, you can skip to the end.
|
|||||||
# Requesting help
|
# Requesting help
|
||||||
|
|
||||||
If you encounter a problem with DZGUI, you can submit tickets on the GitHub
|
If you encounter a problem with DZGUI, you can submit tickets on the GitHub
|
||||||
[issue tracker](https://github.com/aclist/dztui/issues) under the
|
[issue tracker](https://github.com/aclist/dzgui/issues) under the
|
||||||
`troubleshooting` tag.
|
`troubleshooting` tag.
|
||||||
|
|
||||||
# How can I help the project?
|
# How can I help the project?
|
||||||
@@ -24,7 +24,7 @@ accordingly.
|
|||||||
|
|
||||||
## Submitting a ticket
|
## Submitting a ticket
|
||||||
|
|
||||||
Navigate to the GitHub [issue tracker](https://github.com/aclist/dztui/issues).
|
Navigate to the GitHub [issue tracker](https://github.com/aclist/dzgui/issues).
|
||||||
From there, follow the onscreen prompts. You will be asked questions such as:
|
From there, follow the onscreen prompts. You will be asked questions such as:
|
||||||
|
|
||||||
- What version are you using?
|
- What version are you using?
|
||||||
@@ -55,7 +55,6 @@ The following naming conventions apply for PRs:
|
|||||||
- fix/<your-fix> - patch/hotfix branches
|
- fix/<your-fix> - patch/hotfix branches
|
||||||
- feat/<your-feature> - feature branches
|
- feat/<your-feature> - feature branches
|
||||||
- doc/<your-doc-branch> - documentation branches
|
- doc/<your-doc-branch> - documentation branches
|
||||||
- infra/<your-infra-branch> - infrastructure branches
|
|
||||||
|
|
||||||
Implement your changes and test them locally. If they work, you may
|
Implement your changes and test them locally. If they work, you may
|
||||||
open a merge request, and then we review your changes. If everything is OK, it
|
open a merge request, and then we review your changes. If everything is OK, it
|
||||||
|
|||||||
+6
-5
@@ -5,7 +5,7 @@
|
|||||||
### Fetch submodules
|
### Fetch submodules
|
||||||
git submodule update --recursive --init
|
git submodule update --recursive --init
|
||||||
|
|
||||||
### Install with dev dependencies
|
### Install into editable venv with dev dependencies
|
||||||
uv pip install -e '.[dev]'
|
uv pip install -e '.[dev]'
|
||||||
|
|
||||||
This includes all dependencies for building, linting, testing, and checking in code.
|
This includes all dependencies for building, linting, testing, and checking in code.
|
||||||
@@ -16,7 +16,7 @@ docs: documentation tools
|
|||||||
lint: code linting, fixing, and type checking
|
lint: code linting, fixing, and type checking
|
||||||
test: unit and integration tests
|
test: unit and integration tests
|
||||||
|
|
||||||
## Miscellaneous
|
## Build process
|
||||||
|
|
||||||
### Setting up precommit hooks
|
### Setting up precommit hooks
|
||||||
pre-commit install
|
pre-commit install
|
||||||
@@ -25,6 +25,7 @@ pre-commit install
|
|||||||
sphinx-build -M html source build -a
|
sphinx-build -M html source build -a
|
||||||
|
|
||||||
### Building standalone release binaries
|
### Building standalone release binaries
|
||||||
1. Set up the build target: `rustup target add x86_64-unknown-linux-musl`
|
1. Install the applicable system package containing the 'musl-gcc' wrapper
|
||||||
2. Run `python3 scripts/release.py`
|
2. Set up the build target: `rustup target add x86_64-unknown-linux-musl`
|
||||||
3. Generate a release and tag against the resulting tarfile generated in `dist`
|
3. Run `python3 scripts/release.py`
|
||||||
|
4. Generate a release and tag against the resulting tarfile generated in `dist`
|
||||||
+1
-1
@@ -15,7 +15,7 @@ author = 'aclist'
|
|||||||
extensions = []
|
extensions = []
|
||||||
|
|
||||||
templates_path = ['_templates']
|
templates_path = ['_templates']
|
||||||
exclude_patterns = []
|
exclude_patterns = [] # type: ignore[var-annotated]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import logging
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
from concurrent.futures import ThreadPoolExecutor, wait
|
from concurrent.futures import ThreadPoolExecutor, wait
|
||||||
from dataclasses import dataclass
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import subprocess
|
|||||||
import threading
|
import threading
|
||||||
|
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import Any, Optional, TYPE_CHECKING, Union
|
from typing import Any, TYPE_CHECKING, Union
|
||||||
|
|
||||||
from dzgui.const.constants import APP_NAME, REQUEST_TIMEOUT
|
from dzgui.const.constants import APP_NAME, REQUEST_TIMEOUT
|
||||||
from dzgui.const.endpoints import STEAM_SERVERS
|
from dzgui.const.endpoints import STEAM_SERVERS
|
||||||
@@ -491,7 +491,7 @@ def query_by_record(record: Record, update_gameport: bool = False) -> A2SInfo:
|
|||||||
return A2SInfo(record, None)
|
return A2SInfo(record, None)
|
||||||
|
|
||||||
|
|
||||||
def short_ip_to_record(addr: str) -> Optional[Record]:
|
def short_ip_to_record(addr: str) -> Record | None:
|
||||||
r = addr.split(":")
|
r = addr.split(":")
|
||||||
# TODO: raise exceptions instead of Nonetype
|
# TODO: raise exceptions instead of Nonetype
|
||||||
if len(r) != 2:
|
if len(r) != 2:
|
||||||
@@ -499,7 +499,7 @@ def short_ip_to_record(addr: str) -> Optional[Record]:
|
|||||||
return Record(r[0], 0, int(r[1]))
|
return Record(r[0], 0, int(r[1]))
|
||||||
|
|
||||||
|
|
||||||
def fqip_to_record(addr: str) -> Optional[Record]:
|
def fqip_to_record(addr: str) -> Record | None:
|
||||||
r = addr.split(":")
|
r = addr.split(":")
|
||||||
if len(r) != 3:
|
if len(r) != 3:
|
||||||
return None
|
return None
|
||||||
|
|||||||
+13
-4
@@ -27,6 +27,7 @@ from dzgui.const.constants import (
|
|||||||
FLATPAK_STEAM_PATH,
|
FLATPAK_STEAM_PATH,
|
||||||
LIBRARYFOLDERS_PATH,
|
LIBRARYFOLDERS_PATH,
|
||||||
REQUEST_TIMEOUT,
|
REQUEST_TIMEOUT,
|
||||||
|
SNAP_STEAM_PATH,
|
||||||
UBUNTU_STEAM_PATH,
|
UBUNTU_STEAM_PATH,
|
||||||
VDF_PATH,
|
VDF_PATH,
|
||||||
)
|
)
|
||||||
@@ -67,23 +68,31 @@ def get_steam_paths() -> list[tuple[Path, str]]:
|
|||||||
HOME = Path.home()
|
HOME = Path.home()
|
||||||
env = os.environ.get("XDG_DATA_HOME")
|
env = os.environ.get("XDG_DATA_HOME")
|
||||||
if env is not None:
|
if env is not None:
|
||||||
XDG_DATA_HOME = env
|
XDG_DATA_HOME = Path(env)
|
||||||
|
DEFAULT_PATH = XDG_DATA_HOME.joinpath("Steam")
|
||||||
else:
|
else:
|
||||||
XDG_DATA_HOME = DEFAULT_STEAM_PATH
|
DEFAULT_PATH = HOME.joinpath(DEFAULT_STEAM_PATH)
|
||||||
|
|
||||||
DEFAULT_PATH = HOME.joinpath(XDG_DATA_HOME)
|
|
||||||
FLATPAK_PATH = HOME.joinpath(FLATPAK_STEAM_PATH)
|
FLATPAK_PATH = HOME.joinpath(FLATPAK_STEAM_PATH)
|
||||||
UBUNTU_PATH = HOME.joinpath(UBUNTU_STEAM_PATH)
|
UBUNTU_PATH = HOME.joinpath(UBUNTU_STEAM_PATH)
|
||||||
DEBIAN_PATH = HOME.joinpath(DEBIAN_STEAM_PATH)
|
DEBIAN_PATH = HOME.joinpath(DEBIAN_STEAM_PATH)
|
||||||
|
SNAP_PATH = HOME.joinpath(SNAP_STEAM_PATH)
|
||||||
|
|
||||||
human = {
|
human = {
|
||||||
DEFAULT_PATH: wizard.desc_default_path,
|
DEFAULT_PATH: wizard.desc_default_path,
|
||||||
FLATPAK_PATH: wizard.desc_flatpak_path,
|
FLATPAK_PATH: wizard.desc_flatpak_path,
|
||||||
UBUNTU_PATH: wizard.desc_ubuntu_path,
|
UBUNTU_PATH: wizard.desc_ubuntu_path,
|
||||||
|
SNAP_PATH: wizard.desc_snap_path,
|
||||||
DEBIAN_PATH: wizard.desc_debian_path,
|
DEBIAN_PATH: wizard.desc_debian_path,
|
||||||
}
|
}
|
||||||
|
|
||||||
for path in DEFAULT_PATH, FLATPAK_PATH, UBUNTU_PATH, DEBIAN_PATH:
|
for path in (
|
||||||
|
DEFAULT_PATH,
|
||||||
|
FLATPAK_PATH,
|
||||||
|
UBUNTU_PATH,
|
||||||
|
SNAP_PATH,
|
||||||
|
DEBIAN_PATH,
|
||||||
|
):
|
||||||
if path is FLATPAK_PATH and has_flatpak_client() is False:
|
if path is FLATPAK_PATH and has_flatpak_client() is False:
|
||||||
continue
|
continue
|
||||||
if path is not FLATPAK_PATH and has_steam_client() is False:
|
if path is not FLATPAK_PATH and has_steam_client() is False:
|
||||||
|
|||||||
+1
-2
@@ -6,7 +6,6 @@ from importlib import resources
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
APP_NAME,
|
APP_NAME,
|
||||||
APP_NAME_LOWER,
|
APP_NAME_LOWER,
|
||||||
@@ -107,7 +106,7 @@ def load_steam_icon() -> None:
|
|||||||
import gi
|
import gi
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk # noqa
|
from gi.repository import Gtk
|
||||||
|
|
||||||
try:
|
try:
|
||||||
traversable = resources.files(APP_NAME_LOWER).joinpath(ICONS_PATH)
|
traversable = resources.files(APP_NAME_LOWER).joinpath(ICONS_PATH)
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ from dzgui.const.constants import (
|
|||||||
from dzgui.init.proc import is_sandboxed
|
from dzgui.init.proc import is_sandboxed
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass(slots=True, frozen=True)
|
||||||
class Xdg:
|
class Xdg:
|
||||||
config: Path
|
config: Path
|
||||||
columns: Path
|
columns: Path
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ DEFAULT_STEAM_PATH = ".local/share/Steam"
|
|||||||
FLATPAK_ROOT_PATH = ".var/app/com.valvesoftware.Steam"
|
FLATPAK_ROOT_PATH = ".var/app/com.valvesoftware.Steam"
|
||||||
FLATPAK_STEAM_PATH = FLATPAK_ROOT_PATH + "/data/Steam"
|
FLATPAK_STEAM_PATH = FLATPAK_ROOT_PATH + "/data/Steam"
|
||||||
UBUNTU_STEAM_PATH = ".steam/steam"
|
UBUNTU_STEAM_PATH = ".steam/steam"
|
||||||
|
SNAP_STEAM_PATH = "snap/steam/common/" + DEFAULT_STEAM_PATH
|
||||||
DEBIAN_STEAM_PATH = ".steam/debian-installation"
|
DEBIAN_STEAM_PATH = ".steam/debian-installation"
|
||||||
|
|
||||||
LOG_FILTERS = ("CRITICAL", "WARNING", "INFO", "DEBUG")
|
LOG_FILTERS = ("CRITICAL", "WARNING", "INFO", "DEBUG")
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ STEAM_UNSUB = "https://api.steampowered.com/IPublishedFileService/Unsubscribe/v1
|
|||||||
STEAM_APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
|
STEAM_APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
|
||||||
|
|
||||||
GITHUB = "https://github.com/aclist"
|
GITHUB = "https://github.com/aclist"
|
||||||
GITHUB_RELEASES = "https://api.github.com/repos/aclist/dztui/releases/latest"
|
GITHUB_RELEASES = "https://api.github.com/repos/aclist/dzgui/releases/latest"
|
||||||
CODEBERG_RELEASES = "https://codeberg.org/api/v1/repos/aclist/dzgui/releases/latest"
|
CODEBERG_RELEASES = "https://codeberg.org/api/v1/repos/aclist/dzgui/releases/latest"
|
||||||
GITHUB_USER_RELEASES = "https://github.com/aclist/dztui/releases"
|
GITHUB_USER_RELEASES = "https://github.com/aclist/dzgui/releases"
|
||||||
DB_IP = "https://db-ip.com/db/download/ip-to-city-lite"
|
DB_IP = "https://db-ip.com/db/download/ip-to-city-lite"
|
||||||
IP_ECHO = "https://ipecho.net/plain"
|
IP_ECHO = "https://ipecho.net/plain"
|
||||||
COORDS_API = "http://ip-api.com/json"
|
COORDS_API = "http://ip-api.com/json"
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
|
import gi
|
||||||
import logging
|
import logging
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
from typing import Any, TYPE_CHECKING, Union
|
from typing import Any, TYPE_CHECKING, Union
|
||||||
|
|
||||||
import dzgui.util._json as JSON # noqa
|
from dzgui.config.userprefs import UserPrefs
|
||||||
|
from dzgui.const.constants import APP_NAME
|
||||||
|
|
||||||
from dzgui.const.enum import (
|
from dzgui.const.enum import (
|
||||||
ButtonType,
|
ButtonType,
|
||||||
ContextMenuItem,
|
ContextMenuItem,
|
||||||
@@ -14,9 +14,6 @@ from dzgui.const.enum import (
|
|||||||
Preferences,
|
Preferences,
|
||||||
ServerTab,
|
ServerTab,
|
||||||
)
|
)
|
||||||
|
|
||||||
from dzgui.config.userprefs import UserPrefs
|
|
||||||
from dzgui.const.constants import APP_NAME
|
|
||||||
from dzgui.controllers.emitter import Emitter
|
from dzgui.controllers.emitter import Emitter
|
||||||
from dzgui.managers.config import ConfigManager
|
from dzgui.managers.config import ConfigManager
|
||||||
from dzgui.managers.connection import ConnectionManager
|
from dzgui.managers.connection import ConnectionManager
|
||||||
@@ -29,8 +26,6 @@ from dzgui.util.open_links import open_user_workshop, open_workshop_page
|
|||||||
from dzgui.views.dialogs.filepicker import FilePicker
|
from dzgui.views.dialogs.filepicker import FilePicker
|
||||||
from dzgui.views.dialogs.generic import ExceptionDialog
|
from dzgui.views.dialogs.generic import ExceptionDialog
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk, GLib, GObject
|
from gi.repository import Gtk, Gdk, GLib, GObject
|
||||||
|
|
||||||
@@ -371,7 +366,6 @@ class Controller(GObject.GObject):
|
|||||||
filter_man = self.get_filter_man()
|
filter_man = self.get_filter_man()
|
||||||
return filter_man.get_filters()
|
return filter_man.get_filters()
|
||||||
|
|
||||||
# FIXME: wipe maps store when changing tabs if model is none
|
|
||||||
def has_server_model(self) -> bool:
|
def has_server_model(self) -> bool:
|
||||||
treeview = self.get_active_treeview()
|
treeview = self.get_active_treeview()
|
||||||
proxy_man = treeview.get_proxy_man()
|
proxy_man = treeview.get_proxy_man()
|
||||||
|
|||||||
+10
-7
@@ -53,6 +53,11 @@
|
|||||||
- Expand/collapse changelog versions
|
- Expand/collapse changelog versions
|
||||||
- Support local light/dark mode changes on system theme
|
- Support local light/dark mode changes on system theme
|
||||||
- Server time calculator
|
- Server time calculator
|
||||||
|
- Add "Unmodded" filter to servers
|
||||||
|
- List timestamp of last DayZ client update
|
||||||
|
- Validate mods via Mod page to pull in updates
|
||||||
|
- Support for Nasdara (Badlands) DLC
|
||||||
|
- Load offline mods
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
- Conform to PEP 440 versioning for beta versions
|
- Conform to PEP 440 versioning for beta versions
|
||||||
@@ -74,6 +79,7 @@
|
|||||||
- Enable LAN page Empty/Full filters on first run of app
|
- Enable LAN page Empty/Full filters on first run of app
|
||||||
- Propagate subscribed mods to Steam client
|
- Propagate subscribed mods to Steam client
|
||||||
- Make j/k keys in context menus follow same wraparound logic as down arrow/up arrow
|
- Make j/k keys in context menus follow same wraparound logic as down arrow/up arrow
|
||||||
|
- Use SQLite DB for geolocation records
|
||||||
|
|
||||||
### Dropped
|
### Dropped
|
||||||
- Battlemetrics API support
|
- Battlemetrics API support
|
||||||
@@ -92,16 +98,13 @@
|
|||||||
- Moved dialogs out of threads
|
- Moved dialogs out of threads
|
||||||
- History table not being in lock-step with state file
|
- History table not being in lock-step with state file
|
||||||
- Current keyword filter not being applied when refreshing table
|
- Current keyword filter not being applied when refreshing table
|
||||||
|
- Steam Flatpak cannot run DZGUI as a non-Steam game
|
||||||
### Unreleased
|
- Collisions between native Steam and Steam Flatpak clients
|
||||||
- Load offline mods
|
- Sticky toggle signal on radio buttons when reloading Options
|
||||||
- Local documentation
|
|
||||||
- Raw debug command in context menu
|
|
||||||
|
|
||||||
### Developer-facing
|
### Developer-facing
|
||||||
- Add pyproject.toml file
|
|
||||||
- Show deprecation warnings
|
|
||||||
- Options -> Dev page
|
- Options -> Dev page
|
||||||
|
- Raw debug command in preconnect menu
|
||||||
|
|
||||||
## [6.0.5] 2026-05-17
|
## [6.0.5] 2026-05-17
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
@@ -330,7 +330,6 @@ class ConnectionManager:
|
|||||||
|
|
||||||
self.thread_man.update_dialog(waiting_for_launch)
|
self.thread_man.update_dialog(waiting_for_launch)
|
||||||
while True:
|
while True:
|
||||||
# FIXME: cancel should not be visible here per setting above
|
|
||||||
if self.controller.is_cancel_pending():
|
if self.controller.is_cancel_pending():
|
||||||
# TODO: some facility to also close spawned steam process
|
# TODO: some facility to also close spawned steam process
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -58,6 +58,11 @@ class ServerRow:
|
|||||||
getter = cls._to_tuple
|
getter = cls._to_tuple
|
||||||
return [getter(row) for row in rows]
|
return [getter(row) for row in rows]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_index(cls, field: str) -> int:
|
||||||
|
_fields = [f.name for f in fields(cls)]
|
||||||
|
return _fields.index(field)
|
||||||
|
|
||||||
|
|
||||||
class FiltrationManager:
|
class FiltrationManager:
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ LAN_TIMEOUT = 0.5
|
|||||||
API_TIMEOUT = 3
|
API_TIMEOUT = 3
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass(slots=True, frozen=True)
|
||||||
class NewPlayerCount:
|
class NewPlayerCount:
|
||||||
treeiter: Gtk.TreeIter
|
treeiter: Gtk.TreeIter
|
||||||
players: int
|
players: int
|
||||||
@@ -341,8 +341,8 @@ class ServerModelManager:
|
|||||||
return
|
return
|
||||||
config_man.add_saved_server(fqip)
|
config_man.add_saved_server(fqip)
|
||||||
|
|
||||||
# FIXME: this is valid if saved servers tab is already open,
|
# TODO: this is valid if saved servers tab is already open,
|
||||||
# but not if app was just booted; causes single row to appear prematurely
|
# but not if tab is unloaded; causes single row to appear prematurely
|
||||||
if proxy_man.has_control_model() is False:
|
if proxy_man.has_control_model() is False:
|
||||||
proxy_man.push(records)
|
proxy_man.push(records)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ desc_flatpak_path = (
|
|||||||
"This is the default Steam path if you are using <b>Flatpak Steam</b>."
|
"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_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>."
|
desc_debian_path = "This is the default Steam path on <b>Debian-based systems</b>."
|
||||||
no_valid_paths = (
|
no_valid_paths = (
|
||||||
"No valid Steam path or Steam command found on system. Please install Steam to continue."
|
"No valid Steam path or Steam command found on system. Please install Steam to continue."
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
from dataclasses import dataclass
|
||||||
|
from typing import Callable
|
||||||
|
|
||||||
|
def immutable_dataclass(cls: type | None = None, **kwargs: bool) -> type | Callable[[type], type]:
|
||||||
|
kwargs["slots"] = True
|
||||||
|
kwargs["frozen"] = True
|
||||||
|
if cls is None:
|
||||||
|
return lambda c: dataclass(c, **kwargs)
|
||||||
|
return dataclass(cls, **kwargs)
|
||||||
+2
-3
@@ -1,10 +1,10 @@
|
|||||||
import a2s
|
import a2s
|
||||||
from ipaddress import ip_address
|
|
||||||
import requests
|
import requests
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
|
from ipaddress import ip_address
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.api.servers import Record
|
from dzgui.api.servers import Record
|
||||||
@@ -12,12 +12,11 @@ from dzgui.config.ipdb import read_from_table
|
|||||||
from dzgui.const.constants import REQUEST_TIMEOUT
|
from dzgui.const.constants import REQUEST_TIMEOUT
|
||||||
from dzgui.const.endpoints import IP_ECHO
|
from dzgui.const.endpoints import IP_ECHO
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass(slots=True, frozen=True)
|
||||||
class Coords:
|
class Coords:
|
||||||
lat: float
|
lat: float
|
||||||
lon: float
|
lon: float
|
||||||
|
|||||||
+5
-3
@@ -1,3 +1,4 @@
|
|||||||
|
import gi
|
||||||
import logging
|
import logging
|
||||||
import signal
|
import signal
|
||||||
|
|
||||||
@@ -34,8 +35,6 @@ from dzgui.views.pages.preconnect import PreConnectionAssistant
|
|||||||
from dzgui.views.pages.servers import ServerNotebook
|
from dzgui.views.pages.servers import ServerNotebook
|
||||||
from dzgui.views.pages.thanks import Thanks
|
from dzgui.views.pages.thanks import Thanks
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
gi.require_version("GLibUnix", "2.0")
|
gi.require_version("GLibUnix", "2.0")
|
||||||
from gi.repository import Gtk, GLib, GLibUnix, Gdk # type: ignore
|
from gi.repository import Gtk, GLib, GLibUnix, Gdk # type: ignore
|
||||||
@@ -49,7 +48,10 @@ logger = logging.getLogger(APP_NAME)
|
|||||||
class OuterWindow(Gtk.ApplicationWindow):
|
class OuterWindow(Gtk.ApplicationWindow):
|
||||||
def __init__(self, app: "App") -> None:
|
def __init__(self, app: "App") -> None:
|
||||||
super().__init__(
|
super().__init__(
|
||||||
application=app, title=APP_NAME, border_width=10, icon_name=APP_NAME_LOWER
|
application=app,
|
||||||
|
title=APP_NAME,
|
||||||
|
border_width=10,
|
||||||
|
icon_name=APP_NAME_LOWER,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.hb = AppHeaderBar()
|
self.hb = AppHeaderBar()
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
from typing import Sequence
|
|
||||||
|
|
||||||
import gi
|
import gi
|
||||||
|
|
||||||
|
from typing import Sequence
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk # noqa
|
from gi.repository import Gtk
|
||||||
|
|
||||||
|
|
||||||
class GenericBox(Gtk.Box):
|
class GenericBox(Gtk.Box):
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
from typing import Self
|
|
||||||
from dzgui.util import css
|
|
||||||
|
|
||||||
import gi
|
import gi
|
||||||
|
|
||||||
|
from typing import Self
|
||||||
|
|
||||||
|
from dzgui.util import css
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk # noqa
|
from gi.repository import Gtk
|
||||||
|
|
||||||
|
|
||||||
# TODO: subclass Gtk.Frame directly
|
# TODO: subclass Gtk.Frame directly
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import gi
|
||||||
from typing import Self
|
from typing import Self
|
||||||
from warnings import deprecated
|
from warnings import deprecated
|
||||||
|
|
||||||
@@ -8,10 +9,8 @@ from dzgui.strings import options
|
|||||||
from dzgui.views.components.box import HBox
|
from dzgui.views.components.box import HBox
|
||||||
from dzgui.views.components.buttons import Icon
|
from dzgui.views.components.buttons import Icon
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk # noqa
|
from gi.repository import Gtk
|
||||||
|
|
||||||
|
|
||||||
@deprecated("Client choice is determined at setup time")
|
@deprecated("Client choice is determined at setup time")
|
||||||
|
|||||||
@@ -106,14 +106,15 @@ class RightPanel(Gtk.Box):
|
|||||||
if page.loaded is True:
|
if page.loaded is True:
|
||||||
return
|
return
|
||||||
self.filters_vbox.set_sensitive(False)
|
self.filters_vbox.set_sensitive(False)
|
||||||
# TODO: unless it is lan page
|
self.refresh_button.set_sensitive(False)
|
||||||
# self.refresh_button.set_sensitive(False)
|
|
||||||
|
|
||||||
def _on_lan_page_init(self, emitter: "Emitter") -> None:
|
def _on_lan_page_init(self, emitter: "Emitter") -> None:
|
||||||
self.filters_vbox.set_sensitive(False)
|
self.filters_vbox.set_sensitive(False)
|
||||||
|
|
||||||
def _on_servers_loaded(self, emitter: "Emitter", context: "ServerTab") -> None:
|
def _on_servers_loaded(self, emitter: "Emitter", context: "ServerTab") -> None:
|
||||||
# TODO: similar logic on notebook page change
|
# TODO: similar logic on notebook page change
|
||||||
|
# TODO: wipe maps store when changing tabs if model is None
|
||||||
|
|
||||||
state = self.controller.has_server_model()
|
state = self.controller.has_server_model()
|
||||||
self.filters_vbox.set_sensitive(state)
|
self.filters_vbox.set_sensitive(state)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import gi
|
import gi
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk # noqa
|
from gi.repository import Gtk
|
||||||
|
|
||||||
|
|
||||||
class NoOverlayScrolledWindow(Gtk.ScrolledWindow):
|
class NoOverlayScrolledWindow(Gtk.ScrolledWindow):
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ class Statusbar(Gtk.Grid):
|
|||||||
if type(context) is NotebookPage:
|
if type(context) is NotebookPage:
|
||||||
self.prior_enum = context
|
self.prior_enum = context
|
||||||
self.prior_status = ""
|
self.prior_status = ""
|
||||||
# FIXME: CalcDist is being called when table is not loaded
|
|
||||||
if dist is None:
|
if dist is None:
|
||||||
self.set_by_context(context, "")
|
self.set_by_context(context, "")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
|
import gi
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from enum import Enum
|
||||||
from typing import Any, Literal, Self, TYPE_CHECKING
|
from typing import Any, Literal, Self, TYPE_CHECKING
|
||||||
|
|
||||||
# import time
|
|
||||||
from enum import Enum
|
|
||||||
|
|
||||||
|
|
||||||
from dzgui.views.mixins.colorscheme import ColorAwareApp
|
|
||||||
|
|
||||||
# TODO: import dialog titles
|
|
||||||
from dzgui.api.mods import remove_stale_signatures as remove_stale
|
from dzgui.api.mods import remove_stale_signatures as remove_stale
|
||||||
from dzgui.config.ipdb import get_ipdb
|
from dzgui.config.ipdb import get_ipdb
|
||||||
from dzgui.const.constants import HEX_GREEN, HEX_RED
|
from dzgui.const.constants import HEX_GREEN, HEX_RED
|
||||||
@@ -20,12 +16,10 @@ from dzgui.util.format import format_exception
|
|||||||
from dzgui.util.strings import dialog_header
|
from dzgui.util.strings import dialog_header
|
||||||
from dzgui.util.symlink import rebuild_symlinks
|
from dzgui.util.symlink import rebuild_symlinks
|
||||||
from dzgui.views.components.buttons import ClipboardButton
|
from dzgui.views.components.buttons import ClipboardButton
|
||||||
|
from dzgui.views.mixins.colorscheme import ColorAwareApp
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, GLib, Gdk # noqa
|
from gi.repository import Gtk, GLib, Gdk
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.config.xdg import Xdg
|
from dzgui.config.xdg import Xdg
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ class FolderPicker(Gtk.FileChooserDialog):
|
|||||||
return None
|
return None
|
||||||
if res == Gtk.ResponseType.OK:
|
if res == Gtk.ResponseType.OK:
|
||||||
folder = self.get_current_folder()
|
folder = self.get_current_folder()
|
||||||
|
# TODO: this should never be possible
|
||||||
if folder is None:
|
if folder is None:
|
||||||
try:
|
try:
|
||||||
uri = self.get_uri()
|
uri = self.get_uri()
|
||||||
@@ -61,7 +62,7 @@ class FolderPicker(Gtk.FileChooserDialog):
|
|||||||
return None
|
return None
|
||||||
return Path.from_uri(uri)
|
return Path.from_uri(uri)
|
||||||
except Exception:
|
except Exception:
|
||||||
# FIXME: edge cases
|
# TODO: edge cases
|
||||||
return Path("/")
|
return Path("/")
|
||||||
self.destroy()
|
self.destroy()
|
||||||
return Path(folder)
|
return Path(folder)
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ from dzgui.views.dialogs.generic import GenericDialog
|
|||||||
from dzgui.views.trees.tree_base import TreeView
|
from dzgui.views.trees.tree_base import TreeView
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk, Pango # noqa
|
from gi.repository import Gtk, Gdk, Pango
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.api.servers import Details
|
from dzgui.api.servers import Details
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import gi
|
||||||
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
@@ -7,10 +9,8 @@ from dzgui.const.constants import (
|
|||||||
GIO_SETTINGS_VAL,
|
GIO_SETTINGS_VAL,
|
||||||
)
|
)
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gio # noqa
|
from gi.repository import Gtk, Gio
|
||||||
|
|
||||||
|
|
||||||
class ColorAwareApp:
|
class ColorAwareApp:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import gi
|
import gi
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk # noqa
|
from gi.repository import Gtk, Gdk
|
||||||
|
|
||||||
|
|
||||||
class HelpMenuMixin:
|
class HelpMenuMixin:
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
|
import gi
|
||||||
|
|
||||||
from dzgui.const.enum import VAdjustment
|
from dzgui.const.enum import VAdjustment
|
||||||
from dzgui.const.constants import SCROLL_INCREMENT
|
from dzgui.const.constants import SCROLL_INCREMENT
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk # noqa
|
from gi.repository import Gtk, Gdk
|
||||||
|
|
||||||
|
|
||||||
class ScrollableMixin:
|
class ScrollableMixin:
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import gi
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from typing import Self, TYPE_CHECKING
|
from typing import Self, TYPE_CHECKING
|
||||||
@@ -8,10 +9,8 @@ from dzgui.views.components.buttons import SteamWorkshopButton
|
|||||||
from dzgui.views.components.scrollable import NoOverlayScrolledWindow
|
from dzgui.views.components.scrollable import NoOverlayScrolledWindow
|
||||||
from dzgui.views.trees.tree_mods import ModTreeView
|
from dzgui.views.trees.tree_mods import ModTreeView
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk # noqa
|
from gi.repository import Gtk
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.controllers.mc import Controller
|
from dzgui.controllers.mc import Controller
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import gi
|
||||||
|
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
from typing import Self, TYPE_CHECKING, Union
|
from typing import Self, TYPE_CHECKING, Union
|
||||||
|
|
||||||
from dzgui.util import css
|
|
||||||
from dzgui.const.icons import ICON_EDIT_DELETE, ICON_FOLDER, ICON_WARNING
|
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
APPID_DAYZ,
|
APPID_DAYZ,
|
||||||
APPID_DAYZ_EXP,
|
APPID_DAYZ_EXP,
|
||||||
@@ -11,8 +12,10 @@ from dzgui.const.constants import (
|
|||||||
APPNAME_DAYZ_EXP_HUMAN,
|
APPNAME_DAYZ_EXP_HUMAN,
|
||||||
)
|
)
|
||||||
from dzgui.const.enum import ContextMenuGroup, NotebookPage
|
from dzgui.const.enum import ContextMenuGroup, NotebookPage
|
||||||
|
from dzgui.const.icons import ICON_EDIT_DELETE, ICON_FOLDER, ICON_WARNING
|
||||||
from dzgui.managers.offline import OfflineManager
|
from dzgui.managers.offline import OfflineManager
|
||||||
from dzgui.strings import generic, offline
|
from dzgui.strings import generic, offline
|
||||||
|
from dzgui.util import css
|
||||||
from dzgui.views.components.box import HBox, VBox
|
from dzgui.views.components.box import HBox, VBox
|
||||||
from dzgui.views.components.buttons import Icon, IconTextButton
|
from dzgui.views.components.buttons import Icon, IconTextButton
|
||||||
from dzgui.views.components.eventbox import InfoEventBox
|
from dzgui.views.components.eventbox import InfoEventBox
|
||||||
@@ -21,11 +24,8 @@ from dzgui.views.components.scrollable import NoOverlayScrolledWindow
|
|||||||
from dzgui.views.components.misc import ErrorPopover
|
from dzgui.views.components.misc import ErrorPopover
|
||||||
from dzgui.views.trees.tree_mods import OfflineModTreeView
|
from dzgui.views.trees.tree_mods import OfflineModTreeView
|
||||||
|
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk, GObject # noqa
|
from gi.repository import Gtk, Gdk
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.controllers.mc import Controller
|
from dzgui.controllers.mc import Controller
|
||||||
@@ -136,7 +136,6 @@ class FolderHBox(HBox):
|
|||||||
self.folder = ""
|
self.folder = ""
|
||||||
self.label.set_label("")
|
self.label.set_label("")
|
||||||
self.unset_button.hide()
|
self.unset_button.hide()
|
||||||
# FIXME: rename signal
|
|
||||||
self.emitter.emit("custom_mods_unloaded", self)
|
self.emitter.emit("custom_mods_unloaded", self)
|
||||||
|
|
||||||
def get_button(self) -> Gtk.Button:
|
def get_button(self) -> Gtk.Button:
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
|
import gi
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Callable, TYPE_CHECKING
|
from typing import Any, Callable, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.api import pefile as PeFile
|
from dzgui.api import pefile as PeFile
|
||||||
from dzgui.api.steam import get_last_updated
|
from dzgui.api.steam import get_last_updated
|
||||||
|
|
||||||
from dzgui.config import query
|
from dzgui.config import query
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
APPID_DAYZ,
|
APPID_DAYZ,
|
||||||
@@ -14,12 +15,11 @@ from dzgui.const.constants import (
|
|||||||
FLATPAK_SANDBOX,
|
FLATPAK_SANDBOX,
|
||||||
FLATPAK_STEAM_PATH,
|
FLATPAK_STEAM_PATH,
|
||||||
)
|
)
|
||||||
from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
|
|
||||||
from dzgui.const.endpoints import STEAM_API_SETUP
|
from dzgui.const.endpoints import STEAM_API_SETUP
|
||||||
from dzgui.const.enum import Preferences, ServerTab
|
from dzgui.const.enum import Preferences, ServerTab
|
||||||
|
from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
|
||||||
from dzgui.strings import options
|
from dzgui.strings import options
|
||||||
from dzgui.util import strings, css, open_links
|
from dzgui.util import strings, css, open_links
|
||||||
|
|
||||||
from dzgui.views.components.box import ShortHBox, VBox
|
from dzgui.views.components.box import ShortHBox, VBox
|
||||||
from dzgui.views.components.eventbox import InfoEventBox
|
from dzgui.views.components.eventbox import InfoEventBox
|
||||||
from dzgui.views.components.labels import LeftLabel
|
from dzgui.views.components.labels import LeftLabel
|
||||||
@@ -29,11 +29,8 @@ from dzgui.views.components.misc import ErrorPopover
|
|||||||
from dzgui.views.dialogs.generic import ExceptionDialog
|
from dzgui.views.dialogs.generic import ExceptionDialog
|
||||||
from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
|
from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
|
||||||
|
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk # noqa
|
from gi.repository import Gtk, Gdk
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.controllers.mc import Controller
|
from dzgui.controllers.mc import Controller
|
||||||
@@ -233,10 +230,19 @@ class ToggleField(Gtk.Box):
|
|||||||
self.pack_start(self.radio1, expand=False, fill=False, padding=0)
|
self.pack_start(self.radio1, expand=False, fill=False, padding=0)
|
||||||
self.pack_start(self.radio2, expand=False, fill=False, padding=0)
|
self.pack_start(self.radio2, expand=False, fill=False, padding=0)
|
||||||
|
|
||||||
|
self.signal_id: int | None = None
|
||||||
|
|
||||||
|
def disconnect_signal(self) -> None:
|
||||||
|
if self.signal_id is not None:
|
||||||
|
self.radio1.disconnect(self.signal_id)
|
||||||
|
|
||||||
def set_suboption_active(self, state: bool) -> None:
|
def set_suboption_active(self, state: bool) -> None:
|
||||||
# NOTE: defer connection of signal until after state is set
|
# NOTE: defer connection of signal until after state is set
|
||||||
self.radio2.set_active(state)
|
self.radio2.set_active(state)
|
||||||
self.radio1.connect("toggled", self._on_radio_toggled, self.context)
|
self.disconnect_signal()
|
||||||
|
self.signal_id = self.radio1.connect(
|
||||||
|
"toggled", self._on_radio_toggled, self.context
|
||||||
|
)
|
||||||
|
|
||||||
def _on_radio_toggled(self, button: Gtk.RadioButton, context: Preferences) -> None:
|
def _on_radio_toggled(self, button: Gtk.RadioButton, context: Preferences) -> None:
|
||||||
self.controller.toggle_config(context)
|
self.controller.toggle_config(context)
|
||||||
@@ -486,14 +492,5 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore
|
|||||||
start_tab = self.controller.query_config(Preferences.START_TAB)
|
start_tab = self.controller.query_config(Preferences.START_TAB)
|
||||||
self.start_tab_combo.set_active(start_tab)
|
self.start_tab_combo.set_active(start_tab)
|
||||||
|
|
||||||
def _suppress_toggles(self, state: bool) -> None:
|
|
||||||
for toggle in [
|
|
||||||
self.fullscreen_toggle,
|
|
||||||
self.distance_toggle,
|
|
||||||
]:
|
|
||||||
self.controller.suppress_signal(
|
|
||||||
self, toggle.get_children()[0], "_on_radio_toggled", state
|
|
||||||
)
|
|
||||||
|
|
||||||
def grab_content_area(self) -> None:
|
def grab_content_area(self) -> None:
|
||||||
self.grab_focus()
|
self.grab_focus()
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
from dataclasses import dataclass
|
import gi
|
||||||
|
|
||||||
from typing import Self, Sequence, TYPE_CHECKING
|
from typing import Self, Sequence, TYPE_CHECKING
|
||||||
|
|
||||||
|
from dzgui.const.enum import NotebookPage
|
||||||
from dzgui.const.icons import (
|
from dzgui.const.icons import (
|
||||||
ICON_ERROR,
|
ICON_ERROR,
|
||||||
ICON_WARNING,
|
ICON_WARNING,
|
||||||
)
|
)
|
||||||
from dzgui.const.enum import NotebookPage
|
|
||||||
from dzgui.util.css import add_class
|
from dzgui.util.css import add_class
|
||||||
from dzgui.util.keys import is_ctrl_mask
|
from dzgui.util.keys import is_ctrl_mask
|
||||||
from dzgui.util.localize import number
|
from dzgui.util.localize import number
|
||||||
@@ -15,33 +16,15 @@ from dzgui.views.dialogs.generic import DebugDialog
|
|||||||
from dzgui.views.components.frame import HeadingFrame
|
from dzgui.views.components.frame import HeadingFrame
|
||||||
from dzgui.views.trees.tree_server_mods import ServerModTreeView
|
from dzgui.views.trees.tree_server_mods import ServerModTreeView
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gdk, Gtk
|
from gi.repository import Gdk, Gtk
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.managers.connection import Prerequisites
|
from dzgui.managers.connection import Prerequisites
|
||||||
from dzgui.controllers.mc import Controller
|
from dzgui.controllers.mc import Controller
|
||||||
from dzgui.controllers.emitter import Emitter
|
from dzgui.controllers.emitter import Emitter
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class Warnings:
|
|
||||||
passworded: bool
|
|
||||||
dayz_running: bool
|
|
||||||
no_steam: bool
|
|
||||||
wrong_version: bool
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class Errors:
|
|
||||||
no_space: bool
|
|
||||||
no_dayz_exp: bool
|
|
||||||
no_dayz: bool
|
|
||||||
|
|
||||||
|
|
||||||
class Placeholder(Gtk.Label):
|
class Placeholder(Gtk.Label):
|
||||||
def __init__(self, text: str) -> None:
|
def __init__(self, text: str) -> None:
|
||||||
super().__init__(
|
super().__init__(
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
|
import gi
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from typing import Any, Optional, TYPE_CHECKING
|
from typing import Any, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.constants import APP_NAME, SEPARATOR
|
from dzgui.const.constants import APP_NAME, SEPARATOR
|
||||||
from dzgui.util.keys import is_ctrl_mask, is_navkey
|
from dzgui.util.keys import is_ctrl_mask, is_navkey
|
||||||
from dzgui.views.mixins.cursor_mixin import CursorMixin
|
from dzgui.views.mixins.cursor_mixin import CursorMixin
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa
|
from gi.repository import Gtk, Gdk, GObject
|
||||||
|
|
||||||
logger = logging.getLogger(APP_NAME)
|
logger = logging.getLogger(APP_NAME)
|
||||||
|
|
||||||
@@ -20,7 +19,7 @@ if TYPE_CHECKING:
|
|||||||
|
|
||||||
class TreeView(CursorMixin, Gtk.TreeView): # type: ignore
|
class TreeView(CursorMixin, Gtk.TreeView): # type: ignore
|
||||||
def __init__(
|
def __init__(
|
||||||
self, controller: "Controller", menu: Optional["ContextMenuGroup"]
|
self, controller: "Controller", menu: "ContextMenuGroup | None"
|
||||||
) -> None:
|
) -> None:
|
||||||
super().__init__(
|
super().__init__(
|
||||||
enable_search=False,
|
enable_search=False,
|
||||||
@@ -59,7 +58,7 @@ class TreeView(CursorMixin, Gtk.TreeView): # type: ignore
|
|||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get_current_iter(self) -> Optional[Gtk.TreeIter]:
|
def get_current_iter(self) -> Gtk.TreeIter | None:
|
||||||
it = self.get_selection().get_selected()[1]
|
it = self.get_selection().get_selected()[1]
|
||||||
return it
|
return it
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ from dzgui.views.trees.tree_base import TreeView
|
|||||||
import gi
|
import gi
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa
|
from gi.repository import Gtk
|
||||||
|
|
||||||
logger = logging.getLogger(APP_NAME)
|
logger = logging.getLogger(APP_NAME)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
|
import gi
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from typing import Any, TYPE_CHECKING
|
from typing import Any, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.constants import APP_NAME, HEX_RED
|
from dzgui.const.constants import APP_NAME, HEX_RED
|
||||||
@@ -9,10 +11,8 @@ from dzgui.views.mixins.context_mixin import ContextMixin
|
|||||||
from dzgui.views.mixins.mods_mixin import ModsMixin
|
from dzgui.views.mixins.mods_mixin import ModsMixin
|
||||||
from dzgui.views.trees.tree_base import TreeView
|
from dzgui.views.trees.tree_base import TreeView
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa
|
from gi.repository import Gtk, Gdk
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
|
import gi
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.enum import ContextMenuGroup
|
from dzgui.const.enum import ContextMenuGroup
|
||||||
from dzgui.model.model_factory import ModelFactory
|
from dzgui.model.model_factory import ModelFactory
|
||||||
from dzgui.strings import server_mods
|
from dzgui.strings import server_mods
|
||||||
from dzgui.views.mixins.context_mixin import ContextMixin
|
from dzgui.views.mixins.context_mixin import ContextMixin
|
||||||
from dzgui.views.trees.tree_base import TreeView
|
from dzgui.views.trees.tree_base import TreeView
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, GLib, Gdk, Pango # noqa
|
from gi.repository import Gtk, Pango
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.controllers.mc import Controller
|
from dzgui.controllers.mc import Controller
|
||||||
|
|||||||
@@ -1,30 +1,25 @@
|
|||||||
|
import gi
|
||||||
import logging
|
import logging
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
from queue import Queue
|
from queue import Queue
|
||||||
from typing import Any, Self, Union
|
from typing import Any, Literal, Self, TYPE_CHECKING, Union
|
||||||
from warnings import deprecated
|
from warnings import deprecated
|
||||||
|
|
||||||
from dzgui.api.servers import ping, Record
|
from dzgui.api.servers import ping, Record
|
||||||
from dzgui.const.constants import APP_NAME
|
from dzgui.const.constants import APP_NAME
|
||||||
from dzgui.const.enum import ContextMenuItem, ContextMenuGroup, ServerTab
|
from dzgui.const.enum import ContextMenuItem, ContextMenuGroup, ServerTab
|
||||||
from dzgui.managers.filter import FilterManager
|
from dzgui.managers.filter import FilterManager
|
||||||
from dzgui.model.proxy_model import ProxyModelManager
|
from dzgui.model.proxy_model import ProxyModelManager, ServerRow
|
||||||
from dzgui.util import strings
|
from dzgui.util import strings
|
||||||
from dzgui.util.dist import CalcDist
|
from dzgui.util.dist import CalcDist
|
||||||
from dzgui.util.keys import is_ctrl_mask
|
from dzgui.util.keys import is_ctrl_mask
|
||||||
from dzgui.views.mixins.context_mixin import ContextMixin
|
from dzgui.views.mixins.context_mixin import ContextMixin
|
||||||
from typing import Literal, TYPE_CHECKING
|
|
||||||
|
|
||||||
|
|
||||||
from dzgui.views.trees.tree_base import TreeView
|
from dzgui.views.trees.tree_base import TreeView
|
||||||
import dzgui.util._json as JSON # noqa
|
import dzgui.util._json as JSON # noqa
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa
|
from gi.repository import Gtk, GLib, Gdk, GObject
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(APP_NAME)
|
logger = logging.getLogger(APP_NAME)
|
||||||
|
|
||||||
@@ -34,8 +29,15 @@ if TYPE_CHECKING:
|
|||||||
from dzgui.model.model_factory import FastInsertListStore
|
from dzgui.model.model_factory import FastInsertListStore
|
||||||
from dzgui.util.dist import Haversine
|
from dzgui.util.dist import Haversine
|
||||||
|
|
||||||
|
# TODO: consts
|
||||||
QUEUE_CHECK_DELAY = 200
|
QUEUE_CHECK_DELAY = 200
|
||||||
|
|
||||||
|
IND_NAME = ServerRow.get_index("name")
|
||||||
|
IND_ADDR = ServerRow.get_index("ip")
|
||||||
|
IND_QPORT = ServerRow.get_index("qport")
|
||||||
|
IND_PING = ServerRow.get_index("ping")
|
||||||
|
IND_MODDED = ServerRow.get_index("modded")
|
||||||
|
|
||||||
|
|
||||||
class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
||||||
def __init__(
|
def __init__(
|
||||||
@@ -106,7 +108,7 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
if column_title in width_map:
|
if column_title in width_map:
|
||||||
w = width_map[column_title]
|
w = width_map[column_title]
|
||||||
column.set_fixed_width(w)
|
column.set_fixed_width(w)
|
||||||
if column_title == "Ping":
|
if i == IND_PING:
|
||||||
column.set_cell_data_func(renderer, self._get_ping)
|
column.set_cell_data_func(renderer, self._get_ping)
|
||||||
|
|
||||||
column.connect("notify::fixed-width", self._on_col_width_changed)
|
column.connect("notify::fixed-width", self._on_col_width_changed)
|
||||||
@@ -145,8 +147,8 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
if model is None:
|
if model is None:
|
||||||
return False
|
return False
|
||||||
tree_iter = model.get_iter(path[0])
|
tree_iter = model.get_iter(path[0])
|
||||||
ip = model.get_value(tree_iter, 7)
|
ip = model.get_value(tree_iter, IND_ADDR)
|
||||||
qport = model.get_value(tree_iter, 8)
|
qport = model.get_value(tree_iter, IND_QPORT)
|
||||||
addr = ip + ":" + str(qport)
|
addr = ip + ":" + str(qport)
|
||||||
note = self.controller.get_note_by_record(addr)
|
note = self.controller.get_note_by_record(addr)
|
||||||
|
|
||||||
@@ -169,14 +171,12 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
return self.enum
|
return self.enum
|
||||||
|
|
||||||
def _on_map(self, widget: Self) -> None:
|
def _on_map(self, widget: Self) -> None:
|
||||||
# TODO: disable filter panel if current model is None
|
|
||||||
state = self.get_enum() is ServerTab.LAN
|
state = self.get_enum() is ServerTab.LAN
|
||||||
self.emitter.emit("lan_tab_toggled", state)
|
self.emitter.emit("lan_tab_toggled", state)
|
||||||
|
|
||||||
store = self.filter_man.get_map_store()
|
store = self.filter_man.get_map_store()
|
||||||
|
|
||||||
# FIXME: if model is none, wipe maps
|
# TODO: distinguish this signal from changing map combo in-situ
|
||||||
# distinguish this signal from changing map combo in-situ
|
|
||||||
self.emitter.emit("load_maps", store)
|
self.emitter.emit("load_maps", store)
|
||||||
self.handler_id = self.emitter.connect("statusbar_loaded", self.start_distcalc)
|
self.handler_id = self.emitter.connect("statusbar_loaded", self.start_distcalc)
|
||||||
self.start_queue_checker()
|
self.start_queue_checker()
|
||||||
@@ -221,11 +221,11 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
|
|
||||||
def _check_result_queue(self) -> Literal[True]:
|
def _check_result_queue(self) -> Literal[True]:
|
||||||
latest_result = None
|
latest_result = None
|
||||||
# FIXME: empty results cause statusbar to be emptied
|
# TODO: Nonetype results cause statusbar to be blank
|
||||||
while not self.queue.empty():
|
while not self.queue.empty():
|
||||||
latest_result = self.queue.get()
|
latest_result = self.queue.get()
|
||||||
|
|
||||||
# FIXME: cache is being checked in two passes
|
# TODO: cache is being checked in two passes
|
||||||
cache = self.controller.get_dist_cache()
|
cache = self.controller.get_dist_cache()
|
||||||
|
|
||||||
if latest_result:
|
if latest_result:
|
||||||
@@ -267,15 +267,9 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
(model, pathlist) = sels
|
(model, pathlist) = sels
|
||||||
path = pathlist[0]
|
path = pathlist[0]
|
||||||
tree_iter = model.get_iter(path)
|
tree_iter = model.get_iter(path)
|
||||||
has_mods = model.get_value(tree_iter, 11)
|
has_mods = model.get_value(tree_iter, IND_MODDED)
|
||||||
return bool(has_mods)
|
return bool(has_mods)
|
||||||
|
|
||||||
# def get_selected_row(self) -> Gtk.TreeModelRow:
|
|
||||||
# sel = self.get_selection()
|
|
||||||
# sels = sel.get_selected_rows()
|
|
||||||
# print(type(sels[0]))
|
|
||||||
# return sels[0]
|
|
||||||
|
|
||||||
def is_in_favs(self) -> bool:
|
def is_in_favs(self) -> bool:
|
||||||
record = self.get_record_string()
|
record = self.get_record_string()
|
||||||
if self.controller.get_config_man().is_in_favs(record):
|
if self.controller.get_config_man().is_in_favs(record):
|
||||||
@@ -304,17 +298,17 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
self.start_distcalc()
|
self.start_distcalc()
|
||||||
|
|
||||||
def get_name(self) -> str:
|
def get_name(self) -> str:
|
||||||
return str(self.get_value_at_index(0))
|
return str(self.get_value_at_index(IND_NAME))
|
||||||
|
|
||||||
def get_simplified_ip(self) -> str:
|
def get_simplified_ip(self) -> str:
|
||||||
addr = self.get_value_at_index(7)
|
addr = self.get_value_at_index(IND_ADDR)
|
||||||
qport = self.get_value_at_index(8)
|
qport = self.get_value_at_index(IND_QPORT)
|
||||||
ip = addr.split(":")[0]
|
ip = addr.split(":")[0]
|
||||||
return f"{ip}:{qport}"
|
return f"{ip}:{qport}"
|
||||||
|
|
||||||
def get_record_string(self) -> str:
|
def get_record_string(self) -> str:
|
||||||
addr = self.get_value_at_index(7)
|
addr = self.get_value_at_index(IND_ADDR)
|
||||||
qport = self.get_value_at_index(8)
|
qport = self.get_value_at_index(IND_QPORT)
|
||||||
return f"{addr}:{qport}"
|
return f"{addr}:{qport}"
|
||||||
|
|
||||||
def get_record(self) -> Record | None:
|
def get_record(self) -> Record | None:
|
||||||
@@ -353,8 +347,7 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
def _redraw(
|
def _redraw(
|
||||||
self, model: "FastInsertListStore", _iter: Gtk.TreeIter, _ping: int
|
self, model: "FastInsertListStore", _iter: Gtk.TreeIter, _ping: int
|
||||||
) -> None:
|
) -> None:
|
||||||
ping_column = 9
|
model.set(_iter, IND_PING, _ping)
|
||||||
model.set(_iter, ping_column, _ping)
|
|
||||||
self.queue_draw()
|
self.queue_draw()
|
||||||
|
|
||||||
def wipe_cache(self) -> None:
|
def wipe_cache(self) -> None:
|
||||||
@@ -369,13 +362,10 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
data: Any,
|
data: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
||||||
addr_column = 7
|
addr = model.get_value(_iter, IND_ADDR).split(":")
|
||||||
qport_column = 8
|
|
||||||
|
|
||||||
addr = model.get_value(_iter, addr_column).split(":")
|
|
||||||
ip = addr[0]
|
ip = addr[0]
|
||||||
gameport = int(addr[1])
|
gameport = int(addr[1])
|
||||||
qport = model.get_value(_iter, qport_column)
|
qport = model.get_value(_iter, IND_QPORT)
|
||||||
record = Record(ip, gameport, qport)
|
record = Record(ip, gameport, qport)
|
||||||
|
|
||||||
if record in self.seen_cache:
|
if record in self.seen_cache:
|
||||||
@@ -415,6 +405,7 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
real_model = self.proxy_man.get_control()
|
real_model = self.proxy_man.get_control()
|
||||||
from dataclasses import fields
|
from dataclasses import fields
|
||||||
from dzgui.model.proxy_model import ServerRow
|
from dzgui.model.proxy_model import ServerRow
|
||||||
|
|
||||||
key = fields(ServerRow)[col_index].name
|
key = fields(ServerRow)[col_index].name
|
||||||
|
|
||||||
value = getattr(real_model[row_index], key)
|
value = getattr(real_model[row_index], key)
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
|
import gi
|
||||||
|
|
||||||
from typing import TYPE_CHECKING, Union
|
from typing import TYPE_CHECKING, Union
|
||||||
|
|
||||||
|
gi.require_version("Gtk", "3.0")
|
||||||
|
from gi.repository import Gtk
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.model.model_factory import FastInsertListStore
|
from dzgui.model.model_factory import FastInsertListStore
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
|
||||||
from gi.repository import Gtk # noqa
|
|
||||||
|
|
||||||
|
|
||||||
class SimpleTree(Gtk.ScrolledWindow):
|
class SimpleTree(Gtk.ScrolledWindow):
|
||||||
"""Simple scrollable 1-column tree"""
|
"""Simple scrollable 1-column tree"""
|
||||||
|
|||||||
Vendored
+4
-2
@@ -1,5 +1,7 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
CWD = Path(__file__).parent
|
CWD = Path(__file__).parent
|
||||||
def fixture_path(fixture: str) -> str:
|
|
||||||
return str(CWD / fixture)
|
|
||||||
|
def fixture_path(fixture: str) -> Path:
|
||||||
|
return Path(CWD).joinpath(fixture)
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from _pytest.monkeypatch import MonkeyPatch
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
from collections.abc import Iterator
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from dzgui.api.steam import get_app_allows_downloads, get_last_updated
|
from dzgui.api.steam import get_app_allows_downloads, get_last_updated
|
||||||
@@ -36,30 +37,32 @@ def steam_path() -> Path:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module", autouse=True)
|
@pytest.fixture(scope="module", autouse=True)
|
||||||
def patch_api() -> None:
|
def patch_api() -> Iterator[None]:
|
||||||
mp = MonkeyPatch()
|
mp = MonkeyPatch()
|
||||||
mp.setattr("dzgui.api.steam.get_app_path", mock_path)
|
mp.setattr("dzgui.api.steam.get_app_path", mock_path)
|
||||||
yield
|
yield
|
||||||
mp.undo()
|
mp.undo()
|
||||||
|
|
||||||
|
|
||||||
def test_no_last_update(steam_path) -> None:
|
def test_no_last_update(steam_path: Path) -> None:
|
||||||
assert get_last_updated(steam_path, 555) is None
|
assert get_last_updated(steam_path, 555) is None
|
||||||
|
|
||||||
|
|
||||||
def test_last_update(steam_path) -> None:
|
def test_last_update(steam_path: Path) -> None:
|
||||||
assert get_last_updated(steam_path, 444) == "2026-10-22 00:09:33"
|
assert get_last_updated(steam_path, 444) == "2026-10-22 00:09:33"
|
||||||
|
|
||||||
|
|
||||||
def test_app_allows_downloads(steam_path) -> None:
|
def test_app_allows_downloads(steam_path: Path) -> None:
|
||||||
assert get_app_allows_downloads(steam_path, 111) is True
|
assert get_app_allows_downloads(steam_path, 111) is True
|
||||||
|
|
||||||
|
|
||||||
def test_app_disallows_downloads(steam_path):
|
def test_app_disallows_downloads(steam_path: Path) -> None:
|
||||||
assert get_app_allows_downloads(steam_path, 222) is False
|
assert get_app_allows_downloads(steam_path, 222) is False
|
||||||
|
|
||||||
|
|
||||||
def test_app_delegates_downloads(monkeypatch, steam_path, client_allows):
|
def test_app_delegates_downloads(
|
||||||
|
monkeypatch: MonkeyPatch, steam_path: Path, client_allows: Path
|
||||||
|
) -> None:
|
||||||
monkeypatch.setattr("dzgui.api.steam.get_config", mock_config_disallows)
|
monkeypatch.setattr("dzgui.api.steam.get_config", mock_config_disallows)
|
||||||
assert get_app_allows_downloads(steam_path, 333) is False
|
assert get_app_allows_downloads(steam_path, 333) is False
|
||||||
monkeypatch.setattr("dzgui.api.steam.get_config", mock_config_allows)
|
monkeypatch.setattr("dzgui.api.steam.get_config", mock_config_allows)
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import pytest
|
import pytest
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.app_init import copy_bare_configs
|
from dzgui.app_init import copy_bare_configs
|
||||||
from dzgui.config.xdg import get_xdg_paths, parse_filepaths
|
from dzgui.config.xdg import get_xdg_paths, parse_filepaths
|
||||||
|
|
||||||
@@ -8,9 +10,13 @@ from dzgui.config.xdg import get_xdg_paths, parse_filepaths
|
|||||||
CONF_STRING = "DZGUI_CONF\n"
|
CONF_STRING = "DZGUI_CONF\n"
|
||||||
STATE_STRING = "DZGUI_STATE\n"
|
STATE_STRING = "DZGUI_STATE\n"
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
from dzgui.config.xdg import Xdg
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def state_files():
|
def state_files() -> list[str]:
|
||||||
state = [
|
state = [
|
||||||
"dzg.history",
|
"dzg.history",
|
||||||
"dzg.versions",
|
"dzg.versions",
|
||||||
@@ -25,7 +31,7 @@ def state_files():
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def xdg_paths(monkeypatch):
|
def xdg_paths(monkeypatch: "MonkeyPatch") -> "Xdg":
|
||||||
routes = {
|
routes = {
|
||||||
"XDG_CONFIG_HOME": "",
|
"XDG_CONFIG_HOME": "",
|
||||||
"XDG_STATE_HOME": "",
|
"XDG_STATE_HOME": "",
|
||||||
@@ -42,7 +48,7 @@ def xdg_paths(monkeypatch):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.mods
|
@pytest.mark.mods
|
||||||
def test_config_file_import(xdg_paths, state_files):
|
def test_config_file_import(xdg_paths: "Xdg", state_files: list[str]) -> None:
|
||||||
|
|
||||||
# NOTE: write bare files in root
|
# NOTE: write bare files in root
|
||||||
tmp_conf = xdg_paths.config.parent.parent
|
tmp_conf = xdg_paths.config.parent.parent
|
||||||
@@ -67,7 +73,7 @@ def test_config_file_import(xdg_paths, state_files):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.mods
|
@pytest.mark.mods
|
||||||
def test_config_file_no_import(xdg_paths, state_files):
|
def test_config_file_no_import(xdg_paths: "Xdg", state_files: list[str]) -> None:
|
||||||
for subdir in xdg_paths.config.parent, xdg_paths.resolution.parent:
|
for subdir in xdg_paths.config.parent, xdg_paths.resolution.parent:
|
||||||
subdir.mkdir()
|
subdir.mkdir()
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def changelog(request) -> None:
|
def changelog(request: pytest.FixtureRequest) -> str:
|
||||||
root = request.config.rootpath
|
root = request.config.rootpath
|
||||||
changelog = Path(root).joinpath("CHANGELOG.md").read_text()
|
changelog = Path(root).joinpath("CHANGELOG.md").read_text()
|
||||||
return changelog
|
return changelog
|
||||||
@@ -19,7 +19,7 @@ def count_hash(line: str) -> int:
|
|||||||
return cnt
|
return cnt
|
||||||
|
|
||||||
|
|
||||||
def test_changelog_prefix(changelog) -> None:
|
def test_changelog_prefix(changelog: str) -> None:
|
||||||
r = r".*(\[.*\]).*"
|
r = r".*(\[.*\]).*"
|
||||||
lines = changelog.splitlines()
|
lines = changelog.splitlines()
|
||||||
sort = sorted(lines)
|
sort = sorted(lines)
|
||||||
|
|||||||
@@ -1,14 +1,19 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from typing import Any, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.constants import FLATPAK_RUN_CMD, STEAM_CMD
|
from dzgui.const.constants import FLATPAK_RUN_CMD, STEAM_CMD
|
||||||
from dzgui.controllers.mc import Controller
|
from dzgui.controllers.mc import Controller
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"value, expected", [(FLATPAK_RUN_CMD, "Flatpak"), (STEAM_CMD, "Steam")]
|
"value, expected", [(FLATPAK_RUN_CMD, "Flatpak"), (STEAM_CMD, "Steam")]
|
||||||
)
|
)
|
||||||
def test_human_name(monkeypatch, value, expected) -> None:
|
def test_human_name(monkeypatch: "MonkeyPatch", value: str, expected: str) -> None:
|
||||||
def mock_query_config(*args) -> str:
|
def mock_query_config(*args: Any) -> str:
|
||||||
return value
|
return value
|
||||||
|
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
|
import gi
|
||||||
import pytest
|
import pytest
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from dzgui.const.constants import GIO_SETTINGS_KEY
|
from dzgui.const.constants import GIO_SETTINGS_KEY
|
||||||
from dzgui.views.mixins.colorscheme import ColorAwareApp
|
from dzgui.views.mixins.colorscheme import ColorAwareApp
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gio, GLib # noqa
|
from gi.repository import Gtk, GLib
|
||||||
|
|
||||||
|
|
||||||
class DummyWidget(ColorAwareApp, Gtk.Button):
|
class DummyWidget(ColorAwareApp, Gtk.Button): # type: ignore
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
||||||
@@ -27,7 +26,7 @@ def widget() -> DummyWidget:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("key, expect", [("default", False), ("prefer-dark", True)])
|
@pytest.mark.parametrize("key, expect", [("default", False), ("prefer-dark", True)])
|
||||||
def test_light_mode(widget, key: str, expect: bool) -> None:
|
def test_light_mode(widget: DummyWidget, key: str, expect: bool) -> None:
|
||||||
local_pref = subprocess.run(
|
local_pref = subprocess.run(
|
||||||
["gsettings", "get", "org.gnome.desktop.interface", "color-scheme"],
|
["gsettings", "get", "org.gnome.desktop.interface", "color-scheme"],
|
||||||
capture_output=True,
|
capture_output=True,
|
||||||
|
|||||||
+21
-6
@@ -1,33 +1,48 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.init.migrate import convert_cols_file
|
from dzgui.init.migrate import convert_cols_file
|
||||||
from tests.fixtures import fixture_path
|
from tests.fixtures import fixture_path
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def columns_with_perspective():
|
def columns_with_perspective() -> "Path":
|
||||||
return fixture_path("columns_1")
|
return fixture_path("columns_1")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def columns_without_perspective():
|
def columns_without_perspective() -> "Path":
|
||||||
return fixture_path("columns_2")
|
return fixture_path("columns_2")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def columns_with_view():
|
def columns_with_view() -> "Path":
|
||||||
return fixture_path("columns_3")
|
return fixture_path("columns_3")
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.config
|
@pytest.mark.config
|
||||||
def test_columns_with_perspective(columns_with_perspective):
|
def test_columns_with_perspective(columns_with_perspective: "Path") -> None:
|
||||||
j = convert_cols_file(columns_with_perspective)
|
j = convert_cols_file(columns_with_perspective)
|
||||||
|
if j is None:
|
||||||
|
return
|
||||||
assert "View" in j["cols"]
|
assert "View" in j["cols"]
|
||||||
assert "Max" in j["cols"]
|
assert "Max" in j["cols"]
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.config
|
@pytest.mark.config
|
||||||
def test_columns_without_perspective(columns_without_perspective):
|
def test_columns_without_perspective(columns_without_perspective: "Path") -> None:
|
||||||
j = convert_cols_file(columns_without_perspective)
|
j = convert_cols_file(columns_without_perspective)
|
||||||
|
if j is None:
|
||||||
|
return
|
||||||
assert "View" not in j["cols"]
|
assert "View" not in j["cols"]
|
||||||
assert "Max" not in j["cols"]
|
assert "Max" not in j["cols"]
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.config
|
@pytest.mark.config
|
||||||
def test_columns_with_view(columns_with_view):
|
def test_columns_with_view(columns_with_view: "Path") -> None:
|
||||||
j = convert_cols_file(columns_with_view)
|
j = convert_cols_file(columns_with_view)
|
||||||
assert j is None
|
assert j is None
|
||||||
+17
-12
@@ -1,25 +1,30 @@
|
|||||||
import json
|
import json
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from typing import Any, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.boilerplate import config_boilerplate
|
from dzgui.const.boilerplate import config_boilerplate
|
||||||
from dzgui.config.query import get_config
|
from dzgui.config.query import get_config
|
||||||
from dzgui.config.xdg import get_xdg_paths, parse_filepaths
|
from dzgui.config.xdg import get_xdg_paths, parse_filepaths
|
||||||
from dzgui.config import convert
|
from dzgui.config import convert
|
||||||
from tests.fixtures import fixture_path
|
from tests.fixtures import fixture_path
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def legacy_config():
|
def legacy_config() -> "Path":
|
||||||
return fixture_path("dztuirc_1")
|
return fixture_path("dztuirc_1")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def unset_values():
|
def unset_values() -> "Path":
|
||||||
return fixture_path("dztuirc_3")
|
return fixture_path("dztuirc_3")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def keys():
|
def keys() -> list[str]:
|
||||||
return [
|
return [
|
||||||
"fav_server",
|
"fav_server",
|
||||||
"fav_label",
|
"fav_label",
|
||||||
@@ -36,7 +41,7 @@ def keys():
|
|||||||
|
|
||||||
# TODO: use a static fixture instead of system config
|
# TODO: use a static fixture instead of system config
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def config():
|
def config() -> Any:
|
||||||
paths = get_xdg_paths()
|
paths = get_xdg_paths()
|
||||||
xdg = parse_filepaths(paths)
|
xdg = parse_filepaths(paths)
|
||||||
return get_config(xdg.config)
|
return get_config(xdg.config)
|
||||||
@@ -44,21 +49,21 @@ def config():
|
|||||||
|
|
||||||
@pytest.mark.post_install
|
@pytest.mark.post_install
|
||||||
@pytest.mark.realconfig
|
@pytest.mark.realconfig
|
||||||
def test_invalid_config_value(config):
|
def test_invalid_config_value(config: Any) -> None:
|
||||||
with pytest.raises(Exception):
|
with pytest.raises(Exception):
|
||||||
assert config["foo"] is None
|
assert config["foo"] is None
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.post_install
|
@pytest.mark.post_install
|
||||||
@pytest.mark.realconfig
|
@pytest.mark.realconfig
|
||||||
def test_default_config_values(keys, config):
|
def test_default_config_values(keys: list[str], config: Any) -> None:
|
||||||
for key in keys:
|
for key in keys:
|
||||||
assert config[key] is not None
|
assert config[key] is not None
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.post_install
|
@pytest.mark.post_install
|
||||||
@pytest.mark.realconfig
|
@pytest.mark.realconfig
|
||||||
def test_contains_invalid_values(keys, config):
|
def test_contains_invalid_values(keys: list[str], config: Any) -> None:
|
||||||
for key in config:
|
for key in config:
|
||||||
assert key in keys
|
assert key in keys
|
||||||
|
|
||||||
@@ -70,15 +75,15 @@ def test_contains_invalid_values(keys, config):
|
|||||||
("dztuirc_2", (False, False, False)),
|
("dztuirc_2", (False, False, False)),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def test_bool_conversion(fixture, expect):
|
def test_bool_conversion(fixture: str, expect: tuple[bool, bool, bool]) -> None:
|
||||||
fixture = fixture_path(fixture)
|
fixture_p = fixture_path(fixture)
|
||||||
j = convert.rc2json(fixture)
|
j = convert.rc2json(fixture_p)
|
||||||
j = json.loads(j)
|
j = json.loads(j)
|
||||||
assert j["fullscreen"] == expect[0]
|
assert j["fullscreen"] == expect[0]
|
||||||
assert not j["use_miles"]
|
assert not j["use_miles"]
|
||||||
|
|
||||||
|
|
||||||
def test_key_conversion(legacy_config):
|
def test_key_conversion(legacy_config: "Path") -> None:
|
||||||
j = convert.rc2json(legacy_config)
|
j = convert.rc2json(legacy_config)
|
||||||
j = json.loads(j)
|
j = json.loads(j)
|
||||||
keys = [
|
keys = [
|
||||||
@@ -92,7 +97,7 @@ def test_key_conversion(legacy_config):
|
|||||||
assert key not in j
|
assert key not in j
|
||||||
|
|
||||||
|
|
||||||
def test_missing_values(unset_values):
|
def test_missing_values(unset_values: "Path") -> None:
|
||||||
j = convert.rc2json(unset_values)
|
j = convert.rc2json(unset_values)
|
||||||
j = json.loads(j)
|
j = json.loads(j)
|
||||||
assert j.keys() == config_boilerplate.keys()
|
assert j.keys() == config_boilerplate.keys()
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
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)
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import configparser
|
import configparser
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
from dzgui.const.constants import FLATPAK_APPID, GTK_APP_ID, TMP_PATH
|
from dzgui.const.constants import FLATPAK_APPID, GTK_APP_ID, TMP_PATH
|
||||||
from dzgui.config.xdg import get_xdg_paths
|
from dzgui.config.xdg import get_xdg_paths
|
||||||
from dzgui.util.flatpak import apply_overrides
|
from dzgui.util.flatpak import apply_overrides
|
||||||
@@ -13,17 +15,17 @@ pytestmark = pytest.mark.flatpak
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def xdg_paths() -> dict[str, str]:
|
def xdg_paths() -> dict[str, Path]:
|
||||||
return get_xdg_paths()
|
return get_xdg_paths()
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def override(xdg_paths) -> None:
|
def override(xdg_paths: dict[str, Path]) -> None:
|
||||||
apply_overrides(xdg_paths)
|
apply_overrides(xdg_paths)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def config(xdg_paths) -> configparser.ConfigParser:
|
def config(xdg_paths: dict[str, Path]) -> configparser.ConfigParser:
|
||||||
conf_path = xdg_paths["XDG_DATA_HOME"].parent.joinpath(
|
conf_path = xdg_paths["XDG_DATA_HOME"].parent.joinpath(
|
||||||
f"flatpak/overrides/{FLATPAK_APPID}"
|
f"flatpak/overrides/{FLATPAK_APPID}"
|
||||||
)
|
)
|
||||||
@@ -32,14 +34,16 @@ def config(xdg_paths) -> configparser.ConfigParser:
|
|||||||
return config
|
return config
|
||||||
|
|
||||||
|
|
||||||
def test_session_bus(override, config) -> None:
|
def test_session_bus(override: None, config: configparser.ConfigParser) -> None:
|
||||||
bus = config[BUS_KEY][GTK_APP_ID]
|
bus = config[BUS_KEY][GTK_APP_ID]
|
||||||
assert bus == "own"
|
assert bus == "own"
|
||||||
|
|
||||||
|
|
||||||
def test_paths(override, xdg_paths, config) -> None:
|
def test_paths(
|
||||||
expect: list[str] = []
|
override: None, xdg_paths: dict[str, Path], config: configparser.ConfigParser
|
||||||
expect.append(TMP_PATH)
|
) -> None:
|
||||||
|
expect: list[Path] = []
|
||||||
|
expect.append(Path(TMP_PATH))
|
||||||
expect.extend([*xdg_paths.values()])
|
expect.extend([*xdg_paths.values()])
|
||||||
paths = config[PATHS_KEY][PATHS_SUBKEY].split(";")
|
paths = config[PATHS_KEY][PATHS_SUBKEY].split(";")
|
||||||
assert all(str(path) in paths for path in expect)
|
assert all(str(path) in paths for path in expect)
|
||||||
@@ -2,10 +2,11 @@ import pytest
|
|||||||
|
|
||||||
from dzgui.const.constants import FLATPAK_RUN_CMD, FLATPAK_SANDBOX
|
from dzgui.const.constants import FLATPAK_RUN_CMD, FLATPAK_SANDBOX
|
||||||
from dzgui.const.enum import Preferences
|
from dzgui.const.enum import Preferences
|
||||||
|
from dzgui.controllers.mc import Controller
|
||||||
from dzgui.views.pages.options import FlatpakToggleField
|
from dzgui.views.pages.options import FlatpakToggleField
|
||||||
|
|
||||||
|
|
||||||
class MockController:
|
class MockController(Controller):
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.command: str
|
self.command: str
|
||||||
|
|
||||||
|
|||||||
@@ -20,20 +20,23 @@ def get_db_len(path: Path) -> int:
|
|||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
c.execute("SELECT COUNT(*) from ips")
|
c.execute("SELECT COUNT(*) from ips")
|
||||||
db_len = c.fetchone()[0]
|
db_len = c.fetchone()[0]
|
||||||
return db_len
|
return int(db_len)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def csv() -> Path:
|
def csv() -> Path:
|
||||||
csv = Path(tempfile.NamedTemporaryFile().name)
|
csv = Path(tempfile.NamedTemporaryFile().name)
|
||||||
url = find_download_url(DB_IP)
|
url = find_download_url(DB_IP)
|
||||||
|
if url is None:
|
||||||
|
raise TypeError
|
||||||
tmp = serialize(url)
|
tmp = serialize(url)
|
||||||
unzip(tmp, csv)
|
unzip(tmp, csv)
|
||||||
strip_ipv6(csv)
|
strip_ipv6(csv)
|
||||||
return csv
|
return csv
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.slow
|
@pytest.mark.slow
|
||||||
def test_stripping(csv):
|
def test_stripping(csv: Path) -> None:
|
||||||
with open(csv, "rb") as f:
|
with open(csv, "rb") as f:
|
||||||
first = f.readline().decode().rstrip()
|
first = f.readline().decode().rstrip()
|
||||||
try:
|
try:
|
||||||
@@ -52,7 +55,7 @@ def test_stripping(csv):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.slow
|
@pytest.mark.slow
|
||||||
def test_row_parity(csv) -> None:
|
def test_row_parity(csv: Path) -> None:
|
||||||
rows = csv.read_text().splitlines()
|
rows = csv.read_text().splitlines()
|
||||||
|
|
||||||
db = Path(tempfile.NamedTemporaryFile().name)
|
db = Path(tempfile.NamedTemporaryFile().name)
|
||||||
|
|||||||
@@ -1,26 +1,28 @@
|
|||||||
|
import gi
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from dzgui.api.servers import Details
|
from dzgui.api.servers import Details
|
||||||
|
from dzgui.controllers.mc import Controller
|
||||||
|
from dzgui.controllers.emitter import Emitter
|
||||||
from dzgui.views.dialogs.servers import ServerDetailsDialog
|
from dzgui.views.dialogs.servers import ServerDetailsDialog
|
||||||
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk
|
from gi.repository import Gtk
|
||||||
|
|
||||||
|
|
||||||
class MockController:
|
class MockController(Controller):
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.window = Gtk.Window()
|
pass
|
||||||
|
|
||||||
def get_window(self) -> Gtk.Window:
|
def get_window(self) -> None: # type: ignore[override]
|
||||||
return self.window
|
return None
|
||||||
|
|
||||||
def get_server_name(self) -> str:
|
def get_server_name(self) -> str:
|
||||||
return "My server"
|
return "My server"
|
||||||
|
|
||||||
def get_emitter(self) -> None:
|
def get_emitter(self) -> Emitter:
|
||||||
return None
|
return Emitter()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.filterwarnings("ignore::DeprecationWarning")
|
@pytest.mark.filterwarnings("ignore::DeprecationWarning")
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ from dzgui.views.components.entry import validate_ip_truthy
|
|||||||
("192.168.1.101:27016", True),
|
("192.168.1.101:27016", True),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def test_ip_entry(ip) -> None:
|
def test_ip_entry(ip: tuple[str, bool]) -> None:
|
||||||
string, state = ip
|
string, state = ip
|
||||||
assert validate_ip_truthy(string) is state
|
assert validate_ip_truthy(string) is state
|
||||||
|
|
||||||
|
|||||||
@@ -1,27 +1,29 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from dzgui.model.model_factory import FastInsertListStore
|
from dzgui.model.model_factory import FastInsertListStore
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def heterogeneous_list() -> None:
|
def heterogeneous_list() -> list[list[Any]]:
|
||||||
return [["a", 0, True], ["b", 1, False]]
|
return [["a", 0, True], ["b", 1, False]]
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def mismatched_length_list() -> None:
|
def mismatched_length_list() -> list[list[Any]]:
|
||||||
return [["a", 0, True], ["b", 1, False, 0]]
|
return [["a", 0, True], ["b", 1, False, 0]]
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def extended_list(heterogeneous_list) -> None:
|
def extended_list(heterogeneous_list: list[list[Any]]) -> FastInsertListStore:
|
||||||
fs = FastInsertListStore(str, int, bool)
|
fs = FastInsertListStore(str, int, bool)
|
||||||
fs.extend(heterogeneous_list)
|
fs.extend(heterogeneous_list)
|
||||||
return fs
|
return fs
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def appended_list(heterogeneous_list) -> None:
|
def appended_list(heterogeneous_list: list[list[Any]]) -> FastInsertListStore:
|
||||||
fs = FastInsertListStore(str, int, bool)
|
fs = FastInsertListStore(str, int, bool)
|
||||||
for row in heterogeneous_list:
|
for row in heterogeneous_list:
|
||||||
fs.append(row)
|
fs.append(row)
|
||||||
@@ -29,19 +31,21 @@ def appended_list(heterogeneous_list) -> None:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("target", ["extended_list", "appended_list"])
|
@pytest.mark.parametrize("target", ["extended_list", "appended_list"])
|
||||||
def test_list_parity(heterogeneous_list, request, target) -> None:
|
def test_list_parity(
|
||||||
|
heterogeneous_list: list[list[Any]], request: pytest.FixtureRequest, target: str
|
||||||
|
) -> None:
|
||||||
target = request.getfixturevalue(target)
|
target = request.getfixturevalue(target)
|
||||||
extracted = [[el for el in row] for row in target]
|
extracted = [[el for el in row] for row in target]
|
||||||
assert heterogeneous_list == extracted
|
assert heterogeneous_list == extracted
|
||||||
|
|
||||||
|
|
||||||
def test_type_disparity(heterogeneous_list) -> None:
|
def test_type_disparity(heterogeneous_list: list[list[Any]]) -> None:
|
||||||
with pytest.raises(TypeError):
|
with pytest.raises(TypeError):
|
||||||
fs = FastInsertListStore(str, bool, bool)
|
fs = FastInsertListStore(str, bool, bool)
|
||||||
fs.extend(heterogeneous_list)
|
fs.extend(heterogeneous_list)
|
||||||
|
|
||||||
|
|
||||||
def test_length_disparity(mismatched_length_list) -> None:
|
def test_length_disparity(mismatched_length_list: list[list[Any]]) -> None:
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
fs = FastInsertListStore(str, int, bool)
|
fs = FastInsertListStore(str, int, bool)
|
||||||
fs.extend(mismatched_length_list)
|
fs.extend(mismatched_length_list)
|
||||||
@@ -1,27 +1,32 @@
|
|||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.util import localize
|
from dzgui.util import localize
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
def test_de(monkeypatch):
|
|
||||||
|
def test_de(monkeypatch: "MonkeyPatch") -> None:
|
||||||
monkeypatch.setenv("LC_ALL", "de_DE.UTF-8")
|
monkeypatch.setenv("LC_ALL", "de_DE.UTF-8")
|
||||||
localize.set_locale()
|
localize.set_locale()
|
||||||
assert localize.number(9900) == "9.900"
|
assert localize.number(9900) == "9.900"
|
||||||
assert localize.number(99.88) == "99,88"
|
assert localize.number(99.88) == "99,88"
|
||||||
|
|
||||||
|
|
||||||
def test_en(monkeypatch):
|
def test_en(monkeypatch: "MonkeyPatch") -> None:
|
||||||
monkeypatch.setenv("LC_ALL", "en_US.UTF-8")
|
monkeypatch.setenv("LC_ALL", "en_US.UTF-8")
|
||||||
localize.set_locale()
|
localize.set_locale()
|
||||||
assert localize.number(9900) == "9,900"
|
assert localize.number(9900) == "9,900"
|
||||||
assert localize.number(99.88) == "99.88"
|
assert localize.number(99.88) == "99.88"
|
||||||
|
|
||||||
|
|
||||||
def test_none(monkeypatch):
|
def test_none(monkeypatch: "MonkeyPatch") -> None:
|
||||||
localize.set_locale()
|
localize.set_locale()
|
||||||
assert localize.number(9900) == "9,900"
|
assert localize.number(9900) == "9,900"
|
||||||
assert localize.number(99.88) == "99.88"
|
assert localize.number(99.88) == "99.88"
|
||||||
|
|
||||||
|
|
||||||
def test_empty(monkeypatch):
|
def test_empty(monkeypatch: "MonkeyPatch") -> None:
|
||||||
monkeypatch.setenv("LC_ALL", "")
|
monkeypatch.setenv("LC_ALL", "")
|
||||||
localize.set_locale()
|
localize.set_locale()
|
||||||
assert localize.number(9900) == "9,900"
|
assert localize.number(9900) == "9,900"
|
||||||
|
|||||||
@@ -7,13 +7,13 @@ from dzgui.util.redact import RedactionFilter, REDACTION_PATTERNS
|
|||||||
class RecordsListHandler(logging.Handler):
|
class RecordsListHandler(logging.Handler):
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.records_list = []
|
self.records_list: list[logging.LogRecord] = []
|
||||||
|
|
||||||
def emit(self, record: logging.LogRecord) -> None:
|
def emit(self, record: logging.LogRecord) -> None:
|
||||||
self.records_list.append(record)
|
self.records_list.append(record)
|
||||||
|
|
||||||
def pop(self) -> None:
|
def pop(self) -> str:
|
||||||
return self.records_list[-1].msg
|
return str(self.records_list[-1].msg)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.redact
|
@pytest.mark.redact
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.api.steam import find_user_id
|
from dzgui.api.steam import find_user_id
|
||||||
from dzgui.const.constants import DEFAULT_STEAM_PATH
|
from dzgui.const.constants import DEFAULT_STEAM_PATH
|
||||||
@@ -8,6 +9,9 @@ from tests.fixtures import fixture_path
|
|||||||
|
|
||||||
pytestmark = pytest.mark.apitest
|
pytestmark = pytest.mark.apitest
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"fixture, expect",
|
"fixture, expect",
|
||||||
@@ -19,12 +23,14 @@ pytestmark = pytest.mark.apitest
|
|||||||
("api/loginusers_beta_client_multiple_2.vdf", 0),
|
("api/loginusers_beta_client_multiple_2.vdf", 0),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def test_loginusers(monkeypatch, fixture: str, expect: int) -> None:
|
def test_loginusers(monkeypatch: "MonkeyPatch", fixture: str, expect: int) -> None:
|
||||||
def mock_loginusers(path: Path) -> Path:
|
def mock_loginusers(path: Path) -> Path:
|
||||||
return fixture_path(fixture)
|
return fixture_path(fixture)
|
||||||
|
|
||||||
monkeypatch.setattr("dzgui.api.steam.find_loginusers", mock_loginusers)
|
monkeypatch.setattr("dzgui.api.steam.find_loginusers", mock_loginusers)
|
||||||
uid = find_user_id(Path(""))
|
uid = find_user_id(Path(""))
|
||||||
|
if uid is None:
|
||||||
|
raise TypeError
|
||||||
assert int(uid) == expect
|
assert int(uid) == expect
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,42 +11,52 @@ import dzgui.config.query
|
|||||||
from tests.fixtures import fixture_path
|
from tests.fixtures import fixture_path
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.const.enums import Preferences
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
from dzgui.const.enum import Preferences
|
||||||
|
|
||||||
pytestmark = pytest.mark.mods
|
pytestmark = pytest.mark.mods
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def versions() -> str:
|
def versions() -> "Path":
|
||||||
return fixture_path("dzg.versions")
|
return fixture_path("dzg.versions")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def tmp() -> str:
|
def tmp() -> str:
|
||||||
with tempfile.NamedTemporaryFile(delete=False) as f:
|
with tempfile.NamedTemporaryFile(delete=False) as f:
|
||||||
tmp = f.name
|
tmp = f.name
|
||||||
return tmp
|
return tmp
|
||||||
|
|
||||||
|
|
||||||
def mock_local_ids(path: Path) -> list[int]:
|
def mock_local_ids(path: Path) -> list[int]:
|
||||||
return [3410710885, 3739934289]
|
return [3410710885, 3739934289]
|
||||||
|
|
||||||
|
|
||||||
def mock_lookup(path: Path, prefs: "Preferences") -> str:
|
def mock_lookup(path: Path, prefs: "Preferences") -> str:
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
def test_signatures(monkeypatch, tmp: str, versions: str) -> None:
|
|
||||||
|
def test_signatures(monkeypatch: "MonkeyPatch", tmp: str, versions: str) -> None:
|
||||||
ids = [1559212036, 1654462998]
|
ids = [1559212036, 1654462998]
|
||||||
shutil.copyfile(versions, tmp)
|
shutil.copyfile(versions, tmp)
|
||||||
path = Path(tmp)
|
path = Path(tmp)
|
||||||
monkeypatch.setattr("dzgui.api.mods.lookup", mock_lookup)
|
monkeypatch.setattr("dzgui.api.mods.lookup", mock_lookup)
|
||||||
dzgui.api.mods.remove_stale_signatures(path, path, ids)
|
dzgui.api.mods.remove_stale_signatures(path, path, ids)
|
||||||
with open(tmp, "r") as f:
|
with open(tmp, "r") as f:
|
||||||
lines = f.readlines()
|
lines = [line.rstrip() for line in f.readlines()]
|
||||||
assert ids not in lines
|
concat = ",".join(map(str, ids))
|
||||||
|
assert concat not in lines
|
||||||
|
|
||||||
def test_signatures_with_no_ids(monkeypatch, tmp: str, versions: str) -> None:
|
|
||||||
|
def test_signatures_with_no_ids(
|
||||||
|
monkeypatch: "MonkeyPatch", tmp: str, versions: str
|
||||||
|
) -> None:
|
||||||
shutil.copyfile(versions, tmp)
|
shutil.copyfile(versions, tmp)
|
||||||
path = Path(tmp)
|
path = Path(tmp)
|
||||||
monkeypatch.setattr("dzgui.api.mods.get_local_mod_ids", mock_local_ids)
|
monkeypatch.setattr("dzgui.api.mods.get_local_mod_ids", mock_local_ids)
|
||||||
monkeypatch.setattr("dzgui.api.mods.lookup", mock_lookup)
|
monkeypatch.setattr("dzgui.api.mods.lookup", mock_lookup)
|
||||||
dzgui.api.mods.remove_stale_signatures(path, path)
|
dzgui.api.mods.remove_stale_signatures(path, path)
|
||||||
with open(tmp, "r") as f:
|
with open(tmp, "r") as f:
|
||||||
lines = f.readlines()
|
lines = [line.rstrip() for line in f.readlines()]
|
||||||
assert lines == ["3410710885,1752864732\n", "3739934289,1780855136\n"]
|
assert lines == ["3410710885,1752864732", "3739934289,1780855136"]
|
||||||
@@ -4,10 +4,13 @@ from pathlib import Path
|
|||||||
from dzgui.api.mods import tokenize
|
from dzgui.api.mods import tokenize
|
||||||
from tests.fixtures import fixture_path
|
from tests.fixtures import fixture_path
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.mods
|
@pytest.mark.mods
|
||||||
@pytest.mark.parametrize("i", range(1, 7))
|
@pytest.mark.parametrize("i", range(1, 7))
|
||||||
def test_modmeta(i: int) -> None:
|
def test_modmeta(i: int) -> None:
|
||||||
fixture = fixture_path(f"cpp/mod{i}")
|
fixture = fixture_path(f"cpp/mod{i}")
|
||||||
path = Path(fixture)
|
path = Path(fixture)
|
||||||
meta = tokenize(path)
|
meta = tokenize(path)
|
||||||
|
if meta is None:
|
||||||
|
raise TypeError
|
||||||
assert meta["name"] == "ModName"
|
assert meta["name"] == "ModName"
|
||||||
@@ -1,8 +1,13 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.config.xdg import get_xdg_paths
|
from dzgui.config.xdg import get_xdg_paths
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
def test_path_fallback(monkeypatch) -> None:
|
|
||||||
|
def test_path_fallback(monkeypatch: "MonkeyPatch") -> None:
|
||||||
envs = ["XDG_DATA_HOME", "XDG_STATE_HOME", "XDG_CONFIG_HOME", "XDG_CACHE_HOME"]
|
envs = ["XDG_DATA_HOME", "XDG_STATE_HOME", "XDG_CONFIG_HOME", "XDG_CACHE_HOME"]
|
||||||
for env in envs:
|
for env in envs:
|
||||||
monkeypatch.setenv(env, "/etc/dzgui")
|
monkeypatch.setenv(env, "/etc/dzgui")
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
import pytest
|
import pytest
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.api.steam import is_dayz_downloading
|
from dzgui.api.steam import is_dayz_downloading
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"file_list, expect",
|
"file_list, expect",
|
||||||
@@ -16,12 +20,14 @@ from dzgui.api.steam import is_dayz_downloading
|
|||||||
(["state_221100_1111"], False),
|
(["state_221100_1111"], False),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def test_dayz_patch_pending(monkeypatch, file_list: list[str], expect: bool) -> None:
|
def test_dayz_patch_pending(
|
||||||
def mock_get_pending_downloads(steam_path: Path, appid: int) -> None:
|
monkeypatch: "MonkeyPatch", file_list: list[str], expect: bool
|
||||||
|
) -> None:
|
||||||
|
def mock_get_pending_downloads(steam_path: Path, appid: int) -> list[Path]:
|
||||||
files = [Path(file) for file in file_list]
|
files = [Path(file) for file in file_list]
|
||||||
return files
|
return files
|
||||||
|
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"dzgui.api.steam.get_pending_downloads", mock_get_pending_downloads
|
"dzgui.api.steam.get_pending_downloads", mock_get_pending_downloads
|
||||||
)
|
)
|
||||||
assert is_dayz_downloading(Path("/tmp"), Path("/tmp")) == expect
|
assert is_dayz_downloading(Path("/tmp"), 221100) == expect
|
||||||
+19
-11
@@ -1,13 +1,14 @@
|
|||||||
import pytest
|
import pytest
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
import dzgui.api.pefile as PeFile
|
import dzgui.api.pefile as PeFile
|
||||||
from dzgui.api.steam import (
|
from dzgui.api.steam import (
|
||||||
VDFLoadError,
|
VDFLoadError,
|
||||||
AppNotInstalledError,
|
AppNotInstalledError,
|
||||||
AppMovedError,
|
AppMovedError,
|
||||||
get_app_path
|
get_app_path,
|
||||||
)
|
)
|
||||||
|
|
||||||
from dzgui.config.query import get_config
|
from dzgui.config.query import get_config
|
||||||
@@ -16,20 +17,22 @@ from dzgui.const.constants import APPID_DAYZ
|
|||||||
|
|
||||||
from tests.fixtures import fixture_path
|
from tests.fixtures import fixture_path
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
pytestmark = pytest.mark.apitest
|
pytestmark = pytest.mark.apitest
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def default_steam_path():
|
def default_steam_path() -> str:
|
||||||
paths = get_xdg_paths()
|
paths = get_xdg_paths()
|
||||||
xdg = parse_filepaths(paths)
|
xdg = parse_filepaths(paths)
|
||||||
conf = get_config(xdg.config)
|
conf = get_config(xdg.config)
|
||||||
return conf["default_steam_path"]
|
return str(conf["default_steam_path"])
|
||||||
|
|
||||||
|
# TODO: additional parsing tests
|
||||||
|
|
||||||
# TODO: split into separate test file
|
def test_pefile_length(default_steam_path: str) -> None:
|
||||||
# FIXME: use fixtures
|
|
||||||
def test_pefile_length(default_steam_path):
|
|
||||||
try:
|
try:
|
||||||
pe_file_path = PeFile.get_pefile_path(Path(default_steam_path), APPID_DAYZ)
|
pe_file_path = PeFile.get_pefile_path(Path(default_steam_path), APPID_DAYZ)
|
||||||
vers = PeFile.get_dayz_version(pe_file_path)
|
vers = PeFile.get_dayz_version(pe_file_path)
|
||||||
@@ -39,7 +42,7 @@ def test_pefile_length(default_steam_path):
|
|||||||
assert len(st) == 3
|
assert len(st) == 3
|
||||||
|
|
||||||
|
|
||||||
def test_invalid_pefile_path():
|
def test_invalid_pefile_path() -> None:
|
||||||
with pytest.raises(VDFLoadError):
|
with pytest.raises(VDFLoadError):
|
||||||
try:
|
try:
|
||||||
PeFile.get_pefile_path(Path("/not/a/path"), APPID_DAYZ)
|
PeFile.get_pefile_path(Path("/not/a/path"), APPID_DAYZ)
|
||||||
@@ -47,6 +50,7 @@ def test_invalid_pefile_path():
|
|||||||
raise e
|
raise e
|
||||||
|
|
||||||
|
|
||||||
|
# TODO: split into separate test file
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"fixture, exception",
|
"fixture, exception",
|
||||||
[
|
[
|
||||||
@@ -55,8 +59,11 @@ def test_invalid_pefile_path():
|
|||||||
("malformed.vdf", VDFLoadError),
|
("malformed.vdf", VDFLoadError),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def test_not_in_library(monkeypatch, fixture, exception):
|
def test_not_in_library(
|
||||||
|
monkeypatch: "MonkeyPatch", fixture: str, exception: type[Exception]
|
||||||
|
) -> None:
|
||||||
import dzgui.api.steam as steam
|
import dzgui.api.steam as steam
|
||||||
|
|
||||||
monkeypatch.setattr(steam, "LIBRARYFOLDERS_PATH", fixture)
|
monkeypatch.setattr(steam, "LIBRARYFOLDERS_PATH", fixture)
|
||||||
|
|
||||||
folder_path = Path(fixture_path("api"))
|
folder_path = Path(fixture_path("api"))
|
||||||
@@ -68,12 +75,13 @@ def test_not_in_library(monkeypatch, fixture, exception):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def second_drive():
|
def second_drive() -> str:
|
||||||
return "in_library_on_second_drive.vdf"
|
return "in_library_on_second_drive.vdf"
|
||||||
|
|
||||||
|
|
||||||
def test_on_second_drive(monkeypatch, second_drive):
|
def test_on_second_drive(monkeypatch: "MonkeyPatch", second_drive: str) -> None:
|
||||||
import dzgui.api.steam as steam
|
import dzgui.api.steam as steam
|
||||||
|
|
||||||
monkeypatch.setattr(steam, "LIBRARYFOLDERS_PATH", second_drive)
|
monkeypatch.setattr(steam, "LIBRARYFOLDERS_PATH", second_drive)
|
||||||
folder_path = Path(fixture_path("api"))
|
folder_path = Path(fixture_path("api"))
|
||||||
path = get_app_path(folder_path, APPID_DAYZ)
|
path = get_app_path(folder_path, APPID_DAYZ)
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import pytest
|
import pytest
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
FLATPAK_APPID,
|
FLATPAK_APPID,
|
||||||
@@ -14,9 +16,9 @@ pytestmark = pytest.mark.flatpak
|
|||||||
|
|
||||||
|
|
||||||
class TestSteamDetection(unittest.TestCase):
|
class TestSteamDetection(unittest.TestCase):
|
||||||
def test_flatpak_detection_with_multiple_running_apps(self):
|
def test_flatpak_detection_with_multiple_running_apps(self) -> None:
|
||||||
def flatpak_output(args, *, text):
|
def flatpak_output(args: Any, *, text: str) -> str:
|
||||||
# Default `flatpak ps` includes instance, PID, app and runtime columns.
|
# Default 'flatpak ps' includes instance, PID, app and runtime columns.
|
||||||
if args == ["flatpak", "ps", "--columns=application"]:
|
if args == ["flatpak", "ps", "--columns=application"]:
|
||||||
return f"com.spotify.Client\n{FLATPAK_APPID}\n{FLATPAK_APPID}\n"
|
return f"com.spotify.Client\n{FLATPAK_APPID}\n{FLATPAK_APPID}\n"
|
||||||
return f"3904921611\t1257689\t{FLATPAK_APPID}\torg.freedesktop.Platform\n"
|
return f"3904921611\t1257689\t{FLATPAK_APPID}\torg.freedesktop.Platform\n"
|
||||||
@@ -29,7 +31,7 @@ class TestSteamDetection(unittest.TestCase):
|
|||||||
with self.subTest(client=client):
|
with self.subTest(client=client):
|
||||||
self.assertTrue(proc.is_steam_running(client))
|
self.assertTrue(proc.is_steam_running(client))
|
||||||
|
|
||||||
def test_flatpak_not_running(self):
|
def test_flatpak_not_running(self) -> None:
|
||||||
with patch.object(proc, "has_cmd", return_value=True):
|
with patch.object(proc, "has_cmd", return_value=True):
|
||||||
for output in ("", "com.spotify.Client\n", f"{FLATPAK_APPID}Helper\n"):
|
for output in ("", "com.spotify.Client\n", f"{FLATPAK_APPID}Helper\n"):
|
||||||
with (
|
with (
|
||||||
@@ -38,7 +40,7 @@ class TestSteamDetection(unittest.TestCase):
|
|||||||
):
|
):
|
||||||
self.assertFalse(proc.is_flatpak_steam_running())
|
self.assertFalse(proc.is_flatpak_steam_running())
|
||||||
|
|
||||||
def test_flatpak_not_installed(self):
|
def test_flatpak_not_installed(self) -> None:
|
||||||
with (
|
with (
|
||||||
patch.object(proc, "has_cmd", return_value=False),
|
patch.object(proc, "has_cmd", return_value=False),
|
||||||
patch.object(proc.subprocess, "check_output") as check_output,
|
patch.object(proc.subprocess, "check_output") as check_output,
|
||||||
@@ -46,7 +48,7 @@ class TestSteamDetection(unittest.TestCase):
|
|||||||
self.assertFalse(proc.is_flatpak_steam_running())
|
self.assertFalse(proc.is_flatpak_steam_running())
|
||||||
check_output.assert_not_called()
|
check_output.assert_not_called()
|
||||||
|
|
||||||
def test_native_steam(self):
|
def test_native_steam(self) -> None:
|
||||||
with patch.object(proc, "has_cmd", return_value=True):
|
with patch.object(proc, "has_cmd", return_value=True):
|
||||||
for output, expected in (
|
for output, expected in (
|
||||||
(
|
(
|
||||||
@@ -73,6 +75,6 @@ class TestSteamDetection(unittest.TestCase):
|
|||||||
):
|
):
|
||||||
self.assertEqual(proc.is_native_steam_running(), expected)
|
self.assertEqual(proc.is_native_steam_running(), expected)
|
||||||
|
|
||||||
def test_invalid_client(self):
|
def test_invalid_client(self) -> None:
|
||||||
with self.assertRaises(TypeError):
|
with self.assertRaises(TypeError):
|
||||||
proc.is_steam_running("invalid-client")
|
proc.is_steam_running("invalid-client")
|
||||||
@@ -1,23 +1,25 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from dzgui.api import probe
|
||||||
from dzgui.config.query import get_config
|
from dzgui.config.query import get_config
|
||||||
from dzgui.config.xdg import get_xdg_paths, parse_filepaths
|
from dzgui.config.xdg import get_xdg_paths, parse_filepaths
|
||||||
from dzgui.api import probe
|
|
||||||
|
|
||||||
pytestmark = pytest.mark.webtest
|
pytestmark = pytest.mark.webtest
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def config():
|
def config() -> Any:
|
||||||
paths = get_xdg_paths()
|
paths = get_xdg_paths()
|
||||||
xdg = parse_filepaths(paths)
|
xdg = parse_filepaths(paths)
|
||||||
return get_config(xdg.config)
|
return get_config(xdg.config)
|
||||||
|
|
||||||
|
|
||||||
def test_ipdb():
|
def test_ipdb() -> None:
|
||||||
assert probe.test_ipdb()
|
assert probe.test_ipdb()
|
||||||
|
|
||||||
|
|
||||||
def test_steam(config):
|
def test_steam(config: Any) -> None:
|
||||||
key = config["steam_api"]
|
key = config["steam_api"]
|
||||||
assert probe.test_steam_api(key)
|
assert probe.test_steam_api(key)
|
||||||
@@ -18,9 +18,10 @@ def test_row_conversion() -> None:
|
|||||||
"Unofficial",
|
"Unofficial",
|
||||||
False,
|
False,
|
||||||
]
|
]
|
||||||
rows = [ServerRow(*data)]
|
rows = [ServerRow(*data)] # type: ignore
|
||||||
marshalled = ServerRow.marshal_rows(rows)
|
marshalled = ServerRow.marshal_rows(rows)
|
||||||
store = ModelFactory().make_server_store()
|
store = ModelFactory().make_server_store()
|
||||||
store.extend(marshalled)
|
store.extend(marshalled)
|
||||||
converted = [[el for el in row] for row in store]
|
cols = store.get_n_columns()
|
||||||
|
converted = [[row[i] for i in range(cols)] for row in store]
|
||||||
assert data == converted[0]
|
assert data == converted[0]
|
||||||
@@ -3,9 +3,11 @@ import re
|
|||||||
|
|
||||||
from dzgui.api.servers import Details, Record, get_details
|
from dzgui.api.servers import Details, Record, get_details
|
||||||
|
|
||||||
|
pytestmark = pytest.mark.slow
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def details() -> Details:
|
def details() -> Details | None:
|
||||||
"""
|
"""
|
||||||
Static official server, metadata is expected to be invariate
|
Static official server, metadata is expected to be invariate
|
||||||
"""
|
"""
|
||||||
@@ -19,17 +21,21 @@ def test_invalid_server() -> None:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("key, expect", [("day_accel", 2.3), ("night_accel", 6.8)])
|
@pytest.mark.parametrize("key, expect", [("day_accel", 2.3), ("night_accel", 6.8)])
|
||||||
def test_time_accel(details, key, expect) -> None:
|
def test_time_accel(details: Details | None, key: str, expect: float) -> None:
|
||||||
assert getattr(details, key) == expect
|
assert getattr(details, key) == expect
|
||||||
|
|
||||||
|
|
||||||
def test_gametime(details) -> None:
|
def test_gametime(details: Details | None) -> None:
|
||||||
time_reg = r"^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9]$)"
|
time_reg = r"^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9]$)"
|
||||||
|
if details is None:
|
||||||
|
raise TypeError
|
||||||
match = re.match(time_reg, details.gametime)
|
match = re.match(time_reg, details.gametime)
|
||||||
assert match is not None
|
assert match is not None
|
||||||
|
|
||||||
|
|
||||||
def test_metadata(details) -> None:
|
def test_metadata(details: Details | None) -> None:
|
||||||
|
if details is None:
|
||||||
|
raise TypeError
|
||||||
for row in details.data:
|
for row in details.data:
|
||||||
label, value = row
|
label, value = row
|
||||||
match label:
|
match label:
|
||||||
|
|||||||
+18
-17
@@ -1,9 +1,9 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from hypothesis import given, strategies as st
|
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
from hypothesis import given, strategies as st
|
||||||
from dzgui.views.dialogs.calc import (
|
from dzgui.views.dialogs.calc import (
|
||||||
|
Emitter,
|
||||||
LocalClock,
|
LocalClock,
|
||||||
ServerClock,
|
ServerClock,
|
||||||
Time,
|
Time,
|
||||||
@@ -13,31 +13,28 @@ from dzgui.views.dialogs.calc import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class DummyEmitter:
|
|
||||||
def __init__(self) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def connect(self, _, __) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=[("05:00", 10.0), ("15:30", 5.0)])
|
@pytest.fixture(params=[("05:00", 10.0), ("15:30", 5.0)])
|
||||||
def accel_server_clock(request) -> None:
|
def accel_server_clock(request: pytest.FixtureRequest) -> tuple[str, ServerClock]:
|
||||||
clock_time, expect = request.param
|
clock_time, expect = request.param
|
||||||
cur_time = Time(clock_time, 5.0, 2.0)
|
cur_time = Time(clock_time, 5.0, 2.0)
|
||||||
emitter = DummyEmitter()
|
emitter = Emitter()
|
||||||
local_clock = LocalClock(emitter)
|
local_clock = LocalClock(emitter)
|
||||||
server_clock = ServerClock(cur_time, emitter, local_clock)
|
server_clock = ServerClock(cur_time, emitter, local_clock)
|
||||||
return expect, server_clock
|
return expect, server_clock
|
||||||
|
|
||||||
|
|
||||||
def test_accel_factor(accel_server_clock) -> None:
|
def test_accel_factor(accel_server_clock: tuple[float, ServerClock]) -> None:
|
||||||
"""Static test checking times at known boundaries"""
|
"""Static test checking times at known boundaries"""
|
||||||
expect, clock = accel_server_clock
|
expect, clock = accel_server_clock
|
||||||
assert clock.get_accel_factor(clock.cur_time) == expect
|
assert clock.get_accel_factor(clock.cur_time) == expect
|
||||||
|
|
||||||
|
|
||||||
def reference_calc(start, end, day_factor, night_factor):
|
def reference_calc(
|
||||||
|
start: datetime,
|
||||||
|
end: datetime,
|
||||||
|
day_factor: float,
|
||||||
|
night_factor: float,
|
||||||
|
) -> timedelta:
|
||||||
"""
|
"""
|
||||||
Reference implementation to test validity of UI-side calculator
|
Reference implementation to test validity of UI-side calculator
|
||||||
Aggregates total seconds and applies accel factors after
|
Aggregates total seconds and applies accel factors after
|
||||||
@@ -80,7 +77,7 @@ night_accel = st.floats(
|
|||||||
|
|
||||||
|
|
||||||
@st.composite
|
@st.composite
|
||||||
def time_ranges(draw):
|
def time_ranges(draw: st.DrawFn) -> tuple[datetime, datetime]:
|
||||||
start_time = draw(st.times())
|
start_time = draw(st.times())
|
||||||
deltas = st.timedeltas(min_value=timedelta(0), max_value=timedelta(days=1))
|
deltas = st.timedeltas(min_value=timedelta(0), max_value=timedelta(days=1))
|
||||||
duration = draw(deltas)
|
duration = draw(deltas)
|
||||||
@@ -91,12 +88,16 @@ def time_ranges(draw):
|
|||||||
|
|
||||||
|
|
||||||
@given(span=time_ranges(), day_factor=day_accel, night_factor=night_accel)
|
@given(span=time_ranges(), day_factor=day_accel, night_factor=night_accel)
|
||||||
def test_time_aggregation(span, day_factor, night_factor) -> None:
|
def test_time_aggregation(
|
||||||
|
span: tuple[datetime, datetime],
|
||||||
|
day_factor: float,
|
||||||
|
night_factor: float,
|
||||||
|
) -> None:
|
||||||
start, end = span
|
start, end = span
|
||||||
|
|
||||||
strtime = start.strftime("%H:%M")
|
strtime = start.strftime("%H:%M")
|
||||||
t = Time(strtime, day_factor, night_factor)
|
t = Time(strtime, day_factor, night_factor)
|
||||||
emitter = DummyEmitter()
|
emitter = Emitter()
|
||||||
local_clock = LocalClock(emitter)
|
local_clock = LocalClock(emitter)
|
||||||
server_clock = ServerClock(t, emitter, local_clock)
|
server_clock = ServerClock(t, emitter, local_clock)
|
||||||
h = end.time().hour
|
h = end.time().hour
|
||||||
|
|||||||
+41
-37
@@ -1,91 +1,95 @@
|
|||||||
import pytest
|
import pytest
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
from _pytest.monkeypatch import MonkeyPatch
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
from collections.abc import Iterator
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, cast, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.api.shortcuts import Shortcuts
|
from dzgui.api.shortcuts import Shortcuts
|
||||||
from tests.fixtures import fixture_path
|
from tests.fixtures import fixture_path
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
pytestmark = pytest.mark.apitest
|
pytestmark = pytest.mark.apitest
|
||||||
|
|
||||||
|
|
||||||
def mock_find_shortcuts(self, steam_path: Path) -> Path:
|
def mock_find_shortcuts(self: Shortcuts, steam_path: Path) -> Path:
|
||||||
return Path(fixture_path("api/no_shortcuts.vdf"))
|
return Path(fixture_path("api/no_shortcuts.vdf"))
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module", autouse=True)
|
@pytest.fixture(scope="module", autouse=True)
|
||||||
def patch_api() -> None:
|
def patch_api() -> Iterator[None]:
|
||||||
mp = MonkeyPatch()
|
mp = MonkeyPatch()
|
||||||
mp.setattr("dzgui.api.shortcuts.Shortcuts.find_shortcuts_path", mock_find_shortcuts)
|
mp.setattr("dzgui.api.shortcuts.Shortcuts.find_shortcuts_path", mock_find_shortcuts)
|
||||||
yield
|
yield
|
||||||
mp.undo()
|
mp.undo()
|
||||||
|
|
||||||
|
|
||||||
def test_no_shortcuts(monkeypatch) -> None:
|
def test_no_shortcuts(monkeypatch: "MonkeyPatch") -> None:
|
||||||
s = Shortcuts(Path(""))
|
s = Shortcuts(Path(""))
|
||||||
assert len(s.shortcuts["shortcuts"]) == 0
|
assert len(s.shortcuts["shortcuts"]) == 0
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def dummy_app() -> None:
|
def dummy_app() -> dict[str, Any]:
|
||||||
d = {
|
d = {
|
||||||
"AppName": "TEST APP",
|
"AppName": "TEST APP",
|
||||||
"StartDir": "TEST_DIR",
|
"StartDir": Path("TEST_DIR"),
|
||||||
"Exe": "TEST_DIR/TEST_EXE.EXE",
|
"Exe": Path("TEST_DIR/TEST_EXE.EXE"),
|
||||||
"icon": "IMAGES_DIR/TEST_IMAGE.PNG",
|
"icon": Path("IMAGES_DIR/TEST_IMAGE.PNG"),
|
||||||
}
|
}
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
|
||||||
def test_wrap_exe(dummy_app: dict[str, str]) -> None:
|
@pytest.fixture
|
||||||
|
def shortcuts(dummy_app: dict[str, Any]) -> Shortcuts:
|
||||||
s = Shortcuts(Path(""))
|
s = Shortcuts(Path(""))
|
||||||
s.add_shortcut(*dummy_app.values())
|
args = cast(tuple[str, Path, Path, Path], dummy_app.values())
|
||||||
assert s.shortcuts["shortcuts"]["0"]["Exe"][0] == '"'
|
s.add_shortcut(*args)
|
||||||
assert s.shortcuts["shortcuts"]["0"]["Exe"][-1] == '"'
|
return s
|
||||||
|
|
||||||
|
|
||||||
def test_add_shortcut(dummy_app: dict[str, str]) -> None:
|
def test_wrap_exe(shortcuts: Shortcuts) -> None:
|
||||||
s = Shortcuts(Path(""))
|
assert shortcuts.shortcuts["shortcuts"]["0"]["Exe"][0] == '"'
|
||||||
s.add_shortcut(*dummy_app.values())
|
assert shortcuts.shortcuts["shortcuts"]["0"]["Exe"][-1] == '"'
|
||||||
new = s.shortcuts["shortcuts"]
|
|
||||||
|
|
||||||
|
def test_add_shortcut(shortcuts: Shortcuts, dummy_app: dict[str, Any]) -> None:
|
||||||
|
new = shortcuts.shortcuts["shortcuts"]
|
||||||
ind = str(len(new) - 1)
|
ind = str(len(new) - 1)
|
||||||
for k, v in dummy_app.items():
|
for k, v in dummy_app.items():
|
||||||
if k == "Exe":
|
if k == "Exe":
|
||||||
v = f'"{v}"'
|
v = f'"{v}"'
|
||||||
assert new[ind][k] == v
|
assert new[ind][k] == str(v)
|
||||||
|
|
||||||
|
|
||||||
def test_save_shortcut(dummy_app: dict[str, str]) -> None:
|
def test_save_shortcut(shortcuts: Shortcuts) -> None:
|
||||||
s = Shortcuts(Path(""))
|
|
||||||
s.add_shortcut(*dummy_app.values())
|
|
||||||
with tempfile.NamedTemporaryFile() as f:
|
with tempfile.NamedTemporaryFile() as f:
|
||||||
tmp = Path(f.name)
|
tmp = Path(f.name)
|
||||||
s.shortcuts_path = tmp
|
shortcuts.shortcuts_path = tmp
|
||||||
s.save_shortcuts()
|
shortcuts.save_shortcuts()
|
||||||
s._load_shortcuts(tmp)
|
shortcuts._load_shortcuts(tmp)
|
||||||
assert len(s.shortcuts["shortcuts"]) == 1
|
assert len(shortcuts.shortcuts["shortcuts"]) == 1
|
||||||
|
|
||||||
|
|
||||||
def test_shortcut_crc(dummy_app: dict[str, str]) -> None:
|
def test_shortcut_crc(shortcuts: Shortcuts) -> None:
|
||||||
s = Shortcuts(Path(""))
|
for key in shortcuts.shortcuts["shortcuts"].keys():
|
||||||
s.add_shortcut(*dummy_app.values())
|
entry = shortcuts.shortcuts["shortcuts"][key]
|
||||||
for key in s.shortcuts["shortcuts"].keys():
|
|
||||||
entry = s.shortcuts["shortcuts"][key]
|
|
||||||
name = entry["AppName"]
|
name = entry["AppName"]
|
||||||
exe = entry["Exe"]
|
exe = entry["Exe"]
|
||||||
uid = name + exe
|
uid = name + exe
|
||||||
bpid = s.gen_bpid(uid)
|
bpid = shortcuts.gen_bpid(uid)
|
||||||
assert entry["appid"] & 0xFFFFFFFF == bpid
|
assert entry["appid"] & 0xFFFFFFFF == bpid
|
||||||
|
|
||||||
|
|
||||||
def test_reverse_crc(dummy_app: dict[str, str]) -> None:
|
def test_reverse_crc(shortcuts: Shortcuts) -> None:
|
||||||
s = Shortcuts(Path(""))
|
for key in shortcuts.shortcuts["shortcuts"].keys():
|
||||||
s.add_shortcut(*dummy_app.values())
|
entry = shortcuts.shortcuts["shortcuts"][key]
|
||||||
for key in s.shortcuts["shortcuts"].keys():
|
|
||||||
entry = s.shortcuts["shortcuts"][key]
|
|
||||||
name = entry["AppName"]
|
name = entry["AppName"]
|
||||||
exe = entry["Exe"]
|
exe = entry["Exe"]
|
||||||
uid = name + exe
|
uid = name + exe
|
||||||
bpid = s.gen_bpid(uid)
|
bpid = shortcuts.gen_bpid(uid)
|
||||||
assert s.find_appname_by_unsigned_id(bpid) == name
|
assert shortcuts.find_appname_by_unsigned_id(bpid) == name
|
||||||
+2
-1
@@ -2,7 +2,8 @@ import re
|
|||||||
|
|
||||||
from dzgui.model.proxy_model import DAY_REG, NIGHT_REG
|
from dzgui.model.proxy_model import DAY_REG, NIGHT_REG
|
||||||
|
|
||||||
def iterate(h: str, r: str) -> None:
|
|
||||||
|
def iterate(h: int, r: str) -> None:
|
||||||
for m in range(60):
|
for m in range(60):
|
||||||
time = f"{h:02}:{m:02}"
|
time = f"{h:02}:{m:02}"
|
||||||
assert re.match(r, time) is not None
|
assert re.match(r, time) is not None
|
||||||
|
|||||||
Reference in new issue
Block a user