From f23027ed4f8ce705cf8883963a9a9827d40506dc Mon Sep 17 00:00:00 2001 From: xgui4 <134389196+xgui4@users.noreply.github.com> Date: Tue, 14 Jul 2026 00:45:13 -0400 Subject: [PATCH] bump version to alpha 6 and minors update to git managers and app data --- default.nix | 2 +- pyproject.toml | 2 +- shell.nix | 2 +- src/lce_qt_launcher/__init__.py | 2 +- src/lce_qt_launcher/main.py | 4 ++-- src/lce_qt_launcher/managers/git_manager.py | 11 +++++++---- src/lce_qt_launcher/models/app_data.py | 3 +++ 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index f3b89a0..368174b 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,7 @@ pkgs.python3Packages.buildPythonApplication rec { pname = "lce-qt-launcher"; - version = "0.0.21.5"; + version = "0.0.21.6"; format = "pyproject"; src = ./.; diff --git a/pyproject.toml b/pyproject.toml index d37cdfd..f7dce2c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "hatchling.build" [project] name = "LCE-Qt-Launcher" -version = "0.0.21a5" +version = "0.0.21a6" description = "A free cross-platform custom Minecraft LCE launcher, written with PySide6 (Qt6 for Python).." requires-python = ">3.10, <3.13" license = "GPL-3.0-or-later" diff --git a/shell.nix b/shell.nix index 4d63395..0102a39 100644 --- a/shell.nix +++ b/shell.nix @@ -21,7 +21,7 @@ let in pkgs.mkShell rec { pname = "lce-qt-launcher"; - version = "0.0.21.5"; + version = "0.0.21.6"; format = "pyproject"; src = ./.; diff --git a/src/lce_qt_launcher/__init__.py b/src/lce_qt_launcher/__init__.py index 442b116..47e523b 100644 --- a/src/lce_qt_launcher/__init__.py +++ b/src/lce_qt_launcher/__init__.py @@ -4,7 +4,7 @@ from importlib.metadata._meta import PackageMetadata from PySide6.QtCore import qVersion _FALLBACK_APP_NAME = "LCE Qt Launcher" -_FALLBACK_VERSION = "0.0.21a5" +_FALLBACK_VERSION = "0.0.21a6" _FALLBACK_LICENSE = "GPLv3" _FALLBACK_LICENSE_LINK = "https://www.gnu.org/licenses/gpl-3.0" _FALLBACK_GIT_REPO_URL = "https://github.com/xgui4/LCE-QT-Launcher" diff --git a/src/lce_qt_launcher/main.py b/src/lce_qt_launcher/main.py index bd65f83..8eb882d 100755 --- a/src/lce_qt_launcher/main.py +++ b/src/lce_qt_launcher/main.py @@ -22,8 +22,8 @@ along with this program. If not, see https://www.gnu.org/licenses/. # nuitka-project-if: {OS} == "Windows": # nuitka-project: --windows-icon-from-ico=assets/app.ico # nuitka-project: --windows-product-name=LCE-Qt-Launcher -# nuitka-project: --product-version="0.0.21.5" -# nuitka-project: --file-version="0.0.21.5" +# nuitka-project: --product-version="0.0.21.6" +# nuitka-project: --file-version="0.0.21.6" # nuitka-project: --file-description="LCE Qt Launcher Alpha" # nuitka-project: --copyright="Copyleft Xgui4 2026 (GPLv3)" diff --git a/src/lce_qt_launcher/managers/git_manager.py b/src/lce_qt_launcher/managers/git_manager.py index 5dc3d69..f84903f 100644 --- a/src/lce_qt_launcher/managers/git_manager.py +++ b/src/lce_qt_launcher/managers/git_manager.py @@ -2,13 +2,16 @@ import subprocess from lce_qt_launcher.models.app_data import AppData +DEFAULT_DATA_ZIP_URL = "archive/master.zip" + def verify_git_installation(): print(subprocess.getoutput("git --version")) def clone_repo(repo_url : str, path : str, appData : AppData): - subprocess.run(["git", "clone", repo_url, path], cwd=appData.appDataDirs[0]) + if verify_git_installation(): + subprocess.run(["git", "clone", repo_url, path], cwd=appData.appDataDirs[0]) + else: + pass def update_repo(appData : AppData): - subprocess.run(["git", "pull"], cwd=appData.appDataDirs[0]) - -verify_git_installation() \ No newline at end of file + subprocess.run(["git", "pull"], cwd=appData.appDataDirs[0]) \ No newline at end of file diff --git a/src/lce_qt_launcher/models/app_data.py b/src/lce_qt_launcher/models/app_data.py index eff029f..2ddaec4 100644 --- a/src/lce_qt_launcher/models/app_data.py +++ b/src/lce_qt_launcher/models/app_data.py @@ -72,6 +72,9 @@ class AppData(QObject): else: term_service.print_information(f"{file_path} was not a file.") self.instsList = instancesLists + + def is_data_installed(self) -> bool: + return Path.exists(Path(os.path.join(self.appDataDirs[0], "data"))) def _get_source_dir(self) -> str: if _is_compiled() or _is_installed():