Merge remote-tracking branch 'upstream/development' into pre-production-building

Author: MCMi460

.github/workflows/actions.yml

@@ -1,11 +1,11 @@
-name: 'Build NSO-RPC'
+name: 'Build NSO-RPC - x86_64'
 on:
   release:
     types: [published]
 
 jobs:
-  build:
-    name: 'Build NSO-RPC'
+  build-x86_64:
+    name: 'Build NSO-RPC - x86_64'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -15,12 +15,15 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v3
       with:
-        python-version: 3.10.11
+        python-version: 3.11.4
 
     # Windows Build
     - name: "Build"
       if: matrix.os == 'windows-latest'
-      run: cd scripts && ./build.bat
+      run: |
+        cd scripts &&
+        python -m pip install pyqt6 &&
+        ./build.bat
 
     - name: "Upload Build"
       if: matrix.os == 'windows-latest'
@@ -35,13 +38,13 @@ jobs:
       with:
         files: scripts/linux.sh
 
-
     # MacOS Build
     - name: "Build"
       if: matrix.os == 'macos-latest'
       run: |
         cd scripts &&
-        ./build.sh &&
+        python -m pip install pyqt6 &&
+        bash ./build.sh &&
         cd ../client/dist &&
         ln -s /Applications "Applications (admin)" &&
         hdiutil create -fs HFS+ -srcfolder . -volname NSO-RPC mac-installer.dmg &&
@@ -53,3 +56,43 @@ jobs:
         files: |
           client/dist/mac-installer.dmg
           client/dist/mac-portable.zip
+
+  build-universal2:
+    name: 'Build NSO-RPC - Universal2'
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    # MacOS Universal Build
+    - name: "Install Python 3.11.4 and build NSO-RPC"
+      run: |
+        curl https://www.python.org/ftp/python/3.11.4/python-3.11.4-macos11.pkg -o python-3.11.4-macos11.pkg
+        sudo installer -verbose -pkg python-3.11.4-macos11.pkg -target / &&
+        alias python3=python3.11
+        cd scripts/macos-universal2 &&
+        bash ./build.sh &&
+        cd ../../client/dist &&
+        ln -s /Applications "Applications (admin)" &&
+        hdiutil create -fs HFS+ -srcfolder . -volname NSO-RPC mac-universal2-installer.dmg &&
+        zip -yr mac-universal2-portable.zip NSO-RPC.app/
+
+    - name: "Upload NSO-RPC Universal2 Build"
+      uses: softprops/action-gh-release@v0.1.15
+      with:
+        files: |
+          client/dist/mac-universal2-installer.dmg
+          client/dist/mac-universal2-portable.zip
+
+  get-hashes:
+    runs-on: "ubuntu-latest"
+    needs: ["build-x86_64", "build-universal2"]
+    steps:
+      - name: "Generate checksums.txt"
+        uses: MCJack123/ghaction-generate-release-hashes@v4
+        with:
+          hash-type: sha256
+          file-name: checksums.txt
+          get-assets: true
+      - uses: softprops/action-gh-release@v0.1.15
+        with:
+          files: checksums.txt

.gitignore

@@ -5,19 +5,25 @@ tempToken.*
 # App
 settings.*
 logs.*
+NSO-RPC_Data/
 
 # Python
 venv/
 __pycache__/
 
 # Qt
 *.autosave
+arm64/
+PyQt6_Qt6*.whl
+universal/
+x86_64/
 
 # Compilation
 build/
 dist/
 setup.py
 *.spec
+client/version.txt
 
 # Tests
 test*.*

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+-   repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v2.0.2
+    hooks:
+    -   id: autopep8 
+        exclude:
+            client/layout/

README.md

@@ -67,6 +67,12 @@ Once ran, the app will ask for you to log into your Nintendo account on a web br
 ***Q: I can't link my Nintendo Account. What do I do?***  
 **A:** Refer to the question above.
 
+***Q: My status is displaying as offline and won't change!***  
+**A:** First, [make sure that you have a secondary account linked](#quick) and have selected your main account from the friends list. If you've done that and you're still having problems with an offline status, *make sure that both settings in your user profile (play activity and display online status settings) are set to "all friends"*.
+
+***Q: I keep getting Error Code 9407; what should I do?***  
+**A:** You're going to have to link your account with a real Nintendo Switch at least once in order to use the API and add your main account as a friend. (See [#73](https://github.com/MCMi460/NSO-RPC/issues/73))
+
 *I am not liable for any sort of rate limiting Nintendo may hammer upon your network*
 
 <h1 id = 'depth'>In-depth guide</h1>

client/_version.py

@@ -0,0 +1,15 @@
+import os
+import git
+
+if __name__ == '__main__':
+    # Deletes current version.txt file
+    if os.path.exists('version.txt'):
+        os.remove('version.txt')
+
+    # Writes latest git version info to 'version.txt'
+    r = git.repo.Repo(search_parent_directories=True)
+    version_info = r.git.describe('--tags')
+    with open('version.txt', 'w') as f:
+        f.write(version_info)
+        f.write('\n')
+        f.close()