mirror of
https://github.com/aclist/dztui.git
synced 2026-11-10 20:10:38 +01:00
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3dc37561be | ||
|
|
13786591b3 | ||
|
|
9eb1342877 | ||
|
|
3f29484895 | ||
|
|
22dd8fc67f | ||
|
|
03fa707305 | ||
|
|
2479cbd41b |
No files matched your search
-124
@@ -1,124 +0,0 @@
|
||||
# History of the project
|
||||
This file collects notable milestones and events related to DZGUI, mainly around DZGUI as a framework and the history of development.
|
||||
A chronological summary of features can be found in CHANGELOG.md.
|
||||
|
||||
## 2021
|
||||
### 2021-12-03: DayZ adds support for Battleye over Proton
|
||||
DayZ was among a handful of games with whitelisted anti-cheat support under Valve's emerging WINE-based Proton compatibility layer.
|
||||
While adding anti-cheat compatibility at a technical level, this change did not actually allow the client to connect to servers running complex modlists.
|
||||
|
||||
Development of the precursor to DZGUI began at around this time.
|
||||
|
||||
### 2021-12-12: initial version of DZTUI is created
|
||||
DZTUI, a Bash script and terminal user interface, was the precursor to DZGUI.
|
||||
This was an initial attempt at bootstrapping the Steam client to handle mods correctly when launching DayZ.
|
||||
Due to user interest, features continued to be added. This early tool is archived under the 'dztui' branch.
|
||||
|
||||
## 2022
|
||||
### 2022-05-09: addition of zenity GUI and project name change (DZGUI)
|
||||
With the introduction of the Steam Deck, more users wanted a graphical user interface
|
||||
to interact with DZTUI. Being that DZTUI was purely a Bash script, a method of
|
||||
drawing menus was needed, so the "zenity" package was used to create prefabricated dialogs.
|
||||
While this met the minimum requirement to show prompts and selectable options, no rich customization was possible.
|
||||
|
||||
The introduction of zenity as a dependency marked the shift from "DZTUI" to "DZGUI".
|
||||
|
||||
Throughout 2022, the limits of zenity for DZGUI's purposes were tested, particularly in the context of SteamOS.
|
||||
This led to the discovery of a number of bugs in zenity, GTK, and SteamOS, which were reported up to their respective channels.
|
||||
While this was improving the SteamOS user experience, it started to become clear that a fully custom UI was needed.
|
||||
|
||||
This barebones version of DZGUI sufficed for some time, with the Bash script and some standalone Python modules doing the heavy lifting,
|
||||
and this period served to surface a number of bugs and interesting interactions with the Steam client.
|
||||
|
||||
## 2023
|
||||
### 2023-11-23: Python 3.10 dependency
|
||||
Prior to this time, DZGUI open-endedly allowed you to use any Python version for its modules, without any significant handling for
|
||||
the idiosyncrasies of different versions. A minimum requirement of Python 3.10 was thus instituted to normalize expected behavior.
|
||||
|
||||
Throughout 2023, various features related to server browsing were added, such as filters and more granular search parameters.
|
||||
|
||||
There were still a lot of unknowns at this time, so things were being resolved through trial and error.
|
||||
|
||||
## 2024
|
||||
### 2024-01-31: DZGUI 5 API introduces GTK UI
|
||||
Using zenity as a simple GUI had exposed some bugs and limitations in that package, particularly when trying to push huge lists of server records
|
||||
into tables and sorting them in a performant manner.
|
||||
|
||||
Around this time it became clear that a more robust UI framework was needed. While keeping the original Bash script and Python modules for
|
||||
background processing, PyGObject (GTK) was added to the project in order to ship a custom UI that could be designed from the ground up.
|
||||
|
||||
However, it should be noted that at this point, the DZGUI logic itself was still a (increasingly large) Bash script to which a GTK UI had been stitched on.
|
||||
These were totally separate components, with UI actions on the GTK side triggering calls to Bash functions in an overly complex helper file.
|
||||
The UI was basically a thin client around the old Bash logic, but this was still a far cry from an integrated application with proper signals and dedicated components.
|
||||
|
||||
Effectively, DZGUI 5 through 6 were a stepping stone that set the groundwork to go from DZGUI 4 (pure Bash script) to
|
||||
DZGUI 7 (standalone Python application). Today, little of DZGUI 5's original logic remains outside of the basic UI grid.
|
||||
|
||||
### 2024-10-15: Frostline DLC released, widespread parsing problems
|
||||
DayZ's first DLC introduced a new format for server responses that packed extra metadata into the A2S_RULES format.
|
||||
Upon its release, all third-party DayZ launchers and server listing web sites were unable to parse the mod information being returned from Frostline servers.
|
||||
|
||||
For a period of two weeks, this remained unsolved and various attempts were made to understand the updated specification.
|
||||
|
||||
### 2024-10-30: DZGUI hotfix adds support for Frostline servers
|
||||
DZGUI was the first third-party tool to fix parsing for Frostline servers and restore functionality.
|
||||
This was a small milestone, because it meant DZGUI was evolving from a "dumb" launcher to a featureful tool
|
||||
touching upon and improving all aspects of the end-to-end DayZ experience.
|
||||
|
||||
Particularly around this time, the sheer diversity of needs of modders, server operators, and players started to become clear.
|
||||
Users had highly specific and diverse use cases for setting up their game environment, and requested a number of features to support that on
|
||||
the DZGUI side.
|
||||
|
||||
## 2025
|
||||
### 2025-01-17: DZGUI 6 API
|
||||
With DZGUI 6, the difficult decision to enforce a Python 3.13 dependency was made.
|
||||
While the previous dependency was Python 3.10+, it was deemed better to develop against and target identical versions.
|
||||
|
||||
However, due to the vagaries of managing Python environments on end-user systems, this change added unnecessary complexity and frustration.
|
||||
Users had to properly set up virtual environments, install the relevant dependencies, and create a wrapper script to run this version, whereas
|
||||
previous versions had essentially been point and click.
|
||||
|
||||
### 2025-10-23: DZGUI 7 API and the "Ship of Theseus"
|
||||
It had become clear that the situation above was untenable and the legacy Bash script was unmaintainable given the project's enlarged scope.
|
||||
The lack of a robust testing or typehinting framework made it difficult to diagnose rare bugs.
|
||||
|
||||
Shipping a standalone, turnkey application with zero or minimal dependencies was the most urgent priority.
|
||||
DZGUI was still carrying around small bits and pieces of the old Bash script logic, so the decision was made to
|
||||
refactor the application into a pure Python + GTK tool. This would effectively be a total rewrite of all logic,
|
||||
only preserving the most minimal skeleton of the original UI layout as a reference.
|
||||
|
||||
Over the course of a year, a wholesale "Ship of Theseus" rewrite took place.
|
||||
Nearly every component of DZGUI 6, both API and UI side, was taken apart and replaced.
|
||||
|
||||
A soft alpha and beta phase were used to iterate on this concept further. DZGUI 7 was increasingly recommended to users
|
||||
as the preferred choice. This allowed for keeping the established userbase on the (relatively) stable DZGUI 6 spec, while building up
|
||||
the new spec and making it available to more users as features were elaborated.
|
||||
|
||||
Through late 2025, several LLM-generated applications that recycled significant parts of DZGUI's code without the applicable GPL license were found.
|
||||
The maintainers of those projects were advised to excise the offending segments or apply the necessary GPL licenses.
|
||||
|
||||
## 2026
|
||||
### 2026-05-17: Switch to standalone releases
|
||||
The DZGUI 7 beta starts shipping standalone glibc builds with an integrated setup wizard and installer.
|
||||
|
||||
DZGUI 6 had relied on "over the air" updates delivered via either a "stable" or "testing" branch
|
||||
(archived respectively under the "dzgui" and "testing" branches). Effectively, the script would bootstrap itself and
|
||||
fetch raw files directly from the repository. This was prone to problems because updates were monolithic, not giving
|
||||
an easy escape hatch if the user needed to rollback in the event of a regression.
|
||||
|
||||
This was changed to atomic, tagged releases. In addition to updating directly through DZGUI, these prebuilt releases can be
|
||||
downloaded manually as needed, and rollbacks are available for all prior versions under the DZGUI 7 specification.
|
||||
|
||||
### 2026-10-27: 500 tickets closed
|
||||
The milestone of 500 tickets/PRs being closed was reached.
|
||||
|
||||
2026 was by far DZGUI's most intensive year by commits, perhaps suggesting the scope of the rewrite:
|
||||
|
||||
- 2021: 16
|
||||
- 2022: 434
|
||||
- 2023: 322
|
||||
- 2024: 347
|
||||
- 2025: 426
|
||||
- 2026: 1300
|
||||
|
||||
DZGUI 7 is scheduled to release as a stable version within the year.
|
||||
@@ -3,8 +3,8 @@ from typing import TYPE_CHECKING
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository.Gtk import ListStore # noqa E402
|
||||
from gi.repository import Gdk, GObject # noqa E402
|
||||
from gi.repository.Gtk import ListStore
|
||||
from gi.repository import GObject
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.const.enum import NotebookPage, ServerTab
|
||||
|
||||
@@ -32,7 +32,7 @@ from dzgui.views.dialogs.generic import ExceptionDialog
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, GLib, GObject # noqa E402
|
||||
from gi.repository import Gtk, Gdk, GLib, GObject
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
|
||||
@@ -55,11 +55,6 @@ from dzgui.util.symlink import rebuild_symlinks
|
||||
from dzgui.views.dialogs.generic import ExceptionDialog
|
||||
from dzgui.views.dialogs.servers import ServerDetailsDialog, ServerModDialog
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib # noqa E402
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.api.servers import A2SInfo, Record
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -30,7 +30,7 @@ import dzgui.api.pefile as PeFile
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib # noqa E402
|
||||
from gi.repository import GLib
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
|
||||
@@ -15,11 +15,6 @@ from dzgui.strings import dialogs
|
||||
from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager
|
||||
from dzgui.views.dialogs.generic import ExceptionDialog, QuitDialog
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib # noqa E402
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ from dzgui.util.strings import delimiter
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository.Gtk import ListStore, TreeIter # noqa E402
|
||||
from gi.repository import GObject # noqa E402
|
||||
from gi.repository.Gtk import ListStore, TreeIter
|
||||
from gi.repository import GObject
|
||||
|
||||
GTYPE_TO_PYTHON = {
|
||||
GObject.type_from_name(GObject.type_name(ptype)): ptype
|
||||
|
||||
@@ -21,7 +21,7 @@ from dzgui.views.dialogs.generic import ExceptionDialog
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib # noqa E402
|
||||
from gi.repository import Gtk, GLib
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.api.servers import A2SInfo, Record
|
||||
|
||||
+1
-2
@@ -1,8 +1,7 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
gi.require_version("Gdk", "3.0")
|
||||
from gi.repository import Gtk, Gdk # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
|
||||
def copy_clipboard(text: str) -> None:
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ from dzgui.const.constants import APP_NAME_LOWER, CSS_PATH
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
|
||||
def add_class(widget: Gtk.Widget, label: str) -> None:
|
||||
|
||||
@@ -7,11 +7,6 @@ from dzgui.const.constants import APP_NAME
|
||||
from dzgui.util.ip import get_coords
|
||||
from dzgui.util.localize import number
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from queue import Queue
|
||||
from dzgui.const.enum import ServerTab
|
||||
|
||||
@@ -7,7 +7,7 @@ from dzgui.util.strings import no_mods, no_servers, workshop
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
def format_pango(text: str) -> str:
|
||||
|
||||
+4
-1
@@ -1,6 +1,8 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gdk # noqa E402
|
||||
from gi.repository import Gdk
|
||||
|
||||
|
||||
def is_navkey(key: int) -> bool:
|
||||
nav_keys = [
|
||||
@@ -18,6 +20,7 @@ def is_navkey(key: int) -> bool:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def is_ctrl_mask(event: Gdk.EventKey) -> bool:
|
||||
if event.state is Gdk.ModifierType.CONTROL_MASK:
|
||||
return True
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
def set_surrounding_margins(widget: Gtk.Widget, margin: int) -> None:
|
||||
"""
|
||||
|
||||
@@ -4,7 +4,7 @@ from typing import cast, TYPE_CHECKING
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, GLib # noqa E402
|
||||
from gi.repository import Gdk, GLib
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
gi.require_version("GLibUnix", "2.0")
|
||||
from gi.repository import Gtk, GLib, GLibUnix, Gdk # type: ignore # noqa E402
|
||||
from gi.repository import Gtk, GLib, GLibUnix, Gdk # type: ignore
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.config.userprefs import UserPrefs
|
||||
|
||||
@@ -7,7 +7,7 @@ from dzgui.const.enum import ButtonType
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ from dzgui.strings import connect_panel
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, GLib # noqa E402
|
||||
from gi.repository import Gtk, GLib
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from gi.repository import GLib
|
||||
|
||||
@@ -18,7 +18,7 @@ from dzgui.views.components.labels import BoldLabel
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -7,7 +7,7 @@ from dzgui.util.format import embolden
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -9,7 +9,7 @@ from dzgui.strings.errors import api_popover
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, GObject # noqa E402
|
||||
from gi.repository import Gtk, Gdk, GObject
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -6,7 +6,7 @@ from dzgui.const.constants import HELP_BUBBLE
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -17,7 +17,7 @@ from dzgui.views.components.labels import BoldLabel
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, Pango, GLib # noqa E402
|
||||
from gi.repository import Gtk, Gdk, Pango, GLib
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
@@ -42,7 +42,10 @@ class ButtonGrid(Gtk.Grid):
|
||||
self.checks: list[Gtk.CheckButton] = []
|
||||
|
||||
flowbox = Gtk.FlowBox(
|
||||
halign=Gtk.Align.CENTER, min_children_per_line=3, max_children_per_line=3, selection_mode=Gtk.SelectionMode.NONE
|
||||
halign=Gtk.Align.CENTER,
|
||||
min_children_per_line=3,
|
||||
max_children_per_line=3,
|
||||
selection_mode=Gtk.SelectionMode.NONE,
|
||||
)
|
||||
|
||||
for check in defaults.keys():
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class Icon(Gtk.Image):
|
||||
|
||||
@@ -3,7 +3,7 @@ from dzgui.util.format import embolden
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class BoldLabel(Gtk.Label):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class MapsCombo(Gtk.EntryCompletion):
|
||||
|
||||
@@ -8,7 +8,7 @@ from dzgui.views.components.labels import BoldLabel
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -23,7 +23,7 @@ from dzgui.views.components.buttons import IconTextButton, RefreshButton, KeysBu
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, GLib # noqa E402
|
||||
from gi.repository import Gtk, Gdk, GLib
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -7,7 +7,7 @@ from dzgui.views.components.buttons import LoggerAlertsButton
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.const.enum import ServerTab
|
||||
|
||||
@@ -2,8 +2,9 @@ from typing import Literal
|
||||
from dzgui.util import css
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib # noqa E402
|
||||
from gi.repository import Gtk, GLib
|
||||
|
||||
|
||||
class Toast(Gtk.EventBox):
|
||||
|
||||
@@ -10,7 +10,7 @@ from dzgui.views.components.labels import BoldLabel
|
||||
from dzgui.views.components.box import VBox, HBox
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, GObject # type: ignore # noqa E402
|
||||
from gi.repository import Gtk, GLib, GObject
|
||||
|
||||
DAY_START_TIME = time(hour=6, minute=0, second=0)
|
||||
DAY_END_TIME = time(hour=18, minute=0, second=0)
|
||||
|
||||
@@ -8,7 +8,7 @@ from dzgui.views.mixins.colorscheme import ColorAwareApp
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class AbortDialog(ColorAwareApp, Gtk.MessageDialog): # type: ignore
|
||||
|
||||
@@ -2,10 +2,10 @@ from pathlib import Path
|
||||
|
||||
from dzgui.util.strings import picker
|
||||
|
||||
import gi # noqa E402
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class FilePicker(Gtk.FileChooserDialog):
|
||||
|
||||
@@ -8,7 +8,7 @@ from dzgui.views.components.buttons import ClipboardButton
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402
|
||||
from gi.repository import Gtk, GLib
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -9,7 +9,7 @@ from dzgui.views.components.buttons import SteamTextButton
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -3,10 +3,10 @@ from typing import Self, TYPE_CHECKING
|
||||
from dzgui.views.components.entry import ValidatedEntry
|
||||
from dzgui.views.dialogs.generic import GenericDialog
|
||||
|
||||
import gi # noqa E402
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gdk, Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -18,7 +18,7 @@ from dzgui.views.mixins.colorscheme import ColorAwareApp
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Pango # noqa E402
|
||||
from gi.repository import Gtk, GLib, Pango
|
||||
|
||||
|
||||
class Assistant(Gtk.Assistant):
|
||||
|
||||
@@ -14,7 +14,7 @@ from dzgui.const.constants import (
|
||||
HERO_PATH,
|
||||
FLATPAK_ROOT_PATH,
|
||||
LEGACY_CONFIG_PATH,
|
||||
TMP_PATH
|
||||
TMP_PATH,
|
||||
)
|
||||
from dzgui.const.boilerplate import config_boilerplate
|
||||
from dzgui.const.endpoints import STEAM_API_SETUP
|
||||
@@ -35,7 +35,7 @@ from dzgui.views.trees.tree_simple import SimpleTree
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gdk, Gtk, GLib, GObject, GdkPixbuf # noqa E402
|
||||
from gi.repository import Gtk, GLib, GObject, GdkPixbuf
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.config.xdg import Xdg
|
||||
|
||||
@@ -9,7 +9,7 @@ from dzgui.views.trees.tree_base import TreeView
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ from dzgui.util.keys import is_ctrl_mask
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
|
||||
class CursorMixin:
|
||||
|
||||
@@ -3,7 +3,7 @@ from dzgui.views.trees.tree_base import TreeView
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class ModsMixin:
|
||||
|
||||
@@ -15,7 +15,7 @@ from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
|
||||
@@ -7,10 +7,10 @@ from dzgui.util.strings import developers
|
||||
from dzgui.views.components.labels import BoldLabel
|
||||
from dzgui.views.trees.tree_base import TreeView
|
||||
|
||||
import gi # noqa E402
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -4,7 +4,7 @@ from dzgui.views.trees.tree_menu import MenuTreeView
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -7,7 +7,7 @@ from dzgui.util.css import add_class
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -9,7 +9,7 @@ from dzgui.views.trees.tree_log import LogTreeView
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -18,7 +18,7 @@ from dzgui.views.trees.tree_server_mods import ServerModTreeView
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gdk, Gtk # noqa E402
|
||||
from gi.repository import Gdk, Gtk
|
||||
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -10,7 +10,7 @@ from dzgui.util.strings import server_labels
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, GLib # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
# TODO: wrap and center long values
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -12,7 +12,7 @@ from dzgui.views.mixins.context_mixin import ContextMixin
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from pathlib import Path
|
||||
|
||||
@@ -78,6 +78,7 @@ line-length = 88
|
||||
indent-width = 4
|
||||
extend-exclude = ["*lib/a2s"]
|
||||
lint.unfixable = ["F401", "I001"]
|
||||
lint.ignore = ["E402"]
|
||||
|
||||
[tool.ruff.format]
|
||||
quote-style = "double"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from pathlib import Path
|
||||
from shared import get_git_root
|
||||
|
||||
BOILERPLATE = """
|
||||
This file includes the combined licenses to the following components:
|
||||
@@ -40,7 +40,7 @@ class CombinedLicense:
|
||||
|
||||
def concat_license() -> str:
|
||||
combined = CombinedLicense()
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
root = get_git_root()
|
||||
licenses = root.joinpath("docs/licenses")
|
||||
|
||||
main_license = root.joinpath(LICENSE_FILE)
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
par = Path(__file__).parent.parent
|
||||
clog = par / "CHANGELOG.md"
|
||||
target = par / "dzgui/data/CHANGELOG.md"
|
||||
from shared import get_git_root
|
||||
|
||||
root = get_git_root()
|
||||
clog = root.joinpath("CHANGELOG.md")
|
||||
target = root.joinpath("dzgui/data/CHANGELOG.md")
|
||||
|
||||
shutil.copy(clog, target)
|
||||
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
import tomllib
|
||||
from pathlib import Path
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
from shared import get_git_root
|
||||
|
||||
|
||||
def get_entrypoint() -> None:
|
||||
root = get_git_root()
|
||||
p = root.joinpath("pyproject.toml")
|
||||
with open(p, "rb") as f:
|
||||
t = tomllib.load(f)
|
||||
|
||||
+3
-2
@@ -3,14 +3,15 @@ import requests
|
||||
import subprocess
|
||||
import tarfile
|
||||
|
||||
from pathlib import Path
|
||||
from urllib.parse import unquote
|
||||
|
||||
from shared import get_git_root
|
||||
|
||||
BUILD = "3.13.9"
|
||||
DATE = "20251014"
|
||||
CPYTHON_BUILD = f"cpython-{BUILD}"
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
root = get_git_root()
|
||||
build_dir = root.joinpath("build")
|
||||
cpython_dir = build_dir.joinpath(CPYTHON_BUILD)
|
||||
|
||||
|
||||
+2
-1
@@ -9,6 +9,7 @@ from pathlib import Path
|
||||
from concat_licenses import concat_license
|
||||
from parse_toml import get_entrypoint
|
||||
from prebuild import get_pyapp, rebuild_cpython
|
||||
from shared import get_git_root
|
||||
|
||||
|
||||
def update_uname(info: tarfile.TarInfo) -> tarfile.TarInfo:
|
||||
@@ -17,7 +18,7 @@ def update_uname(info: tarfile.TarInfo) -> tarfile.TarInfo:
|
||||
return info
|
||||
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
root = get_git_root()
|
||||
dist_dir = root.joinpath("dist")
|
||||
build_dir = root.joinpath("build")
|
||||
|
||||
|
||||
+1
-10
@@ -1,16 +1,7 @@
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
from dzgui.app_init import build_gui
|
||||
|
||||
|
||||
def get_git_root() -> Path:
|
||||
proc = subprocess.run(
|
||||
["git", "rev-parse", "--show-toplevel"], capture_output=True, text=True
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise OSError("Failed to parse git root")
|
||||
return Path(proc.stdout.rstrip())
|
||||
from shared import get_git_root
|
||||
|
||||
|
||||
def get_image_path() -> Path:
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def get_git_root() -> Path:
|
||||
proc = subprocess.run(
|
||||
["git", "rev-parse", "--show-toplevel"], capture_output=True, text=True
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise OSError("Failed to parse git root")
|
||||
return Path(proc.stdout.rstrip())
|
||||
@@ -1,38 +0,0 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def iterate(search_str: str) -> None:
|
||||
# TODO: exclude files from .gitignore
|
||||
print()
|
||||
print(f"Searching for '{search_str}'")
|
||||
print()
|
||||
files = Path(".").rglob("*")
|
||||
ignore = [
|
||||
"scripts/",
|
||||
".git",
|
||||
"egg",
|
||||
"CHANGELOG",
|
||||
".mypy",
|
||||
"build/",
|
||||
"test.py",
|
||||
"bugs",
|
||||
"pyproject.toml",
|
||||
]
|
||||
for file in files:
|
||||
if file.is_dir():
|
||||
continue
|
||||
if any(s in str(file) for s in ignore):
|
||||
continue
|
||||
try:
|
||||
text = file.read_text()
|
||||
if search_str in text:
|
||||
c = text.count(search_str)
|
||||
if 0 < c < 2:
|
||||
print(file, c)
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
|
||||
imports = ["Pango", "GObject", "GLib", "Gdk", "Gtk"]
|
||||
for i in imports:
|
||||
iterate(i)
|
||||
@@ -6,7 +6,7 @@ from dzgui.views.dialogs.servers import ServerDetailsDialog
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class MockController:
|
||||
|
||||
Reference in new issue
Block a user