README.md: documented autoskip mode

Bumps wiiu-env/devkitppc from 20221228 to 20230621.

---
updated-dependencies:
- dependency-name: wiiu-env/devkitppc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -7,17 +7,17 @@ on:
     
 jobs:
   clang-format:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: clang-format
       run: |
-        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./source
+        docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./source
   build-binary:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     needs: clang-format
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: create version.h
       run: |
          git_hash=$(git rev-parse --short "$GITHUB_SHA")
@@ -33,13 +33,9 @@ jobs:
       with:
        name: wuhb-binary
        path: "*.wuhb"
-    - uses: actions/upload-artifact@master
-      with:
-       name: rpx-binary
-       path: "*.rpx"
   deploy-binary:
     needs: build-binary
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:   
     - name: Get environment variables
       id: get_repository_name
@@ -50,32 +46,15 @@ jobs:
       with:
         name: wuhb-binary
         path: wiiu/apps/wudd
-    - uses: actions/download-artifact@master
-      with:
-        name: rpx-binary
-        path: wiiu/apps/wudd
     - name: zip artifact
       run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip wiiu
     - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: "softprops/action-gh-release@v1"
       with:
         tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
-        release_name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
         draft: false
         prerelease: true
-        body: |
-           Not a stable release:
-           ${{ github.event.head_commit.message }}
-    - name: Upload Release Asset
-      id: upload-release-asset 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-        asset_path: ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
-        asset_name: ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
-        asset_content_type: application/zip
+        generate_release_notes: true
+        name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
+        files: |
+          ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip

.github/workflows/pr.yml

@@ -4,17 +4,17 @@ on: [pull_request]
 
 jobs:
   clang-format:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: clang-format
       run: |
-        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./source
+        docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./source
   check-build-with-logging:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     needs: clang-format
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: build binary with logging
         run: |
           docker build . -t builder
@@ -22,10 +22,10 @@ jobs:
           docker run --rm -v ${PWD}:/project builder make clean
           docker run --rm -v ${PWD}:/project builder make DEBUG=1
   build-binary:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     needs: clang-format
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: create version.h
       run: |
          git_hash=$(git rev-parse --short "${{ github.event.pull_request.head.sha }}")
@@ -40,4 +40,4 @@ jobs:
     - uses: actions/upload-artifact@master
       with:
        name: binary
-       path: "*.rpx"
+       path: "*.wuhb"

Dockerfile

@@ -1,6 +1,6 @@
-FROM wiiuenv/devkitppc:20220801
+FROM ghcr.io/wiiu-env/devkitppc:20230621
 
-COPY --from=wiiuenv/libntfs:20220726 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/libmocha:20220726 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libntfs:20220726 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libmocha:20220919 /artifacts $DEVKITPRO
 
 WORKDIR project

Makefile

@@ -52,6 +52,7 @@ SOURCES		:=	source \
 
 DATA		:=	data
 INCLUDES	:=	source
+ICON	    :=	data/icon.png
 
 #-------------------------------------------------------------------------------
 # options for code generation
@@ -164,7 +165,7 @@ endif
 all: $(BUILD)
 
 $(BUILD):
-	@[ -d $@ ] || mkdir -p $@
+	@$(shell [ ! -d $(BUILD) ] && mkdir -p $(BUILD))
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 
 #-------------------------------------------------------------------------------

README.md

@@ -9,6 +9,8 @@ Features:
 
 Files will be dumped to `/wudump/[DISC-ID]/`. The disc id of a game can be found on the disc (e.g. WUP-P-ARDP for the EUR version of Super Mario 3D World). If WUDD fails to determine the disc id, "DISC" with a timestamp will be used instead.
 
+If you want to create a partial dump (skipped sectors represented by 00 bytes) for discs with unreadable sectors, you can avoid the need to manually choose the skip sectors option on each error, by pressing Y at the error message to activate auto skip mode
+
 ## How to merge splitted files
 
 When you dump a .wux or .wud to the SD card it gets splitted into 2 GiB parts (FAT32 limitation). To merge them you can use the `copy` cmd tool.
@@ -51,4 +53,4 @@ docker run -it --rm -v ${PWD}:/project wudd-builder make clean
 
 ## Format the code via docker
 
-`docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./source -i`
+`docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./source -i`

source/ApplicationState.h

@@ -56,7 +56,7 @@ public:
     }
 
     virtual void printHeader() {
-        WiiUScreen::drawLine("WUDD - Wii U Disc Dumper v1.2.0" VERSION_EXTRA);
+        WiiUScreen::drawLine("WUDD - Wii U Disc Dumper v1.2.2" VERSION_EXTRA);
         WiiUScreen::drawLine("==================");
         WiiUScreen::drawLine("");
     }

source/WUD/content/partitions/volumes/H3HashArray.h

@@ -28,5 +28,5 @@ public:
     ~H3HashArray();
 
     std::unique_ptr<uint8_t[]> data;
-    uint8_t size;
+    uint32_t size;
 };

source/main.cpp

@@ -11,6 +11,7 @@
 #include <mocha/mocha.h>
 #include <ntfs.h>
 #include <padscore/kpad.h>
+#include <sndcore2/core.h>
 #include <thread>
 #include <whb/log.h>
 #include <whb/proc.h>
@@ -37,7 +38,7 @@ procHomeButtonDeniedCustom(void *context) {
 
 int main(int argc, char **argv) {
     initLogging();
-    DEBUG_FUNCTION_LINE("Hello from wudump!");
+    AXInit();
     WHBProcInit();
     WiiUScreen::Init();
 
@@ -62,7 +63,7 @@ int main(int argc, char **argv) {
     IMIsAPDEnabled(&isAPDEnabled);
 
     if (isAPDEnabled) {
-        DEBUG_FUNCTION_LINE("Disable auto shutdown");
+        DEBUG_FUNCTION_LINE_VERBOSE("Disable auto shutdown");
         IMDisableAPD();
     }
 
@@ -98,7 +99,7 @@ int main(int argc, char **argv) {
     }
 
     if (isAPDEnabled) {
-        DEBUG_FUNCTION_LINE("Enable auto shutdown");
+        DEBUG_FUNCTION_LINE_VERBOSE("Enable auto shutdown");
         IMEnableAPD();
     }
 
@@ -106,12 +107,13 @@ int main(int argc, char **argv) {
 
     WiiUScreen::DeInit();
     WHBProcShutdown();
+    AXQuit();
 
     return 0;
 }
 
 void main_loop() {
-    DEBUG_FUNCTION_LINE("Creating state");
+    DEBUG_FUNCTION_LINE_VERBOSE("Creating state");
     std::unique_ptr<MainApplicationState> state = std::make_unique<MainApplicationState>();
     CombinedInput baseInput;
     VPadInput vpadInput;
@@ -121,7 +123,7 @@ void main_loop() {
             WPAD_CHAN_2,
             WPAD_CHAN_3};
 
-    DEBUG_FUNCTION_LINE("Entering main loop");
+    DEBUG_FUNCTION_LINE_VERBOSE("Entering main loop");
     while (WHBProcIsRunning()) {
         baseInput.reset();
         if (vpadInput.update(1280, 720)) {
@@ -151,7 +153,7 @@ void initMochaLib() {
 
 void deInitMochaLib() {
     if (slibMochaMount) {
-        Mocha_DeinitLibrary();
+        Mocha_DeInitLibrary();
     }
 
     Mocha_sdio_disc_interface.shutdown();