Initial linting/formatting/type fixes

Author: rlaphoenix

.github/workflows/ci.yml

@@ -50,4 +50,4 @@ jobs:
         PROD_KEYS: ${{ secrets.PROD_KEYS }}
       run: $env:PROD_KEYS | Out-File prod.keys
     - name: Build basic NSP forwarder
-      run: uv run nton build "sdl-hello.nro" --name "Hello World" --publisher "vgmoose" --version "1.1" --sdmc "/switch/sdl-hello.nro"
+      run: uv run nton build "sdl-hello.nro" --name "Hello World" --publisher "vgmoose" --version "1.1" --sdmc "/switch/sdl-hello.nro"

.pre-commit-config.yaml

@@ -1,13 +1,21 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 
+exclude: |
+  (?x)^(
+    nton/gui/main\.py|
+    nton/gui/resources/icons_rc\.py
+  )$
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.13
     hooks:
       - id: ruff-check
         language: system
         types: [ python ]
+      - id: ruff-format
+        language: system
+        types: [ python ]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.19.1
     hooks:

.vscode/extensions.json

@@ -7,4 +7,4 @@
     "ms-python.isort",
     "ms-python.mypy-type-checker"
   ]
-}
+}

CHANGELOG.md

@@ -41,7 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Special characters like "é" etc. are no longer garbled in the built NSP. This was a bug when HacBrewPack set the
   name and publisher, yet that was never intended anyway. Now NTON itself fully manages setting the Name and Publisher.
 - Multiple language data being included but with missing data is now fixed. Only AmericanEnglish is enabled, and only
-  AmericanEnglish has language data. Similarly to the previous issue, this was caused by HacBrewPack in the same way. 
+  AmericanEnglish has language data. Similarly to the previous issue, this was caused by HacBrewPack in the same way.
 
 ## [2.0.1] - 2023-08-26
 
@@ -114,7 +114,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed API call within `get_game_title_ids()`, though it still sometimes errors with HTTP 500. 
+- Fixed API call within `get_game_title_ids()`, though it still sometimes errors with HTTP 500.
 
 ## [1.2.2] - 2023-04-20
 
@@ -137,7 +137,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   folders, or `atmosphere` & `bootloader` folders. This is much more reliable than simply assuming any drive that
   isn't the C drive to be your microSD card.
 - The NRO path is no longer forced to be within `/retroarch/cores` when `--rom` is used. This is to allow use of
-  `--rom` with other Homebrew, e.g., MGBA. 
+  `--rom` with other Homebrew, e.g., MGBA.
 
 ### Fixed
 

README.md

@@ -198,8 +198,8 @@ There are numerous reasons why this could be, see the following main reasons:
 forwarder has a hardcoded file path that it loads the NRO from when launched.
 2. You may have since updated Atmosphere or your Firmware which broke the changes you made to the bootloader that enabled
 the use of custom NSP files. As this project does not support piracy on any Nintendo system, support is not provided.
-4. It's possible a firmware update has broken the Forwarder ROM binary (source under /rom in this repo) and needs
-to be re-compiled against a newer libnx / devkitpro version. Firmware 9.0.0, 12.0.0, 19.0.0, and 21.0.0 have previously 
+3. It's possible a firmware update has broken the Forwarder ROM binary (source under /rom in this repo) and needs
+to be re-compiled against a newer libnx / devkitpro version. Firmware 9.0.0, 12.0.0, 19.0.0, and 21.0.0 have previously
 broken different forwarder ROMs requiring updates. If you believe this to be the case then please make an Issue.
 
 If after reading all of these troubleshooting steps, you still cannot get the NSP forwarder to work, then I do not
@@ -208,30 +208,19 @@ recommend the use of them and instead recommend using the Homebrew launcher from
 
 ## Development
 
-The following steps are basic instructions on downloading and working on the code under a [Poetry] environment.
+1. Install [uv]
+2. `uv sync --all-extras --all-groups`
+3. `.venv\Scripts\activate` (or `source .venv/bin/activate` on macOS and Linux)
+4. `uv tool install pre-commit --with pre-commit-uv --force-reinstall`
+5. `pre-commit install`
 
-1. Follow Poetry's Docs to [Install Poetry].
-2. Download NTON's latest code, `git clone https://github.com/rlaphoenix/nton`
-3. Navigate to the downloaded code repository, `cd nton`
-4. _Optionally_ have Poetry install the virtual-env in the project, `poetry config virtualenvs.in-project true`
-5. Install NTON's dependencies and development tools, `poetry install -E gui`
-6. Run NTON from within the Poetry venv, `poetry run nton --help`
+Now feel free to work on the project however you like, all code will be checked before committing.
+You can run nton with the GUI with `nton` or without the GUI with `nton --help`.
 
-> [!NOTE]
-> If you plan to work on or use the GUI during development, then add `-E gui` during Step 5.
-
-As shown, running the `nton` executable is somewhat different to a normal installation. This is because Poetry installs
-all dependencies and the `nton` shim itself within a virtual-environment, which is like a clone of your Python install
-stripped clean, with only NTON's dependencies installed. That way you don't mess around with any dependencies from any
-other installed Python applications, nor the other way around. A secluded environment.
-
-I recommend taking a look at [Poetry's Docs] for further information, why not get started by reading Poetry's guide on
-[Using Your Virtual Environment].
+If you make any changes to the QT UI file (main.ui) or any of the icon/image files, then you must
+run `.\make` to re-compile them to Python files.
 
-  [Poetry]: <https://python-poetry.org>
-  [Install Poetry]: <https://python-poetry.org/docs/#installation>
-  [Poetry's Docs]: <https://python-poetry.org/docs>
-  [Using Your Virtual Environment]: <https://python-poetry.org/docs/basic-usage/#using-your-virtual-environment>
+  [uv]: <https://docs.astral.sh/uv>
 
 ## Credit
 

make.bat

@@ -0,0 +1,3 @@
+@echo off
+pyside6-rcc nton\gui\resources\icons.qrc -o nton\gui\resources\icons_rc.py
+pyside6-uic nton\gui\main.ui -o nton\gui\main.py --absolute-imports --python-paths "."

make.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+pyside6-rcc nton/gui/resources/icons.qrc -o nton/gui/resources/icons_rc.py
+pyside6-uic nton/gui/main.ui -o nton/gui/main.py --absolute-imports --python-paths "."

nton/assets/game_title_ids.json

@@ -336,4 +336,4 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+Public License instead of this License.

nton/bin/hacbrewpack.license

@@ -336,4 +336,4 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+Public License instead of this License.