✨ Redo config system with TOML (#69)

Co-authored-by: Tuxinal <[email protected]>

Author: osfanbuff63

.gitattributes

@@ -6,4 +6,5 @@
 *.sh eol=lf
 *.pyc binary
 
+.vscode/*.json linguist-language=jsonc
 *.all-contributorsrc linguist-language=json

.github/workflows/ci.yml

@@ -72,14 +72,22 @@ jobs:
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: poetry install --no-interaction --no-root
+      - name: Shorten commit SHA
+        uses: benjlevesque/[email protected]
+        id: short-sha
       - name: Build
         run: poetry build --no-interaction
 
+      - name: Get normalized branch name
+        run: |
+          RAW_BRANCH=${{ github.ref_name || github.head_ref }}
+          BRANCH=${RAW_BRANCH//\//-}
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV          
       - name: Upload built wheels
         uses: actions/upload-artifact@v3
         with:
-          name: Vanilla Installer ${{ github.head_ref || github.ref_name }}+{{ steps.short-sha.outputs.sha }} (Python binaries)
-          path: dist/*
+          name: Vanilla Installer ${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }} (Windows)
+          path: "dist/*"
 
   build-windows:
     name: Build Windows exe
@@ -110,16 +118,22 @@ jobs:
           setup-python: false
           aqtversion: ==3.1.*
           py7zrversion: ==0.20.*
-      - name: Install dependencies
+      - name: Get normalized branch name
+        shell: bash
+        run: |
+          RAW_BRANCH=${{ github.ref_name || github.head_ref }}
+          BRANCH=${RAW_BRANCH//\//-}
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV   
+      - name: Install dependencies and build
         run: |
           pipx run poetry install --no-interaction --with compile
           ./.venv/Scripts/activate.ps1
           pip install nuitka minecraft_launcher_lib PySide6 click tomli darkdetect
-          python -m nuitka --standalone --onefile --windows-icon-from-ico=media/icon.ico --output-dir=build --include-package=minecraft_launcher_lib,PySide6,click,tomli,darkdetect -o "Vanilla Installer-GUI ${{ github.head_ref || github.ref_name }}+{{ steps.short-sha.outputs.sha }}.exe" --enable-plugin=pyside6 --include-data-dir=vanilla_installer/assets=assets/ --disable-console vanilla_installer/gui.py --assume-yes-for-downloads
+          python -m nuitka --standalone --onefile --windows-icon-from-ico=media/icon.ico --output-dir=build --include-package=minecraft_launcher_lib,PySide6,click,tomli,darkdetect -o "Vanilla Installer-GUI ${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }}.exe" --enable-plugin=pyside6 --include-data-dir=vanilla_installer/assets=assets/ --disable-console vanilla_installer/gui.py --assume-yes-for-downloads
       - name: Upload built executable
         uses: actions/upload-artifact@v3
         with:
-          name: Vanilla Installer ${{ github.head_ref || github.ref_name }}+{{ steps.short-sha.outputs.sha }} (Windows)
+          name: Vanilla Installer ${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }} (Windows)
           path: "*.exe"
 
   # build-macos:

.gitignore

@@ -9,6 +9,9 @@ disticon.png
 *.whl
 cx_Logging-doc/
 
+# Configuration
+vanilla_installer.toml
+
 # Editors
 .vscode/launch.json
 

.vscode/settings.json

@@ -16,15 +16,5 @@
     },
     "hide-files.files": [
         "vanilla_installer/__pycache__"
-    ],
-    "cSpell.words": [
-        "authdata",
-        "modpack",
-        "nobackslash"
-    ]// ,
-    // "python.testing.pytestArgs": [
-    //    "."
-    // ],
-    // "python.testing.unittestEnabled": false,
-    // "python.testing.pytestEnabled": true .
+    ]
 }

SECURITY.md

@@ -4,8 +4,7 @@
 
 | Version    | Supported          |
 | -------    | ------------------ |
-| release    | :white_check_mark: |
-| beta/alpha | :x:                |
+| 0.x        | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

poetry.lock

@@ -30,6 +30,7 @@ tomlkit = "^0.11.6"
 [tool.poetry.group.dev.dependencies]
 pylint = "^2.16.1"
 black = "^22.10.0"
+isort = "^5.11.4"
 
 
 [tool.poetry.group.ci.dependencies]