From 259e65287f92f543204a692a3b0e847641175dcd Mon Sep 17 00:00:00 2001 From: Exverge Date: Sat, 23 Mar 2024 00:24:42 -0400 Subject: [PATCH 1/5] Fix typo in encryption keys --- src/suyu/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 0d07c8d6d0..e7354e8fa5 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -1755,8 +1755,8 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa if (!ContentManager::AreKeysPresent()) { QMessageBox::warning(this, tr("Derivation Components Missing"), tr("Encryption keys are missing. " - "In order to use this emulator" - "you need to provide your own encryption keys" + "In order to use this emulator, " + "you need to provide your own encryption keys " "in order to play them.")); return false; } @@ -4630,8 +4630,8 @@ void GMainWindow::OnCheckFirmwareDecryption() { if (!ContentManager::AreKeysPresent()) { QMessageBox::warning(this, tr("Derivation Components Missing"), tr("Encryption keys are missing. " - "In order to use this emulator" - "you need to provide your own encryption keys" + "In order to use this emulator, " + "you need to provide your own encryption keys " "in order to play them.")); } From 18ba0f1345daf6ca66e314b1f70250c3e10bb8df Mon Sep 17 00:00:00 2001 From: Crimson-Hawk Date: Sat, 23 Mar 2024 19:20:40 +0800 Subject: [PATCH 2/5] Revert "Merge branch 'XForYouX-dev' into dev" this broke android build This reverts commit 16841915fd0dcf7d72f8be66318ae67c01b61717, reversing changes made to c7d2f08de8bb51e323e95211f4553872b565b432. --- src/android/app/src/main/res/values/arrays.xml | 2 -- src/android/app/src/main/res/values/strings.xml | 1 - 2 files changed, 3 deletions(-) diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index 0500bb2a4f..1bd6455b4c 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -142,7 +142,6 @@ @string/ratio_force_four_three @string/ratio_force_twenty_one_nine @string/ratio_force_sixteen_ten - @string/ratio_thirty_two_nine @string/ratio_stretch @@ -152,7 +151,6 @@ 2 3 4 - 5 diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 5331f2b419..a2487f4f11 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -601,7 +601,6 @@ Force 4:3 Force 21:9 Force 16:10 - Force 32:9 Stretch to window From 15ca12c0ec644867b1e6b797a4ba02e4035c7a75 Mon Sep 17 00:00:00 2001 From: nullequal Date: Sat, 23 Mar 2024 16:31:28 +0100 Subject: [PATCH 3/5] Allow NRO files to skip FW and keys' presence checks (#11) doing an old suggestion from the now-deleted "emulator-suggestions" channel on the discord Co-authored-by: nullequal Co-committed-by: nullequal --- src/suyu/main.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index e7354e8fa5..b1a3211823 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -1747,18 +1747,21 @@ void GMainWindow::AllowOSSleep() { } bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletParameters params) { - if (!CheckFirmwarePresence()) { - QMessageBox::critical(this, tr("Component Missing"), tr("Missing Firmware.")); - return false; - } + if (Loader::IdentifyType(Core::GetGameFileFromPath(vfs, filename.toStdString())) != + Loader::FileType::NRO) { + if (!CheckFirmwarePresence()) { + QMessageBox::critical(this, tr("Component Missing"), tr("Missing Firmware.")); + return false; + } - if (!ContentManager::AreKeysPresent()) { - QMessageBox::warning(this, tr("Derivation Components Missing"), - tr("Encryption keys are missing. " - "In order to use this emulator, " - "you need to provide your own encryption keys " - "in order to play them.")); - return false; + if (!ContentManager::AreKeysPresent()) { + QMessageBox::warning(this, tr("Derivation Components Missing"), + tr("Encryption keys are missing. " + "In order to use this emulator, " + "you need to provide your own encryption keys " + "in order to play them.")); + return false; + } } // Shutdown previous session if the emu thread is still active... From c6d34f6d77e100e6d73176e5855d50f6dc104340 Mon Sep 17 00:00:00 2001 From: Exverge Date: Sat, 23 Mar 2024 12:23:00 -0400 Subject: [PATCH 4/5] fix: compile errors from #11 --- src/suyu/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index b1a3211823..0d6189a8e9 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -12,6 +12,7 @@ #include #include "core/hle/service/am/applet_manager.h" #include "core/loader/nca.h" +#include "core/loader/nro.h" #include "core/tools/renderdoc.h" #ifdef __APPLE__ @@ -1747,7 +1748,7 @@ void GMainWindow::AllowOSSleep() { } bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletParameters params) { - if (Loader::IdentifyType(Core::GetGameFileFromPath(vfs, filename.toStdString())) != + if (Loader::AppLoader_NRO::IdentifyType(Core::GetGameFileFromPath(vfs, filename.toStdString())) != Loader::FileType::NRO) { if (!CheckFirmwarePresence()) { QMessageBox::critical(this, tr("Component Missing"), tr("Missing Firmware.")); From 649a90ff402ac91c819543950950dc32ad615081 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sat, 23 Mar 2024 16:13:40 -0300 Subject: [PATCH 5/5] ci: Use different runner label for Codespell and Format Verification --- .forgejo/workflows/ci.yml | 3 +- .forgejo/workflows/codespell.yml | 2 +- .../ISSUE_TEMPLATE/blank_issue_template.yml | 10 +++ .gitea/ISSUE_TEMPLATE/bug_report.yml | 64 +++++++++++++++++++ .gitea/ISSUE_TEMPLATE/config.yml | 5 ++ .gitea/ISSUE_TEMPLATE/feature_request.yml | 28 ++++++++ src/suyu/main.cpp | 6 +- 7 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 .gitea/ISSUE_TEMPLATE/blank_issue_template.yml create mode 100644 .gitea/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .gitea/ISSUE_TEMPLATE/config.yml create mode 100644 .gitea/ISSUE_TEMPLATE/feature_request.yml diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 143ad8982e..39bbbdf2c6 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -29,7 +29,8 @@ jobs: # TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} reuse: - runs-on: ubuntu-latest + name: Check REUSE Specification + runs-on: verify if: ${{ github.repository == 'suyu/suyu' }} steps: - uses: https://code.forgejo.org/actions/checkout@v3 diff --git a/.forgejo/workflows/codespell.yml b/.forgejo/workflows/codespell.yml index bf6d35d1e8..d711137d3a 100644 --- a/.forgejo/workflows/codespell.yml +++ b/.forgejo/workflows/codespell.yml @@ -20,7 +20,7 @@ permissions: {} jobs: codespell: name: Check for spelling errors - runs-on: ubuntu-latest + runs-on: verify steps: - uses: https://code.forgejo.org/actions/checkout@v3 with: diff --git a/.gitea/ISSUE_TEMPLATE/blank_issue_template.yml b/.gitea/ISSUE_TEMPLATE/blank_issue_template.yml new file mode 100644 index 0000000000..49b7f38228 --- /dev/null +++ b/.gitea/ISSUE_TEMPLATE/blank_issue_template.yml @@ -0,0 +1,10 @@ +name: New Issue (Developers Only) +description: A blank issue template for developers only. If you are not a developer, do not use this issue template. Your issue WILL BE CLOSED if you do not use the appropriate issue template. +body: + - type: markdown + attributes: + value: | + **If you are not a developer, do not use this issue template. Your issue WILL BE CLOSED if you do not use the appropriate issue template.** + - type: textarea + attributes: + label: "Issue" diff --git a/.gitea/ISSUE_TEMPLATE/bug_report.yml b/.gitea/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000000..041a4ff3bf --- /dev/null +++ b/.gitea/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,64 @@ +name: Bug Report +description: File a bug report +body: + - type: markdown + attributes: + value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with suyu. + - type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the bug you encountered. + options: + - label: I have searched the existing issues + required: true + - type: input + attributes: + label: Affected Commit or Release + description: List the affected commits that this issue applies to. + placeholder: Mainline 1234 / Early Access 1234 + validations: + required: true + - type: textarea + id: issue-desc + attributes: + label: Description of Issue + description: A brief description of the issue encountered along with any images and/or videos. + validations: + required: true + - type: textarea + id: expected-behavior + attributes: + label: Expected Behavior + description: A brief description of how it is expected to work along with any images and/or videos. + validations: + required: true + - type: textarea + id: reproduction-steps + attributes: + label: Reproduction Steps + description: A brief explanation of how to reproduce this issue. If possible, provide a save file to aid in reproducing the issue. + validations: + required: true + - type: textarea + id: log + attributes: + label: Log File + description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://suyu.dev/help/reference/log-files). + validations: + required: true + - type: textarea + id: system-config + attributes: + label: System Configuration + placeholder: | + CPU: Intel i5-10400 / AMD Ryzen 5 3600 + GPU/Driver: NVIDIA GeForce GTX 1060 (Driver 512.95) + RAM: 16GB DDR4-3200 + OS: Windows 11 22H2 (Build 22621.819) + value: | + CPU: + GPU/Driver: + RAM: + OS: + validations: + required: true diff --git a/.gitea/ISSUE_TEMPLATE/config.yml b/.gitea/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000..0be63fdb7a --- /dev/null +++ b/.gitea/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: suyu Discord + url: https://discord.com/invite/suyu + about: If you are experiencing an issue with suyu, and you need tech support, or if you have a general question, try asking in the official suyu Discord linked here. Piracy is not allowed. diff --git a/.gitea/ISSUE_TEMPLATE/feature_request.yml b/.gitea/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 0000000000..c0c27fc0a6 --- /dev/null +++ b/.gitea/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,28 @@ +name: Feature Request +description: File a feature request +labels: "enhancement" +body: + - type: markdown + attributes: + value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make suyu better. + - type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the feature you are requesting. + options: + - label: I have searched the existing issues + required: true + - type: textarea + id: what-feature + attributes: + label: What feature are you suggesting? + description: A brief description of the requested feature. + validations: + required: true + - type: textarea + id: why-feature + attributes: + label: Why would this feature be useful? + description: A brief description of why this feature would make suyu better. + validations: + required: true diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 0d6189a8e9..19148fcfc3 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -1748,8 +1748,8 @@ void GMainWindow::AllowOSSleep() { } bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletParameters params) { - if (Loader::AppLoader_NRO::IdentifyType(Core::GetGameFileFromPath(vfs, filename.toStdString())) != - Loader::FileType::NRO) { + if (Loader::AppLoader_NRO::IdentifyType( + Core::GetGameFileFromPath(vfs, filename.toStdString())) != Loader::FileType::NRO) { if (!CheckFirmwarePresence()) { QMessageBox::critical(this, tr("Component Missing"), tr("Missing Firmware.")); return false; @@ -1757,7 +1757,7 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa if (!ContentManager::AreKeysPresent()) { QMessageBox::warning(this, tr("Derivation Components Missing"), - tr("Encryption keys are missing. " + tr("Encryption keys are missing. " "In order to use this emulator, " "you need to provide your own encryption keys " "in order to play them."));