[WIP - DO NOT USE] Pythonic and simpler refactor of wemod-launcher

.devcontainer.json

@@ -0,0 +1,12 @@
+{
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "mkhl.direnv"
+      ]
+    }
+  },
+  "image": "ghcr.io/cachix/devenv:latest",
+  "overrideCommand": false,
+  "updateContentCommand": "devenv test"
+}

.envrc

@@ -0,0 +1,10 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
+fi
+
+watch_file flake.nix
+watch_file flake.lock
+if ! use flake . --impure
+then
+  echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
+fi

.github/workflows/black.yml

@@ -32,10 +32,10 @@ jobs:
       - name: Check if Python files or wemod file changed
         id: check_files
         run: |
-          if echo "${{ steps.changed_files.outputs.added_modified }}" | grep -E '\.py$|wemod' > /dev/null; then
-            echo "PYTHON_FILES_CHANGED=true" >> $GITHUB_ENV
+          if echo "${{ steps.changed_files.outputs.added_modified }}" | grep -E 'wemod_launcher/\.py$' > /dev/null; then
+            echo "PYTHON_FILES_CHANGED=true" >> "$GITHUB_ENV"
           else
-            echo "PYTHON_FILES_CHANGED=false" >> $GITHUB_ENV
+            echo "PYTHON_FILES_CHANGED=false" >> "$GITHUB_ENV"
           fi
 
       - name: Set up Python
@@ -53,7 +53,7 @@ jobs:
         if: env.PYTHON_FILES_CHANGED == 'true'
         id: run_black
         run: |
-          black -l 78 -t py312 ./*.py ./wemod
+          black -l 78 -t py312 ./wemod_launcher/
 
       - name: Increment version number
         if: steps.run_black.outcome == 'success' && env.PYTHON_FILES_CHANGED == 'true'
@@ -64,13 +64,13 @@ jobs:
             new_ver = ver + 0.001;
             printf("    script_version = \"%.3f\"\n", new_ver);
           }
-          !/script_version = "/ { print $0 }' coreutils.py > coreutils.py.tmp && mv coreutils.py.tmp coreutils.py
+          !/script_version = "/ { print $0 }' wemod_launcher/coreutils.py > wemod_launcher/coreutils.py.tmp && mv wemod_launcher/coreutils.py.tmp wemod_launcher/coreutils.py
 
-          current_ver=$(awk '/script_version = "/ {print $3}' coreutils.py | tr -d '"')
+          current_ver=$(awk '/script_version = "/ {print $3}' wemod_launcher/coreutils.py | tr -d '"')
           awk -v ver="$current_ver" '/The WeMod Launcher is currently on version / {
             printf("**The WeMod Launcher is currently on version %.3f.**\n", ver);
           }
-          !/The WeMod Launcher is currently on version / { print $0 }' readme.md > readme.tmp && mv readme.tmp readme.md
+          !/The WeMod Launcher is currently on version / { print $0 }' README.md > README.tmp && mv README.tmp README.md
 
       - name: Commit changes on dev
         if: github.ref == 'refs/heads/dev' && steps.run_black.outcome == 'success' && env.PYTHON_FILES_CHANGED == 'true'
@@ -79,7 +79,7 @@ jobs:
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
           git add .
-          git update-index --chmod=+x *.py wemod
+          git update-index --chmod=+x wemod_launcher/**.py
           git commit -m 'Github actions automatic code formatting on dev branch' -m 'This is an automatic task, run by a GitHub workflow, to automatically format the Python code in the repo, with the code formatter "black"' || echo "No changes to commit"
           git push
         env:
@@ -92,7 +92,7 @@ jobs:
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
           git add .
-          git update-index --chmod=+x *.py wemod
+          git update-index --chmod=+x wemod_launcher/**.py
           git commit -m 'Github actions automatic code formatting on main branch' -m 'This is an automatic task, run by a GitHub workflow, to automatically format the Python code in the repo, with the code formatter "black"' || echo "No changes to commit"
           git push
         env:

.gitignore

@@ -1,9 +1,24 @@
 .cache/
+logs/
 wemod_bin/
 wemod_data/
 wemod_venv/
 __pycache__/
+
 wemod.conf
-wemod.log
 winetricks
-pip.pyz
+poetry.lock
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+
+dist/
+.pdm-build/
+.pdm-python

readme.md → README.md

@@ -1,6 +1,8 @@
 # WeMod Launcher (Wemod for Linux)
 **The WeMod Launcher is currently on version 1.506.**
 
+### This refactor is under development, do not use yet.
+
 ## DISCLAIMER
 This project is *NOT* affiliated with, funded by, or paid by WeMod.  
 The work done here is purely from the contributors who donate their time and efforts.  

default.nix

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2024 The DeckCheatz Developers
+#
+# SPDX-License-Identifier: Apache-2.0
+
+(import
+  (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }).defaultNix

devenv.nix

@@ -0,0 +1,66 @@
+{ pkgs
+, self
+, inputs
+, ...
+}:
+let
+  freesimplegui = pkgs.python3Packages.buildPythonApplication rec {
+    pname = "freesimplegui";
+    version = "5.1.1";
+    src = pkgs.fetchPypi {
+      inherit pname version;
+      sha256 = "sha256-LwlGx6wiHJl5KRgcvnUm40L/9fwpGibR1yYoel3ZZPs=";
+    };
+  };
+in
+{
+  packages =
+    with pkgs;
+    [
+      git
+      pdm
+      pyright
+    ]
+    ++ (with pkgs.python3Packages; [
+      requests
+      pyxdg
+      setuptools
+      pyinstaller
+      tkinter
+    ])
+    ++ [ freesimplegui ];
+
+  languages = {
+    nix.enable = true;
+    python = {
+      enable = true;
+      package = pkgs.python313Full;
+    };
+    shell.enable = true;
+  };
+
+  difftastic.enable = true;
+  devcontainer.enable = true;
+
+  pre-commit.hooks = {
+    shellcheck.enable = true;
+    shfmt.enable = true;
+    # FIXME: Fix Flake8 lints.
+    #    flake8.enable = true;
+    actionlint.enable = true;
+    nixpkgs-fmt.enable = true;
+    black = {
+      enable = true;
+      settings.flags = "-l 78 -t py312";
+    };
+    # FIXME: Fix Markdown lints.
+    #    markdownlint.enable = true;
+    statix.enable = true;
+  };
+
+  enterShell = ''
+    export TK_LIBRARY="${pkgs.tk.outPath}/lib/${pkgs.tk.libPrefix}"
+    export TCL_LIBRARY="${pkgs.tcl.outPath}/lib/${pkgs.tcl.libPrefix}"
+  '';
+
+}