diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 890061d..b074ab9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -3,52 +3,67 @@ name: Bug report about: Report a bug to help improve Universal-Updater title: "[Bug Report] " labels: bug -assignees: '' - +assignees: "" --- + + + -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Console/Version (please complete the following information):** - - Console : - - - [ ] 3DS - - [ ] 3DS XL - - [ ] 2DS - - [ ] New 3DS - - [ ] New 3DS XL - - [ ] New 2DS XL - - Luma & System version: - -Luma 3DS version [example: v10.0.1] -System version & Region [example: v11.13.0-45E] + +**Describe the bug:** -**Universal-Updater (please complete the following information):** - - [ ] Release -If Release -> version [example: v2.2.0] + +**To Reproduce:** +1. +2. +3. - - [ ] Nightly + +**Expected behavior:** -If Nightly -> Commit hash [example: a10b9da] - How do you launch it: - - [ ] cia - - [ ] 3dsx + +**Screenshots:** + + + + +**Console:** +- [ ] 3DS +- [ ] 3DS XL +- [ ] 2DS +- [ ] New 3DS +- [ ] New 3DS XL +- [ ] New 2DS XL + + + + +**Luma3DS & System versions:** + +Luma 3DS version: + + +System version and region: + + +**Universal-Updater version:** + +Release: + + +Nightly: + + +Installed as: +- [ ] CIA +- [ ] 3DSX + + + +**Additional context:** + -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..2c9d395 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: true +contact_links: + - name: Universal-DB issue + url: https://github.com/Universal-Team/db/issues/new/choose + about: Issues with the app database should go in the db repository + - name: Support (on Discord) + url: https://universal-team.net/discord + about: "Please use #support on the Discord server to for support-related questions" diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index b55b5ec..4b6ad9c 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,20 +1,31 @@ --- name: Feature request about: Suggest an idea for Universal-Updater. -title: "[Feature Request]" +title: "[Feature Request] " labels: enhancement -assignees: '' +assignees: "" --- + + + + **Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Example: I'm always frustrated when [...] -**Describe the solution you'd like** -A clear and concise description of what you want to happen. -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. -**Additional context** -Add any other context or screenshots about the feature request here. + +**Describe the solution you'd like:** + + + + +**Describe alternatives you've considered:** + + + + +**Additional context:** + + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df8cf5e..c743a5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,8 @@ -name: Build Universal-Updater +name: Build StreetPass-Shop on: - push: - branches-ignore: [translation, full-rewrite] + workflow_dispatch: + branches-ignore: [translation] paths-ignore: - 'README.md' pull_request: @@ -10,7 +10,7 @@ on: paths-ignore: - 'README.md' release: - types: [created] + types: [published] jobs: build: @@ -29,12 +29,14 @@ jobs: uses: actions/checkout@v1 with: submodules: recursive + - name: Setup environment + run: git config --global safe.directory '*' - name: Install tools run: | sudo apt-get update sudo apt-get install p7zip-full -y - curl -L https://github.com/Steveice10/bannertool/releases/download/1.1.0/bannertool.zip -o bannertool.zip + curl -L https://github.com/Steveice10/bannertool/releases/download/1.2.0/bannertool.zip -o bannertool.zip sudo 7z e bannertool.zip linux-x86_64/bannertool sudo chmod +x bannertool mv bannertool /usr/local/bin @@ -49,118 +51,18 @@ jobs: run: | make mkdir -p ~/artifacts - cp Universal-Updater.3dsx ~/artifacts - cp Universal-Updater.cia ~/artifacts + cp *.3dsx ~/artifacts + cp *.cia ~/artifacts echo ::set-output name=commit_tag::$(git describe --abbrev=0 --tags) echo ::set-output name=commit_hash::$(git log --format=%h -1) # Webhook info - echo ::set-output name=author_name::$(git log -1 "$GITHUB_SHA" --pretty="%aN") - echo ::set-output name=committer_name::$(git log -1 "$GITHUB_SHA" --pretty="%cN") - echo ::set-output name=commit_subject::$(git log -1 "$GITHUB_SHA" --pretty="%s") - echo ::set-output name=commit_message::$(git log -1 "$GITHUB_SHA" --pretty="%b") + echo "::set-output name=author_name::$(git log -1 $GITHUB_SHA --pretty=%aN)" + echo "::set-output name=committer_name::$(git log -1 $GITHUB_SHA --pretty=%cN)" + echo "::set-output name=commit_subject::$(git log -1 $GITHUB_SHA --pretty=%s)" + echo "::set-output name=commit_message::$(git log -1 $GITHUB_SHA --pretty=%b)" - name: Publish build to GH Actions uses: actions/upload-artifact@v2 with: path: ~/artifacts/* name: build - - # Only run this for non-PR jobs. - publish_build: - runs-on: ubuntu-latest - name: Publish build to Universal-Team/extras - if: ${{ success() && !startsWith(github.ref, 'refs/pull') }} - needs: build - env: - COMMIT_TAG: ${{ needs.build.outputs.commit_tag }} - COMMIT_HASH: ${{ needs.build.outputs.commit_hash }} - AUTHOR_NAME: ${{ needs.build.outputs.author_name }} - COMMIT_MESSAGE: ${{ needs.build.outputs.commit_message }} - outputs: - current_date: ${{ steps.commit.outputs.current_date }} - steps: - - name: Install tools - run: | - sudo apt-get update - sudo apt-get install qrencode -y - - name: Download artifacts - uses: actions/download-artifact@v2 - with: - name: build - path: build - - name: Upload to ${{ github.repository }} release - if: ${{ startsWith(github.ref, 'refs/tags') }} - run: | - ID=$(jq --raw-output '.release.id' $GITHUB_EVENT_PATH) - - for file in ${{ github.workspace }}/build/*; do - AUTH_HEADER="Authorization: token ${{ secrets.GITHUB_TOKEN }}" - CONTENT_LENGTH="Content-Length: $(stat -c%s $file)" - CONTENT_TYPE="Content-Type: application/7z-x-compressed" - UPLOAD_URL="https://uploads.github.com/repos/${{ github.repository }}/releases/$ID/assets?name=$(basename $file)" - - curl -XPOST -H "$AUTH_HEADER" -H "$CONTENT_LENGTH" -H "$CONTENT_TYPE" --upload-file "$file" "$UPLOAD_URL" - done - - name: Commit and push to Universal-Team/extras - id: commit - run: | - CURRENT_DATE=$(date +"%Y%m%d-%H%M%S") - echo ::set-output name=current_date::$CURRENT_DATE - - git config --global user.email "flamekat54@aol.com" - git config --global user.name "TWLBot" - git clone --depth 1 https://${{ secrets.TWLBOT_TOKEN }}@github.com/Universal-Team/extras.git - mkdir -p extras/builds/Universal-Updater/ - cd extras/builds/Universal-Updater/ - qrencode -o Universal-Updater.png https://github.com/Universal-Team/extras/raw/v$CURRENT_DATE/builds/Universal-Updater/Universal-Updater.cia - qrencode -o Universal-Updater-release.png https://github.com/Universal-Team/Universal-Updater/releases/download/$COMMIT_TAG/Universal-Updater.cia - cp ${{ github.workspace }}/build/* . - git stage . - git commit -m "Universal-Updater | $COMMIT_HASH" - git tag v$CURRENT_DATE - git push origin master v$CURRENT_DATE - - name: Release to Universal-Team/extras - run: | - AUTH_HEADER="Authorization: token ${{ secrets.TWLBOT_TOKEN }}" - CONTENT_TYPE="Content-Type: application/json" - API_URL="https://api.github.com/repos/Universal-Team/extras/releases" - RELEASE_INFO="{\"tag_name\": \"v${{ steps.commit.outputs.current_date }}\", \"name\": \"Universal-Updater | $COMMIT_HASH\", \"body\": \"$AUTHOR_NAME - $COMMIT_MESSAGE\", \"prerelease\": true}" - - RESPONSE=$(curl -XPOST -H "$AUTH_HEADER" -H "$CONTENT_TYPE" "$API_URL" -d "$RELEASE_INFO") - - ID=$(echo $RESPONSE | jq --raw-output '.id') - - for file in ${{ github.workspace }}/build/*; do - AUTH_HEADER="Authorization: token ${{ secrets.TWLBOT_TOKEN }}" - CONTENT_LENGTH="Content-Length: $(stat -c%s $file)" - CONTENT_TYPE="Content-Type: application/7z-x-compressed" - UPLOAD_URL="https://uploads.github.com/repos/Universal-Team/extras/releases/$ID/assets?name=$(basename $file)" - - curl -XPOST -H "$AUTH_HEADER" -H "$CONTENT_LENGTH" -H "$CONTENT_TYPE" --upload-file "$file" "$UPLOAD_URL" - done - - send_webhook: - runs-on: ubuntu-latest - needs: [publish_build, build] - name: Send Discord webhook - if: ${{ !startsWith(github.ref, 'refs/pull') }} - env: - CURRENT_DATE: ${{ needs.publish_build.outputs.current_date }} - AUTHOR_NAME: ${{ needs.build.outputs.author_name }} - COMMITTER_NAME: ${{ needs.build.outputs.committer_name }} - COMMIT_SUBJECT: ${{ needs.build.outputs.commit_subject }} - COMMIT_MESSAGE: ${{ needs.build.outputs.commit_message }} - steps: - - name: Send success webhook - if: ${{ success() }} - run: | - curl -o send.sh https://raw.githubusercontent.com/Universal-Team/discord-webhooks/master/send-ghactions.sh - chmod +x send.sh - export IMAGE=https://raw.githubusercontent.com/Universal-Team/extras/v$CURRENT_DATE/builds/Universal-Updater/Universal-Updater.png - ./send.sh success ${{ secrets.WEBHOOK_URL }} - - name: Send failure webhook - if: ${{ failure() }} - run: | - curl -o send.sh https://raw.githubusercontent.com/Universal-Team/discord-webhooks/master/send-ghactions.sh - chmod +x send.sh - ./send.sh failure ${{ secrets.WEBHOOK_URL }} diff --git a/.gitignore b/.gitignore index 0183c25..4e744df 100644 --- a/.gitignore +++ b/.gitignore @@ -6,16 +6,17 @@ *.elf *.cia *.3dsx -*/build +*build *.map *.lst -.vscode/ipch +.vscode *.DS_Store romfs/gfx/*.t3x +include/version.hpp +cppcheck.log bannertool* makerom* *.pfs0 *.nso *.nacp -build/sprites.h diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 97d6069..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "files.associations": { - "*.tcc": "cpp", - "cctype": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "exception": "cpp", - "fstream": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "memory": "cpp", - "new": "cpp", - "ostream": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "typeinfo": "cpp", - "valarray": "cpp", - "array": "cpp", - "atomic": "cpp", - "bit": "cpp", - "cstdint": "cpp", - "deque": "cpp", - "forward_list": "cpp", - "map": "cpp", - "unordered_map": "cpp", - "vector": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "string": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "initializer_list": "cpp", - "bitset": "cpp", - "chrono": "cpp", - "condition_variable": "cpp", - "ratio": "cpp", - "regex": "cpp", - "shared_mutex": "cpp" - } -} \ No newline at end of file diff --git a/Makefile b/Makefile index a9bc7bf..0965e24 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,8 @@ include $(DEVKITARM)/3ds_rules # External tools #--------------------------------------------------------------------------------- ifeq ($(OS),Windows_NT) -MAKEROM ?= ../makerom.exe -BANNERTOOL ?= ../bannertool.exe +MAKEROM ?= makerom.exe +BANNERTOOL ?= bannertool.exe else MAKEROM ?= makerom @@ -46,11 +46,25 @@ endif CURRENT_VERSION := $(shell git describe --abbrev=0 --tags) -# If on a tagged commit, use the tag instead of the commit +GIT_TAG := $(shell git describe --abbrev=0 --tags) +GIT_SHA := $(shell git rev-parse --short=7 HEAD) + +# If on a tagged commit, use just the tag ifneq ($(shell echo $(shell git tag -l --points-at HEAD) | head -c 1),) -GIT_VER := $(shell git tag -l --points-at HEAD) +GIT_VER := $(GIT_TAG) else -GIT_VER := $(shell git describe --abbrev=0 --tags)-$(shell git rev-parse --short HEAD) +GIT_VER := $(GIT_TAG)-$(GIT_SHA) +endif + +# Ensure version.hpp exists +ifeq (,$(wildcard include/version.hpp)) +$(shell mkdir -p include) +$(shell touch include/version.hpp) +endif + +# Print new version if changed +ifeq (,$(findstring $(GIT_VER), $(shell cat include/version.hpp))) +$(shell printf "#ifndef VERSION_HPP\n#define VERSION_HPP\n\n#define VER_NUMBER \"$(GIT_VER)\"\n#define GIT_SHA \"$(GIT_SHA)\"\n\n#endif\n" > include/version.hpp) endif #--------------------------------------------------------------------------------- @@ -75,21 +89,21 @@ VERSION_MICRO := 0 endif #--------------------------------------------------------------------------------- -TARGET := Universal-Updater +TARGET := StreetPass-Shop BUILD := build -UNIVCORE := Universal-Core -SOURCES := $(UNIVCORE) source source/download source/gui source/lang source/overlays source/qr source/screens \ - source/store source/utils +UNIVCORE := Universal-Core +SOURCES := $(UNIVCORE) source source/download source/gui source/lang source/menu source/overlays \ + source/qr source/screens source/store source/utils DATA := data INCLUDES := $(UNIVCORE) include include/download include/gui include/lang include/overlays include/qr include/screens \ include/store include/utils GRAPHICS := assets/gfx ROMFS := romfs GFXBUILD := $(ROMFS)/gfx -APP_AUTHOR := Universal-Team -APP_DESCRIPTION := An easy to use app for installing and updating 3DS homebrew +APP_AUTHOR := MattTheTekie +APP_DESCRIPTION := Your one-stop shop for StreetPass data! ICON := app/icon.png -BNR_IMAGE := app/banner.png +BNR_IMAGE := app/banner.cgfx BNR_AUDIO := app/BannerAudio.wav RSF_FILE := app/build-cia.rsf @@ -99,25 +113,24 @@ RSF_FILE := app/build-cia.rsf ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft CFLAGS := -g -Wall -Wno-psabi -O2 -mword-relocations \ - -DV_STRING=\"$(GIT_VER)\" \ -DC_V=\"$(CURRENT_VERSION)\" \ -fomit-frame-pointer -ffunction-sections \ $(ARCH) -CFLAGS += $(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE=1 +CFLAGS += $(INCLUDE) -D__3DS__ -D_GNU_SOURCE=1 -CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17 +CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17 $(CITRA) ASFLAGS := -g $(ARCH) LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -LIBS := -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -larchive -lbz2 -llzma -lm -lz -lcitro2d -lcitro3d -lctru -lstdc++ +LIBS := -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -larchive -lbz2 -llzma -lz -lcitro2d -lcitro3d -lctru -lstdc++ #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing # include and lib #--------------------------------------------------------------------------------- -LIBDIRS := $(PORTLIBS) $(CTRULIB) +LIBDIRS := $(CURDIR)/libs $(PORTLIBS) $(CTRULIB) #--------------------------------------------------------------------------------- @@ -210,12 +223,16 @@ ifneq ($(ROMFS),) export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS) endif -.PHONY: all clean +.PHONY: all citra clean cppcheck #--------------------------------------------------------------------------------- all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES) @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile +#--------------------------------------------------------------------------------- +citra: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES) + @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile CITRA=-DCITRA + #------------------------------------------------------------------------------ clean: @echo clean ... @@ -252,11 +269,12 @@ all: $(OUTPUT).cia $(OUTPUT).elf $(OUTPUT).3dsx $(OUTPUT).elf : $(OFILES) $(OUTPUT).cia : $(OUTPUT).elf $(OUTPUT).smdh - $(BANNERTOOL) makebanner -i "../app/banner.png" -a "../app/BannerAudio.wav" -o "../app/banner.bin" + @$(BANNERTOOL) makebanner -ci "../app/banner.cgfx" -a "../app/BannerAudio.wav" -o "../app/banner.bin" - $(BANNERTOOL) makesmdh -i "../app/icon.png" -s "$(TARGET)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -o "../app/icon.bin" + @$(BANNERTOOL) makesmdh -i "../app/icon.png" -s "$(TARGET)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -o "../app/icon.bin" \ + --flags visible,ratingrequired,recordusage --cero 153 --esrb 153 --usk 153 --pegigen 153 --pegiptr 153 --pegibbfc 153 --cob 153 --grb 153 --cgsrr 153 - $(MAKEROM) -f cia -target t -exefslogo -o "../$(TARGET).cia" -elf "../$(TARGET).elf" -rsf "../app/build-cia.rsf" -banner "../app/banner.bin" -icon "../app/icon.bin" -logo "../app/logo.bcma.lz" -DAPP_ROMFS="$(TOPDIR)/$(ROMFS)" -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_VERSION_MAJOR="$(VERSION_MAJOR)" + @$(MAKEROM) -f cia -target t -exefslogo -o "../$(TARGET).cia" -elf "../$(TARGET).elf" -rsf "../app/build-cia.rsf" -banner "../app/banner.bin" -icon "../app/icon.bin" -logo "../app/logo.bcma.lz" -DAPP_ROMFS="$(TOPDIR)/$(ROMFS)" -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_VERSION_MAJOR="$(VERSION_MAJOR)" #--------------------------------------------------------------------------------- # you need a rule like this for each extension you use as binary data #--------------------------------------------------------------------------------- @@ -309,4 +327,9 @@ endef #--------------------------------------------------------------------------------------- endif -#--------------------------------------------------------------------------------------- \ No newline at end of file +#--------------------------------------------------------------------------------------- + +cppcheck: + @rm -f cppcheck.log + @cppcheck . --enable=all $(INCLUDE) -UJSON_CATCH_USER -U_Check_return_ -U_MSC_VER -U_Ret_notnull_ -U__INTEL_COMPILER -U__PGI -U__SUNPRO_CC -UJSON_INTERNAL_CATCH_USER -UJSON_THROW_USER -UJSON_TRY_USER -U__IBMCPP__ -U__SUNPRO_CC -D__GNUC__=9 -D__GNUC_MINOR__=1 -DNULL=nullptr --force 2> cppcheck.log + @echo cppcheck.log file created... diff --git a/README.md b/README.md index 59c1927..b9edf42 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

-
+
An easy to use app for installing and updating 3DS homebrew
Discord Server @@ -13,31 +13,69 @@ Translation status on Crowdin

-Universal-Updater is a homebrew application for the Nintendo 3DS with the intention to make downloading other homebrew simple and easy. No need to manually copy files or go through installation processes, as we do that for you. +Universal-Updater is a homebrew application for the Nintendo 3DS with the intention to make downloading other homebrew simple and easy. No need to manually copy files or go through installation processes, as it does that all for you. ## Features - A store format with a concept similar to the Cydia Repositories - - Default is [Universal-DB](https://db.universal-team.net) - - Want to add your own? Go to settings, find "Select Unistore", hit the + icon and type the URL or hit the QR button and scan the QR code (if they have one) + - The default is [Universal-DB](https://db.universal-team.net) + - Want to add more? Go to settings, choose "Select Unistore", click the + icon and select one from the list, enter a URL, or scan a QR code - Customization in sorting and display - - All sorting keys: "Title", "Author" & "Last Updated" - - Direction could be Ascending or Descending - - App display could be shown in either a Grid or Rows -- Translations for multi-lingual users - - To contribute to translations, join our [Crowdin](https://crwd.in/universal-updater) - - Request a new language on our [Discord Server](https://discord.gg/KDJCfGF) + - Several sorting keys: "Title", "Author", and "Last Updated" + - Direction can be Ascending or Descending + - App display can be shown in either a grid or rows +- Background installation so you can keep using the rest of the app while installing +- Searching and markings to make finding apps easy +- Viewing screenshots and release notes for apps +- Shortcuts for easily updating frequently updated apps when using the Homebrew Launcher +- Translations for users of many languages + - To contribute to translations, join our [Crowdin project](https://crwd.in/universal-updater) + - To request a new language, join our [Discord Server](https://universal-team.net/discord) or contact a project manager on Crowdin + ## Compilation -### Setting up your enviromment -To build Universal-Updater from source, you will need to setup devkitARM with libctru, 3ds-curl and 3ds-libarchive. Follow devkitPro's [Getting Started](https://devkitpro.org/wiki/Getting_Started) page to install pacman, then run `(sudo dkp-)pacman -S 3ds-dev 3ds-curl 3ds-libarchive`. You will also need [bannertool](https://github.com/Steveice10/bannertool/releases/latest) and [makerom](https://github.com/profi200/Project_CTR/releases/latest) in your PATH. Once you clone the repo (and its submodules), simply run `make` in the source code directory. +### Setting up your environment + +To build Universal-Updater from source, you will need to install devkitARM and some libraries. Follow devkitPro's [Getting Started](https://devkitpro.org/wiki/Getting_Started) page to install pacman, then run the following command to install everything you need: +``` +(sudo dkp-)pacman -S 3ds-dev 3ds-curl 3ds-bzip2 3ds-liblzma +``` +(The `sudo dkp-` may not be needed depending on your OS) + +You will also need [bannertool](https://github.com/Steveice10/bannertool/releases/latest) and [makerom](https://github.com/profi200/Project_CTR/releases/latest) in your PATH. + +### Cloning the repository + +To download the source you will need to clone the repository with submodules, this can be done by running: +``` +git clone --recursive https://github.com/Universal-Team/Universal-Updater.git +``` + +If you've already cloned it, you can use the following command to update all of the submodules: +``` +git submodule update --init --recursive +``` + +### Building + +Once you've cloned the repository (with submodules), simply run `make` in the root of the repository. + +If you're testing in Citra, run `make citra` instead of just `make` to disable the Wi-Fi check. (Note: `source/utils/download.cpp` must be rebuilt for this to take affect, save the file if it's already been built) ## Screenshots
Screenshots -![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/Credits.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/DirectorySelection.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/DownloadList.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/EntryInfo.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/LanguageSelection.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/ListStyle.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/MarkMenu.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/SearchMenu.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/SettingsMenu.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/SortMenu.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/StoreSelection.png) ![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/AutoUpdateSettings.png)![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/DirectorySettings.png)![](https://github.com/Universal-Team/Universal-Updater/blob/master/screenshots/GUISettings.png) +![Entry info](https://db.universal-team.net/assets/images/screenshots/universal-updater/entry-info.png) ![Download list](https://db.universal-team.net/assets/images/screenshots/universal-updater/download-list.png) +![Queue menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/queue-menu.png) ![Search menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/search-menu.png) +![Sorting and Filters menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/sort-menu.png) ![Settings menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/settings-menu.png) +![Marking menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/mark-menu.png) ![Viewing a screenshot](https://db.universal-team.net/assets/images/screenshots/universal-updater/screenshot.png) +![Viewing release notes](https://db.universal-team.net/assets/images/screenshots/universal-updater/release-notes.png) ![The menu in list mode](https://db.universal-team.net/assets/images/screenshots/universal-updater/list-style.png) +![Language selection menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/language-selection.png) ![UniStore selection menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/store-selection.png) +![Recommended UniStores menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/recommended-unistores.png) ![="Auto-Update settings menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/auto-update-settings.png) +![GUI settings menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/gui-settings.png) ![Directory settings menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/directory-settings.png) +![Directory selection menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/directory-selection.png) ![Credits menu](https://db.universal-team.net/assets/images/screenshots/universal-updater/credits.png)
@@ -49,4 +87,6 @@ To build Universal-Updater from source, you will need to setup devkitARM with li - [dlbeer](https://github.com/dlbeer) - Original developer of [quirc](https://github.com/dlbeer/quirc) - [FlagBrew](https://github.com/FlagBrew): Original QR Code Scanner code - [Icons8](https://icons8.com/): Icon Designer -- [PabloMK7](https://github.com/mariohackandglitch): Download Code Improvements +- [lvandeve](https://github.com/lvandeve): For [LodePNG](https://github.com/lvandeve/lodepng) +- [PabloMK7](https://github.com/PabloMK7): 3D Banner & Download Code Improvements +- [lividhen](https://github.com/lividhen): 3D Banner diff --git a/Universal-Core b/Universal-Core index 155058f..a7fe0a1 160000 --- a/Universal-Core +++ b/Universal-Core @@ -1 +1 @@ -Subproject commit 155058f9a14dd376fde8f49e9d5b8666bffc6dec +Subproject commit a7fe0a1fb2bc2337cac61bd782e7629c659726bc diff --git a/app/banner.cgfx b/app/banner.cgfx new file mode 100644 index 0000000..4621b1c Binary files /dev/null and b/app/banner.cgfx differ diff --git a/app/build-cia.rsf b/app/build-cia.rsf index 0c462a3..196dd5c 100644 --- a/app/build-cia.rsf +++ b/app/build-cia.rsf @@ -1,6 +1,6 @@ BasicInfo: - Title : "UNIV-UPDATER" - ProductCode : "CTR-H-UVUP" + Title : "STREETPASS_DL" + ProductCode : "CTR-H-UVUV" Logo : Homebrew # Nintendo / Licensed / Distributed / iQue / iQueForSystem RomFs: @@ -8,7 +8,7 @@ RomFs: TitleInfo: Category : Application - UniqueId : 0x43917 + UniqueId : 0x43916 Option: UseOnSD : true # true if App is to be installed to SD diff --git a/app/icon.png b/app/icon.png index 8ce27c0..bf8dd4d 100644 Binary files a/app/icon.png and b/app/icon.png differ diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s index 145e747..48cec1c 100644 --- a/assets/gfx/sprites.t3s +++ b/assets/gfx/sprites.t3s @@ -1,15 +1,48 @@ --atlas -f rgba -z auto sprites/add.png +sprites/add_font.png sprites/arrow.png +sprites/battery/battery_0.png +sprites/battery/battery_1.png +sprites/battery/battery_2.png +sprites/battery/battery_3.png +sprites/battery/battery_4.png +sprites/battery/battery_blink.png +sprites/battery/battery_charge.png +sprites/battery/battery_charge_full.png +sprites/wifi/wifi_0.png +sprites/wifi/wifi_1.png +sprites/wifi/wifi_2.png +sprites/wifi/wifi_3.png +sprites/cancel.png sprites/checked.png sprites/delete.png sprites/download.png sprites/info.png +sprites/installed.png +sprites/keyboard.png +sprites/langs/jp.png +sprites/langs/ko.png +sprites/langs/ry.png +sprites/langs/zh-CN.png +sprites/langs/zh-TW.png +sprites/list.png sprites/noIcon.png +sprites/notes.png sprites/qr_code.png +sprites/queue0.png +sprites/queue1.png +sprites/queue2.png +sprites/queue3.png +sprites/queue4.png +sprites/queue5.png +sprites/queue6.png +sprites/queue7.png +sprites/screenshot.png sprites/search.png sprites/settings.png +sprites/shortcut.png sprites/sort.png sprites/sort_checked.png sprites/sort_unchecked.png @@ -20,4 +53,4 @@ sprites/universal-updater.png sprites/universal-core.png sprites/update.png sprites/update_app.png -sprites/update_filter.png \ No newline at end of file +sprites/update_filter.png diff --git a/assets/gfx/sprites/add_font.png b/assets/gfx/sprites/add_font.png new file mode 100644 index 0000000..a056b84 Binary files /dev/null and b/assets/gfx/sprites/add_font.png differ diff --git a/assets/gfx/sprites/battery/battery_0.png b/assets/gfx/sprites/battery/battery_0.png new file mode 100644 index 0000000..628de22 Binary files /dev/null and b/assets/gfx/sprites/battery/battery_0.png differ diff --git a/assets/gfx/sprites/battery/battery_1.png b/assets/gfx/sprites/battery/battery_1.png new file mode 100644 index 0000000..2d2185e Binary files /dev/null and b/assets/gfx/sprites/battery/battery_1.png differ diff --git a/assets/gfx/sprites/battery/battery_2.png b/assets/gfx/sprites/battery/battery_2.png new file mode 100644 index 0000000..465c3dd Binary files /dev/null and b/assets/gfx/sprites/battery/battery_2.png differ diff --git a/assets/gfx/sprites/battery/battery_3.png b/assets/gfx/sprites/battery/battery_3.png new file mode 100644 index 0000000..7a40598 Binary files /dev/null and b/assets/gfx/sprites/battery/battery_3.png differ diff --git a/assets/gfx/sprites/battery/battery_4.png b/assets/gfx/sprites/battery/battery_4.png new file mode 100644 index 0000000..7cf311c Binary files /dev/null and b/assets/gfx/sprites/battery/battery_4.png differ diff --git a/assets/gfx/sprites/battery/battery_blink.png b/assets/gfx/sprites/battery/battery_blink.png new file mode 100644 index 0000000..3c287c2 Binary files /dev/null and b/assets/gfx/sprites/battery/battery_blink.png differ diff --git a/assets/gfx/sprites/battery/battery_charge.png b/assets/gfx/sprites/battery/battery_charge.png new file mode 100644 index 0000000..c8774ec Binary files /dev/null and b/assets/gfx/sprites/battery/battery_charge.png differ diff --git a/assets/gfx/sprites/battery/battery_charge_full.png b/assets/gfx/sprites/battery/battery_charge_full.png new file mode 100644 index 0000000..8b79ac7 Binary files /dev/null and b/assets/gfx/sprites/battery/battery_charge_full.png differ diff --git a/assets/gfx/sprites/cancel.png b/assets/gfx/sprites/cancel.png new file mode 100644 index 0000000..dba91e4 Binary files /dev/null and b/assets/gfx/sprites/cancel.png differ diff --git a/assets/gfx/sprites/download.png b/assets/gfx/sprites/download.png index e9e3168..daecc55 100644 Binary files a/assets/gfx/sprites/download.png and b/assets/gfx/sprites/download.png differ diff --git a/assets/gfx/sprites/info.png b/assets/gfx/sprites/info.png index 628f051..41a08aa 100644 Binary files a/assets/gfx/sprites/info.png and b/assets/gfx/sprites/info.png differ diff --git a/assets/gfx/sprites/installed.png b/assets/gfx/sprites/installed.png new file mode 100644 index 0000000..f2692c8 Binary files /dev/null and b/assets/gfx/sprites/installed.png differ diff --git a/assets/gfx/sprites/keyboard.png b/assets/gfx/sprites/keyboard.png new file mode 100644 index 0000000..8840359 Binary files /dev/null and b/assets/gfx/sprites/keyboard.png differ diff --git a/assets/gfx/sprites/langs/jp.png b/assets/gfx/sprites/langs/jp.png new file mode 100644 index 0000000..6275e9a Binary files /dev/null and b/assets/gfx/sprites/langs/jp.png differ diff --git a/assets/gfx/sprites/langs/ko.png b/assets/gfx/sprites/langs/ko.png new file mode 100644 index 0000000..0036c3b Binary files /dev/null and b/assets/gfx/sprites/langs/ko.png differ diff --git a/assets/gfx/sprites/langs/ry.png b/assets/gfx/sprites/langs/ry.png new file mode 100644 index 0000000..5038db0 Binary files /dev/null and b/assets/gfx/sprites/langs/ry.png differ diff --git a/assets/gfx/sprites/langs/zh-CN.png b/assets/gfx/sprites/langs/zh-CN.png new file mode 100644 index 0000000..914f8b8 Binary files /dev/null and b/assets/gfx/sprites/langs/zh-CN.png differ diff --git a/assets/gfx/sprites/langs/zh-TW.png b/assets/gfx/sprites/langs/zh-TW.png new file mode 100644 index 0000000..33340a1 Binary files /dev/null and b/assets/gfx/sprites/langs/zh-TW.png differ diff --git a/assets/gfx/sprites/list.png b/assets/gfx/sprites/list.png new file mode 100644 index 0000000..829a032 Binary files /dev/null and b/assets/gfx/sprites/list.png differ diff --git a/assets/gfx/sprites/notes.png b/assets/gfx/sprites/notes.png new file mode 100644 index 0000000..c11078e Binary files /dev/null and b/assets/gfx/sprites/notes.png differ diff --git a/assets/gfx/sprites/qr_code.png b/assets/gfx/sprites/qr_code.png index ea9ffe9..872f464 100644 Binary files a/assets/gfx/sprites/qr_code.png and b/assets/gfx/sprites/qr_code.png differ diff --git a/assets/gfx/sprites/queue0.png b/assets/gfx/sprites/queue0.png new file mode 100644 index 0000000..cd9450e Binary files /dev/null and b/assets/gfx/sprites/queue0.png differ diff --git a/assets/gfx/sprites/queue1.png b/assets/gfx/sprites/queue1.png new file mode 100644 index 0000000..9781ca4 Binary files /dev/null and b/assets/gfx/sprites/queue1.png differ diff --git a/assets/gfx/sprites/queue2.png b/assets/gfx/sprites/queue2.png new file mode 100644 index 0000000..6f4bcd0 Binary files /dev/null and b/assets/gfx/sprites/queue2.png differ diff --git a/assets/gfx/sprites/queue3.png b/assets/gfx/sprites/queue3.png new file mode 100644 index 0000000..10a446a Binary files /dev/null and b/assets/gfx/sprites/queue3.png differ diff --git a/assets/gfx/sprites/queue4.png b/assets/gfx/sprites/queue4.png new file mode 100644 index 0000000..6d6be96 Binary files /dev/null and b/assets/gfx/sprites/queue4.png differ diff --git a/assets/gfx/sprites/queue5.png b/assets/gfx/sprites/queue5.png new file mode 100644 index 0000000..6e9ee3c Binary files /dev/null and b/assets/gfx/sprites/queue5.png differ diff --git a/assets/gfx/sprites/queue6.png b/assets/gfx/sprites/queue6.png new file mode 100644 index 0000000..aa886ed Binary files /dev/null and b/assets/gfx/sprites/queue6.png differ diff --git a/assets/gfx/sprites/queue7.png b/assets/gfx/sprites/queue7.png new file mode 100644 index 0000000..f56bc9e Binary files /dev/null and b/assets/gfx/sprites/queue7.png differ diff --git a/assets/gfx/sprites/screenshot.png b/assets/gfx/sprites/screenshot.png new file mode 100644 index 0000000..43a53f8 Binary files /dev/null and b/assets/gfx/sprites/screenshot.png differ diff --git a/assets/gfx/sprites/search.png b/assets/gfx/sprites/search.png index fc3252d..dcb5226 100644 Binary files a/assets/gfx/sprites/search.png and b/assets/gfx/sprites/search.png differ diff --git a/assets/gfx/sprites/settings.png b/assets/gfx/sprites/settings.png index 23c51b8..9723422 100644 Binary files a/assets/gfx/sprites/settings.png and b/assets/gfx/sprites/settings.png differ diff --git a/assets/gfx/sprites/shortcut.png b/assets/gfx/sprites/shortcut.png new file mode 100644 index 0000000..864a299 Binary files /dev/null and b/assets/gfx/sprites/shortcut.png differ diff --git a/assets/gfx/sprites/sort.png b/assets/gfx/sprites/sort.png index 519d04e..79dd411 100644 Binary files a/assets/gfx/sprites/sort.png and b/assets/gfx/sprites/sort.png differ diff --git a/assets/gfx/sprites/toggle_off.png b/assets/gfx/sprites/toggle_off.png index f7818f5..3181ab0 100644 Binary files a/assets/gfx/sprites/toggle_off.png and b/assets/gfx/sprites/toggle_off.png differ diff --git a/assets/gfx/sprites/toggle_on.png b/assets/gfx/sprites/toggle_on.png index 347281f..cce3bd7 100644 Binary files a/assets/gfx/sprites/toggle_on.png and b/assets/gfx/sprites/toggle_on.png differ diff --git a/assets/gfx/sprites/wifi/wifi_0.png b/assets/gfx/sprites/wifi/wifi_0.png new file mode 100644 index 0000000..3fe75af Binary files /dev/null and b/assets/gfx/sprites/wifi/wifi_0.png differ diff --git a/assets/gfx/sprites/wifi/wifi_1.png b/assets/gfx/sprites/wifi/wifi_1.png new file mode 100644 index 0000000..eb77e01 Binary files /dev/null and b/assets/gfx/sprites/wifi/wifi_1.png differ diff --git a/assets/gfx/sprites/wifi/wifi_2.png b/assets/gfx/sprites/wifi/wifi_2.png new file mode 100644 index 0000000..88c23bd Binary files /dev/null and b/assets/gfx/sprites/wifi/wifi_2.png differ diff --git a/assets/gfx/sprites/wifi/wifi_3.png b/assets/gfx/sprites/wifi/wifi_3.png new file mode 100644 index 0000000..7bd5128 Binary files /dev/null and b/assets/gfx/sprites/wifi/wifi_3.png differ diff --git a/assets/gfx/sprites/wifi/wifi_off.png b/assets/gfx/sprites/wifi/wifi_off.png new file mode 100644 index 0000000..848425b Binary files /dev/null and b/assets/gfx/sprites/wifi/wifi_off.png differ diff --git a/crowdin.yml b/crowdin.yml index 7eb07c7..888860d 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,7 @@ +"project_id_env": "UU_CROWDIN_ID" +"api_token_env": "CROWDIN_TOKEN" +preserve_hierarchy: true + files: - source: /romfs/lang/en/app.json translation: /romfs/lang/%two_letters_code%/app.json diff --git a/include/common.hpp b/include/common.hpp index ccfade9..ff6cc8b 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,11 +32,17 @@ #include "lang.hpp" #include "msg.hpp" #include "screenCommon.hpp" - -inline std::unique_ptr config; +#include <3ds.h> +#include #define _STORE_PATH "sdmc:/3ds/Universal-Updater/stores/" #define _META_PATH "sdmc:/3ds/Universal-Updater/MetaData.json" -inline uint32_t hRepeat; +#define _THEME_AMOUNT 2 +#define _UNISTORE_VERSION 4 + +inline std::unique_ptr config; +inline uint32_t hRepeat, hDown, hHeld; +inline touchPosition touch; +inline C2D_Font font; #endif \ No newline at end of file diff --git a/include/gui/gfx.hpp b/include/gui/gfx.hpp index 284fe07..e21b27b 100644 --- a/include/gui/gfx.hpp +++ b/include/gui/gfx.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,12 +29,11 @@ #include "common.hpp" #include "sprites.h" +#include "theme.hpp" #include #include -/* - Define all used Colors, for easier changes. -*/ +extern std::unique_ptr UIThemes; /* Standard Colors. */ #define WHITE C2D_Color32(255, 255, 255, 255) @@ -42,41 +41,18 @@ #define TRANSPARENT C2D_Color32(0, 0, 0, 0) #define DIM_COLOR C2D_Color32(0, 0, 0, 190) -/* Bar, Text, BG Colors. */ -#define TEXT_COLOR WHITE -#define BAR_COLOR C2D_Color32(50, 73, 98, 255) -#define BAR_OUTL_COLOR C2D_Color32(25, 30, 53, 255) -#define BG_COLOR C2D_Color32(38, 44, 77, 255) - -/* Entry Colors. */ -#define ENTRY_BAR_COLOR BAR_COLOR -#define ENTRY_BAR_OUTL_COLOR BAR_OUTL_COLOR - -/* Entry Box Colors. */ -#define BOX_INSIDE_COLOR C2D_Color32(28, 33, 58, 255) -#define BOX_SELECTED_COLOR C2D_Color32(108, 130, 155, 255) -#define BOX_UNSELECTED_COLOR BLACK - -/* Progressbar Colors. */ -#define PROGRESSBAR_OUT_COLOR BOX_INSIDE_COLOR -#define PROGRESSBAR_IN_COLOR SIDEBAR_UNSELECTED_COLOR - -/* Search Menu Colors. */ -#define SEARCH_BAR_COLOR C2D_Color32(51, 75, 102, 255) -#define SEARCH_BAR_OUTL_COLOR BAR_OUTL_COLOR - -/* Sidebar Colors. */ -#define SIDEBAR_SELECTED_COLOR C2D_Color32(108, 130, 155, 255) -#define SIDEBAR_UNSELECTED_COLOR C2D_Color32(77, 101, 128, 255) - namespace GFX { void DrawTop(void); void DrawBottom(); - void DrawSprite(const int &img, const int &x, const int &y, const float &ScaleX = 1, const float &ScaleY = 1); - void DrawBox(const float &xPos, const float &yPos, const float &width = 50, const float &height = 50, const bool &selected = false, const uint32_t &clr = BOX_INSIDE_COLOR); - void DrawButton(const float &xPos, const float &yPos, const float &width, const float &height, const bool &selected, const std::string &Text = ""); - void DrawCheckbox(const float &xPos, const float &yPos, const bool &selected); + void DrawSprite(int img, int x, int y, float ScaleX = 1, float ScaleY = 1); + void DrawBox(float xPos, float yPos, float width = 50, float height = 50, bool selected = false, uint32_t clr = UIThemes->BoxInside()); + void DrawCheckbox(float xPos, float yPos, bool selected); void DrawToggle(float xPos, float yPos, bool toggled); + void DrawTime(); + void DrawBattery(); + void HandleBattery(); + void DrawWifi(); + void DrawIcon(const int Idx, int X, int Y, uint32_t Color = UIThemes->SideBarIconColor(), float BlendPower = 1.0f, float ScaleX = 1, float ScaleY = 1); }; #endif \ No newline at end of file diff --git a/include/gui/msg.hpp b/include/gui/msg.hpp index ab38e99..0399524 100644 --- a/include/gui/msg.hpp +++ b/include/gui/msg.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/init.hpp b/include/init.hpp index 7860e65..8051d94 100644 --- a/include/init.hpp +++ b/include/init.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,6 +33,9 @@ namespace Init { Result Initialize(); Result MainLoop(); Result Exit(); + + void LoadFont(); + void UnloadFont(); }; #endif \ No newline at end of file diff --git a/include/keyboard.hpp b/include/keyboard.hpp index 67c9225..133bdc8 100644 --- a/include/keyboard.hpp +++ b/include/keyboard.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/overlays/overlay.hpp b/include/overlays/overlay.hpp index 2e1ff12..cc1d21e 100644 --- a/include/overlays/overlay.hpp +++ b/include/overlays/overlay.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,15 +28,14 @@ #define _UNIVERSAL_UPDATER_OVERLAY_HPP #include "common.hpp" -#include "store.hpp" -#include "storeEntry.hpp" #include <3ds.h> namespace Overlays { - void SelectStore(std::unique_ptr &store, std::vector> &entries, std::unique_ptr &meta); - void SelectLanguage(const std::unique_ptr &store); + void SelectStore(); + void SelectLanguage(); void ShowCredits(); - std::string SelectDir(const std::string &oldDir, const std::string &msg, const std::unique_ptr &store); + std::string SelectDir(const std::string &oldDir, const std::string &msg); + void SelectTheme(); }; #endif \ No newline at end of file diff --git a/include/qr/qrcode.hpp b/include/qr/qrcode.hpp index 7e9738a..55426f6 100644 --- a/include/qr/qrcode.hpp +++ b/include/qr/qrcode.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,9 +67,10 @@ public: void drawThread(); void captureThread(); - void handler(std::vector& out); - bool done() const { return finished; }; - bool cancelled() const { return cancel; }; + void handler(std::string &result); + bool done() const { return this->finished; }; + bool cancelled() const { return this->cancel; }; + void List(bool v) { this->displayList = v; }; private: void buffToImage(); void finish(); @@ -83,15 +84,17 @@ private: std::atomic finished = false; bool capturing = false; bool cancel = false; + bool displayList = false; + int selectedStore = 0, sPos = 0; + std::vector stores = { }; + std::vector out; }; /* This is, what should get called. */ namespace QR_Scanner { - /* Empty == cancelled. */ - std::vector scan(); - std::string GetQRURL(); + std::string StoreHandle(); }; #endif \ No newline at end of file diff --git a/include/screens/mainScreen.hpp b/include/screens/mainScreen.hpp index cc88ed2..aa682f7 100644 --- a/include/screens/mainScreen.hpp +++ b/include/screens/mainScreen.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,9 +37,12 @@ 0: Entry Info. 1: Download List. - 2: Search + Favorites. - 3: Sorting. - 4: Settings / Credits(?). + 2: Queue. + 3: Search + Favorites. + 4: Sorting. + 5: Settings / Credits(?). + 6: Screenshot Menu. + 7: Release Notes. */ class MainScreen : public Screen { @@ -48,17 +51,21 @@ public: void Draw(void) const override; void Logic(u32 hDown, u32 hHeld, touchPosition touch) override; private: - std::unique_ptr store = nullptr; - std::unique_ptr meta = nullptr; - std::vector> entries; - std::vector dwnldList; - bool initialized = false, fetchDown = false, showMarks = false, showSettings = false, ascending = false, updateFilter = false; - int storeMode = 0, marks = 0, markIndex = 0, sPage = 0, lMode = 0, sSelection = 0, lastMode = 0, smallDelay = 0, sPos = 0; + std::vector dwnldList, dwnldSizes, dwnldTypes; + + bool initialized = false, fetchDown = false, showMarks = false, showSettings = false, + ascending = false, updateFilter = false, screenshotFetch = false, canDisplay = false, isAND = true; + + int storeMode = 0, marks = 0, markIndex = 0, sPage = 0, lMode = 0, sSelection = 0, + lastMode = 0, smallDelay = 0, sPos = 0, screenshotIndex = 0, sSize = 0, zoom = 0, scrollIndex = 0, queueIndex = 0; + SortType sorttype = SortType::LAST_UPDATED; /* Title, Author, Category, Console. */ - std::vector searchIncludes = { false, false, false, false }; - std::string searchResult = ""; + std::vector searchIncludes = { true, false, false, false }, installs = { }; + std::string searchResult = "", screenshotName = ""; + + C2D_Image Screenshot = { nullptr, nullptr }; }; #endif \ No newline at end of file diff --git a/include/store/meta.hpp b/include/store/meta.hpp index 89f3fe2..2747c8c 100644 --- a/include/store/meta.hpp +++ b/include/store/meta.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ #include "json.hpp" #include +#include enum favoriteMarks { STAR = 1 << 0, @@ -43,18 +44,53 @@ public: Meta(); ~Meta() { this->SaveCall(); }; - std::string GetUpdated(std::string unistoreName, std::string entry) const; - int GetMarks(std::string unistoreName, std::string entry) const; - bool UpdateAvailable(std::string unistoreName, std::string entry, std::string updated) const; + std::string GetUpdated(const std::string &unistoreName, const std::string &entry) const; + int GetMarks(const std::string &unistoreName, const std::string &entry) const; + bool UpdateAvailable(const std::string &unistoreName, const std::string &entry, const std::string &updated) const; + std::vector GetInstalled(const std::string &unistoreName, const std::string &entry) const; - void SetUpdated(std::string unistoreName, std::string entry, std::string updated) { + void SetUpdated(const std::string &unistoreName, const std::string &entry, const std::string &updated) { this->metadataJson[unistoreName][entry]["updated"] = updated; }; - void SetMarks(std::string unistoreName, std::string entry, int marks) { + void SetMarks(const std::string &unistoreName, const std::string &entry, int marks) { this->metadataJson[unistoreName][entry]["marks"] = marks; }; + /* TODO: Handle this better. */ + void SetInstalled(const std::string &unistoreName, const std::string &entry, const std::string &name) { + const std::vector installs = this->GetInstalled(unistoreName, entry); + bool write = true; + + if (!installs.empty()) { + write = !installs.empty(); + + for (int i = 0; i < (int)installs.size(); i++) { + if (installs[i] == name) { + write = false; + break; + } + } + } + + if (write) this->metadataJson[unistoreName][entry]["installed"] += name; + } + + /* Remove installed state from a download list entry. */ + void RemoveInstalled(const std::string &unistoreName, const std::string &entry, const std::string &name) { + const std::vector installs = this->GetInstalled(unistoreName, entry); + if (installs.empty()) return; + + for (int i = 0; i < (int)installs.size(); i++) { + if (installs[i] == name) { + this->metadataJson[unistoreName][entry]["installed"].erase(i); + break; + } + } + + if (this->metadataJson[unistoreName][entry]["installed"].empty() && this->metadataJson[unistoreName][entry].contains("updated")) this->metadataJson[unistoreName][entry].erase("updated"); + } + void ImportMetadata(); void SaveCall(); private: diff --git a/include/store/store.hpp b/include/store/store.hpp index ad3e819..95ba520 100644 --- a/include/store/store.hpp +++ b/include/store/store.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ class Store { public: - Store(const std::string &file); + Store(const std::string &file, const std::string &file2, bool ARGMode = false); ~Store(); void LoadFromFile(const std::string &file); void loadSheets(); @@ -44,18 +44,23 @@ public: std::string GetUniStoreTitle() const; std::string GetUniStoreAuthor() const; - /* Get Information of the UniStore Entries. */ - std::string GetTitleEntry(const int &index) const; - std::string GetAuthorEntry(const int &index) const; - std::string GetDescriptionEntry(const int &index) const; - std::vector GetCategoryIndex(const int &index) const; - std::string GetVersionEntry(const int &index) const; - std::vector GetConsoleEntry(const int &index) const; - std::string GetLastUpdatedEntry(const int &index) const; - std::string GetLicenseEntry(const int &index) const; - C2D_Image GetIconEntry(const int &index) const; + /* Get Information of the UniStore entries. */ + std::string GetTitleEntry(int index) const; + std::string GetAuthorEntry(int index) const; + std::string GetDescriptionEntry(int index) const; + std::vector GetCategoryIndex(int index) const; + std::string GetVersionEntry(int index) const; + std::vector GetConsoleEntry(int index) const; + std::string GetLastUpdatedEntry(int index) const; + std::string GetLicenseEntry(int index) const; + C2D_Image GetIconEntry(int index) const; + std::string GetFileSizes(int index, const std::string &entry) const; + std::string GetFileTypes(int index, const std::string &entry) const; + std::vector GetScreenshotList(int index) const; + std::vector GetScreenshotNames(int index) const; + std::string GetReleaseNotes(int index) const; - std::vector GetDownloadList(const int &index) const; + std::vector GetDownloadList(int index) const; int GetStoreSize() const { return (int)this->storeJson["storeContent"].size(); }; @@ -80,6 +85,9 @@ public: /* Both of these things are used for custom BG support. */ C2D_Image GetStoreImg() const { return this->storeBG; }; bool customBG() const { return this->hasCustomBG; }; + + /* Return filename of the UniStore. */ + std::string GetFileName() const { return this->fileName; }; private: void SetC2DBGImage(); nlohmann::json storeJson = nullptr; @@ -87,6 +95,7 @@ private: C2D_Image storeBG = { nullptr }; bool valid = false, hasSheet = false, hasCustomBG = false; int screenIndex = 0, entry = 0, box = 0, downEntry = 0, downIndex = 0; + std::string fileName = ""; }; #endif \ No newline at end of file diff --git a/include/store/storeEntry.hpp b/include/store/storeEntry.hpp index 43664ab..2a54699 100644 --- a/include/store/storeEntry.hpp +++ b/include/store/storeEntry.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ class StoreEntry { public: - StoreEntry(const std::unique_ptr &store, const std::unique_ptr &meta, const int &index); + StoreEntry(const std::unique_ptr &store, const std::unique_ptr &meta, int index); std::string GetTitle() const { return this->Title; }; std::string GetAuthor() const { return this->Author; }; @@ -52,20 +52,25 @@ public: std::vector GetCategoryFull() const { return this->FullCategory; }; std::vector GetConsoleFull() const { return this->FullConsole; }; + std::vector GetSizes() const { return this->Sizes; }; + std::vector GetTypes() const { return this->Types; }; + std::vector GetScreenshots() const { return this->Screenshots; }; + std::vector GetScreenshotNames() const { return this->ScreenshotNames; }; + std::string GetReleaseNotes() const { return this->ReleaseNotes; }; bool GetUpdateAvl() const { return this->UpdateAvailable; }; - void SetUpdateAvl(const bool &v) { this->UpdateAvailable = v; }; + void SetUpdateAvl(bool v) { this->UpdateAvailable = v; }; - void SetMark(const int &marks) { + void SetMark(int marks) { this->Marks = marks; this->MarkString = StringUtils::GetMarkString(this->Marks); }; private: - std::string Title, Author, Description, Category, Version, Console, LastUpdated, License, MarkString; + std::string Title, Author, Description, Category, Version, Console, LastUpdated, License, MarkString, ReleaseNotes; C2D_Image Icon; int SheetIndex, EntryIndex, Marks; - std::vector FullCategory, FullConsole; + std::vector FullCategory, FullConsole, Sizes, Types, Screenshots, ScreenshotNames; bool UpdateAvailable; }; diff --git a/include/store/storeUtils.hpp b/include/store/storeUtils.hpp index cd2ef34..5bf8a2e 100644 --- a/include/store/storeUtils.hpp +++ b/include/store/storeUtils.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ #ifndef _UNIVERSAL_UPDATER_STORE_UTILS_HPP #define _UNIVERSAL_UPDATER_STORE_UTILS_HPP -#include "common.hpp" +#include "meta.hpp" #include "store.hpp" #include "storeEntry.hpp" #include @@ -39,44 +39,63 @@ enum class SortType : uint8_t { }; namespace StoreUtils { + extern std::unique_ptr meta; + extern std::unique_ptr store; + extern std::vector> entries; + /* Grid. */ - void DrawGrid(const std::unique_ptr &store, const std::vector> &entries); - void GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, int ¤tMode, int &lastMode, bool &fetch, int &smallDelay); + void DrawGrid(); + void GridLogic(int ¤tMode, int &lastMode, bool &fetch, int &smallDelay); /* Top List. */ - void DrawList(const std::unique_ptr &store, const std::vector> &entries); - void ListLogic(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, int ¤tMode, int &lastMode, bool &fetch, int &smallDelay); + void DrawList(); + void ListLogic(int ¤tMode, int &lastMode, bool &fetch, int &smallDelay); /* Entry Info. */ - void DrawEntryInfo(const std::unique_ptr &store, const std::unique_ptr &entry); - void EntryHandle(u32 hDown, u32 hHeld, touchPosition touch, bool &showMark, bool &fetch); + void DrawEntryInfo(const std::unique_ptr &entry); + void EntryHandle(bool &showMark, bool &fetch, bool &sFetch, int &mode, const std::unique_ptr &entry); /* Side Menu. */ - void DrawSideMenu(const int ¤tMenu); - void SideMenuHandle(u32 hDown, touchPosition touch, int ¤tMenu, bool &fetch); + void DrawSideMenu(int currentMenu); + void SideMenuHandle(int ¤tMenu, bool &fetch, int &lastMenu); - /* Download Entries. */ - void DrawDownList(const std::unique_ptr &store, const std::vector &entries, const bool &fetch); - void DownloadHandle(u32 hDown, u32 hHeld, touchPosition touch, const std::unique_ptr &store, const std::unique_ptr &entry, const std::vector &entries, int ¤tMenu, std::unique_ptr &meta, const int &lastMode, int &smallDelay); + /* Download entries. */ + void DrawDownList(const std::vector &entries, bool fetch, const std::unique_ptr &entry, const std::vector &sizes, const std::vector &installs); + void DownloadHandle(const std::unique_ptr &entry, const std::vector &entries, int ¤tMenu, const int &lastMode, int &smallDelay, std::vector &installs, const std::vector &types); + + /* Queue System. */ + void DrawQueueMenu(const int queueIndex); + void QueueMenuHandle(int &queueIndex, int &storeMode); /* Search + Favorite Menu. */ - void DrawSearchMenu(const std::vector &searchIncludes, const std::string &searchResult, const int &marks, const bool &updateFilter); - void SearchHandle(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, std::vector &searchIncludes, std::unique_ptr &meta, std::string &searchResult, int &marks, bool &updateFilter, bool ascending, SortType sorttype); + void DrawSearchMenu(const std::vector &searchIncludes, const std::string &searchResult, int marks, bool updateFilter, bool isAND); + void SearchHandle(std::vector &searchIncludes, std::string &searchResult, int &marks, bool &updateFilter, bool ascending, SortType sorttype, bool &isAND); /* Mark Menu. */ - void DisplayMarkBox(const int &marks); - void MarkHandle(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &entry, const std::unique_ptr &store, bool &showMark, std::unique_ptr &meta); + void DisplayMarkBox(int marks); + void MarkHandle(std::unique_ptr &entry, bool &showMark); /* Credits. */ void DrawCredits(); + /* Screenshot menu. */ + void DrawScreenshotMenu(const C2D_Image &img, const int sIndex, const bool sFetch, const int screenshotSize, const std::string &name, const int zoom, const bool canDisplay); + void ScreenshotMenu(C2D_Image &img, int &sIndex, bool &sFetch, int &storeMode, const int screenshotSize, int &zoom, bool &canDisplay); + /* Settings. */ - void DrawSettings(const int &page, const int &selection, const int &sPos); - void SettingsHandle(u32 hDown, u32 hHeld, touchPosition touch, int &page, bool &dspSettings, int &storeMode, int &selection, std::unique_ptr &store, std::vector> &entries, std::unique_ptr &meta, int &sPos); + void DrawSettings(int page, int selection, int sPos); + void SettingsHandle(int &page, bool &dspSettings, int &storeMode, int &selection, int &sPos); /* Sorting. */ - void DrawSorting(const bool &asc, const SortType &st); - void SortHandle(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, bool &asc, SortType &st); + void DrawSorting(bool asc, SortType st); + void SortHandle(bool &asc, SortType &st); + + /* Release Notes. */ + size_t FindSplitPoint(const std::string &str, const std::vector splitters); + void ProcessReleaseNotes(std::string ReleaseNotes); + + void DrawReleaseNotes(const int &scrollIndex, const std::unique_ptr &entry); + void ReleaseNotesLogic(int &scrollIndex, int &storeMode); bool compareTitleDescending(const std::unique_ptr &a, const std::unique_ptr &b); bool compareTitleAscending(const std::unique_ptr &a, const std::unique_ptr &b); @@ -87,13 +106,16 @@ namespace StoreUtils { bool compareUpdateDescending(const std::unique_ptr &a, const std::unique_ptr &b); bool compareUpdateAscending(const std::unique_ptr &a, const std::unique_ptr &b); - void SortEntries(const bool &Ascending, const SortType &sorttype, std::vector> &entries); + void SortEntries(bool Ascending, SortType sorttype); - void search(std::vector> &entries, const std::string &query, bool title, bool author, bool category, bool console, int selectedMarks, bool updateAvl); + void search(const std::string &query, bool title, bool author, bool category, bool console, int selectedMarks, bool updateAvl, bool isAND); - void FilterUpdateAvailable(std::vector> &entries); + void ResetAll(); - void ResetAll(const std::unique_ptr &store, const std::unique_ptr &meta, std::vector> &entries); + void RefreshUpdateAVL(); + + void AddToQueue(int index, const std::string &entry, const std::string &entryName, const std::string &lUpdated); + void AddAllToQueue(); }; #endif \ No newline at end of file diff --git a/include/utils/animation.hpp b/include/utils/animation.hpp index 204557f..6f04151 100644 --- a/include/utils/animation.hpp +++ b/include/utils/animation.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,8 +38,17 @@ enum class ProgressBar { }; namespace Animation { - void DrawProgressBar(const u64 ¤tProgress, const u64 &totalProgress); + extern int DisplayY, DisplayDelay; + extern bool MoveUp, DoDelay; + + void DrawProgressBar(u64 currentProgress, u64 totalProgress); void displayProgressBar(); + + void DrawQueue(int x, int y); + void QueueAnimHandle(); + + void QueueEntryDone(); + void HandleQueueEntryDone(); }; #endif \ No newline at end of file diff --git a/include/utils/argumentParser.hpp b/include/utils/argumentParser.hpp new file mode 100644 index 0000000..fe7ac95 --- /dev/null +++ b/include/utils/argumentParser.hpp @@ -0,0 +1,47 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#ifndef _UNIVERSAL_UPDATER_ARGUMENT_PARSER_HPP +#define _UNIVERSAL_UPDATER_ARGUMENT_PARSER_HPP + +#include "json.hpp" +#include "store.hpp" +#include + +class ArgumentParser { +public: + ArgumentParser(const std::string &file, const std::string &entry, int dlIndex); + void Load(); + void Execute(); + bool GetValid() const { return this->isValid; }; +private: + std::unique_ptr store = nullptr; + bool isValid = false; + std::string file = "", executeEntry = "", entry = ""; + int dlIndex = -1, entryIndex = -1; +}; + +#endif \ No newline at end of file diff --git a/include/utils/cia.hpp b/include/utils/cia.hpp index 8fb7ae3..dcbaec0 100644 --- a/include/utils/cia.hpp +++ b/include/utils/cia.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,8 +31,10 @@ #include <3ds.h> -Result CIA_LaunchTitle(const u64 &titleId, const FS_MediaType &mediaType); -Result deletePrevious(const u64 &titleid, const FS_MediaType &media); -Result installCia(const char *ciaPath, const bool &updateSelf); +namespace Title { + Result Launch(u64 titleId, FS_MediaType mediaType); + Result DeletePrevious(u64 titleid, FS_MediaType media); + Result Install(const char *ciaPath, bool updateSelf); +}; #endif \ No newline at end of file diff --git a/include/utils/config.hpp b/include/utils/config.hpp index 3d10aa1..3a2444e 100644 --- a/include/utils/config.hpp +++ b/include/utils/config.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -55,6 +55,9 @@ public: bool autoupdate() const { return this->v_autoUpdate; }; void autoupdate(bool v) { this->v_autoUpdate = v; if (!this->changesMade) this->changesMade = true; }; + bool _3dsxInFolder() const { return this->v_3dsxInFolder; }; + void _3dsxInFolder(bool v) { this->v_3dsxInFolder = v; if (!this->changesMade) this->changesMade = true; }; + std::string _3dsxPath() const { return this->v_3dsxPath; }; void _3dsxPath(const std::string &v) { this->v_3dsxPath = v; if (!this->changesMade) this->changesMade = true; }; @@ -64,6 +67,9 @@ public: std::string archPath() const { return this->v_archivePath; }; void archPath(const std::string &v) { this->v_archivePath = v; if (!this->changesMade) this->changesMade = true; }; + std::string firmPath() const { return this->v_firmPath; }; + void firmPath(const std::string &v) { this->v_firmPath = v; if (!this->changesMade) this->changesMade = true; }; + /* Fetching old metadata. */ bool metadata() const { return this->v_metadata; }; void metadata(bool v) { this->v_metadata = v; if (!this->changesMade) this->changesMade = true; }; @@ -72,9 +78,33 @@ public: bool updatecheck() const { return this->v_updateCheck; }; void updatecheck(bool v) { this->v_updateCheck = v; if (!this->changesMade) this->changesMade = true; }; + /* Check for nightly/release on startup. */ + bool updatenightly() const { return this->v_updateNightly; }; + void updatenightly(bool v) { this->v_updateNightly = v; if (!this->changesMade) this->changesMade = true; }; + /* U-U Update check on startup. */ bool usebg() const { return this->v_showBg; }; void usebg(bool v) { this->v_showBg = v; if (!this->changesMade) this->changesMade = true; }; + + /* If using custom Font. */ + bool customfont() const { return this->v_customFont; }; + void customfont(bool v) { this->v_customFont = v; if (!this->changesMade) this->changesMade = true; }; + + /* The shortcut path. */ + std::string shortcut() const { return this->v_shortcutPath; }; + void shortcut(const std::string &v) { this->v_shortcutPath = v; if (!this->changesMade) this->changesMade = true; }; + + /* If displaying changelog. */ + bool changelog() const { return this->v_changelog; }; + void changelog(bool v) { this->v_changelog = v; if (!this->changesMade) this->changesMade = true; }; + + /* The active Theme. */ + std::string theme() const { return this->v_theme; }; + void theme(const std::string &v) { this->v_theme = v; if (!this->changesMade) this->changesMade = true; }; + + /* If showing prompt if action failed / succeeded. */ + bool prompt() const { return this->v_prompt; }; + void prompt(bool v) { this->v_prompt = v; if (!this->changesMade) this->changesMade = true; }; private: /* Mainly helper. */ bool getBool(const std::string &key); @@ -88,8 +118,11 @@ private: bool changesMade = false; std::string v_language = "en", v_lastStore = "universal-db.unistore", - v_3dsxPath = "sdmc:/3ds", v_ndsPath = "sdmc:", v_archivePath = "sdmc:"; - bool v_list = false, v_autoUpdate = true, v_metadata = true, v_updateCheck = true, v_showBg = false; + v_3dsxPath = "sdmc:/3ds", v_ndsPath = "sdmc:", v_archivePath = "sdmc:", + v_shortcutPath = "sdmc:/3ds/Universal-Updater/shortcuts", v_firmPath = "sdmc:/luma/payloads", v_theme = "Default"; + + bool v_list = false, v_autoUpdate = true, v_metadata = true, v_updateCheck = true, v_updateNightly = false, + v_showBg = false, v_customFont = false, v_changelog = true, v_prompt = true, v_3dsxInFolder = false; }; #endif diff --git a/include/utils/download.hpp b/include/utils/download.hpp index a07cb29..53ebb66 100644 --- a/include/utils/download.hpp +++ b/include/utils/download.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,6 @@ #include "common.hpp" #define APP_TITLE "Universal-Updater" -#define VERSION_STRING "3.0.0" enum DownloadError { DL_ERROR_NONE = 0, @@ -41,8 +40,21 @@ enum DownloadError { DL_CANCEL, // No clue if that's needed tho. }; +struct StoreList { + std::string Title; + std::string Author; + std::string URL; + std::string Description; +}; + +struct UUUpdate { + bool Available = false; + std::string Notes = ""; + std::string Version = ""; +}; + Result downloadToFile(const std::string &url, const std::string &path); -Result downloadFromRelease(const std::string &url, const std::string &asset, const std::string &path, const bool &includePrereleases); +Result downloadFromRelease(const std::string &url, const std::string &asset, const std::string &path, bool includePrereleases); /* Check Wi-Fi status. @@ -65,10 +77,13 @@ void notImplemented(void); */ void doneMsg(void); -bool IsUpdateAvailable(const std::string &URL, const int &revCurrent); -bool DownloadUniStore(const std::string &URL, const int ¤tRev, std::string &fl, const bool &isDownload = false, const bool &isUDB = false); +bool IsUpdateAvailable(const std::string &URL, int revCurrent); +bool DownloadUniStore(const std::string &URL, int currentRev, std::string &fl, bool isDownload = false, bool isUDB = false); bool DownloadSpriteSheet(const std::string &URL, const std::string &file); -bool IsUUUpdateAvailable(); +UUUpdate IsUUUpdateAvailable(); void UpdateAction(); +std::vector FetchStores(); +C2D_Image FetchScreenshot(const std::string &URL); +std::string GetChangelog(); #endif \ No newline at end of file diff --git a/include/utils/extract.hpp b/include/utils/extract.hpp index 5437f4b..f462103 100644 --- a/include/utils/extract.hpp +++ b/include/utils/extract.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/utils/fileBrowse.hpp b/include/utils/fileBrowse.hpp index a716146..6c3c3e1 100644 --- a/include/utils/fileBrowse.hpp +++ b/include/utils/fileBrowse.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -56,7 +56,6 @@ struct UniStoreInfo { bool nameEndsWith(const std::string &name, const std::vector &extensionList); void getDirectoryContents(std::vector &dirContents, const std::vector &extensionList); void getDirectoryContents(std::vector &dirContents); -std::vector getContents(const std::string &name, const std::vector &extensionList); std::vector GetUniStoreInfo(const std::string &path); diff --git a/include/utils/files.hpp b/include/utils/files.hpp index b1e58ca..b3afc75 100644 --- a/include/utils/files.hpp +++ b/include/utils/files.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,9 +30,10 @@ #include "common.hpp" Result makeDirs(const char *path); -Result openFile(Handle *fileHandle, const char *path, const bool &write); +Result openFile(Handle *fileHandle, const char *path, bool write); Result deleteFile(const char *path); Result removeDir(const char *path); Result removeDirRecursive(const char *path); +u64 getAvailableSpace(); #endif \ No newline at end of file diff --git a/include/utils/lang.hpp b/include/utils/lang.hpp index 2c5e87e..84432f1 100644 --- a/include/utils/lang.hpp +++ b/include/utils/lang.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/utils/lodepng.h b/include/utils/lodepng.h new file mode 100644 index 0000000..6801cb7 --- /dev/null +++ b/include/utils/lodepng.h @@ -0,0 +1,1977 @@ +/* +LodePNG version 20201017 + +Copyright (c) 2005-2020 Lode Vandevenne + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ + +#ifndef LODEPNG_H +#define LODEPNG_H + +#include /*for size_t*/ + +extern const char* LODEPNG_VERSION_STRING; + +/* +The following #defines are used to create code sections. They can be disabled +to disable code sections, which can give faster compile time and smaller binary. +The "NO_COMPILE" defines are designed to be used to pass as defines to the +compiler command to disable them without modifying this header, e.g. +-DLODEPNG_NO_COMPILE_ZLIB for gcc. +In addition to those below, you can also define LODEPNG_NO_COMPILE_CRC to +allow implementing a custom lodepng_crc32. +*/ +/*deflate & zlib. If disabled, you must specify alternative zlib functions in +the custom_zlib field of the compress and decompress settings*/ +#ifndef LODEPNG_NO_COMPILE_ZLIB +#define LODEPNG_COMPILE_ZLIB +#endif + +/*png encoder and png decoder*/ +#ifndef LODEPNG_NO_COMPILE_PNG +#define LODEPNG_COMPILE_PNG +#endif + +/*deflate&zlib decoder and png decoder*/ +#ifndef LODEPNG_NO_COMPILE_DECODER +#define LODEPNG_COMPILE_DECODER +#endif + +/*deflate&zlib encoder and png encoder*/ +#ifndef LODEPNG_NO_COMPILE_ENCODER +#define LODEPNG_COMPILE_ENCODER +#endif + +/*the optional built in harddisk file loading and saving functions*/ +#ifndef LODEPNG_NO_COMPILE_DISK +#define LODEPNG_COMPILE_DISK +#endif + +/*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and unknown chunks*/ +#ifndef LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS +#define LODEPNG_COMPILE_ANCILLARY_CHUNKS +#endif + +/*ability to convert error numerical codes to English text string*/ +#ifndef LODEPNG_NO_COMPILE_ERROR_TEXT +#define LODEPNG_COMPILE_ERROR_TEXT +#endif + +/*Compile the default allocators (C's free, malloc and realloc). If you disable this, +you can define the functions lodepng_free, lodepng_malloc and lodepng_realloc in your +source files with custom allocators.*/ +#ifndef LODEPNG_NO_COMPILE_ALLOCATORS +#define LODEPNG_COMPILE_ALLOCATORS +#endif + +/*compile the C++ version (you can disable the C++ wrapper here even when compiling for C++)*/ +#ifdef __cplusplus +#ifndef LODEPNG_NO_COMPILE_CPP +#define LODEPNG_COMPILE_CPP +#endif +#endif + +#ifdef LODEPNG_COMPILE_CPP +#include +#include +#endif /*LODEPNG_COMPILE_CPP*/ + +#ifdef LODEPNG_COMPILE_PNG +/*The PNG color types (also used for raw image).*/ +typedef enum LodePNGColorType { + LCT_GREY = 0, /*grayscale: 1,2,4,8,16 bit*/ + LCT_RGB = 2, /*RGB: 8,16 bit*/ + LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/ + LCT_GREY_ALPHA = 4, /*grayscale with alpha: 8,16 bit*/ + LCT_RGBA = 6, /*RGB with alpha: 8,16 bit*/ + /*LCT_MAX_OCTET_VALUE lets the compiler allow this enum to represent any invalid + byte value from 0 to 255 that could be present in an invalid PNG file header. Do + not use, compare with or set the name LCT_MAX_OCTET_VALUE, instead either use + the valid color type names above, or numeric values like 1 or 7 when checking for + particular disallowed color type byte values, or cast to integer to print it.*/ + LCT_MAX_OCTET_VALUE = 255 +} LodePNGColorType; + +#ifdef LODEPNG_COMPILE_DECODER +/* +Converts PNG data in memory to raw pixel data. +out: Output parameter. Pointer to buffer that will contain the raw pixel data. + After decoding, its size is w * h * (bytes per pixel) bytes larger than + initially. Bytes per pixel depends on colortype and bitdepth. + Must be freed after usage with free(*out). + Note: for 16-bit per channel colors, uses big endian format like PNG does. +w: Output parameter. Pointer to width of pixel data. +h: Output parameter. Pointer to height of pixel data. +in: Memory buffer with the PNG file. +insize: size of the in buffer. +colortype: the desired color type for the raw output image. See explanation on PNG color types. +bitdepth: the desired bit depth for the raw output image. See explanation on PNG color types. +Return value: LodePNG error code (0 means no error). +*/ +unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, + const unsigned char* in, size_t insize, + LodePNGColorType colortype, unsigned bitdepth); + +/*Same as lodepng_decode_memory, but always decodes to 32-bit RGBA raw image*/ +unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, + const unsigned char* in, size_t insize); + +/*Same as lodepng_decode_memory, but always decodes to 24-bit RGB raw image*/ +unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, + const unsigned char* in, size_t insize); + +#ifdef LODEPNG_COMPILE_DISK +/* +Load PNG from disk, from file with given name. +Same as the other decode functions, but instead takes a filename as input. +*/ +unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, + const char* filename, + LodePNGColorType colortype, unsigned bitdepth); + +/*Same as lodepng_decode_file, but always decodes to 32-bit RGBA raw image.*/ +unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, + const char* filename); + +/*Same as lodepng_decode_file, but always decodes to 24-bit RGB raw image.*/ +unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, + const char* filename); +#endif /*LODEPNG_COMPILE_DISK*/ +#endif /*LODEPNG_COMPILE_DECODER*/ + + +#ifdef LODEPNG_COMPILE_ENCODER +/* +Converts raw pixel data into a PNG image in memory. The colortype and bitdepth + of the output PNG image cannot be chosen, they are automatically determined + by the colortype, bitdepth and content of the input pixel data. + Note: for 16-bit per channel colors, needs big endian format like PNG does. +out: Output parameter. Pointer to buffer that will contain the PNG image data. + Must be freed after usage with free(*out). +outsize: Output parameter. Pointer to the size in bytes of the out buffer. +image: The raw pixel data to encode. The size of this buffer should be + w * h * (bytes per pixel), bytes per pixel depends on colortype and bitdepth. +w: width of the raw pixel data in pixels. +h: height of the raw pixel data in pixels. +colortype: the color type of the raw input image. See explanation on PNG color types. +bitdepth: the bit depth of the raw input image. See explanation on PNG color types. +Return value: LodePNG error code (0 means no error). +*/ +unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, + const unsigned char* image, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth); + +/*Same as lodepng_encode_memory, but always encodes from 32-bit RGBA raw image.*/ +unsigned lodepng_encode32(unsigned char** out, size_t* outsize, + const unsigned char* image, unsigned w, unsigned h); + +/*Same as lodepng_encode_memory, but always encodes from 24-bit RGB raw image.*/ +unsigned lodepng_encode24(unsigned char** out, size_t* outsize, + const unsigned char* image, unsigned w, unsigned h); + +#ifdef LODEPNG_COMPILE_DISK +/* +Converts raw pixel data into a PNG file on disk. +Same as the other encode functions, but instead takes a filename as output. +NOTE: This overwrites existing files without warning! +*/ +unsigned lodepng_encode_file(const char* filename, + const unsigned char* image, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth); + +/*Same as lodepng_encode_file, but always encodes from 32-bit RGBA raw image.*/ +unsigned lodepng_encode32_file(const char* filename, + const unsigned char* image, unsigned w, unsigned h); + +/*Same as lodepng_encode_file, but always encodes from 24-bit RGB raw image.*/ +unsigned lodepng_encode24_file(const char* filename, + const unsigned char* image, unsigned w, unsigned h); +#endif /*LODEPNG_COMPILE_DISK*/ +#endif /*LODEPNG_COMPILE_ENCODER*/ + + +#ifdef LODEPNG_COMPILE_CPP +namespace lodepng { +#ifdef LODEPNG_COMPILE_DECODER +/*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype +is the format to output the pixels to. Default is RGBA 8-bit per channel.*/ +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + const unsigned char* in, size_t insize, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + const std::vector& in, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +#ifdef LODEPNG_COMPILE_DISK +/* +Converts PNG file from disk to raw pixel data in memory. +Same as the other decode functions, but instead takes a filename as input. +*/ +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + const std::string& filename, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +#endif /* LODEPNG_COMPILE_DISK */ +#endif /* LODEPNG_COMPILE_DECODER */ + +#ifdef LODEPNG_COMPILE_ENCODER +/*Same as lodepng_encode_memory, but encodes to an std::vector. colortype +is that of the raw input data. The output PNG color type will be auto chosen.*/ +unsigned encode(std::vector& out, + const unsigned char* in, unsigned w, unsigned h, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned encode(std::vector& out, + const std::vector& in, unsigned w, unsigned h, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +#ifdef LODEPNG_COMPILE_DISK +/* +Converts 32-bit RGBA raw pixel data into a PNG file on disk. +Same as the other encode functions, but instead takes a filename as output. +NOTE: This overwrites existing files without warning! +*/ +unsigned encode(const std::string& filename, + const unsigned char* in, unsigned w, unsigned h, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned encode(const std::string& filename, + const std::vector& in, unsigned w, unsigned h, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +#endif /* LODEPNG_COMPILE_DISK */ +#endif /* LODEPNG_COMPILE_ENCODER */ +} /* namespace lodepng */ +#endif /*LODEPNG_COMPILE_CPP*/ +#endif /*LODEPNG_COMPILE_PNG*/ + +#ifdef LODEPNG_COMPILE_ERROR_TEXT +/*Returns an English description of the numerical error code.*/ +const char* lodepng_error_text(unsigned code); +#endif /*LODEPNG_COMPILE_ERROR_TEXT*/ + +#ifdef LODEPNG_COMPILE_DECODER +/*Settings for zlib decompression*/ +typedef struct LodePNGDecompressSettings LodePNGDecompressSettings; +struct LodePNGDecompressSettings { + /* Check LodePNGDecoderSettings for more ignorable errors such as ignore_crc */ + unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/ + unsigned ignore_nlen; /*ignore complement of len checksum in uncompressed blocks*/ + + /*Maximum decompressed size, beyond this the decoder may (and is encouraged to) stop decoding, + return an error, output a data size > max_output_size and all the data up to that point. This is + not hard limit nor a guarantee, but can prevent excessive memory usage. This setting is + ignored by the PNG decoder, but is used by the deflate/zlib decoder and can be used by custom ones. + Set to 0 to impose no limit (the default).*/ + size_t max_output_size; + + /*use custom zlib decoder instead of built in one (default: null). + Should return 0 if success, any non-0 if error (numeric value not exposed).*/ + unsigned (*custom_zlib)(unsigned char**, size_t*, + const unsigned char*, size_t, + const LodePNGDecompressSettings*); + /*use custom deflate decoder instead of built in one (default: null) + if custom_zlib is not null, custom_inflate is ignored (the zlib format uses deflate). + Should return 0 if success, any non-0 if error (numeric value not exposed).*/ + unsigned (*custom_inflate)(unsigned char**, size_t*, + const unsigned char*, size_t, + const LodePNGDecompressSettings*); + + const void* custom_context; /*optional custom settings for custom functions*/ +}; + +extern const LodePNGDecompressSettings lodepng_default_decompress_settings; +void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings); +#endif /*LODEPNG_COMPILE_DECODER*/ + +#ifdef LODEPNG_COMPILE_ENCODER +/* +Settings for zlib compression. Tweaking these settings tweaks the balance +between speed and compression ratio. +*/ +typedef struct LodePNGCompressSettings LodePNGCompressSettings; +struct LodePNGCompressSettings /*deflate = compress*/ { + /*LZ77 related settings*/ + unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/ + unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/ + unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Default value: 2048.*/ + unsigned minmatch; /*minimum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/ + unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/ + unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/ + + /*use custom zlib encoder instead of built in one (default: null)*/ + unsigned (*custom_zlib)(unsigned char**, size_t*, + const unsigned char*, size_t, + const LodePNGCompressSettings*); + /*use custom deflate encoder instead of built in one (default: null) + if custom_zlib is used, custom_deflate is ignored since only the built in + zlib function will call custom_deflate*/ + unsigned (*custom_deflate)(unsigned char**, size_t*, + const unsigned char*, size_t, + const LodePNGCompressSettings*); + + const void* custom_context; /*optional custom settings for custom functions*/ +}; + +extern const LodePNGCompressSettings lodepng_default_compress_settings; +void lodepng_compress_settings_init(LodePNGCompressSettings* settings); +#endif /*LODEPNG_COMPILE_ENCODER*/ + +#ifdef LODEPNG_COMPILE_PNG +/* +Color mode of an image. Contains all information required to decode the pixel +bits to RGBA colors. This information is the same as used in the PNG file +format, and is used both for PNG and raw image data in LodePNG. +*/ +typedef struct LodePNGColorMode { + /*header (IHDR)*/ + LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/ + unsigned bitdepth; /*bits per sample, see PNG standard or documentation further in this header file*/ + + /* + palette (PLTE and tRNS) + + Dynamically allocated with the colors of the palette, including alpha. + This field may not be allocated directly, use lodepng_color_mode_init first, + then lodepng_palette_add per color to correctly initialize it (to ensure size + of exactly 1024 bytes). + + The alpha channels must be set as well, set them to 255 for opaque images. + + When decoding, by default you can ignore this palette, since LodePNG already + fills the palette colors in the pixels of the raw RGBA output. + + The palette is only supported for color type 3. + */ + unsigned char* palette; /*palette in RGBARGBA... order. Must be either 0, or when allocated must have 1024 bytes*/ + size_t palettesize; /*palette size in number of colors (amount of used bytes is 4 * palettesize)*/ + + /* + transparent color key (tRNS) + + This color uses the same bit depth as the bitdepth value in this struct, which can be 1-bit to 16-bit. + For grayscale PNGs, r, g and b will all 3 be set to the same. + + When decoding, by default you can ignore this information, since LodePNG sets + pixels with this key to transparent already in the raw RGBA output. + + The color key is only supported for color types 0 and 2. + */ + unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/ + unsigned key_r; /*red/grayscale component of color key*/ + unsigned key_g; /*green component of color key*/ + unsigned key_b; /*blue component of color key*/ +} LodePNGColorMode; + +/*init, cleanup and copy functions to use with this struct*/ +void lodepng_color_mode_init(LodePNGColorMode* info); +void lodepng_color_mode_cleanup(LodePNGColorMode* info); +/*return value is error code (0 means no error)*/ +unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source); +/* Makes a temporary LodePNGColorMode that does not need cleanup (no palette) */ +LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth); + +void lodepng_palette_clear(LodePNGColorMode* info); +/*add 1 color to the palette*/ +unsigned lodepng_palette_add(LodePNGColorMode* info, + unsigned char r, unsigned char g, unsigned char b, unsigned char a); + +/*get the total amount of bits per pixel, based on colortype and bitdepth in the struct*/ +unsigned lodepng_get_bpp(const LodePNGColorMode* info); +/*get the amount of color channels used, based on colortype in the struct. +If a palette is used, it counts as 1 channel.*/ +unsigned lodepng_get_channels(const LodePNGColorMode* info); +/*is it a grayscale type? (only colortype 0 or 4)*/ +unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info); +/*has it got an alpha channel? (only colortype 2 or 6)*/ +unsigned lodepng_is_alpha_type(const LodePNGColorMode* info); +/*has it got a palette? (only colortype 3)*/ +unsigned lodepng_is_palette_type(const LodePNGColorMode* info); +/*only returns true if there is a palette and there is a value in the palette with alpha < 255. +Loops through the palette to check this.*/ +unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info); +/* +Check if the given color info indicates the possibility of having non-opaque pixels in the PNG image. +Returns true if the image can have translucent or invisible pixels (it still be opaque if it doesn't use such pixels). +Returns false if the image can only have opaque pixels. +In detail, it returns true only if it's a color type with alpha, or has a palette with non-opaque values, +or if "key_defined" is true. +*/ +unsigned lodepng_can_have_alpha(const LodePNGColorMode* info); +/*Returns the byte size of a raw image buffer with given width, height and color mode*/ +size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color); + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS +/*The information of a Time chunk in PNG.*/ +typedef struct LodePNGTime { + unsigned year; /*2 bytes used (0-65535)*/ + unsigned month; /*1-12*/ + unsigned day; /*1-31*/ + unsigned hour; /*0-23*/ + unsigned minute; /*0-59*/ + unsigned second; /*0-60 (to allow for leap seconds)*/ +} LodePNGTime; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +/*Information about the PNG image, except pixels, width and height.*/ +typedef struct LodePNGInfo { + /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ + unsigned compression_method;/*compression method of the original file. Always 0.*/ + unsigned filter_method; /*filter method of the original file*/ + unsigned interlace_method; /*interlace method of the original file: 0=none, 1=Adam7*/ + LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/ + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /* + Suggested background color chunk (bKGD) + + This uses the same color mode and bit depth as the PNG (except no alpha channel), + with values truncated to the bit depth in the unsigned integer. + + For grayscale and palette PNGs, the value is stored in background_r. The values + in background_g and background_b are then unused. + + So when decoding, you may get these in a different color mode than the one you requested + for the raw pixels. + + When encoding with auto_convert, you must use the color model defined in info_png.color for + these values. The encoder normally ignores info_png.color when auto_convert is on, but will + use it to interpret these values (and convert copies of them to its chosen color model). + + When encoding, avoid setting this to an expensive color, such as a non-gray value + when the image is gray, or the compression will be worse since it will be forced to + write the PNG with a more expensive color mode (when auto_convert is on). + + The decoder does not use this background color to edit the color of pixels. This is a + completely optional metadata feature. + */ + unsigned background_defined; /*is a suggested background color given?*/ + unsigned background_r; /*red/gray/palette component of suggested background color*/ + unsigned background_g; /*green component of suggested background color*/ + unsigned background_b; /*blue component of suggested background color*/ + + /* + Non-international text chunks (tEXt and zTXt) + + The char** arrays each contain num strings. The actual messages are in + text_strings, while text_keys are keywords that give a short description what + the actual text represents, e.g. Title, Author, Description, or anything else. + + All the string fields below including strings, keys, names and language tags are null terminated. + The PNG specification uses null characters for the keys, names and tags, and forbids null + characters to appear in the main text which is why we can use null termination everywhere here. + + A keyword is minimum 1 character and maximum 79 characters long (plus the + additional null terminator). It's discouraged to use a single line length + longer than 79 characters for texts. + + Don't allocate these text buffers yourself. Use the init/cleanup functions + correctly and use lodepng_add_text and lodepng_clear_text. + + Standard text chunk keywords and strings are encoded using Latin-1. + */ + size_t text_num; /*the amount of texts in these char** buffers (there may be more texts in itext)*/ + char** text_keys; /*the keyword of a text chunk (e.g. "Comment")*/ + char** text_strings; /*the actual text*/ + + /* + International text chunks (iTXt) + Similar to the non-international text chunks, but with additional strings + "langtags" and "transkeys", and the following text encodings are used: + keys: Latin-1, langtags: ASCII, transkeys and strings: UTF-8. + keys must be 1-79 characters (plus the additional null terminator), the other + strings are any length. + */ + size_t itext_num; /*the amount of international texts in this PNG*/ + char** itext_keys; /*the English keyword of the text chunk (e.g. "Comment")*/ + char** itext_langtags; /*language tag for this text's language, ISO/IEC 646 string, e.g. ISO 639 language tag*/ + char** itext_transkeys; /*keyword translated to the international language - UTF-8 string*/ + char** itext_strings; /*the actual international text - UTF-8 string*/ + + /*time chunk (tIME)*/ + unsigned time_defined; /*set to 1 to make the encoder generate a tIME chunk*/ + LodePNGTime time; + + /*phys chunk (pHYs)*/ + unsigned phys_defined; /*if 0, there is no pHYs chunk and the values below are undefined, if 1 else there is one*/ + unsigned phys_x; /*pixels per unit in x direction*/ + unsigned phys_y; /*pixels per unit in y direction*/ + unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/ + + /* + Color profile related chunks: gAMA, cHRM, sRGB, iCPP + + LodePNG does not apply any color conversions on pixels in the encoder or decoder and does not interpret these color + profile values. It merely passes on the information. If you wish to use color profiles and convert colors, please + use these values with a color management library. + + See the PNG, ICC and sRGB specifications for more information about the meaning of these values. + */ + + /* gAMA chunk: optional, overridden by sRGB or iCCP if those are present. */ + unsigned gama_defined; /* Whether a gAMA chunk is present (0 = not present, 1 = present). */ + unsigned gama_gamma; /* Gamma exponent times 100000 */ + + /* cHRM chunk: optional, overridden by sRGB or iCCP if those are present. */ + unsigned chrm_defined; /* Whether a cHRM chunk is present (0 = not present, 1 = present). */ + unsigned chrm_white_x; /* White Point x times 100000 */ + unsigned chrm_white_y; /* White Point y times 100000 */ + unsigned chrm_red_x; /* Red x times 100000 */ + unsigned chrm_red_y; /* Red y times 100000 */ + unsigned chrm_green_x; /* Green x times 100000 */ + unsigned chrm_green_y; /* Green y times 100000 */ + unsigned chrm_blue_x; /* Blue x times 100000 */ + unsigned chrm_blue_y; /* Blue y times 100000 */ + + /* + sRGB chunk: optional. May not appear at the same time as iCCP. + If gAMA is also present gAMA must contain value 45455. + If cHRM is also present cHRM must contain respectively 31270,32900,64000,33000,30000,60000,15000,6000. + */ + unsigned srgb_defined; /* Whether an sRGB chunk is present (0 = not present, 1 = present). */ + unsigned srgb_intent; /* Rendering intent: 0=perceptual, 1=rel. colorimetric, 2=saturation, 3=abs. colorimetric */ + + /* + iCCP chunk: optional. May not appear at the same time as sRGB. + + LodePNG does not parse or use the ICC profile (except its color space header field for an edge case), a + separate library to handle the ICC data (not included in LodePNG) format is needed to use it for color + management and conversions. + + For encoding, if iCCP is present, gAMA and cHRM are recommended to be added as well with values that match the ICC + profile as closely as possible, if you wish to do this you should provide the correct values for gAMA and cHRM and + enable their '_defined' flags since LodePNG will not automatically compute them from the ICC profile. + + For encoding, the ICC profile is required by the PNG specification to be an "RGB" profile for non-gray + PNG color types and a "GRAY" profile for gray PNG color types. If you disable auto_convert, you must ensure + the ICC profile type matches your requested color type, else the encoder gives an error. If auto_convert is + enabled (the default), and the ICC profile is not a good match for the pixel data, this will result in an encoder + error if the pixel data has non-gray pixels for a GRAY profile, or a silent less-optimal compression of the pixel + data if the pixels could be encoded as grayscale but the ICC profile is RGB. + + To avoid this do not set an ICC profile in the image unless there is a good reason for it, and when doing so + make sure you compute it carefully to avoid the above problems. + */ + unsigned iccp_defined; /* Whether an iCCP chunk is present (0 = not present, 1 = present). */ + char* iccp_name; /* Null terminated string with profile name, 1-79 bytes */ + /* + The ICC profile in iccp_profile_size bytes. + Don't allocate this buffer yourself. Use the init/cleanup functions + correctly and use lodepng_set_icc and lodepng_clear_icc. + */ + unsigned char* iccp_profile; + unsigned iccp_profile_size; /* The size of iccp_profile in bytes */ + + /* End of color profile related chunks */ + + + /* + unknown chunks: chunks not known by LodePNG, passed on byte for byte. + + There are 3 buffers, one for each position in the PNG where unknown chunks can appear. + Each buffer contains all unknown chunks for that position consecutively. + The 3 positions are: + 0: between IHDR and PLTE, 1: between PLTE and IDAT, 2: between IDAT and IEND. + + For encoding, do not store critical chunks or known chunks that are enabled with a "_defined" flag + above in here, since the encoder will blindly follow this and could then encode an invalid PNG file + (such as one with two IHDR chunks or the disallowed combination of sRGB with iCCP). But do use + this if you wish to store an ancillary chunk that is not supported by LodePNG (such as sPLT or hIST), + or any non-standard PNG chunk. + + Do not allocate or traverse this data yourself. Use the chunk traversing functions declared + later, such as lodepng_chunk_next and lodepng_chunk_append, to read/write this struct. + */ + unsigned char* unknown_chunks_data[3]; + size_t unknown_chunks_size[3]; /*size in bytes of the unknown chunks, given for protection*/ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +} LodePNGInfo; + +/*init, cleanup and copy functions to use with this struct*/ +void lodepng_info_init(LodePNGInfo* info); +void lodepng_info_cleanup(LodePNGInfo* info); +/*return value is error code (0 means no error)*/ +unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source); + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS +unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str); /*push back both texts at once*/ +void lodepng_clear_text(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ + +unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, + const char* transkey, const char* str); /*push back the 4 texts of 1 chunk at once*/ +void lodepng_clear_itext(LodePNGInfo* info); /*use this to clear the itexts again after you filled them in*/ + +/*replaces if exists*/ +unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size); +void lodepng_clear_icc(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +/* +Converts raw buffer from one color type to another color type, based on +LodePNGColorMode structs to describe the input and output color type. +See the reference manual at the end of this header file to see which color conversions are supported. +return value = LodePNG error code (0 if all went ok, an error if the conversion isn't supported) +The out buffer must have size (w * h * bpp + 7) / 8, where bpp is the bits per pixel +of the output color type (lodepng_get_bpp). +For < 8 bpp images, there should not be padding bits at the end of scanlines. +For 16-bit per channel colors, uses big endian format like PNG does. +Return value is LodePNG error code +*/ +unsigned lodepng_convert(unsigned char* out, const unsigned char* in, + const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, + unsigned w, unsigned h); + +#ifdef LODEPNG_COMPILE_DECODER +/* +Settings for the decoder. This contains settings for the PNG and the Zlib +decoder, but not the Info settings from the Info structs. +*/ +typedef struct LodePNGDecoderSettings { + LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ + + /* Check LodePNGDecompressSettings for more ignorable errors such as ignore_adler32 */ + unsigned ignore_crc; /*ignore CRC checksums*/ + unsigned ignore_critical; /*ignore unknown critical chunks*/ + unsigned ignore_end; /*ignore issues at end of file if possible (missing IEND chunk, too large chunk, ...)*/ + /* TODO: make a system involving warnings with levels and a strict mode instead. Other potentially recoverable + errors: srgb rendering intent value, size of content of ancillary chunks, more than 79 characters for some + strings, placement/combination rules for ancillary chunks, crc of unknown chunks, allowed characters + in string keys, etc... */ + + unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/ + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + unsigned read_text_chunks; /*if false but remember_unknown_chunks is true, they're stored in the unknown chunks*/ + + /*store all bytes from unknown chunks in the LodePNGInfo (off by default, useful for a png editor)*/ + unsigned remember_unknown_chunks; + + /* maximum size for decompressed text chunks. If a text chunk's text is larger than this, an error is returned, + unless reading text chunks is disabled or this limit is set higher or disabled. Set to 0 to allow any size. + By default it is a value that prevents unreasonably large strings from hogging memory. */ + size_t max_text_size; + + /* maximum size for compressed ICC chunks. If the ICC profile is larger than this, an error will be returned. Set to + 0 to allow any size. By default this is a value that prevents ICC profiles that would be much larger than any + legitimate profile could be to hog memory. */ + size_t max_icc_size; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +} LodePNGDecoderSettings; + +void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings); +#endif /*LODEPNG_COMPILE_DECODER*/ + +#ifdef LODEPNG_COMPILE_ENCODER +/*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/ +typedef enum LodePNGFilterStrategy { + /*every filter at zero*/ + LFS_ZERO = 0, + /*every filter at 1, 2, 3 or 4 (paeth), unlike LFS_ZERO not a good choice, but for testing*/ + LFS_ONE = 1, + LFS_TWO = 2, + LFS_THREE = 3, + LFS_FOUR = 4, + /*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/ + LFS_MINSUM, + /*Use the filter type that gives smallest Shannon entropy for this scanline. Depending + on the image, this is better or worse than minsum.*/ + LFS_ENTROPY, + /* + Brute-force-search PNG filters by compressing each filter for each scanline. + Experimental, very slow, and only rarely gives better compression than MINSUM. + */ + LFS_BRUTE_FORCE, + /*use predefined_filters buffer: you specify the filter type for each scanline*/ + LFS_PREDEFINED +} LodePNGFilterStrategy; + +/*Gives characteristics about the integer RGBA colors of the image (count, alpha channel usage, bit depth, ...), +which helps decide which color model to use for encoding. +Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/ +typedef struct LodePNGColorStats { + unsigned colored; /*not grayscale*/ + unsigned key; /*image is not opaque and color key is possible instead of full alpha*/ + unsigned short key_r; /*key values, always as 16-bit, in 8-bit case the byte is duplicated, e.g. 65535 means 255*/ + unsigned short key_g; + unsigned short key_b; + unsigned alpha; /*image is not opaque and alpha channel or alpha palette required*/ + unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16 or allow_palette is disabled.*/ + unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order, only valid when numcolors is valid*/ + unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for grayscale only. 16 if 16-bit per channel required.*/ + size_t numpixels; + + /*user settings for computing/using the stats*/ + unsigned allow_palette; /*default 1. if 0, disallow choosing palette colortype in auto_choose_color, and don't count numcolors*/ + unsigned allow_greyscale; /*default 1. if 0, choose RGB or RGBA even if the image only has gray colors*/ +} LodePNGColorStats; + +void lodepng_color_stats_init(LodePNGColorStats* stats); + +/*Get a LodePNGColorStats of the image. The stats must already have been inited. +Returns error code (e.g. alloc fail) or 0 if ok.*/ +unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, + const unsigned char* image, unsigned w, unsigned h, + const LodePNGColorMode* mode_in); + +/*Settings for the encoder.*/ +typedef struct LodePNGEncoderSettings { + LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/ + + unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/ + + /*If true, follows the official PNG heuristic: if the PNG uses a palette or lower than + 8 bit depth, set all filters to zero. Otherwise use the filter_strategy. Note that to + completely follow the official PNG heuristic, filter_palette_zero must be true and + filter_strategy must be LFS_MINSUM*/ + unsigned filter_palette_zero; + /*Which filter strategy to use when not using zeroes due to filter_palette_zero. + Set filter_palette_zero to 0 to ensure always using your chosen strategy. Default: LFS_MINSUM*/ + LodePNGFilterStrategy filter_strategy; + /*used if filter_strategy is LFS_PREDEFINED. In that case, this must point to a buffer with + the same length as the amount of scanlines in the image, and each value must <= 5. You + have to cleanup this buffer, LodePNG will never free it. Don't forget that filter_palette_zero + must be set to 0 to ensure this is also used on palette or low bitdepth images.*/ + const unsigned char* predefined_filters; + + /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested palette). + If colortype is 3, PLTE is _always_ created.*/ + unsigned force_palette; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*add LodePNG identifier and version as a text chunk, for debugging*/ + unsigned add_id; + /*encode text chunks as zTXt chunks instead of tEXt chunks, and use compression in iTXt chunks*/ + unsigned text_compression; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +} LodePNGEncoderSettings; + +void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings); +#endif /*LODEPNG_COMPILE_ENCODER*/ + + +#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) +/*The settings, state and information for extended encoding and decoding.*/ +typedef struct LodePNGState { +#ifdef LODEPNG_COMPILE_DECODER + LodePNGDecoderSettings decoder; /*the decoding settings*/ +#endif /*LODEPNG_COMPILE_DECODER*/ +#ifdef LODEPNG_COMPILE_ENCODER + LodePNGEncoderSettings encoder; /*the encoding settings*/ +#endif /*LODEPNG_COMPILE_ENCODER*/ + LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/ + LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ + unsigned error; +} LodePNGState; + +/*init, cleanup and copy functions to use with this struct*/ +void lodepng_state_init(LodePNGState* state); +void lodepng_state_cleanup(LodePNGState* state); +void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source); +#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ + +#ifdef LODEPNG_COMPILE_DECODER +/* +Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings and +getting much more information about the PNG image and color mode. +*/ +unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, + LodePNGState* state, + const unsigned char* in, size_t insize); + +/* +Read the PNG header, but not the actual data. This returns only the information +that is in the IHDR chunk of the PNG, such as width, height and color type. The +information is placed in the info_png field of the LodePNGState. +*/ +unsigned lodepng_inspect(unsigned* w, unsigned* h, + LodePNGState* state, + const unsigned char* in, size_t insize); +#endif /*LODEPNG_COMPILE_DECODER*/ + +/* +Reads one metadata chunk (other than IHDR) of the PNG file and outputs what it +read in the state. Returns error code on failure. +Use lodepng_inspect first with a new state, then e.g. lodepng_chunk_find_const +to find the desired chunk type, and if non null use lodepng_inspect_chunk (with +chunk_pointer - start_of_file as pos). +Supports most metadata chunks from the PNG standard (gAMA, bKGD, tEXt, ...). +Ignores unsupported, unknown, non-metadata or IHDR chunks (without error). +Requirements: &in[pos] must point to start of a chunk, must use regular +lodepng_inspect first since format of most other chunks depends on IHDR, and if +there is a PLTE chunk, that one must be inspected before tRNS or bKGD. +*/ +unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, + const unsigned char* in, size_t insize); + +#ifdef LODEPNG_COMPILE_ENCODER +/*This function allocates the out buffer with standard malloc and stores the size in *outsize.*/ +unsigned lodepng_encode(unsigned char** out, size_t* outsize, + const unsigned char* image, unsigned w, unsigned h, + LodePNGState* state); +#endif /*LODEPNG_COMPILE_ENCODER*/ + +/* +The lodepng_chunk functions are normally not needed, except to traverse the +unknown chunks stored in the LodePNGInfo struct, or add new ones to it. +It also allows traversing the chunks of an encoded PNG file yourself. + +The chunk pointer always points to the beginning of the chunk itself, that is +the first byte of the 4 length bytes. + +In the PNG file format, chunks have the following format: +-4 bytes length: length of the data of the chunk in bytes (chunk itself is 12 bytes longer) +-4 bytes chunk type (ASCII a-z,A-Z only, see below) +-length bytes of data (may be 0 bytes if length was 0) +-4 bytes of CRC, computed on chunk name + data + +The first chunk starts at the 8th byte of the PNG file, the entire rest of the file +exists out of concatenated chunks with the above format. + +PNG standard chunk ASCII naming conventions: +-First byte: uppercase = critical, lowercase = ancillary +-Second byte: uppercase = public, lowercase = private +-Third byte: must be uppercase +-Fourth byte: uppercase = unsafe to copy, lowercase = safe to copy +*/ + +/* +Gets the length of the data of the chunk. Total chunk length has 12 bytes more. +There must be at least 4 bytes to read from. If the result value is too large, +it may be corrupt data. +*/ +unsigned lodepng_chunk_length(const unsigned char* chunk); + +/*puts the 4-byte type in null terminated string*/ +void lodepng_chunk_type(char type[5], const unsigned char* chunk); + +/*check if the type is the given type*/ +unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type); + +/*0: it's one of the critical chunk types, 1: it's an ancillary chunk (see PNG standard)*/ +unsigned char lodepng_chunk_ancillary(const unsigned char* chunk); + +/*0: public, 1: private (see PNG standard)*/ +unsigned char lodepng_chunk_private(const unsigned char* chunk); + +/*0: the chunk is unsafe to copy, 1: the chunk is safe to copy (see PNG standard)*/ +unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk); + +/*get pointer to the data of the chunk, where the input points to the header of the chunk*/ +unsigned char* lodepng_chunk_data(unsigned char* chunk); +const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk); + +/*returns 0 if the crc is correct, 1 if it's incorrect (0 for OK as usual!)*/ +unsigned lodepng_chunk_check_crc(const unsigned char* chunk); + +/*generates the correct CRC from the data and puts it in the last 4 bytes of the chunk*/ +void lodepng_chunk_generate_crc(unsigned char* chunk); + +/* +Iterate to next chunks, allows iterating through all chunks of the PNG file. +Input must be at the beginning of a chunk (result of a previous lodepng_chunk_next call, +or the 8th byte of a PNG file which always has the first chunk), or alternatively may +point to the first byte of the PNG file (which is not a chunk but the magic header, the +function will then skip over it and return the first real chunk). +Will output pointer to the start of the next chunk, or at or beyond end of the file if there +is no more chunk after this or possibly if the chunk is corrupt. +Start this process at the 8th byte of the PNG file. +In a non-corrupt PNG file, the last chunk should have name "IEND". +*/ +unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end); +const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end); + +/*Finds the first chunk with the given type in the range [chunk, end), or returns NULL if not found.*/ +unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]); +const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]); + +/* +Appends chunk to the data in out. The given chunk should already have its chunk header. +The out variable and outsize are updated to reflect the new reallocated buffer. +Returns error code (0 if it went ok) +*/ +unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk); + +/* +Appends new chunk to out. The chunk to append is given by giving its length, type +and data separately. The type is a 4-letter string. +The out variable and outsize are updated to reflect the new reallocated buffer. +Returne error code (0 if it went ok) +*/ +unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length, + const char* type, const unsigned char* data); + + +/*Calculate CRC32 of buffer*/ +unsigned lodepng_crc32(const unsigned char* buf, size_t len); +#endif /*LODEPNG_COMPILE_PNG*/ + + +#ifdef LODEPNG_COMPILE_ZLIB +/* +This zlib part can be used independently to zlib compress and decompress a +buffer. It cannot be used to create gzip files however, and it only supports the +part of zlib that is required for PNG, it does not support dictionaries. +*/ + +#ifdef LODEPNG_COMPILE_DECODER +/*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer must be freed after use.*/ +unsigned lodepng_inflate(unsigned char** out, size_t* outsize, + const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings); + +/* +Decompresses Zlib data. Reallocates the out buffer and appends the data. The +data must be according to the zlib specification. +Either, *out must be NULL and *outsize must be 0, or, *out must be a valid +buffer and *outsize its size in bytes. out must be freed by user after usage. +*/ +unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, + const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings); +#endif /*LODEPNG_COMPILE_DECODER*/ + +#ifdef LODEPNG_COMPILE_ENCODER +/* +Compresses data with Zlib. Reallocates the out buffer and appends the data. +Zlib adds a small header and trailer around the deflate data. +The data is output in the format of the zlib specification. +Either, *out must be NULL and *outsize must be 0, or, *out must be a valid +buffer and *outsize its size in bytes. out must be freed by user after usage. +*/ +unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, + const unsigned char* in, size_t insize, + const LodePNGCompressSettings* settings); + +/* +Find length-limited Huffman code for given frequencies. This function is in the +public interface only for tests, it's used internally by lodepng_deflate. +*/ +unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies, + size_t numcodes, unsigned maxbitlen); + +/*Compress a buffer with deflate. See RFC 1951. Out buffer must be freed after use.*/ +unsigned lodepng_deflate(unsigned char** out, size_t* outsize, + const unsigned char* in, size_t insize, + const LodePNGCompressSettings* settings); + +#endif /*LODEPNG_COMPILE_ENCODER*/ +#endif /*LODEPNG_COMPILE_ZLIB*/ + +#ifdef LODEPNG_COMPILE_DISK +/* +Load a file from disk into buffer. The function allocates the out buffer, and +after usage you should free it. +out: output parameter, contains pointer to loaded buffer. +outsize: output parameter, size of the allocated out buffer +filename: the path to the file to load +return value: error code (0 means ok) +*/ +unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename); + +/* +Save a file from buffer to disk. Warning, if it exists, this function overwrites +the file without warning! +buffer: the buffer to write +buffersize: size of the buffer to write +filename: the path to the file to save to +return value: error code (0 means ok) +*/ +unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename); +#endif /*LODEPNG_COMPILE_DISK*/ + +#ifdef LODEPNG_COMPILE_CPP +/* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */ +namespace lodepng { +#ifdef LODEPNG_COMPILE_PNG +class State : public LodePNGState { + public: + State(); + State(const State& other); + ~State(); + State& operator=(const State& other); +}; + +#ifdef LODEPNG_COMPILE_DECODER +/* Same as other lodepng::decode, but using a State for more settings and information. */ +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + State& state, + const unsigned char* in, size_t insize); +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + State& state, + const std::vector& in); +#endif /*LODEPNG_COMPILE_DECODER*/ + +#ifdef LODEPNG_COMPILE_ENCODER +/* Same as other lodepng::encode, but using a State for more settings and information. */ +unsigned encode(std::vector& out, + const unsigned char* in, unsigned w, unsigned h, + State& state); +unsigned encode(std::vector& out, + const std::vector& in, unsigned w, unsigned h, + State& state); +#endif /*LODEPNG_COMPILE_ENCODER*/ + +#ifdef LODEPNG_COMPILE_DISK +/* +Load a file from disk into an std::vector. +return value: error code (0 means ok) +*/ +unsigned load_file(std::vector& buffer, const std::string& filename); + +/* +Save the binary data in an std::vector to a file on disk. The file is overwritten +without warning. +*/ +unsigned save_file(const std::vector& buffer, const std::string& filename); +#endif /* LODEPNG_COMPILE_DISK */ +#endif /* LODEPNG_COMPILE_PNG */ + +#ifdef LODEPNG_COMPILE_ZLIB +#ifdef LODEPNG_COMPILE_DECODER +/* Zlib-decompress an unsigned char buffer */ +unsigned decompress(std::vector& out, const unsigned char* in, size_t insize, + const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings); + +/* Zlib-decompress an std::vector */ +unsigned decompress(std::vector& out, const std::vector& in, + const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings); +#endif /* LODEPNG_COMPILE_DECODER */ + +#ifdef LODEPNG_COMPILE_ENCODER +/* Zlib-compress an unsigned char buffer */ +unsigned compress(std::vector& out, const unsigned char* in, size_t insize, + const LodePNGCompressSettings& settings = lodepng_default_compress_settings); + +/* Zlib-compress an std::vector */ +unsigned compress(std::vector& out, const std::vector& in, + const LodePNGCompressSettings& settings = lodepng_default_compress_settings); +#endif /* LODEPNG_COMPILE_ENCODER */ +#endif /* LODEPNG_COMPILE_ZLIB */ +} /* namespace lodepng */ +#endif /*LODEPNG_COMPILE_CPP*/ + +/* +TODO: +[.] test if there are no memory leaks or security exploits - done a lot but needs to be checked often +[.] check compatibility with various compilers - done but needs to be redone for every newer version +[X] converting color to 16-bit per channel types +[X] support color profile chunk types (but never let them touch RGB values by default) +[ ] support all public PNG chunk types (almost done except sBIT, sPLT and hIST) +[ ] make sure encoder generates no chunks with size > (2^31)-1 +[ ] partial decoding (stream processing) +[X] let the "isFullyOpaque" function check color keys and transparent palettes too +[X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl" +[ ] allow treating some errors like warnings, when image is recoverable (e.g. 69, 57, 58) +[ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in text, ... +[ ] error messages with line numbers (and version) +[ ] errors in state instead of as return code? +[ ] new errors/warnings like suspiciously big decompressed ztxt or iccp chunk +[ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes +[ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ... +[ ] allow user to give data (void*) to custom allocator +[X] provide alternatives for C library functions not present on some platforms (memcpy, ...) +*/ + +#endif /*LODEPNG_H inclusion guard*/ + +/* +LodePNG Documentation +--------------------- + +0. table of contents +-------------------- + + 1. about + 1.1. supported features + 1.2. features not supported + 2. C and C++ version + 3. security + 4. decoding + 5. encoding + 6. color conversions + 6.1. PNG color types + 6.2. color conversions + 6.3. padding bits + 6.4. A note about 16-bits per channel and endianness + 7. error values + 8. chunks and PNG editing + 9. compiler support + 10. examples + 10.1. decoder C++ example + 10.2. decoder C example + 11. state settings reference + 12. changes + 13. contact information + + +1. about +-------- + +PNG is a file format to store raster images losslessly with good compression, +supporting different color types and alpha channel. + +LodePNG is a PNG codec according to the Portable Network Graphics (PNG) +Specification (Second Edition) - W3C Recommendation 10 November 2003. + +The specifications used are: + +*) Portable Network Graphics (PNG) Specification (Second Edition): + http://www.w3.org/TR/2003/REC-PNG-20031110 +*) RFC 1950 ZLIB Compressed Data Format version 3.3: + http://www.gzip.org/zlib/rfc-zlib.html +*) RFC 1951 DEFLATE Compressed Data Format Specification ver 1.3: + http://www.gzip.org/zlib/rfc-deflate.html + +The most recent version of LodePNG can currently be found at +http://lodev.org/lodepng/ + +LodePNG works both in C (ISO C90) and C++, with a C++ wrapper that adds +extra functionality. + +LodePNG exists out of two files: +-lodepng.h: the header file for both C and C++ +-lodepng.c(pp): give it the name lodepng.c or lodepng.cpp (or .cc) depending on your usage + +If you want to start using LodePNG right away without reading this doc, get the +examples from the LodePNG website to see how to use it in code, or check the +smaller examples in chapter 13 here. + +LodePNG is simple but only supports the basic requirements. To achieve +simplicity, the following design choices were made: There are no dependencies +on any external library. There are functions to decode and encode a PNG with +a single function call, and extended versions of these functions taking a +LodePNGState struct allowing to specify or get more information. By default +the colors of the raw image are always RGB or RGBA, no matter what color type +the PNG file uses. To read and write files, there are simple functions to +convert the files to/from buffers in memory. + +This all makes LodePNG suitable for loading textures in games, demos and small +programs, ... It's less suitable for full fledged image editors, loading PNGs +over network (it requires all the image data to be available before decoding can +begin), life-critical systems, ... + +1.1. supported features +----------------------- + +The following features are supported by the decoder: + +*) decoding of PNGs with any color type, bit depth and interlace mode, to a 24- or 32-bit color raw image, + or the same color type as the PNG +*) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same color type as the raw image +*) Adam7 interlace and deinterlace for any color type +*) loading the image from harddisk or decoding it from a buffer from other sources than harddisk +*) support for alpha channels, including RGBA color model, translucent palettes and color keying +*) zlib decompression (inflate) +*) zlib compression (deflate) +*) CRC32 and ADLER32 checksums +*) colorimetric color profile conversions: currently experimentally available in lodepng_util.cpp only, + plus alternatively ability to pass on chroma/gamma/ICC profile information to other color management system. +*) handling of unknown chunks, allowing making a PNG editor that stores custom and unknown chunks. +*) the following chunks are supported by both encoder and decoder: + IHDR: header information + PLTE: color palette + IDAT: pixel data + IEND: the final chunk + tRNS: transparency for palettized images + tEXt: textual information + zTXt: compressed textual information + iTXt: international textual information + bKGD: suggested background color + pHYs: physical dimensions + tIME: modification time + cHRM: RGB chromaticities + gAMA: RGB gamma correction + iCCP: ICC color profile + sRGB: rendering intent + +1.2. features not supported +--------------------------- + +The following features are _not_ supported: + +*) some features needed to make a conformant PNG-Editor might be still missing. +*) partial loading/stream processing. All data must be available and is processed in one call. +*) The following public chunks are not (yet) supported but treated as unknown chunks by LodePNG: + sBIT + hIST + sPLT + + +2. C and C++ version +-------------------- + +The C version uses buffers allocated with alloc that you need to free() +yourself. You need to use init and cleanup functions for each struct whenever +using a struct from the C version to avoid exploits and memory leaks. + +The C++ version has extra functions with std::vectors in the interface and the +lodepng::State class which is a LodePNGState with constructor and destructor. + +These files work without modification for both C and C++ compilers because all +the additional C++ code is in "#ifdef __cplusplus" blocks that make C-compilers +ignore it, and the C code is made to compile both with strict ISO C90 and C++. + +To use the C++ version, you need to rename the source file to lodepng.cpp +(instead of lodepng.c), and compile it with a C++ compiler. + +To use the C version, you need to rename the source file to lodepng.c (instead +of lodepng.cpp), and compile it with a C compiler. + + +3. Security +----------- + +Even if carefully designed, it's always possible that LodePNG contains possible +exploits. If you discover one, please let me know, and it will be fixed. + +When using LodePNG, care has to be taken with the C version of LodePNG, as well +as the C-style structs when working with C++. The following conventions are used +for all C-style structs: + +-if a struct has a corresponding init function, always call the init function when making a new one +-if a struct has a corresponding cleanup function, call it before the struct disappears to avoid memory leaks +-if a struct has a corresponding copy function, use the copy function instead of "=". + The destination must also be inited already. + + +4. Decoding +----------- + +Decoding converts a PNG compressed image to a raw pixel buffer. + +Most documentation on using the decoder is at its declarations in the header +above. For C, simple decoding can be done with functions such as +lodepng_decode32, and more advanced decoding can be done with the struct +LodePNGState and lodepng_decode. For C++, all decoding can be done with the +various lodepng::decode functions, and lodepng::State can be used for advanced +features. + +When using the LodePNGState, it uses the following fields for decoding: +*) LodePNGInfo info_png: it stores extra information about the PNG (the input) in here +*) LodePNGColorMode info_raw: here you can say what color mode of the raw image (the output) you want to get +*) LodePNGDecoderSettings decoder: you can specify a few extra settings for the decoder to use + +LodePNGInfo info_png +-------------------- + +After decoding, this contains extra information of the PNG image, except the actual +pixels, width and height because these are already gotten directly from the decoder +functions. + +It contains for example the original color type of the PNG image, text comments, +suggested background color, etc... More details about the LodePNGInfo struct are +at its declaration documentation. + +LodePNGColorMode info_raw +------------------------- + +When decoding, here you can specify which color type you want +the resulting raw image to be. If this is different from the colortype of the +PNG, then the decoder will automatically convert the result. This conversion +always works, except if you want it to convert a color PNG to grayscale or to +a palette with missing colors. + +By default, 32-bit color is used for the result. + +LodePNGDecoderSettings decoder +------------------------------ + +The settings can be used to ignore the errors created by invalid CRC and Adler32 +chunks, and to disable the decoding of tEXt chunks. + +There's also a setting color_convert, true by default. If false, no conversion +is done, the resulting data will be as it was in the PNG (after decompression) +and you'll have to puzzle the colors of the pixels together yourself using the +color type information in the LodePNGInfo. + + +5. Encoding +----------- + +Encoding converts a raw pixel buffer to a PNG compressed image. + +Most documentation on using the encoder is at its declarations in the header +above. For C, simple encoding can be done with functions such as +lodepng_encode32, and more advanced decoding can be done with the struct +LodePNGState and lodepng_encode. For C++, all encoding can be done with the +various lodepng::encode functions, and lodepng::State can be used for advanced +features. + +Like the decoder, the encoder can also give errors. However it gives less errors +since the encoder input is trusted, the decoder input (a PNG image that could +be forged by anyone) is not trusted. + +When using the LodePNGState, it uses the following fields for encoding: +*) LodePNGInfo info_png: here you specify how you want the PNG (the output) to be. +*) LodePNGColorMode info_raw: here you say what color type of the raw image (the input) has +*) LodePNGEncoderSettings encoder: you can specify a few settings for the encoder to use + +LodePNGInfo info_png +-------------------- + +When encoding, you use this the opposite way as when decoding: for encoding, +you fill in the values you want the PNG to have before encoding. By default it's +not needed to specify a color type for the PNG since it's automatically chosen, +but it's possible to choose it yourself given the right settings. + +The encoder will not always exactly match the LodePNGInfo struct you give, +it tries as close as possible. Some things are ignored by the encoder. The +encoder uses, for example, the following settings from it when applicable: +colortype and bitdepth, text chunks, time chunk, the color key, the palette, the +background color, the interlace method, unknown chunks, ... + +When encoding to a PNG with colortype 3, the encoder will generate a PLTE chunk. +If the palette contains any colors for which the alpha channel is not 255 (so +there are translucent colors in the palette), it'll add a tRNS chunk. + +LodePNGColorMode info_raw +------------------------- + +You specify the color type of the raw image that you give to the input here, +including a possible transparent color key and palette you happen to be using in +your raw image data. + +By default, 32-bit color is assumed, meaning your input has to be in RGBA +format with 4 bytes (unsigned chars) per pixel. + +LodePNGEncoderSettings encoder +------------------------------ + +The following settings are supported (some are in sub-structs): +*) auto_convert: when this option is enabled, the encoder will +automatically choose the smallest possible color mode (including color key) that +can encode the colors of all pixels without information loss. +*) btype: the block type for LZ77. 0 = uncompressed, 1 = fixed huffman tree, + 2 = dynamic huffman tree (best compression). Should be 2 for proper + compression. +*) use_lz77: whether or not to use LZ77 for compressed block types. Should be + true for proper compression. +*) windowsize: the window size used by the LZ77 encoder (1 - 32768). Has value + 2048 by default, but can be set to 32768 for better, but slow, compression. +*) force_palette: if colortype is 2 or 6, you can make the encoder write a PLTE + chunk if force_palette is true. This can used as suggested palette to convert + to by viewers that don't support more than 256 colors (if those still exist) +*) add_id: add text chunk "Encoder: LodePNG " to the image. +*) text_compression: default 1. If 1, it'll store texts as zTXt instead of tEXt chunks. + zTXt chunks use zlib compression on the text. This gives a smaller result on + large texts but a larger result on small texts (such as a single program name). + It's all tEXt or all zTXt though, there's no separate setting per text yet. + + +6. color conversions +-------------------- + +An important thing to note about LodePNG, is that the color type of the PNG, and +the color type of the raw image, are completely independent. By default, when +you decode a PNG, you get the result as a raw image in the color type you want, +no matter whether the PNG was encoded with a palette, grayscale or RGBA color. +And if you encode an image, by default LodePNG will automatically choose the PNG +color type that gives good compression based on the values of colors and amount +of colors in the image. It can be configured to let you control it instead as +well, though. + +To be able to do this, LodePNG does conversions from one color mode to another. +It can convert from almost any color type to any other color type, except the +following conversions: RGB to grayscale is not supported, and converting to a +palette when the palette doesn't have a required color is not supported. This is +not supported on purpose: this is information loss which requires a color +reduction algorithm that is beyond the scope of a PNG encoder (yes, RGB to gray +is easy, but there are multiple ways if you want to give some channels more +weight). + +By default, when decoding, you get the raw image in 32-bit RGBA or 24-bit RGB +color, no matter what color type the PNG has. And by default when encoding, +LodePNG automatically picks the best color model for the output PNG, and expects +the input image to be 32-bit RGBA or 24-bit RGB. So, unless you want to control +the color format of the images yourself, you can skip this chapter. + +6.1. PNG color types +-------------------- + +A PNG image can have many color types, ranging from 1-bit color to 64-bit color, +as well as palettized color modes. After the zlib decompression and unfiltering +in the PNG image is done, the raw pixel data will have that color type and thus +a certain amount of bits per pixel. If you want the output raw image after +decoding to have another color type, a conversion is done by LodePNG. + +The PNG specification gives the following color types: + +0: grayscale, bit depths 1, 2, 4, 8, 16 +2: RGB, bit depths 8 and 16 +3: palette, bit depths 1, 2, 4 and 8 +4: grayscale with alpha, bit depths 8 and 16 +6: RGBA, bit depths 8 and 16 + +Bit depth is the amount of bits per pixel per color channel. So the total amount +of bits per pixel is: amount of channels * bitdepth. + +6.2. color conversions +---------------------- + +As explained in the sections about the encoder and decoder, you can specify +color types and bit depths in info_png and info_raw to change the default +behaviour. + +If, when decoding, you want the raw image to be something else than the default, +you need to set the color type and bit depth you want in the LodePNGColorMode, +or the parameters colortype and bitdepth of the simple decoding function. + +If, when encoding, you use another color type than the default in the raw input +image, you need to specify its color type and bit depth in the LodePNGColorMode +of the raw image, or use the parameters colortype and bitdepth of the simple +encoding function. + +If, when encoding, you don't want LodePNG to choose the output PNG color type +but control it yourself, you need to set auto_convert in the encoder settings +to false, and specify the color type you want in the LodePNGInfo of the +encoder (including palette: it can generate a palette if auto_convert is true, +otherwise not). + +If the input and output color type differ (whether user chosen or auto chosen), +LodePNG will do a color conversion, which follows the rules below, and may +sometimes result in an error. + +To avoid some confusion: +-the decoder converts from PNG to raw image +-the encoder converts from raw image to PNG +-the colortype and bitdepth in LodePNGColorMode info_raw, are those of the raw image +-the colortype and bitdepth in the color field of LodePNGInfo info_png, are those of the PNG +-when encoding, the color type in LodePNGInfo is ignored if auto_convert + is enabled, it is automatically generated instead +-when decoding, the color type in LodePNGInfo is set by the decoder to that of the original + PNG image, but it can be ignored since the raw image has the color type you requested instead +-if the color type of the LodePNGColorMode and PNG image aren't the same, a conversion + between the color types is done if the color types are supported. If it is not + supported, an error is returned. If the types are the same, no conversion is done. +-even though some conversions aren't supported, LodePNG supports loading PNGs from any + colortype and saving PNGs to any colortype, sometimes it just requires preparing + the raw image correctly before encoding. +-both encoder and decoder use the same color converter. + +The function lodepng_convert does the color conversion. It is available in the +interface but normally isn't needed since the encoder and decoder already call +it. + +Non supported color conversions: +-color to grayscale when non-gray pixels are present: no error is thrown, but +the result will look ugly because only the red channel is taken (it assumes all +three channels are the same in this case so ignores green and blue). The reason +no error is given is to allow converting from three-channel grayscale images to +one-channel even if there are numerical imprecisions. +-anything to palette when the palette does not have an exact match for a from-color +in it: in this case an error is thrown + +Supported color conversions: +-anything to 8-bit RGB, 8-bit RGBA, 16-bit RGB, 16-bit RGBA +-any gray or gray+alpha, to gray or gray+alpha +-anything to a palette, as long as the palette has the requested colors in it +-removing alpha channel +-higher to smaller bitdepth, and vice versa + +If you want no color conversion to be done (e.g. for speed or control): +-In the encoder, you can make it save a PNG with any color type by giving the +raw color mode and LodePNGInfo the same color mode, and setting auto_convert to +false. +-In the decoder, you can make it store the pixel data in the same color type +as the PNG has, by setting the color_convert setting to false. Settings in +info_raw are then ignored. + +6.3. padding bits +----------------- + +In the PNG file format, if a less than 8-bit per pixel color type is used and the scanlines +have a bit amount that isn't a multiple of 8, then padding bits are used so that each +scanline starts at a fresh byte. But that is NOT true for the LodePNG raw input and output. +The raw input image you give to the encoder, and the raw output image you get from the decoder +will NOT have these padding bits, e.g. in the case of a 1-bit image with a width +of 7 pixels, the first pixel of the second scanline will the 8th bit of the first byte, +not the first bit of a new byte. + +6.4. A note about 16-bits per channel and endianness +---------------------------------------------------- + +LodePNG uses unsigned char arrays for 16-bit per channel colors too, just like +for any other color format. The 16-bit values are stored in big endian (most +significant byte first) in these arrays. This is the opposite order of the +little endian used by x86 CPU's. + +LodePNG always uses big endian because the PNG file format does so internally. +Conversions to other formats than PNG uses internally are not supported by +LodePNG on purpose, there are myriads of formats, including endianness of 16-bit +colors, the order in which you store R, G, B and A, and so on. Supporting and +converting to/from all that is outside the scope of LodePNG. + +This may mean that, depending on your use case, you may want to convert the big +endian output of LodePNG to little endian with a for loop. This is certainly not +always needed, many applications and libraries support big endian 16-bit colors +anyway, but it means you cannot simply cast the unsigned char* buffer to an +unsigned short* buffer on x86 CPUs. + + +7. error values +--------------- + +All functions in LodePNG that return an error code, return 0 if everything went +OK, or a non-zero code if there was an error. + +The meaning of the LodePNG error values can be retrieved with the function +lodepng_error_text: given the numerical error code, it returns a description +of the error in English as a string. + +Check the implementation of lodepng_error_text to see the meaning of each code. + +It is not recommended to use the numerical values to programmatically make +different decisions based on error types as the numbers are not guaranteed to +stay backwards compatible. They are for human consumption only. Programmatically +only 0 or non-0 matter. + + +8. chunks and PNG editing +------------------------- + +If you want to add extra chunks to a PNG you encode, or use LodePNG for a PNG +editor that should follow the rules about handling of unknown chunks, or if your +program is able to read other types of chunks than the ones handled by LodePNG, +then that's possible with the chunk functions of LodePNG. + +A PNG chunk has the following layout: + +4 bytes length +4 bytes type name +length bytes data +4 bytes CRC + +8.1. iterating through chunks +----------------------------- + +If you have a buffer containing the PNG image data, then the first chunk (the +IHDR chunk) starts at byte number 8 of that buffer. The first 8 bytes are the +signature of the PNG and are not part of a chunk. But if you start at byte 8 +then you have a chunk, and can check the following things of it. + +NOTE: none of these functions check for memory buffer boundaries. To avoid +exploits, always make sure the buffer contains all the data of the chunks. +When using lodepng_chunk_next, make sure the returned value is within the +allocated memory. + +unsigned lodepng_chunk_length(const unsigned char* chunk): + +Get the length of the chunk's data. The total chunk length is this length + 12. + +void lodepng_chunk_type(char type[5], const unsigned char* chunk): +unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type): + +Get the type of the chunk or compare if it's a certain type + +unsigned char lodepng_chunk_critical(const unsigned char* chunk): +unsigned char lodepng_chunk_private(const unsigned char* chunk): +unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk): + +Check if the chunk is critical in the PNG standard (only IHDR, PLTE, IDAT and IEND are). +Check if the chunk is private (public chunks are part of the standard, private ones not). +Check if the chunk is safe to copy. If it's not, then, when modifying data in a critical +chunk, unsafe to copy chunks of the old image may NOT be saved in the new one if your +program doesn't handle that type of unknown chunk. + +unsigned char* lodepng_chunk_data(unsigned char* chunk): +const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk): + +Get a pointer to the start of the data of the chunk. + +unsigned lodepng_chunk_check_crc(const unsigned char* chunk): +void lodepng_chunk_generate_crc(unsigned char* chunk): + +Check if the crc is correct or generate a correct one. + +unsigned char* lodepng_chunk_next(unsigned char* chunk): +const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk): + +Iterate to the next chunk. This works if you have a buffer with consecutive chunks. Note that these +functions do no boundary checking of the allocated data whatsoever, so make sure there is enough +data available in the buffer to be able to go to the next chunk. + +unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk): +unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length, + const char* type, const unsigned char* data): + +These functions are used to create new chunks that are appended to the data in *out that has +length *outsize. The append function appends an existing chunk to the new data. The create +function creates a new chunk with the given parameters and appends it. Type is the 4-letter +name of the chunk. + +8.2. chunks in info_png +----------------------- + +The LodePNGInfo struct contains fields with the unknown chunk in it. It has 3 +buffers (each with size) to contain 3 types of unknown chunks: +the ones that come before the PLTE chunk, the ones that come between the PLTE +and the IDAT chunks, and the ones that come after the IDAT chunks. +It's necessary to make the distinction between these 3 cases because the PNG +standard forces to keep the ordering of unknown chunks compared to the critical +chunks, but does not force any other ordering rules. + +info_png.unknown_chunks_data[0] is the chunks before PLTE +info_png.unknown_chunks_data[1] is the chunks after PLTE, before IDAT +info_png.unknown_chunks_data[2] is the chunks after IDAT + +The chunks in these 3 buffers can be iterated through and read by using the same +way described in the previous subchapter. + +When using the decoder to decode a PNG, you can make it store all unknown chunks +if you set the option settings.remember_unknown_chunks to 1. By default, this +option is off (0). + +The encoder will always encode unknown chunks that are stored in the info_png. +If you need it to add a particular chunk that isn't known by LodePNG, you can +use lodepng_chunk_append or lodepng_chunk_create to the chunk data in +info_png.unknown_chunks_data[x]. + +Chunks that are known by LodePNG should not be added in that way. E.g. to make +LodePNG add a bKGD chunk, set background_defined to true and add the correct +parameters there instead. + + +9. compiler support +------------------- + +No libraries other than the current standard C library are needed to compile +LodePNG. For the C++ version, only the standard C++ library is needed on top. +Add the files lodepng.c(pp) and lodepng.h to your project, include +lodepng.h where needed, and your program can read/write PNG files. + +It is compatible with C90 and up, and C++03 and up. + +If performance is important, use optimization when compiling! For both the +encoder and decoder, this makes a large difference. + +Make sure that LodePNG is compiled with the same compiler of the same version +and with the same settings as the rest of the program, or the interfaces with +std::vectors and std::strings in C++ can be incompatible. + +CHAR_BITS must be 8 or higher, because LodePNG uses unsigned chars for octets. + +*) gcc and g++ + +LodePNG is developed in gcc so this compiler is natively supported. It gives no +warnings with compiler options "-Wall -Wextra -pedantic -ansi", with gcc and g++ +version 4.7.1 on Linux, 32-bit and 64-bit. + +*) Clang + +Fully supported and warning-free. + +*) Mingw + +The Mingw compiler (a port of gcc for Windows) should be fully supported by +LodePNG. + +*) Visual Studio and Visual C++ Express Edition + +LodePNG should be warning-free with warning level W4. Two warnings were disabled +with pragmas though: warning 4244 about implicit conversions, and warning 4996 +where it wants to use a non-standard function fopen_s instead of the standard C +fopen. + +Visual Studio may want "stdafx.h" files to be included in each source file and +give an error "unexpected end of file while looking for precompiled header". +This is not standard C++ and will not be added to the stock LodePNG. You can +disable it for lodepng.cpp only by right clicking it, Properties, C/C++, +Precompiled Headers, and set it to Not Using Precompiled Headers there. + +NOTE: Modern versions of VS should be fully supported, but old versions, e.g. +VS6, are not guaranteed to work. + +*) Compilers on Macintosh + +LodePNG has been reported to work both with gcc and LLVM for Macintosh, both for +C and C++. + +*) Other Compilers + +If you encounter problems on any compilers, feel free to let me know and I may +try to fix it if the compiler is modern and standards compliant. + + +10. examples +------------ + +This decoder example shows the most basic usage of LodePNG. More complex +examples can be found on the LodePNG website. + +10.1. decoder C++ example +------------------------- + +#include "lodepng.h" +#include + +int main(int argc, char *argv[]) { + const char* filename = argc > 1 ? argv[1] : "test.png"; + + //load and decode + std::vector image; + unsigned width, height; + unsigned error = lodepng::decode(image, width, height, filename); + + //if there's an error, display it + if(error) std::cout << "decoder error " << error << ": " << lodepng_error_text(error) << std::endl; + + //the pixels are now in the vector "image", 4 bytes per pixel, ordered RGBARGBA..., use it as texture, draw it, ... +} + +10.2. decoder C example +----------------------- + +#include "lodepng.h" + +int main(int argc, char *argv[]) { + unsigned error; + unsigned char* image; + size_t width, height; + const char* filename = argc > 1 ? argv[1] : "test.png"; + + error = lodepng_decode32_file(&image, &width, &height, filename); + + if(error) printf("decoder error %u: %s\n", error, lodepng_error_text(error)); + + / * use image here * / + + free(image); + return 0; +} + +11. state settings reference +---------------------------- + +A quick reference of some settings to set on the LodePNGState + +For decoding: + +state.decoder.zlibsettings.ignore_adler32: ignore ADLER32 checksums +state.decoder.zlibsettings.custom_...: use custom inflate function +state.decoder.ignore_crc: ignore CRC checksums +state.decoder.ignore_critical: ignore unknown critical chunks +state.decoder.ignore_end: ignore missing IEND chunk. May fail if this corruption causes other errors +state.decoder.color_convert: convert internal PNG color to chosen one +state.decoder.read_text_chunks: whether to read in text metadata chunks +state.decoder.remember_unknown_chunks: whether to read in unknown chunks +state.info_raw.colortype: desired color type for decoded image +state.info_raw.bitdepth: desired bit depth for decoded image +state.info_raw....: more color settings, see struct LodePNGColorMode +state.info_png....: no settings for decoder but ouput, see struct LodePNGInfo + +For encoding: + +state.encoder.zlibsettings.btype: disable compression by setting it to 0 +state.encoder.zlibsettings.use_lz77: use LZ77 in compression +state.encoder.zlibsettings.windowsize: tweak LZ77 windowsize +state.encoder.zlibsettings.minmatch: tweak min LZ77 length to match +state.encoder.zlibsettings.nicematch: tweak LZ77 match where to stop searching +state.encoder.zlibsettings.lazymatching: try one more LZ77 matching +state.encoder.zlibsettings.custom_...: use custom deflate function +state.encoder.auto_convert: choose optimal PNG color type, if 0 uses info_png +state.encoder.filter_palette_zero: PNG filter strategy for palette +state.encoder.filter_strategy: PNG filter strategy to encode with +state.encoder.force_palette: add palette even if not encoding to one +state.encoder.add_id: add LodePNG identifier and version as a text chunk +state.encoder.text_compression: use compressed text chunks for metadata +state.info_raw.colortype: color type of raw input image you provide +state.info_raw.bitdepth: bit depth of raw input image you provide +state.info_raw: more color settings, see struct LodePNGColorMode +state.info_png.color.colortype: desired color type if auto_convert is false +state.info_png.color.bitdepth: desired bit depth if auto_convert is false +state.info_png.color....: more color settings, see struct LodePNGColorMode +state.info_png....: more PNG related settings, see struct LodePNGInfo + + +12. changes +----------- + +The version number of LodePNG is the date of the change given in the format +yyyymmdd. + +Some changes aren't backwards compatible. Those are indicated with a (!) +symbol. + +Not all changes are listed here, the commit history in github lists more: +https://github.com/lvandeve/lodepng + +*) 17 okt 2020: prevent decoding too large text/icc chunks by default. +*) 06 mar 2020: simplified some of the dynamic memory allocations. +*) 12 jan 2020: (!) added 'end' argument to lodepng_chunk_next to allow correct + overflow checks. +*) 14 aug 2019: around 25% faster decoding thanks to huffman lookup tables. +*) 15 jun 2019: (!) auto_choose_color API changed (for bugfix: don't use palette + if gray ICC profile) and non-ICC LodePNGColorProfile renamed to + LodePNGColorStats. +*) 30 dec 2018: code style changes only: removed newlines before opening braces. +*) 10 sep 2018: added way to inspect metadata chunks without full decoding. +*) 19 aug 2018: (!) fixed color mode bKGD is encoded with and made it use + palette index in case of palette. +*) 10 aug 2018: (!) added support for gAMA, cHRM, sRGB and iCCP chunks. This + change is backwards compatible unless you relied on unknown_chunks for those. +*) 11 jun 2018: less restrictive check for pixel size integer overflow +*) 14 jan 2018: allow optionally ignoring a few more recoverable errors +*) 17 sep 2017: fix memory leak for some encoder input error cases +*) 27 nov 2016: grey+alpha auto color model detection bugfix +*) 18 apr 2016: Changed qsort to custom stable sort (for platforms w/o qsort). +*) 09 apr 2016: Fixed colorkey usage detection, and better file loading (within + the limits of pure C90). +*) 08 dec 2015: Made load_file function return error if file can't be opened. +*) 24 okt 2015: Bugfix with decoding to palette output. +*) 18 apr 2015: Boundary PM instead of just package-merge for faster encoding. +*) 24 aug 2014: Moved to github +*) 23 aug 2014: Reduced needless memory usage of decoder. +*) 28 jun 2014: Removed fix_png setting, always support palette OOB for + simplicity. Made ColorProfile public. +*) 09 jun 2014: Faster encoder by fixing hash bug and more zeros optimization. +*) 22 dec 2013: Power of two windowsize required for optimization. +*) 15 apr 2013: Fixed bug with LAC_ALPHA and color key. +*) 25 mar 2013: Added an optional feature to ignore some PNG errors (fix_png). +*) 11 mar 2013: (!) Bugfix with custom free. Changed from "my" to "lodepng_" + prefix for the custom allocators and made it possible with a new #define to + use custom ones in your project without needing to change lodepng's code. +*) 28 jan 2013: Bugfix with color key. +*) 27 okt 2012: Tweaks in text chunk keyword length error handling. +*) 8 okt 2012: (!) Added new filter strategy (entropy) and new auto color mode. + (no palette). Better deflate tree encoding. New compression tweak settings. + Faster color conversions while decoding. Some internal cleanups. +*) 23 sep 2012: Reduced warnings in Visual Studio a little bit. +*) 1 sep 2012: (!) Removed #define's for giving custom (de)compression functions + and made it work with function pointers instead. +*) 23 jun 2012: Added more filter strategies. Made it easier to use custom alloc + and free functions and toggle #defines from compiler flags. Small fixes. +*) 6 may 2012: (!) Made plugging in custom zlib/deflate functions more flexible. +*) 22 apr 2012: (!) Made interface more consistent, renaming a lot. Removed + redundant C++ codec classes. Reduced amount of structs. Everything changed, + but it is cleaner now imho and functionality remains the same. Also fixed + several bugs and shrunk the implementation code. Made new samples. +*) 6 nov 2011: (!) By default, the encoder now automatically chooses the best + PNG color model and bit depth, based on the amount and type of colors of the + raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color. +*) 9 okt 2011: simpler hash chain implementation for the encoder. +*) 8 sep 2011: lz77 encoder lazy matching instead of greedy matching. +*) 23 aug 2011: tweaked the zlib compression parameters after benchmarking. + A bug with the PNG filtertype heuristic was fixed, so that it chooses much + better ones (it's quite significant). A setting to do an experimental, slow, + brute force search for PNG filter types is added. +*) 17 aug 2011: (!) changed some C zlib related function names. +*) 16 aug 2011: made the code less wide (max 120 characters per line). +*) 17 apr 2011: code cleanup. Bugfixes. Convert low to 16-bit per sample colors. +*) 21 feb 2011: fixed compiling for C90. Fixed compiling with sections disabled. +*) 11 dec 2010: encoding is made faster, based on suggestion by Peter Eastman + to optimize long sequences of zeros. +*) 13 nov 2010: added LodePNG_InfoColor_hasPaletteAlpha and + LodePNG_InfoColor_canHaveAlpha functions for convenience. +*) 7 nov 2010: added LodePNG_error_text function to get error code description. +*) 30 okt 2010: made decoding slightly faster +*) 26 okt 2010: (!) changed some C function and struct names (more consistent). + Reorganized the documentation and the declaration order in the header. +*) 08 aug 2010: only changed some comments and external samples. +*) 05 jul 2010: fixed bug thanks to warnings in the new gcc version. +*) 14 mar 2010: fixed bug where too much memory was allocated for char buffers. +*) 02 sep 2008: fixed bug where it could create empty tree that linux apps could + read by ignoring the problem but windows apps couldn't. +*) 06 jun 2008: added more error checks for out of memory cases. +*) 26 apr 2008: added a few more checks here and there to ensure more safety. +*) 06 mar 2008: crash with encoding of strings fixed +*) 02 feb 2008: support for international text chunks added (iTXt) +*) 23 jan 2008: small cleanups, and #defines to divide code in sections +*) 20 jan 2008: support for unknown chunks allowing using LodePNG for an editor. +*) 18 jan 2008: support for tIME and pHYs chunks added to encoder and decoder. +*) 17 jan 2008: ability to encode and decode compressed zTXt chunks added + Also various fixes, such as in the deflate and the padding bits code. +*) 13 jan 2008: Added ability to encode Adam7-interlaced images. Improved + filtering code of encoder. +*) 07 jan 2008: (!) changed LodePNG to use ISO C90 instead of C++. A + C++ wrapper around this provides an interface almost identical to before. + Having LodePNG be pure ISO C90 makes it more portable. The C and C++ code + are together in these files but it works both for C and C++ compilers. +*) 29 dec 2007: (!) changed most integer types to unsigned int + other tweaks +*) 30 aug 2007: bug fixed which makes this Borland C++ compatible +*) 09 aug 2007: some VS2005 warnings removed again +*) 21 jul 2007: deflate code placed in new namespace separate from zlib code +*) 08 jun 2007: fixed bug with 2- and 4-bit color, and small interlaced images +*) 04 jun 2007: improved support for Visual Studio 2005: crash with accessing + invalid std::vector element [0] fixed, and level 3 and 4 warnings removed +*) 02 jun 2007: made the encoder add a tag with version by default +*) 27 may 2007: zlib and png code separated (but still in the same file), + simple encoder/decoder functions added for more simple usage cases +*) 19 may 2007: minor fixes, some code cleaning, new error added (error 69), + moved some examples from here to lodepng_examples.cpp +*) 12 may 2007: palette decoding bug fixed +*) 24 apr 2007: changed the license from BSD to the zlib license +*) 11 mar 2007: very simple addition: ability to encode bKGD chunks. +*) 04 mar 2007: (!) tEXt chunk related fixes, and support for encoding + palettized PNG images. Plus little interface change with palette and texts. +*) 03 mar 2007: Made it encode dynamic Huffman shorter with repeat codes. + Fixed a bug where the end code of a block had length 0 in the Huffman tree. +*) 26 feb 2007: Huffman compression with dynamic trees (BTYPE 2) now implemented + and supported by the encoder, resulting in smaller PNGs at the output. +*) 27 jan 2007: Made the Adler-32 test faster so that a timewaste is gone. +*) 24 jan 2007: gave encoder an error interface. Added color conversion from any + greyscale type to 8-bit greyscale with or without alpha. +*) 21 jan 2007: (!) Totally changed the interface. It allows more color types + to convert to and is more uniform. See the manual for how it works now. +*) 07 jan 2007: Some cleanup & fixes, and a few changes over the last days: + encode/decode custom tEXt chunks, separate classes for zlib & deflate, and + at last made the decoder give errors for incorrect Adler32 or Crc. +*) 01 jan 2007: Fixed bug with encoding PNGs with less than 8 bits per channel. +*) 29 dec 2006: Added support for encoding images without alpha channel, and + cleaned out code as well as making certain parts faster. +*) 28 dec 2006: Added "Settings" to the encoder. +*) 26 dec 2006: The encoder now does LZ77 encoding and produces much smaller files now. + Removed some code duplication in the decoder. Fixed little bug in an example. +*) 09 dec 2006: (!) Placed output parameters of public functions as first parameter. + Fixed a bug of the decoder with 16-bit per color. +*) 15 okt 2006: Changed documentation structure +*) 09 okt 2006: Encoder class added. It encodes a valid PNG image from the + given image buffer, however for now it's not compressed. +*) 08 sep 2006: (!) Changed to interface with a Decoder class +*) 30 jul 2006: (!) LodePNG_InfoPng , width and height are now retrieved in different + way. Renamed decodePNG to decodePNGGeneric. +*) 29 jul 2006: (!) Changed the interface: image info is now returned as a + struct of type LodePNG::LodePNG_Info, instead of a vector, which was a bit clumsy. +*) 28 jul 2006: Cleaned the code and added new error checks. + Corrected terminology "deflate" into "inflate". +*) 23 jun 2006: Added SDL example in the documentation in the header, this + example allows easy debugging by displaying the PNG and its transparency. +*) 22 jun 2006: (!) Changed way to obtain error value. Added + loadFile function for convenience. Made decodePNG32 faster. +*) 21 jun 2006: (!) Changed type of info vector to unsigned. + Changed position of palette in info vector. Fixed an important bug that + happened on PNGs with an uncompressed block. +*) 16 jun 2006: Internally changed unsigned into unsigned where + needed, and performed some optimizations. +*) 07 jun 2006: (!) Renamed functions to decodePNG and placed them + in LodePNG namespace. Changed the order of the parameters. Rewrote the + documentation in the header. Renamed files to lodepng.cpp and lodepng.h +*) 22 apr 2006: Optimized and improved some code +*) 07 sep 2005: (!) Changed to std::vector interface +*) 12 aug 2005: Initial release (C++, decoder only) + + +13. contact information +----------------------- + +Feel free to contact me with suggestions, problems, comments, ... concerning +LodePNG. If you encounter a PNG image that doesn't work properly with this +decoder, feel free to send it and I'll use it to find and fix the problem. + +My email address is (puzzle the account and domain together with an @ symbol): +Domain: gmail dot com. +Account: lode dot vandevenne. + + +Copyright (c) 2005-2020 Lode Vandevenne +*/ diff --git a/include/utils/queueSystem.hpp b/include/utils/queueSystem.hpp new file mode 100644 index 0000000..aa8286e --- /dev/null +++ b/include/utils/queueSystem.hpp @@ -0,0 +1,82 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#ifndef _UNIVERSAL_UPDATER_QUEUE_SYSTEM_HPP +#define _UNIVERSAL_UPDATER_QUEUE_SYSTEM_HPP + +#include "json.hpp" +#include +#include +#include + +/* Extend this, if more statuses are neccessary. */ +enum class QueueStatus { + None, + Copying, + Deleting, + Downloading, + Extracting, + Installing, + Moving, + Request, // For User needed Requests. + Failed, + Done +}; + +enum RequestType { + PROMPT_RET = -3, + NO_REQUEST = -1, + RMDIR_REQUEST = 1, // remove dir prompt request. + PROMPT_REQUEST = 2, // skip prompt request. + PROMPT_ERROR = 3 // Error message prompt. Unused right now. +}; + +/* Of course also a namespace to that part, so we can do that in a Thread. */ +namespace QueueSystem { + extern int RequestNeeded, RequestAnswer; + extern std::string RequestMsg, EndMsg; + extern int LastElement; + extern bool Wait, Popup, CancelCallback; + + void QueueHandle(); // Handles the Queue. + void AddToQueue(nlohmann::json obj, const C2D_Image &icn, const std::string &name, const std::string &uName, const std::string &eName, const std::string &lUpdated); // Adds to Queue. + void ClearQueue(); // Clears the Queue. + void Resume(); +}; + +class Queue { +public: + Queue(nlohmann::json object, const C2D_Image &img, const std::string &name, const std::string &uName, const std::string &eName, const std::string &lUpdated) : + obj(object), icn(img), total(object.size()), current(QueueSystem::LastElement), name(name), unistoreName(uName), entryName(eName), lastUpdated(lUpdated) { }; + + QueueStatus status = QueueStatus::None; + nlohmann::json obj; + C2D_Image icn; + int total, current; + std::string name = "", unistoreName = "", entryName = "", lastUpdated = ""; +}; + +#endif \ No newline at end of file diff --git a/include/utils/screenshot.hpp b/include/utils/screenshot.hpp new file mode 100644 index 0000000..f30b191 --- /dev/null +++ b/include/utils/screenshot.hpp @@ -0,0 +1,39 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#ifndef _UNIVERSAL_UPDATER_SCREENSHOT_HPP +#define _UNIVERSAL_UPDATER_SCREENSHOT_HPP + +#include +#include +#include + +namespace Screenshot { + C2D_Image Convert(const std::string &filename); + C2D_Image ConvertFromBuffer(const std::vector &buffer); +}; + +#endif \ No newline at end of file diff --git a/include/utils/scriptUtils.hpp b/include/utils/scriptUtils.hpp index 56d67c5..1042443 100644 --- a/include/utils/scriptUtils.hpp +++ b/include/utils/scriptUtils.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,23 +38,24 @@ enum ScriptState { SYNTAX_ERROR, COPY_ERROR, MOVE_ERROR, - DELETE_ERROR + DELETE_ERROR, + EXTRACT_ERROR }; namespace ScriptUtils { bool matchPattern(const std::string &pattern, const std::string &tested); - Result removeFile(const std::string &file, const std::string &message); - void bootTitle(const std::string &TitleID, const bool &isNAND, const std::string &message); + Result removeFile(const std::string &file, bool isARG = false); + void bootTitle(const std::string &TitleID, bool isNAND, bool isARG = false); Result prompt(const std::string &message); - Result copyFile(const std::string &source, const std::string &destination, const std::string &message); - Result renameFile(const std::string &oldName, const std::string &newName, const std::string &message); - Result downloadRelease(const std::string &repo, const std::string &file, const std::string &output, const bool &includePrereleases, const std::string &message); - Result downloadFile(const std::string &file, const std::string &output, const std::string &message); - void installFile(const std::string &file, const bool &updatingSelf, const std::string &message); - void extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message); + Result copyFile(const std::string &source, const std::string &destination, const std::string &message, bool isARG = false); + Result renameFile(const std::string &oldName, const std::string &newName, bool isARG = false); + Result downloadRelease(const std::string &repo, const std::string &file, const std::string &output, bool includePrereleases, const std::string &message, bool isARG = false); + Result downloadFile(const std::string &file, const std::string &output, const std::string &message, bool isARG = false); + void installFile(const std::string &file, bool updatingSelf, const std::string &message, bool isARG = false); + Result extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message, bool isARG = false); - Result runFunctions(const nlohmann::json &storeJson, const int &selection, const std::string &entry); + Result runFunctions(nlohmann::json storeJson, int selection, const std::string &entry); }; #endif \ No newline at end of file diff --git a/include/utils/sound.hpp b/include/utils/sound.hpp new file mode 100644 index 0000000..4bbba3a --- /dev/null +++ b/include/utils/sound.hpp @@ -0,0 +1,47 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#ifndef _UNIVERSAL_UPDATER_SOUND_HPP +#define _UNIVERSAL_UPDATER_SOUND_HPP + +#include <3ds.h> +#include + +class Sound { +public: + Sound(const std::string &path, const int channel = 1, const bool toloop = true); + ~Sound(); + void play(); + void stop(); +private: + u32 dataSize; + bool good = true; + ndspWaveBuf waveBuf; + u8 *data = nullptr; + int chnl; +}; + +#endif \ No newline at end of file diff --git a/include/utils/stringutils.hpp b/include/utils/stringutils.hpp index 6fcf8fa..84f47d5 100644 --- a/include/utils/stringutils.hpp +++ b/include/utils/stringutils.hpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,9 +34,10 @@ namespace StringUtils { std::string lower_case(const std::string &str); std::string FetchStringsFromVector(const std::vector &fetch); - std::string formatBytes(const int bytes); + std::string formatBytes(u64 bytes); std::string GetMarkString(int marks); std::vector GetMarks(int marks); + std::string format(const char *fmt_str, ...); }; #endif \ No newline at end of file diff --git a/include/utils/theme.hpp b/include/utils/theme.hpp new file mode 100644 index 0000000..dadad84 --- /dev/null +++ b/include/utils/theme.hpp @@ -0,0 +1,72 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#ifndef _UNIVERSAL_UPDATER_THEME_HPP +#define _UNIVERSAL_UPDATER_THEME_HPP + +#include "json.hpp" +#include +#include + +class Theme { +public: + Theme(const std::string &ThemeJSON = "sdmc:/3ds/Universal-Updater/Themes.json"); + nlohmann::json InitWithDefaultColors(const std::string &ThemePath = "sdmc:/3ds/Universal-Updater/Themes.json"); + void LoadTheme(const std::string &ThemeName); + std::vector> ThemeNames(); + uint32_t GetThemeColor(const std::string &ThemeName, const std::string &Key, const uint32_t DefaultColor); + + uint32_t BarColor() const { return this->vBarColor; }; + uint32_t BGColor() const { return this->vBGColor; }; + uint32_t BarOutline() const { return this->vBarOutline; }; + uint32_t TextColor() const { return this->vTextColor; }; + uint32_t EntryBar() const { return this->vEntryBar; }; + uint32_t EntryOutline() const { return this->vEntryOutline; }; + uint32_t BoxInside() const { return this->vBoxInside; }; + uint32_t BoxSelected() const { return this->vBoxSelected; }; + uint32_t BoxUnselected() const { return this->vBoxUnselected; }; + uint32_t ProgressbarOut() const { return this->vProgressbarOut; }; + uint32_t ProgressbarIn() const { return this->vProgressbarIn; }; + uint32_t SearchBar() const { return this->vSearchBar; }; + uint32_t SearchBarOutline() const { return this->vSearchBarOutline; }; + uint32_t SideBarSelected() const { return this->vSideBarSelected; }; + uint32_t SideBarUnselected() const { return this->vSideBarUnselected; }; + uint32_t MarkSelected() const { return this->vMarkSelected; }; + uint32_t MarkUnselected() const { return this->vMarkUnselected; }; + uint32_t DownListPrev() const { return this->vDownListPrev; }; + uint32_t SideBarIconColor() const { return this->vSideBarIconColor; }; +private: + uint32_t vBarColor = 0, vBGColor = 0, vBarOutline = 0, vTextColor = 0, vEntryBar = 0, vEntryOutline = 0, + vBoxInside = 0, vBoxSelected = 0, vBoxUnselected = 0, vProgressbarOut = 0, vProgressbarIn = 0, + vSearchBar = 0, vSearchBarOutline = 0, vSideBarSelected = 0, vSideBarUnselected = 0, + vMarkSelected = 0, vMarkUnselected = 0, vDownListPrev = 0, vSideBarIconColor = 0; + + int SelectedTheme = 0; + bool Loaded = false; + nlohmann::json json = nullptr; +}; + +#endif \ No newline at end of file diff --git a/libs/include/archive.hpp b/libs/include/archive.hpp new file mode 100644 index 0000000..52f4d78 --- /dev/null +++ b/libs/include/archive.hpp @@ -0,0 +1,1204 @@ +/*- + * Copyright (c) 2003-2010 Tim Kientzle + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.50 2008/05/26 17:00:22 kientzle Exp $ + */ + +#ifndef ARCHIVE_H_INCLUDED +#define ARCHIVE_H_INCLUDED + +/* + * The version number is expressed as a single integer that makes it + * easy to compare versions at build time: for version a.b.c, the + * version number is printf("%d%03d%03d",a,b,c). For example, if you + * know your application requires version 2.12.108 or later, you can + * assert that ARCHIVE_VERSION_NUMBER >= 2012108. + */ +/* Note: Compiler will complain if this does not match archive_entry.h! */ +#define ARCHIVE_VERSION_NUMBER 3005001 + +#include +#include /* for wchar_t */ +#include /* For FILE * */ +#include /* For time_t */ + +/* + * Note: archive.h is for use outside of libarchive; the configuration + * headers (config.h, archive_platform.h, etc.) are purely internal. + * Do NOT use HAVE_XXX configuration macros to control the behavior of + * this header! If you must conditionalize, use predefined compiler and/or + * platform macros. + */ +#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560 +# include +#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__) && !defined(__CLANG_INTTYPES_H) +# include +#endif + +/* Get appropriate definitions of 64-bit integer */ +#if !defined(__LA_INT64_T_DEFINED) +/* Older code relied on the __LA_INT64_T macro; after 4.0 we'll switch to the typedef exclusively. */ +# if ARCHIVE_VERSION_NUMBER < 4000000 +#define __LA_INT64_T la_int64_t +# endif +#define __LA_INT64_T_DEFINED +# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__) +typedef __int64 la_int64_t; +# else +# include /* ssize_t */ +# if defined(_SCO_DS) || defined(__osf__) +typedef long long la_int64_t; +# else +typedef int64_t la_int64_t; +# endif +# endif +#endif + +/* The la_ssize_t should match the type used in 'struct stat' */ +#if !defined(__LA_SSIZE_T_DEFINED) +/* Older code relied on the __LA_SSIZE_T macro; after 4.0 we'll switch to the typedef exclusively. */ +# if ARCHIVE_VERSION_NUMBER < 4000000 +#define __LA_SSIZE_T la_ssize_t +# endif +#define __LA_SSIZE_T_DEFINED +# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__) +# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) +typedef ssize_t la_ssize_t; +# elif defined(_WIN64) +typedef __int64 la_ssize_t; +# else +typedef long la_ssize_t; +# endif +# else +# include /* ssize_t */ +typedef ssize_t la_ssize_t; +# endif +#endif + +/* Large file support for Android */ +#ifdef __ANDROID__ +#include "android_lf.h" +#endif + +/* + * On Windows, define LIBARCHIVE_STATIC if you're building or using a + * .lib. The default here assumes you're building a DLL. Only + * libarchive source should ever define __LIBARCHIVE_BUILD. + */ +#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC) +# ifdef __LIBARCHIVE_BUILD +# ifdef __GNUC__ +# define __LA_DECL __attribute__((dllexport)) extern +# else +# define __LA_DECL __declspec(dllexport) +# endif +# else +# ifdef __GNUC__ +# define __LA_DECL +# else +# define __LA_DECL __declspec(dllimport) +# endif +# endif +#else +/* Static libraries or non-Windows needs no special declaration. */ +# define __LA_DECL +#endif + +#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__MINGW32__) +#define __LA_PRINTF(fmtarg, firstvararg) \ + __attribute__((__format__ (__printf__, fmtarg, firstvararg))) +#else +#define __LA_PRINTF(fmtarg, firstvararg) /* nothing */ +#endif + +#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1 +# define __LA_DEPRECATED __attribute__((deprecated)) +#else +# define __LA_DEPRECATED +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * The version number is provided as both a macro and a function. + * The macro identifies the installed header; the function identifies + * the library version (which may not be the same if you're using a + * dynamically-linked version of the library). Of course, if the + * header and library are very different, you should expect some + * strangeness. Don't do that. + */ +__LA_DECL int archive_version_number(void); + +/* + * Textual name/version of the library, useful for version displays. + */ +#define ARCHIVE_VERSION_ONLY_STRING "3.5.1" +#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING +__LA_DECL const char * archive_version_string(void); + +/* + * Detailed textual name/version of the library and its dependencies. + * This has the form: + * "libarchive x.y.z zlib/a.b.c liblzma/d.e.f ... etc ..." + * the list of libraries described here will vary depending on how + * libarchive was compiled. + */ +__LA_DECL const char * archive_version_details(void); + +/* + * Returns NULL if libarchive was compiled without the associated library. + * Otherwise, returns the version number that libarchive was compiled + * against. + */ +__LA_DECL const char * archive_zlib_version(void); +__LA_DECL const char * archive_liblzma_version(void); +__LA_DECL const char * archive_bzlib_version(void); +__LA_DECL const char * archive_liblz4_version(void); +__LA_DECL const char * archive_libzstd_version(void); + +/* Declare our basic types. */ +struct archive; +struct archive_entry; + +/* + * Error codes: Use archive_errno() and archive_error_string() + * to retrieve details. Unless specified otherwise, all functions + * that return 'int' use these codes. + */ +#define ARCHIVE_EOF 1 /* Found end of archive. */ +#define ARCHIVE_OK 0 /* Operation was successful. */ +#define ARCHIVE_RETRY (-10) /* Retry might succeed. */ +#define ARCHIVE_WARN (-20) /* Partial success. */ +/* For example, if write_header "fails", then you can't push data. */ +#define ARCHIVE_FAILED (-25) /* Current operation cannot complete. */ +/* But if write_header is "fatal," then this archive is dead and useless. */ +#define ARCHIVE_FATAL (-30) /* No more operations are possible. */ + +/* + * As far as possible, archive_errno returns standard platform errno codes. + * Of course, the details vary by platform, so the actual definitions + * here are stored in "archive_platform.h". The symbols are listed here + * for reference; as a rule, clients should not need to know the exact + * platform-dependent error code. + */ +/* Unrecognized or invalid file format. */ +/* #define ARCHIVE_ERRNO_FILE_FORMAT */ +/* Illegal usage of the library. */ +/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */ +/* Unknown or unclassified error. */ +/* #define ARCHIVE_ERRNO_MISC */ + +/* + * Callbacks are invoked to automatically read/skip/write/open/close the + * archive. You can provide your own for complex tasks (like breaking + * archives across multiple tapes) or use standard ones built into the + * library. + */ + +/* Returns pointer and size of next block of data from archive. */ +typedef la_ssize_t archive_read_callback(struct archive *, + void *_client_data, const void **_buffer); + +/* Skips at most request bytes from archive and returns the skipped amount. + * This may skip fewer bytes than requested; it may even skip zero bytes. + * If you do skip fewer bytes than requested, libarchive will invoke your + * read callback and discard data as necessary to make up the full skip. + */ +typedef la_int64_t archive_skip_callback(struct archive *, + void *_client_data, la_int64_t request); + +/* Seeks to specified location in the file and returns the position. + * Whence values are SEEK_SET, SEEK_CUR, SEEK_END from stdio.h. + * Return ARCHIVE_FATAL if the seek fails for any reason. + */ +typedef la_int64_t archive_seek_callback(struct archive *, + void *_client_data, la_int64_t offset, int whence); + +/* Returns size actually written, zero on EOF, -1 on error. */ +typedef la_ssize_t archive_write_callback(struct archive *, + void *_client_data, + const void *_buffer, size_t _length); + +typedef int archive_open_callback(struct archive *, void *_client_data); + +typedef int archive_close_callback(struct archive *, void *_client_data); + +typedef int archive_free_callback(struct archive *, void *_client_data); + +/* Switches from one client data object to the next/prev client data object. + * This is useful for reading from different data blocks such as a set of files + * that make up one large file. + */ +typedef int archive_switch_callback(struct archive *, void *_client_data1, + void *_client_data2); + +/* + * Returns a passphrase used for encryption or decryption, NULL on nothing + * to do and give it up. + */ +typedef const char *archive_passphrase_callback(struct archive *, + void *_client_data); + +/* + * Codes to identify various stream filters. + */ +#define ARCHIVE_FILTER_NONE 0 +#define ARCHIVE_FILTER_GZIP 1 +#define ARCHIVE_FILTER_BZIP2 2 +#define ARCHIVE_FILTER_COMPRESS 3 +#define ARCHIVE_FILTER_PROGRAM 4 +#define ARCHIVE_FILTER_LZMA 5 +#define ARCHIVE_FILTER_XZ 6 +#define ARCHIVE_FILTER_UU 7 +#define ARCHIVE_FILTER_RPM 8 +#define ARCHIVE_FILTER_LZIP 9 +#define ARCHIVE_FILTER_LRZIP 10 +#define ARCHIVE_FILTER_LZOP 11 +#define ARCHIVE_FILTER_GRZIP 12 +#define ARCHIVE_FILTER_LZ4 13 +#define ARCHIVE_FILTER_ZSTD 14 + +#if ARCHIVE_VERSION_NUMBER < 4000000 +#define ARCHIVE_COMPRESSION_NONE ARCHIVE_FILTER_NONE +#define ARCHIVE_COMPRESSION_GZIP ARCHIVE_FILTER_GZIP +#define ARCHIVE_COMPRESSION_BZIP2 ARCHIVE_FILTER_BZIP2 +#define ARCHIVE_COMPRESSION_COMPRESS ARCHIVE_FILTER_COMPRESS +#define ARCHIVE_COMPRESSION_PROGRAM ARCHIVE_FILTER_PROGRAM +#define ARCHIVE_COMPRESSION_LZMA ARCHIVE_FILTER_LZMA +#define ARCHIVE_COMPRESSION_XZ ARCHIVE_FILTER_XZ +#define ARCHIVE_COMPRESSION_UU ARCHIVE_FILTER_UU +#define ARCHIVE_COMPRESSION_RPM ARCHIVE_FILTER_RPM +#define ARCHIVE_COMPRESSION_LZIP ARCHIVE_FILTER_LZIP +#define ARCHIVE_COMPRESSION_LRZIP ARCHIVE_FILTER_LRZIP +#endif + +/* + * Codes returned by archive_format. + * + * Top 16 bits identifies the format family (e.g., "tar"); lower + * 16 bits indicate the variant. This is updated by read_next_header. + * Note that the lower 16 bits will often vary from entry to entry. + * In some cases, this variation occurs as libarchive learns more about + * the archive (for example, later entries might utilize extensions that + * weren't necessary earlier in the archive; in this case, libarchive + * will change the format code to indicate the extended format that + * was used). In other cases, it's because different tools have + * modified the archive and so different parts of the archive + * actually have slightly different formats. (Both tar and cpio store + * format codes in each entry, so it is quite possible for each + * entry to be in a different format.) + */ +#define ARCHIVE_FORMAT_BASE_MASK 0xff0000 +#define ARCHIVE_FORMAT_CPIO 0x10000 +#define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1) +#define ARCHIVE_FORMAT_CPIO_BIN_LE (ARCHIVE_FORMAT_CPIO | 2) +#define ARCHIVE_FORMAT_CPIO_BIN_BE (ARCHIVE_FORMAT_CPIO | 3) +#define ARCHIVE_FORMAT_CPIO_SVR4_NOCRC (ARCHIVE_FORMAT_CPIO | 4) +#define ARCHIVE_FORMAT_CPIO_SVR4_CRC (ARCHIVE_FORMAT_CPIO | 5) +#define ARCHIVE_FORMAT_CPIO_AFIO_LARGE (ARCHIVE_FORMAT_CPIO | 6) +#define ARCHIVE_FORMAT_SHAR 0x20000 +#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1) +#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2) +#define ARCHIVE_FORMAT_TAR 0x30000 +#define ARCHIVE_FORMAT_TAR_USTAR (ARCHIVE_FORMAT_TAR | 1) +#define ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE (ARCHIVE_FORMAT_TAR | 2) +#define ARCHIVE_FORMAT_TAR_PAX_RESTRICTED (ARCHIVE_FORMAT_TAR | 3) +#define ARCHIVE_FORMAT_TAR_GNUTAR (ARCHIVE_FORMAT_TAR | 4) +#define ARCHIVE_FORMAT_ISO9660 0x40000 +#define ARCHIVE_FORMAT_ISO9660_ROCKRIDGE (ARCHIVE_FORMAT_ISO9660 | 1) +#define ARCHIVE_FORMAT_ZIP 0x50000 +#define ARCHIVE_FORMAT_EMPTY 0x60000 +#define ARCHIVE_FORMAT_AR 0x70000 +#define ARCHIVE_FORMAT_AR_GNU (ARCHIVE_FORMAT_AR | 1) +#define ARCHIVE_FORMAT_AR_BSD (ARCHIVE_FORMAT_AR | 2) +#define ARCHIVE_FORMAT_MTREE 0x80000 +#define ARCHIVE_FORMAT_RAW 0x90000 +#define ARCHIVE_FORMAT_XAR 0xA0000 +#define ARCHIVE_FORMAT_LHA 0xB0000 +#define ARCHIVE_FORMAT_CAB 0xC0000 +#define ARCHIVE_FORMAT_RAR 0xD0000 +#define ARCHIVE_FORMAT_7ZIP 0xE0000 +#define ARCHIVE_FORMAT_WARC 0xF0000 +#define ARCHIVE_FORMAT_RAR_V5 0x100000 + +/* + * Codes returned by archive_read_format_capabilities(). + * + * This list can be extended with values between 0 and 0xffff. + * The original purpose of this list was to let different archive + * format readers expose their general capabilities in terms of + * encryption. + */ +#define ARCHIVE_READ_FORMAT_CAPS_NONE (0) /* no special capabilities */ +#define ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA (1<<0) /* reader can detect encrypted data */ +#define ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA (1<<1) /* reader can detect encryptable metadata (pathname, mtime, etc.) */ + +/* + * Codes returned by archive_read_has_encrypted_entries(). + * + * In case the archive does not support encryption detection at all + * ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED is returned. If the reader + * for some other reason (e.g. not enough bytes read) cannot say if + * there are encrypted entries, ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW + * is returned. + */ +#define ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED -2 +#define ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW -1 + +/*- + * Basic outline for reading an archive: + * 1) Ask archive_read_new for an archive reader object. + * 2) Update any global properties as appropriate. + * In particular, you'll certainly want to call appropriate + * archive_read_support_XXX functions. + * 3) Call archive_read_open_XXX to open the archive + * 4) Repeatedly call archive_read_next_header to get information about + * successive archive entries. Call archive_read_data to extract + * data for entries of interest. + * 5) Call archive_read_free to end processing. + */ +__LA_DECL struct archive *archive_read_new(void); + +/* + * The archive_read_support_XXX calls enable auto-detect for this + * archive handle. They also link in the necessary support code. + * For example, if you don't want bzlib linked in, don't invoke + * support_compression_bzip2(). The "all" functions provide the + * obvious shorthand. + */ + +#if ARCHIVE_VERSION_NUMBER < 4000000 +__LA_DECL int archive_read_support_compression_all(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_bzip2(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_compress(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_gzip(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_lzip(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_lzma(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_none(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_program(struct archive *, + const char *command) __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_program_signature + (struct archive *, const char *, + const void * /* match */, size_t) __LA_DEPRECATED; + +__LA_DECL int archive_read_support_compression_rpm(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_uu(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_read_support_compression_xz(struct archive *) + __LA_DEPRECATED; +#endif + +__LA_DECL int archive_read_support_filter_all(struct archive *); +__LA_DECL int archive_read_support_filter_by_code(struct archive *, int); +__LA_DECL int archive_read_support_filter_bzip2(struct archive *); +__LA_DECL int archive_read_support_filter_compress(struct archive *); +__LA_DECL int archive_read_support_filter_gzip(struct archive *); +__LA_DECL int archive_read_support_filter_grzip(struct archive *); +__LA_DECL int archive_read_support_filter_lrzip(struct archive *); +__LA_DECL int archive_read_support_filter_lz4(struct archive *); +__LA_DECL int archive_read_support_filter_lzip(struct archive *); +__LA_DECL int archive_read_support_filter_lzma(struct archive *); +__LA_DECL int archive_read_support_filter_lzop(struct archive *); +__LA_DECL int archive_read_support_filter_none(struct archive *); +__LA_DECL int archive_read_support_filter_program(struct archive *, + const char *command); +__LA_DECL int archive_read_support_filter_program_signature + (struct archive *, const char * /* cmd */, + const void * /* match */, size_t); +__LA_DECL int archive_read_support_filter_rpm(struct archive *); +__LA_DECL int archive_read_support_filter_uu(struct archive *); +__LA_DECL int archive_read_support_filter_xz(struct archive *); +__LA_DECL int archive_read_support_filter_zstd(struct archive *); + +__LA_DECL int archive_read_support_format_7zip(struct archive *); +__LA_DECL int archive_read_support_format_all(struct archive *); +__LA_DECL int archive_read_support_format_ar(struct archive *); +__LA_DECL int archive_read_support_format_by_code(struct archive *, int); +__LA_DECL int archive_read_support_format_cab(struct archive *); +__LA_DECL int archive_read_support_format_cpio(struct archive *); +__LA_DECL int archive_read_support_format_empty(struct archive *); +__LA_DECL int archive_read_support_format_gnutar(struct archive *); +__LA_DECL int archive_read_support_format_iso9660(struct archive *); +__LA_DECL int archive_read_support_format_lha(struct archive *); +__LA_DECL int archive_read_support_format_mtree(struct archive *); +__LA_DECL int archive_read_support_format_rar(struct archive *); +__LA_DECL int archive_read_support_format_rar5(struct archive *); +__LA_DECL int archive_read_support_format_raw(struct archive *); +__LA_DECL int archive_read_support_format_tar(struct archive *); +__LA_DECL int archive_read_support_format_warc(struct archive *); +__LA_DECL int archive_read_support_format_xar(struct archive *); +/* archive_read_support_format_zip() enables both streamable and seekable + * zip readers. */ +__LA_DECL int archive_read_support_format_zip(struct archive *); +/* Reads Zip archives as stream from beginning to end. Doesn't + * correctly handle SFX ZIP files or ZIP archives that have been modified + * in-place. */ +__LA_DECL int archive_read_support_format_zip_streamable(struct archive *); +/* Reads starting from central directory; requires seekable input. */ +__LA_DECL int archive_read_support_format_zip_seekable(struct archive *); + +/* Functions to manually set the format and filters to be used. This is + * useful to bypass the bidding process when the format and filters to use + * is known in advance. + */ +__LA_DECL int archive_read_set_format(struct archive *, int); +__LA_DECL int archive_read_append_filter(struct archive *, int); +__LA_DECL int archive_read_append_filter_program(struct archive *, + const char *); +__LA_DECL int archive_read_append_filter_program_signature + (struct archive *, const char *, const void * /* match */, size_t); + +/* Set various callbacks. */ +__LA_DECL int archive_read_set_open_callback(struct archive *, + archive_open_callback *); +__LA_DECL int archive_read_set_read_callback(struct archive *, + archive_read_callback *); +__LA_DECL int archive_read_set_seek_callback(struct archive *, + archive_seek_callback *); +__LA_DECL int archive_read_set_skip_callback(struct archive *, + archive_skip_callback *); +__LA_DECL int archive_read_set_close_callback(struct archive *, + archive_close_callback *); +/* Callback used to switch between one data object to the next */ +__LA_DECL int archive_read_set_switch_callback(struct archive *, + archive_switch_callback *); + +/* This sets the first data object. */ +__LA_DECL int archive_read_set_callback_data(struct archive *, void *); +/* This sets data object at specified index */ +__LA_DECL int archive_read_set_callback_data2(struct archive *, void *, + unsigned int); +/* This adds a data object at the specified index. */ +__LA_DECL int archive_read_add_callback_data(struct archive *, void *, + unsigned int); +/* This appends a data object to the end of list */ +__LA_DECL int archive_read_append_callback_data(struct archive *, void *); +/* This prepends a data object to the beginning of list */ +__LA_DECL int archive_read_prepend_callback_data(struct archive *, void *); + +/* Opening freezes the callbacks. */ +__LA_DECL int archive_read_open1(struct archive *); + +/* Convenience wrappers around the above. */ +__LA_DECL int archive_read_open(struct archive *, void *_client_data, + archive_open_callback *, archive_read_callback *, + archive_close_callback *); +__LA_DECL int archive_read_open2(struct archive *, void *_client_data, + archive_open_callback *, archive_read_callback *, + archive_skip_callback *, archive_close_callback *); + +/* + * A variety of shortcuts that invoke archive_read_open() with + * canned callbacks suitable for common situations. The ones that + * accept a block size handle tape blocking correctly. + */ +/* Use this if you know the filename. Note: NULL indicates stdin. */ +__LA_DECL int archive_read_open_filename(struct archive *, + const char *_filename, size_t _block_size); +/* Use this for reading multivolume files by filenames. + * NOTE: Must be NULL terminated. Sorting is NOT done. */ +__LA_DECL int archive_read_open_filenames(struct archive *, + const char **_filenames, size_t _block_size); +__LA_DECL int archive_read_open_filename_w(struct archive *, + const wchar_t *_filename, size_t _block_size); +/* archive_read_open_file() is a deprecated synonym for ..._open_filename(). */ +__LA_DECL int archive_read_open_file(struct archive *, + const char *_filename, size_t _block_size) __LA_DEPRECATED; +/* Read an archive that's stored in memory. */ +__LA_DECL int archive_read_open_memory(struct archive *, + const void * buff, size_t size); +/* A more involved version that is only used for internal testing. */ +__LA_DECL int archive_read_open_memory2(struct archive *a, const void *buff, + size_t size, size_t read_size); +/* Read an archive that's already open, using the file descriptor. */ +__LA_DECL int archive_read_open_fd(struct archive *, int _fd, + size_t _block_size); +/* Read an archive that's already open, using a FILE *. */ +/* Note: DO NOT use this with tape drives. */ +__LA_DECL int archive_read_open_FILE(struct archive *, FILE *_file); + +/* Parses and returns next entry header. */ +__LA_DECL int archive_read_next_header(struct archive *, + struct archive_entry **); + +/* Parses and returns next entry header using the archive_entry passed in */ +__LA_DECL int archive_read_next_header2(struct archive *, + struct archive_entry *); + +/* + * Retrieve the byte offset in UNCOMPRESSED data where last-read + * header started. + */ +__LA_DECL la_int64_t archive_read_header_position(struct archive *); + +/* + * Returns 1 if the archive contains at least one encrypted entry. + * If the archive format not support encryption at all + * ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED is returned. + * If for any other reason (e.g. not enough data read so far) + * we cannot say whether there are encrypted entries, then + * ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW is returned. + * In general, this function will return values below zero when the + * reader is uncertain or totally incapable of encryption support. + * When this function returns 0 you can be sure that the reader + * supports encryption detection but no encrypted entries have + * been found yet. + * + * NOTE: If the metadata/header of an archive is also encrypted, you + * cannot rely on the number of encrypted entries. That is why this + * function does not return the number of encrypted entries but# + * just shows that there are some. + */ +__LA_DECL int archive_read_has_encrypted_entries(struct archive *); + +/* + * Returns a bitmask of capabilities that are supported by the archive format reader. + * If the reader has no special capabilities, ARCHIVE_READ_FORMAT_CAPS_NONE is returned. + */ +__LA_DECL int archive_read_format_capabilities(struct archive *); + +/* Read data from the body of an entry. Similar to read(2). */ +__LA_DECL la_ssize_t archive_read_data(struct archive *, + void *, size_t); + +/* Seek within the body of an entry. Similar to lseek(2). */ +__LA_DECL la_int64_t archive_seek_data(struct archive *, la_int64_t, int); + +/* + * A zero-copy version of archive_read_data that also exposes the file offset + * of each returned block. Note that the client has no way to specify + * the desired size of the block. The API does guarantee that offsets will + * be strictly increasing and that returned blocks will not overlap. + */ +__LA_DECL int archive_read_data_block(struct archive *a, + const void **buff, size_t *size, la_int64_t *offset); + +/*- + * Some convenience functions that are built on archive_read_data: + * 'skip': skips entire entry + * 'into_buffer': writes data into memory buffer that you provide + * 'into_fd': writes data to specified filedes + */ +__LA_DECL int archive_read_data_skip(struct archive *); +__LA_DECL int archive_read_data_into_fd(struct archive *, int fd); + +/* + * Set read options. + */ +/* Apply option to the format only. */ +__LA_DECL int archive_read_set_format_option(struct archive *_a, + const char *m, const char *o, + const char *v); +/* Apply option to the filter only. */ +__LA_DECL int archive_read_set_filter_option(struct archive *_a, + const char *m, const char *o, + const char *v); +/* Apply option to both the format and the filter. */ +__LA_DECL int archive_read_set_option(struct archive *_a, + const char *m, const char *o, + const char *v); +/* Apply option string to both the format and the filter. */ +__LA_DECL int archive_read_set_options(struct archive *_a, + const char *opts); + +/* + * Add a decryption passphrase. + */ +__LA_DECL int archive_read_add_passphrase(struct archive *, const char *); +__LA_DECL int archive_read_set_passphrase_callback(struct archive *, + void *client_data, archive_passphrase_callback *); + + +/*- + * Convenience function to recreate the current entry (whose header + * has just been read) on disk. + * + * This does quite a bit more than just copy data to disk. It also: + * - Creates intermediate directories as required. + * - Manages directory permissions: non-writable directories will + * be initially created with write permission enabled; when the + * archive is closed, dir permissions are edited to the values specified + * in the archive. + * - Checks hardlinks: hardlinks will not be extracted unless the + * linked-to file was also extracted within the same session. (TODO) + */ + +/* The "flags" argument selects optional behavior, 'OR' the flags you want. */ + +/* Default: Do not try to set owner/group. */ +#define ARCHIVE_EXTRACT_OWNER (0x0001) +/* Default: Do obey umask, do not restore SUID/SGID/SVTX bits. */ +#define ARCHIVE_EXTRACT_PERM (0x0002) +/* Default: Do not restore mtime/atime. */ +#define ARCHIVE_EXTRACT_TIME (0x0004) +/* Default: Replace existing files. */ +#define ARCHIVE_EXTRACT_NO_OVERWRITE (0x0008) +/* Default: Try create first, unlink only if create fails with EEXIST. */ +#define ARCHIVE_EXTRACT_UNLINK (0x0010) +/* Default: Do not restore ACLs. */ +#define ARCHIVE_EXTRACT_ACL (0x0020) +/* Default: Do not restore fflags. */ +#define ARCHIVE_EXTRACT_FFLAGS (0x0040) +/* Default: Do not restore xattrs. */ +#define ARCHIVE_EXTRACT_XATTR (0x0080) +/* Default: Do not try to guard against extracts redirected by symlinks. */ +/* Note: With ARCHIVE_EXTRACT_UNLINK, will remove any intermediate symlink. */ +#define ARCHIVE_EXTRACT_SECURE_SYMLINKS (0x0100) +/* Default: Do not reject entries with '..' as path elements. */ +#define ARCHIVE_EXTRACT_SECURE_NODOTDOT (0x0200) +/* Default: Create parent directories as needed. */ +#define ARCHIVE_EXTRACT_NO_AUTODIR (0x0400) +/* Default: Overwrite files, even if one on disk is newer. */ +#define ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER (0x0800) +/* Detect blocks of 0 and write holes instead. */ +#define ARCHIVE_EXTRACT_SPARSE (0x1000) +/* Default: Do not restore Mac extended metadata. */ +/* This has no effect except on Mac OS. */ +#define ARCHIVE_EXTRACT_MAC_METADATA (0x2000) +/* Default: Use HFS+ compression if it was compressed. */ +/* This has no effect except on Mac OS v10.6 or later. */ +#define ARCHIVE_EXTRACT_NO_HFS_COMPRESSION (0x4000) +/* Default: Do not use HFS+ compression if it was not compressed. */ +/* This has no effect except on Mac OS v10.6 or later. */ +#define ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED (0x8000) +/* Default: Do not reject entries with absolute paths */ +#define ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (0x10000) +/* Default: Do not clear no-change flags when unlinking object */ +#define ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS (0x20000) +/* Default: Do not extract atomically (using rename) */ +#define ARCHIVE_EXTRACT_SAFE_WRITES (0x40000) + +__LA_DECL int archive_read_extract(struct archive *, struct archive_entry *, + int flags); +__LA_DECL int archive_read_extract2(struct archive *, struct archive_entry *, + struct archive * /* dest */); +__LA_DECL void archive_read_extract_set_progress_callback(struct archive *, + void (*_progress_func)(void *), void *_user_data); + +/* Record the dev/ino of a file that will not be written. This is + * generally set to the dev/ino of the archive being read. */ +__LA_DECL void archive_read_extract_set_skip_file(struct archive *, + la_int64_t, la_int64_t); + +/* Close the file and release most resources. */ +__LA_DECL int archive_read_close(struct archive *); +/* Release all resources and destroy the object. */ +/* Note that archive_read_free will call archive_read_close for you. */ +__LA_DECL int archive_read_free(struct archive *); +#if ARCHIVE_VERSION_NUMBER < 4000000 +/* Synonym for archive_read_free() for backwards compatibility. */ +__LA_DECL int archive_read_finish(struct archive *) __LA_DEPRECATED; +#endif + +/*- + * To create an archive: + * 1) Ask archive_write_new for an archive writer object. + * 2) Set any global properties. In particular, you should set + * the compression and format to use. + * 3) Call archive_write_open to open the file (most people + * will use archive_write_open_file or archive_write_open_fd, + * which provide convenient canned I/O callbacks for you). + * 4) For each entry: + * - construct an appropriate struct archive_entry structure + * - archive_write_header to write the header + * - archive_write_data to write the entry data + * 5) archive_write_close to close the output + * 6) archive_write_free to cleanup the writer and release resources + */ +__LA_DECL struct archive *archive_write_new(void); +__LA_DECL int archive_write_set_bytes_per_block(struct archive *, + int bytes_per_block); +__LA_DECL int archive_write_get_bytes_per_block(struct archive *); +/* XXX This is badly misnamed; suggestions appreciated. XXX */ +__LA_DECL int archive_write_set_bytes_in_last_block(struct archive *, + int bytes_in_last_block); +__LA_DECL int archive_write_get_bytes_in_last_block(struct archive *); + +/* The dev/ino of a file that won't be archived. This is used + * to avoid recursively adding an archive to itself. */ +__LA_DECL int archive_write_set_skip_file(struct archive *, + la_int64_t, la_int64_t); + +#if ARCHIVE_VERSION_NUMBER < 4000000 +__LA_DECL int archive_write_set_compression_bzip2(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_write_set_compression_compress(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_write_set_compression_gzip(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_write_set_compression_lzip(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_write_set_compression_lzma(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_write_set_compression_none(struct archive *) + __LA_DEPRECATED; +__LA_DECL int archive_write_set_compression_program(struct archive *, + const char *cmd) __LA_DEPRECATED; +__LA_DECL int archive_write_set_compression_xz(struct archive *) + __LA_DEPRECATED; +#endif + +/* A convenience function to set the filter based on the code. */ +__LA_DECL int archive_write_add_filter(struct archive *, int filter_code); +__LA_DECL int archive_write_add_filter_by_name(struct archive *, + const char *name); +__LA_DECL int archive_write_add_filter_b64encode(struct archive *); +__LA_DECL int archive_write_add_filter_bzip2(struct archive *); +__LA_DECL int archive_write_add_filter_compress(struct archive *); +__LA_DECL int archive_write_add_filter_grzip(struct archive *); +__LA_DECL int archive_write_add_filter_gzip(struct archive *); +__LA_DECL int archive_write_add_filter_lrzip(struct archive *); +__LA_DECL int archive_write_add_filter_lz4(struct archive *); +__LA_DECL int archive_write_add_filter_lzip(struct archive *); +__LA_DECL int archive_write_add_filter_lzma(struct archive *); +__LA_DECL int archive_write_add_filter_lzop(struct archive *); +__LA_DECL int archive_write_add_filter_none(struct archive *); +__LA_DECL int archive_write_add_filter_program(struct archive *, + const char *cmd); +__LA_DECL int archive_write_add_filter_uuencode(struct archive *); +__LA_DECL int archive_write_add_filter_xz(struct archive *); +__LA_DECL int archive_write_add_filter_zstd(struct archive *); + + +/* A convenience function to set the format based on the code or name. */ +__LA_DECL int archive_write_set_format(struct archive *, int format_code); +__LA_DECL int archive_write_set_format_by_name(struct archive *, + const char *name); +/* To minimize link pollution, use one or more of the following. */ +__LA_DECL int archive_write_set_format_7zip(struct archive *); +__LA_DECL int archive_write_set_format_ar_bsd(struct archive *); +__LA_DECL int archive_write_set_format_ar_svr4(struct archive *); +__LA_DECL int archive_write_set_format_cpio(struct archive *); +__LA_DECL int archive_write_set_format_cpio_newc(struct archive *); +__LA_DECL int archive_write_set_format_gnutar(struct archive *); +__LA_DECL int archive_write_set_format_iso9660(struct archive *); +__LA_DECL int archive_write_set_format_mtree(struct archive *); +__LA_DECL int archive_write_set_format_mtree_classic(struct archive *); +/* TODO: int archive_write_set_format_old_tar(struct archive *); */ +__LA_DECL int archive_write_set_format_pax(struct archive *); +__LA_DECL int archive_write_set_format_pax_restricted(struct archive *); +__LA_DECL int archive_write_set_format_raw(struct archive *); +__LA_DECL int archive_write_set_format_shar(struct archive *); +__LA_DECL int archive_write_set_format_shar_dump(struct archive *); +__LA_DECL int archive_write_set_format_ustar(struct archive *); +__LA_DECL int archive_write_set_format_v7tar(struct archive *); +__LA_DECL int archive_write_set_format_warc(struct archive *); +__LA_DECL int archive_write_set_format_xar(struct archive *); +__LA_DECL int archive_write_set_format_zip(struct archive *); +__LA_DECL int archive_write_set_format_filter_by_ext(struct archive *a, const char *filename); +__LA_DECL int archive_write_set_format_filter_by_ext_def(struct archive *a, const char *filename, const char * def_ext); +__LA_DECL int archive_write_zip_set_compression_deflate(struct archive *); +__LA_DECL int archive_write_zip_set_compression_store(struct archive *); +/* Deprecated; use archive_write_open2 instead */ +__LA_DECL int archive_write_open(struct archive *, void *, + archive_open_callback *, archive_write_callback *, + archive_close_callback *); +__LA_DECL int archive_write_open2(struct archive *, void *, + archive_open_callback *, archive_write_callback *, + archive_close_callback *, archive_free_callback *); +__LA_DECL int archive_write_open_fd(struct archive *, int _fd); +__LA_DECL int archive_write_open_filename(struct archive *, const char *_file); +__LA_DECL int archive_write_open_filename_w(struct archive *, + const wchar_t *_file); +/* A deprecated synonym for archive_write_open_filename() */ +__LA_DECL int archive_write_open_file(struct archive *, const char *_file) + __LA_DEPRECATED; +__LA_DECL int archive_write_open_FILE(struct archive *, FILE *); +/* _buffSize is the size of the buffer, _used refers to a variable that + * will be updated after each write into the buffer. */ +__LA_DECL int archive_write_open_memory(struct archive *, + void *_buffer, size_t _buffSize, size_t *_used); + +/* + * Note that the library will truncate writes beyond the size provided + * to archive_write_header or pad if the provided data is short. + */ +__LA_DECL int archive_write_header(struct archive *, + struct archive_entry *); +__LA_DECL la_ssize_t archive_write_data(struct archive *, + const void *, size_t); + +/* This interface is currently only available for archive_write_disk handles. */ +__LA_DECL la_ssize_t archive_write_data_block(struct archive *, + const void *, size_t, la_int64_t); + +__LA_DECL int archive_write_finish_entry(struct archive *); +__LA_DECL int archive_write_close(struct archive *); +/* Marks the archive as FATAL so that a subsequent free() operation + * won't try to close() cleanly. Provides a fast abort capability + * when the client discovers that things have gone wrong. */ +__LA_DECL int archive_write_fail(struct archive *); +/* This can fail if the archive wasn't already closed, in which case + * archive_write_free() will implicitly call archive_write_close(). */ +__LA_DECL int archive_write_free(struct archive *); +#if ARCHIVE_VERSION_NUMBER < 4000000 +/* Synonym for archive_write_free() for backwards compatibility. */ +__LA_DECL int archive_write_finish(struct archive *) __LA_DEPRECATED; +#endif + +/* + * Set write options. + */ +/* Apply option to the format only. */ +__LA_DECL int archive_write_set_format_option(struct archive *_a, + const char *m, const char *o, + const char *v); +/* Apply option to the filter only. */ +__LA_DECL int archive_write_set_filter_option(struct archive *_a, + const char *m, const char *o, + const char *v); +/* Apply option to both the format and the filter. */ +__LA_DECL int archive_write_set_option(struct archive *_a, + const char *m, const char *o, + const char *v); +/* Apply option string to both the format and the filter. */ +__LA_DECL int archive_write_set_options(struct archive *_a, + const char *opts); + +/* + * Set a encryption passphrase. + */ +__LA_DECL int archive_write_set_passphrase(struct archive *_a, const char *p); +__LA_DECL int archive_write_set_passphrase_callback(struct archive *, + void *client_data, archive_passphrase_callback *); + +/*- + * ARCHIVE_WRITE_DISK API + * + * To create objects on disk: + * 1) Ask archive_write_disk_new for a new archive_write_disk object. + * 2) Set any global properties. In particular, you probably + * want to set the options. + * 3) For each entry: + * - construct an appropriate struct archive_entry structure + * - archive_write_header to create the file/dir/etc on disk + * - archive_write_data to write the entry data + * 4) archive_write_free to cleanup the writer and release resources + * + * In particular, you can use this in conjunction with archive_read() + * to pull entries out of an archive and create them on disk. + */ +__LA_DECL struct archive *archive_write_disk_new(void); +/* This file will not be overwritten. */ +__LA_DECL int archive_write_disk_set_skip_file(struct archive *, + la_int64_t, la_int64_t); +/* Set flags to control how the next item gets created. + * This accepts a bitmask of ARCHIVE_EXTRACT_XXX flags defined above. */ +__LA_DECL int archive_write_disk_set_options(struct archive *, + int flags); +/* + * The lookup functions are given uname/uid (or gname/gid) pairs and + * return a uid (gid) suitable for this system. These are used for + * restoring ownership and for setting ACLs. The default functions + * are naive, they just return the uid/gid. These are small, so reasonable + * for applications that don't need to preserve ownership; they + * are probably also appropriate for applications that are doing + * same-system backup and restore. + */ +/* + * The "standard" lookup functions use common system calls to lookup + * the uname/gname, falling back to the uid/gid if the names can't be + * found. They cache lookups and are reasonably fast, but can be very + * large, so they are not used unless you ask for them. In + * particular, these match the specifications of POSIX "pax" and old + * POSIX "tar". + */ +__LA_DECL int archive_write_disk_set_standard_lookup(struct archive *); +/* + * If neither the default (naive) nor the standard (big) functions suit + * your needs, you can write your own and register them. Be sure to + * include a cleanup function if you have allocated private data. + */ +__LA_DECL int archive_write_disk_set_group_lookup(struct archive *, + void * /* private_data */, + la_int64_t (*)(void *, const char *, la_int64_t), + void (* /* cleanup */)(void *)); +__LA_DECL int archive_write_disk_set_user_lookup(struct archive *, + void * /* private_data */, + la_int64_t (*)(void *, const char *, la_int64_t), + void (* /* cleanup */)(void *)); +__LA_DECL la_int64_t archive_write_disk_gid(struct archive *, const char *, la_int64_t); +__LA_DECL la_int64_t archive_write_disk_uid(struct archive *, const char *, la_int64_t); + +/* + * ARCHIVE_READ_DISK API + * + * This is still evolving and somewhat experimental. + */ +__LA_DECL struct archive *archive_read_disk_new(void); +/* The names for symlink modes here correspond to an old BSD + * command-line argument convention: -L, -P, -H */ +/* Follow all symlinks. */ +__LA_DECL int archive_read_disk_set_symlink_logical(struct archive *); +/* Follow no symlinks. */ +__LA_DECL int archive_read_disk_set_symlink_physical(struct archive *); +/* Follow symlink initially, then not. */ +__LA_DECL int archive_read_disk_set_symlink_hybrid(struct archive *); +/* TODO: Handle Linux stat32/stat64 ugliness. */ +__LA_DECL int archive_read_disk_entry_from_file(struct archive *, + struct archive_entry *, int /* fd */, const struct stat *); +/* Look up gname for gid or uname for uid. */ +/* Default implementations are very, very stupid. */ +__LA_DECL const char *archive_read_disk_gname(struct archive *, la_int64_t); +__LA_DECL const char *archive_read_disk_uname(struct archive *, la_int64_t); +/* "Standard" implementation uses getpwuid_r, getgrgid_r and caches the + * results for performance. */ +__LA_DECL int archive_read_disk_set_standard_lookup(struct archive *); +/* You can install your own lookups if you like. */ +__LA_DECL int archive_read_disk_set_gname_lookup(struct archive *, + void * /* private_data */, + const char *(* /* lookup_fn */)(void *, la_int64_t), + void (* /* cleanup_fn */)(void *)); +__LA_DECL int archive_read_disk_set_uname_lookup(struct archive *, + void * /* private_data */, + const char *(* /* lookup_fn */)(void *, la_int64_t), + void (* /* cleanup_fn */)(void *)); +/* Start traversal. */ +__LA_DECL int archive_read_disk_open(struct archive *, const char *); +__LA_DECL int archive_read_disk_open_w(struct archive *, const wchar_t *); +/* + * Request that current entry be visited. If you invoke it on every + * directory, you'll get a physical traversal. This is ignored if the + * current entry isn't a directory or a link to a directory. So, if + * you invoke this on every returned path, you'll get a full logical + * traversal. + */ +__LA_DECL int archive_read_disk_descend(struct archive *); +__LA_DECL int archive_read_disk_can_descend(struct archive *); +__LA_DECL int archive_read_disk_current_filesystem(struct archive *); +__LA_DECL int archive_read_disk_current_filesystem_is_synthetic(struct archive *); +__LA_DECL int archive_read_disk_current_filesystem_is_remote(struct archive *); +/* Request that the access time of the entry visited by traversal be restored. */ +__LA_DECL int archive_read_disk_set_atime_restored(struct archive *); +/* + * Set behavior. The "flags" argument selects optional behavior. + */ +/* Request that the access time of the entry visited by traversal be restored. + * This is the same as archive_read_disk_set_atime_restored. */ +#define ARCHIVE_READDISK_RESTORE_ATIME (0x0001) +/* Default: Do not skip an entry which has nodump flags. */ +#define ARCHIVE_READDISK_HONOR_NODUMP (0x0002) +/* Default: Skip a mac resource fork file whose prefix is "._" because of + * using copyfile. */ +#define ARCHIVE_READDISK_MAC_COPYFILE (0x0004) +/* Default: Traverse mount points. */ +#define ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS (0x0008) +/* Default: Xattrs are read from disk. */ +#define ARCHIVE_READDISK_NO_XATTR (0x0010) +/* Default: ACLs are read from disk. */ +#define ARCHIVE_READDISK_NO_ACL (0x0020) +/* Default: File flags are read from disk. */ +#define ARCHIVE_READDISK_NO_FFLAGS (0x0040) + +__LA_DECL int archive_read_disk_set_behavior(struct archive *, + int flags); + +/* + * Set archive_match object that will be used in archive_read_disk to + * know whether an entry should be skipped. The callback function + * _excluded_func will be invoked when an entry is skipped by the result + * of archive_match. + */ +__LA_DECL int archive_read_disk_set_matching(struct archive *, + struct archive *_matching, void (*_excluded_func) + (struct archive *, void *, struct archive_entry *), + void *_client_data); +__LA_DECL int archive_read_disk_set_metadata_filter_callback(struct archive *, + int (*_metadata_filter_func)(struct archive *, void *, + struct archive_entry *), void *_client_data); + +/* Simplified cleanup interface; + * This calls archive_read_free() or archive_write_free() as needed. */ +__LA_DECL int archive_free(struct archive *); + +/* + * Accessor functions to read/set various information in + * the struct archive object: + */ + +/* Number of filters in the current filter pipeline. */ +/* Filter #0 is the one closest to the format, -1 is a synonym for the + * last filter, which is always the pseudo-filter that wraps the + * client callbacks. */ +__LA_DECL int archive_filter_count(struct archive *); +__LA_DECL la_int64_t archive_filter_bytes(struct archive *, int); +__LA_DECL int archive_filter_code(struct archive *, int); +__LA_DECL const char * archive_filter_name(struct archive *, int); + +#if ARCHIVE_VERSION_NUMBER < 4000000 +/* These don't properly handle multiple filters, so are deprecated and + * will eventually be removed. */ +/* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, -1); */ +__LA_DECL la_int64_t archive_position_compressed(struct archive *) + __LA_DEPRECATED; +/* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, 0); */ +__LA_DECL la_int64_t archive_position_uncompressed(struct archive *) + __LA_DEPRECATED; +/* As of libarchive 3.0, this is an alias for archive_filter_name(a, 0); */ +__LA_DECL const char *archive_compression_name(struct archive *) + __LA_DEPRECATED; +/* As of libarchive 3.0, this is an alias for archive_filter_code(a, 0); */ +__LA_DECL int archive_compression(struct archive *) + __LA_DEPRECATED; +#endif + +__LA_DECL int archive_errno(struct archive *); +__LA_DECL const char *archive_error_string(struct archive *); +__LA_DECL const char *archive_format_name(struct archive *); +__LA_DECL int archive_format(struct archive *); +__LA_DECL void archive_clear_error(struct archive *); +__LA_DECL void archive_set_error(struct archive *, int _err, + const char *fmt, ...) __LA_PRINTF(3, 4); +__LA_DECL void archive_copy_error(struct archive *dest, + struct archive *src); +__LA_DECL int archive_file_count(struct archive *); + +/* + * ARCHIVE_MATCH API + */ +__LA_DECL struct archive *archive_match_new(void); +__LA_DECL int archive_match_free(struct archive *); + +/* + * Test if archive_entry is excluded. + * This is a convenience function. This is the same as calling all + * archive_match_path_excluded, archive_match_time_excluded + * and archive_match_owner_excluded. + */ +__LA_DECL int archive_match_excluded(struct archive *, + struct archive_entry *); + +/* + * Test if pathname is excluded. The conditions are set by following functions. + */ +__LA_DECL int archive_match_path_excluded(struct archive *, + struct archive_entry *); +/* Control recursive inclusion of directory content when directory is included. Default on. */ +__LA_DECL int archive_match_set_inclusion_recursion(struct archive *, int); +/* Add exclusion pathname pattern. */ +__LA_DECL int archive_match_exclude_pattern(struct archive *, const char *); +__LA_DECL int archive_match_exclude_pattern_w(struct archive *, + const wchar_t *); +/* Add exclusion pathname pattern from file. */ +__LA_DECL int archive_match_exclude_pattern_from_file(struct archive *, + const char *, int _nullSeparator); +__LA_DECL int archive_match_exclude_pattern_from_file_w(struct archive *, + const wchar_t *, int _nullSeparator); +/* Add inclusion pathname pattern. */ +__LA_DECL int archive_match_include_pattern(struct archive *, const char *); +__LA_DECL int archive_match_include_pattern_w(struct archive *, + const wchar_t *); +/* Add inclusion pathname pattern from file. */ +__LA_DECL int archive_match_include_pattern_from_file(struct archive *, + const char *, int _nullSeparator); +__LA_DECL int archive_match_include_pattern_from_file_w(struct archive *, + const wchar_t *, int _nullSeparator); +/* + * How to get statistic information for inclusion patterns. + */ +/* Return the amount number of unmatched inclusion patterns. */ +__LA_DECL int archive_match_path_unmatched_inclusions(struct archive *); +/* Return the pattern of unmatched inclusion with ARCHIVE_OK. + * Return ARCHIVE_EOF if there is no inclusion pattern. */ +__LA_DECL int archive_match_path_unmatched_inclusions_next( + struct archive *, const char **); +__LA_DECL int archive_match_path_unmatched_inclusions_next_w( + struct archive *, const wchar_t **); + +/* + * Test if a file is excluded by its time stamp. + * The conditions are set by following functions. + */ +__LA_DECL int archive_match_time_excluded(struct archive *, + struct archive_entry *); + +/* + * Flags to tell a matching type of time stamps. These are used for + * following functions. + */ +/* Time flag: mtime to be tested. */ +#define ARCHIVE_MATCH_MTIME (0x0100) +/* Time flag: ctime to be tested. */ +#define ARCHIVE_MATCH_CTIME (0x0200) +/* Comparison flag: Match the time if it is newer than. */ +#define ARCHIVE_MATCH_NEWER (0x0001) +/* Comparison flag: Match the time if it is older than. */ +#define ARCHIVE_MATCH_OLDER (0x0002) +/* Comparison flag: Match the time if it is equal to. */ +#define ARCHIVE_MATCH_EQUAL (0x0010) +/* Set inclusion time. */ +__LA_DECL int archive_match_include_time(struct archive *, int _flag, + time_t _sec, long _nsec); +/* Set inclusion time by a date string. */ +__LA_DECL int archive_match_include_date(struct archive *, int _flag, + const char *_datestr); +__LA_DECL int archive_match_include_date_w(struct archive *, int _flag, + const wchar_t *_datestr); +/* Set inclusion time by a particular file. */ +__LA_DECL int archive_match_include_file_time(struct archive *, + int _flag, const char *_pathname); +__LA_DECL int archive_match_include_file_time_w(struct archive *, + int _flag, const wchar_t *_pathname); +/* Add exclusion entry. */ +__LA_DECL int archive_match_exclude_entry(struct archive *, + int _flag, struct archive_entry *); + +/* + * Test if a file is excluded by its uid ,gid, uname or gname. + * The conditions are set by following functions. + */ +__LA_DECL int archive_match_owner_excluded(struct archive *, + struct archive_entry *); +/* Add inclusion uid, gid, uname and gname. */ +__LA_DECL int archive_match_include_uid(struct archive *, la_int64_t); +__LA_DECL int archive_match_include_gid(struct archive *, la_int64_t); +__LA_DECL int archive_match_include_uname(struct archive *, const char *); +__LA_DECL int archive_match_include_uname_w(struct archive *, + const wchar_t *); +__LA_DECL int archive_match_include_gname(struct archive *, const char *); +__LA_DECL int archive_match_include_gname_w(struct archive *, + const wchar_t *); + +/* Utility functions */ +/* Convenience function to sort a NULL terminated list of strings */ +__LA_DECL int archive_utility_string_sort(char **); + +#ifdef __cplusplus +} +#endif + +/* These are meaningless outside of this header. */ +#undef __LA_DECL + +#endif /* !ARCHIVE_H_INCLUDED */ diff --git a/libs/include/archive_entry.hpp b/libs/include/archive_entry.hpp new file mode 100644 index 0000000..c0e75bf --- /dev/null +++ b/libs/include/archive_entry.hpp @@ -0,0 +1,721 @@ +/*- + * Copyright (c) 2003-2008 Tim Kientzle + * Copyright (c) 2016 Martin Matuska + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: head/lib/libarchive/archive_entry.h 201096 2009-12-28 02:41:27Z kientzle $ + */ + +#ifndef ARCHIVE_ENTRY_H_INCLUDED +#define ARCHIVE_ENTRY_H_INCLUDED + +/* Note: Compiler will complain if this does not match archive.h! */ +#define ARCHIVE_VERSION_NUMBER 3005001 + +/* + * Note: archive_entry.h is for use outside of libarchive; the + * configuration headers (config.h, archive_platform.h, etc.) are + * purely internal. Do NOT use HAVE_XXX configuration macros to + * control the behavior of this header! If you must conditionalize, + * use predefined compiler and/or platform macros. + */ + +#include +#include /* for wchar_t */ +#include +#include + +#if defined(_WIN32) && !defined(__CYGWIN__) +#include +#endif + +/* Get a suitable 64-bit integer type. */ +#if !defined(__LA_INT64_T_DEFINED) +# if ARCHIVE_VERSION_NUMBER < 4000000 +#define __LA_INT64_T la_int64_t +# endif +#define __LA_INT64_T_DEFINED +# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__) +typedef __int64 la_int64_t; +# else +#include +# if defined(_SCO_DS) || defined(__osf__) +typedef long long la_int64_t; +# else +typedef int64_t la_int64_t; +# endif +# endif +#endif + +/* The la_ssize_t should match the type used in 'struct stat' */ +#if !defined(__LA_SSIZE_T_DEFINED) +/* Older code relied on the __LA_SSIZE_T macro; after 4.0 we'll switch to the typedef exclusively. */ +# if ARCHIVE_VERSION_NUMBER < 4000000 +#define __LA_SSIZE_T la_ssize_t +# endif +#define __LA_SSIZE_T_DEFINED +# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__) +# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) +typedef ssize_t la_ssize_t; +# elif defined(_WIN64) +typedef __int64 la_ssize_t; +# else +typedef long la_ssize_t; +# endif +# else +# include /* ssize_t */ +typedef ssize_t la_ssize_t; +# endif +#endif + +/* Get a suitable definition for mode_t */ +#if ARCHIVE_VERSION_NUMBER >= 3999000 +/* Switch to plain 'int' for libarchive 4.0. It's less broken than 'mode_t' */ +# define __LA_MODE_T int +#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__) && !defined(__WATCOMC__) +# define __LA_MODE_T unsigned short +#else +# define __LA_MODE_T mode_t +#endif + +/* Large file support for Android */ +#ifdef __ANDROID__ +#include "android_lf.h" +#endif + +/* + * On Windows, define LIBARCHIVE_STATIC if you're building or using a + * .lib. The default here assumes you're building a DLL. Only + * libarchive source should ever define __LIBARCHIVE_BUILD. + */ +#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC) +# ifdef __LIBARCHIVE_BUILD +# ifdef __GNUC__ +# define __LA_DECL __attribute__((dllexport)) extern +# else +# define __LA_DECL __declspec(dllexport) +# endif +# else +# ifdef __GNUC__ +# define __LA_DECL +# else +# define __LA_DECL __declspec(dllimport) +# endif +# endif +#else +/* Static libraries on all platforms and shared libraries on non-Windows. */ +# define __LA_DECL +#endif + +#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1 +# define __LA_DEPRECATED __attribute__((deprecated)) +#else +# define __LA_DEPRECATED +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Description of an archive entry. + * + * You can think of this as "struct stat" with some text fields added in. + * + * TODO: Add "comment", "charset", and possibly other entries that are + * supported by "pax interchange" format. However, GNU, ustar, cpio, + * and other variants don't support these features, so they're not an + * excruciatingly high priority right now. + * + * TODO: "pax interchange" format allows essentially arbitrary + * key/value attributes to be attached to any entry. Supporting + * such extensions may make this library useful for special + * applications (e.g., a package manager could attach special + * package-management attributes to each entry). + */ +struct archive; +struct archive_entry; + +/* + * File-type constants. These are returned from archive_entry_filetype() + * and passed to archive_entry_set_filetype(). + * + * These values match S_XXX defines on every platform I've checked, + * including Windows, AIX, Linux, Solaris, and BSD. They're + * (re)defined here because platforms generally don't define the ones + * they don't support. For example, Windows doesn't define S_IFLNK or + * S_IFBLK. Instead of having a mass of conditional logic and system + * checks to define any S_XXX values that aren't supported locally, + * I've just defined a new set of such constants so that + * libarchive-based applications can manipulate and identify archive + * entries properly even if the hosting platform can't store them on + * disk. + * + * These values are also used directly within some portable formats, + * such as cpio. If you find a platform that varies from these, the + * correct solution is to leave these alone and translate from these + * portable values to platform-native values when entries are read from + * or written to disk. + */ +/* + * In libarchive 4.0, we can drop the casts here. + * They're needed to work around Borland C's broken mode_t. + */ +#define AE_IFMT ((__LA_MODE_T)0170000) +#define AE_IFREG ((__LA_MODE_T)0100000) +#define AE_IFLNK ((__LA_MODE_T)0120000) +#define AE_IFSOCK ((__LA_MODE_T)0140000) +#define AE_IFCHR ((__LA_MODE_T)0020000) +#define AE_IFBLK ((__LA_MODE_T)0060000) +#define AE_IFDIR ((__LA_MODE_T)0040000) +#define AE_IFIFO ((__LA_MODE_T)0010000) + +/* + * Symlink types + */ +#define AE_SYMLINK_TYPE_UNDEFINED 0 +#define AE_SYMLINK_TYPE_FILE 1 +#define AE_SYMLINK_TYPE_DIRECTORY 2 + +/* + * Basic object manipulation + */ + +__LA_DECL struct archive_entry *archive_entry_clear(struct archive_entry *); +/* The 'clone' function does a deep copy; all of the strings are copied too. */ +__LA_DECL struct archive_entry *archive_entry_clone(struct archive_entry *); +__LA_DECL void archive_entry_free(struct archive_entry *); +__LA_DECL struct archive_entry *archive_entry_new(void); + +/* + * This form of archive_entry_new2() will pull character-set + * conversion information from the specified archive handle. The + * older archive_entry_new(void) form is equivalent to calling + * archive_entry_new2(NULL) and will result in the use of an internal + * default character-set conversion. + */ +__LA_DECL struct archive_entry *archive_entry_new2(struct archive *); + +/* + * Retrieve fields from an archive_entry. + * + * There are a number of implicit conversions among these fields. For + * example, if a regular string field is set and you read the _w wide + * character field, the entry will implicitly convert narrow-to-wide + * using the current locale. Similarly, dev values are automatically + * updated when you write devmajor or devminor and vice versa. + * + * In addition, fields can be "set" or "unset." Unset string fields + * return NULL, non-string fields have _is_set() functions to test + * whether they've been set. You can "unset" a string field by + * assigning NULL; non-string fields have _unset() functions to + * unset them. + * + * Note: There is one ambiguity in the above; string fields will + * also return NULL when implicit character set conversions fail. + * This is usually what you want. + */ +__LA_DECL time_t archive_entry_atime(struct archive_entry *); +__LA_DECL long archive_entry_atime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_ctime(struct archive_entry *); +__LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); +__LA_DECL dev_t archive_entry_dev(struct archive_entry *); +__LA_DECL int archive_entry_dev_is_set(struct archive_entry *); +__LA_DECL dev_t archive_entry_devmajor(struct archive_entry *); +__LA_DECL dev_t archive_entry_devminor(struct archive_entry *); +__LA_DECL __LA_MODE_T archive_entry_filetype(struct archive_entry *); +__LA_DECL void archive_entry_fflags(struct archive_entry *, + unsigned long * /* set */, + unsigned long * /* clear */); +__LA_DECL const char *archive_entry_fflags_text(struct archive_entry *); +__LA_DECL la_int64_t archive_entry_gid(struct archive_entry *); +__LA_DECL const char *archive_entry_gname(struct archive_entry *); +__LA_DECL const char *archive_entry_gname_utf8(struct archive_entry *); +__LA_DECL const wchar_t *archive_entry_gname_w(struct archive_entry *); +__LA_DECL const char *archive_entry_hardlink(struct archive_entry *); +__LA_DECL const char *archive_entry_hardlink_utf8(struct archive_entry *); +__LA_DECL const wchar_t *archive_entry_hardlink_w(struct archive_entry *); +__LA_DECL la_int64_t archive_entry_ino(struct archive_entry *); +__LA_DECL la_int64_t archive_entry_ino64(struct archive_entry *); +__LA_DECL int archive_entry_ino_is_set(struct archive_entry *); +__LA_DECL __LA_MODE_T archive_entry_mode(struct archive_entry *); +__LA_DECL time_t archive_entry_mtime(struct archive_entry *); +__LA_DECL long archive_entry_mtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_mtime_is_set(struct archive_entry *); +__LA_DECL unsigned int archive_entry_nlink(struct archive_entry *); +__LA_DECL const char *archive_entry_pathname(struct archive_entry *); +__LA_DECL const char *archive_entry_pathname_utf8(struct archive_entry *); +__LA_DECL const wchar_t *archive_entry_pathname_w(struct archive_entry *); +__LA_DECL __LA_MODE_T archive_entry_perm(struct archive_entry *); +__LA_DECL dev_t archive_entry_rdev(struct archive_entry *); +__LA_DECL dev_t archive_entry_rdevmajor(struct archive_entry *); +__LA_DECL dev_t archive_entry_rdevminor(struct archive_entry *); +__LA_DECL const char *archive_entry_sourcepath(struct archive_entry *); +__LA_DECL const wchar_t *archive_entry_sourcepath_w(struct archive_entry *); +__LA_DECL la_int64_t archive_entry_size(struct archive_entry *); +__LA_DECL int archive_entry_size_is_set(struct archive_entry *); +__LA_DECL const char *archive_entry_strmode(struct archive_entry *); +__LA_DECL const char *archive_entry_symlink(struct archive_entry *); +__LA_DECL const char *archive_entry_symlink_utf8(struct archive_entry *); +__LA_DECL int archive_entry_symlink_type(struct archive_entry *); +__LA_DECL const wchar_t *archive_entry_symlink_w(struct archive_entry *); +__LA_DECL la_int64_t archive_entry_uid(struct archive_entry *); +__LA_DECL const char *archive_entry_uname(struct archive_entry *); +__LA_DECL const char *archive_entry_uname_utf8(struct archive_entry *); +__LA_DECL const wchar_t *archive_entry_uname_w(struct archive_entry *); +__LA_DECL int archive_entry_is_data_encrypted(struct archive_entry *); +__LA_DECL int archive_entry_is_metadata_encrypted(struct archive_entry *); +__LA_DECL int archive_entry_is_encrypted(struct archive_entry *); + +/* + * Set fields in an archive_entry. + * + * Note: Before libarchive 2.4, there were 'set' and 'copy' versions + * of the string setters. 'copy' copied the actual string, 'set' just + * stored the pointer. In libarchive 2.4 and later, strings are + * always copied. + */ + +__LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_atime(struct archive_entry *); +#if defined(_WIN32) && !defined(__CYGWIN__) +__LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, BY_HANDLE_FILE_INFORMATION *); +#endif +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); +__LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_ctime(struct archive_entry *); +__LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); +__LA_DECL void archive_entry_set_devmajor(struct archive_entry *, dev_t); +__LA_DECL void archive_entry_set_devminor(struct archive_entry *, dev_t); +__LA_DECL void archive_entry_set_filetype(struct archive_entry *, unsigned int); +__LA_DECL void archive_entry_set_fflags(struct archive_entry *, + unsigned long /* set */, unsigned long /* clear */); +/* Returns pointer to start of first invalid token, or NULL if none. */ +/* Note that all recognized tokens are processed, regardless. */ +__LA_DECL const char *archive_entry_copy_fflags_text(struct archive_entry *, + const char *); +__LA_DECL const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *, + const wchar_t *); +__LA_DECL void archive_entry_set_gid(struct archive_entry *, la_int64_t); +__LA_DECL void archive_entry_set_gname(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_gname_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_gname(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *); +__LA_DECL int archive_entry_update_gname_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_hardlink(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_hardlink_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_hardlink(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *); +__LA_DECL int archive_entry_update_hardlink_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_ino(struct archive_entry *, la_int64_t); +__LA_DECL void archive_entry_set_ino64(struct archive_entry *, la_int64_t); +__LA_DECL void archive_entry_set_link(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_link_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_link(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_link_w(struct archive_entry *, const wchar_t *); +__LA_DECL int archive_entry_update_link_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_mode(struct archive_entry *, __LA_MODE_T); +__LA_DECL void archive_entry_set_mtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_mtime(struct archive_entry *); +__LA_DECL void archive_entry_set_nlink(struct archive_entry *, unsigned int); +__LA_DECL void archive_entry_set_pathname(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_pathname_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_pathname(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *); +__LA_DECL int archive_entry_update_pathname_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_perm(struct archive_entry *, __LA_MODE_T); +__LA_DECL void archive_entry_set_rdev(struct archive_entry *, dev_t); +__LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, dev_t); +__LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, dev_t); +__LA_DECL void archive_entry_set_size(struct archive_entry *, la_int64_t); +__LA_DECL void archive_entry_unset_size(struct archive_entry *); +__LA_DECL void archive_entry_copy_sourcepath(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_sourcepath_w(struct archive_entry *, const wchar_t *); +__LA_DECL void archive_entry_set_symlink(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_symlink_type(struct archive_entry *, int); +__LA_DECL void archive_entry_set_symlink_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_symlink(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *); +__LA_DECL int archive_entry_update_symlink_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_uid(struct archive_entry *, la_int64_t); +__LA_DECL void archive_entry_set_uname(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_uname_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_uname(struct archive_entry *, const char *); +__LA_DECL void archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *); +__LA_DECL int archive_entry_update_uname_utf8(struct archive_entry *, const char *); +__LA_DECL void archive_entry_set_is_data_encrypted(struct archive_entry *, char is_encrypted); +__LA_DECL void archive_entry_set_is_metadata_encrypted(struct archive_entry *, char is_encrypted); +/* + * Routines to bulk copy fields to/from a platform-native "struct + * stat." Libarchive used to just store a struct stat inside of each + * archive_entry object, but this created issues when trying to + * manipulate archives on systems different than the ones they were + * created on. + * + * TODO: On Linux and other LFS systems, provide both stat32 and + * stat64 versions of these functions and all of the macro glue so + * that archive_entry_stat is magically defined to + * archive_entry_stat32 or archive_entry_stat64 as appropriate. + */ +__LA_DECL const struct stat *archive_entry_stat(struct archive_entry *); +__LA_DECL void archive_entry_copy_stat(struct archive_entry *, const struct stat *); + +/* + * Storage for Mac OS-specific AppleDouble metadata information. + * Apple-format tar files store a separate binary blob containing + * encoded metadata with ACL, extended attributes, etc. + * This provides a place to store that blob. + */ + +__LA_DECL const void * archive_entry_mac_metadata(struct archive_entry *, size_t *); +__LA_DECL void archive_entry_copy_mac_metadata(struct archive_entry *, const void *, size_t); + +/* + * Digest routine. This is used to query the raw hex digest for the + * given entry. The type of digest is provided as an argument. + */ +#define ARCHIVE_ENTRY_DIGEST_MD5 0x00000001 +#define ARCHIVE_ENTRY_DIGEST_RMD160 0x00000002 +#define ARCHIVE_ENTRY_DIGEST_SHA1 0x00000003 +#define ARCHIVE_ENTRY_DIGEST_SHA256 0x00000004 +#define ARCHIVE_ENTRY_DIGEST_SHA384 0x00000005 +#define ARCHIVE_ENTRY_DIGEST_SHA512 0x00000006 + +__LA_DECL const unsigned char * archive_entry_digest(struct archive_entry *, int /* type */); + +/* + * ACL routines. This used to simply store and return text-format ACL + * strings, but that proved insufficient for a number of reasons: + * = clients need control over uname/uid and gname/gid mappings + * = there are many different ACL text formats + * = would like to be able to read/convert archives containing ACLs + * on platforms that lack ACL libraries + * + * This last point, in particular, forces me to implement a reasonably + * complete set of ACL support routines. + */ + +/* + * Permission bits. + */ +#define ARCHIVE_ENTRY_ACL_EXECUTE 0x00000001 +#define ARCHIVE_ENTRY_ACL_WRITE 0x00000002 +#define ARCHIVE_ENTRY_ACL_READ 0x00000004 +#define ARCHIVE_ENTRY_ACL_READ_DATA 0x00000008 +#define ARCHIVE_ENTRY_ACL_LIST_DIRECTORY 0x00000008 +#define ARCHIVE_ENTRY_ACL_WRITE_DATA 0x00000010 +#define ARCHIVE_ENTRY_ACL_ADD_FILE 0x00000010 +#define ARCHIVE_ENTRY_ACL_APPEND_DATA 0x00000020 +#define ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY 0x00000020 +#define ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS 0x00000040 +#define ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS 0x00000080 +#define ARCHIVE_ENTRY_ACL_DELETE_CHILD 0x00000100 +#define ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES 0x00000200 +#define ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES 0x00000400 +#define ARCHIVE_ENTRY_ACL_DELETE 0x00000800 +#define ARCHIVE_ENTRY_ACL_READ_ACL 0x00001000 +#define ARCHIVE_ENTRY_ACL_WRITE_ACL 0x00002000 +#define ARCHIVE_ENTRY_ACL_WRITE_OWNER 0x00004000 +#define ARCHIVE_ENTRY_ACL_SYNCHRONIZE 0x00008000 + +#define ARCHIVE_ENTRY_ACL_PERMS_POSIX1E \ + (ARCHIVE_ENTRY_ACL_EXECUTE \ + | ARCHIVE_ENTRY_ACL_WRITE \ + | ARCHIVE_ENTRY_ACL_READ) + +#define ARCHIVE_ENTRY_ACL_PERMS_NFS4 \ + (ARCHIVE_ENTRY_ACL_EXECUTE \ + | ARCHIVE_ENTRY_ACL_READ_DATA \ + | ARCHIVE_ENTRY_ACL_LIST_DIRECTORY \ + | ARCHIVE_ENTRY_ACL_WRITE_DATA \ + | ARCHIVE_ENTRY_ACL_ADD_FILE \ + | ARCHIVE_ENTRY_ACL_APPEND_DATA \ + | ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY \ + | ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS \ + | ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS \ + | ARCHIVE_ENTRY_ACL_DELETE_CHILD \ + | ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES \ + | ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES \ + | ARCHIVE_ENTRY_ACL_DELETE \ + | ARCHIVE_ENTRY_ACL_READ_ACL \ + | ARCHIVE_ENTRY_ACL_WRITE_ACL \ + | ARCHIVE_ENTRY_ACL_WRITE_OWNER \ + | ARCHIVE_ENTRY_ACL_SYNCHRONIZE) + +/* + * Inheritance values (NFS4 ACLs only); included in permset. + */ +#define ARCHIVE_ENTRY_ACL_ENTRY_INHERITED 0x01000000 +#define ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT 0x02000000 +#define ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT 0x04000000 +#define ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT 0x08000000 +#define ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY 0x10000000 +#define ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS 0x20000000 +#define ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS 0x40000000 + +#define ARCHIVE_ENTRY_ACL_INHERITANCE_NFS4 \ + (ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT \ + | ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT \ + | ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT \ + | ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY \ + | ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS \ + | ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS \ + | ARCHIVE_ENTRY_ACL_ENTRY_INHERITED) + +/* We need to be able to specify combinations of these. */ +#define ARCHIVE_ENTRY_ACL_TYPE_ACCESS 0x00000100 /* POSIX.1e only */ +#define ARCHIVE_ENTRY_ACL_TYPE_DEFAULT 0x00000200 /* POSIX.1e only */ +#define ARCHIVE_ENTRY_ACL_TYPE_ALLOW 0x00000400 /* NFS4 only */ +#define ARCHIVE_ENTRY_ACL_TYPE_DENY 0x00000800 /* NFS4 only */ +#define ARCHIVE_ENTRY_ACL_TYPE_AUDIT 0x00001000 /* NFS4 only */ +#define ARCHIVE_ENTRY_ACL_TYPE_ALARM 0x00002000 /* NFS4 only */ +#define ARCHIVE_ENTRY_ACL_TYPE_POSIX1E (ARCHIVE_ENTRY_ACL_TYPE_ACCESS \ + | ARCHIVE_ENTRY_ACL_TYPE_DEFAULT) +#define ARCHIVE_ENTRY_ACL_TYPE_NFS4 (ARCHIVE_ENTRY_ACL_TYPE_ALLOW \ + | ARCHIVE_ENTRY_ACL_TYPE_DENY \ + | ARCHIVE_ENTRY_ACL_TYPE_AUDIT \ + | ARCHIVE_ENTRY_ACL_TYPE_ALARM) + +/* Tag values mimic POSIX.1e */ +#define ARCHIVE_ENTRY_ACL_USER 10001 /* Specified user. */ +#define ARCHIVE_ENTRY_ACL_USER_OBJ 10002 /* User who owns the file. */ +#define ARCHIVE_ENTRY_ACL_GROUP 10003 /* Specified group. */ +#define ARCHIVE_ENTRY_ACL_GROUP_OBJ 10004 /* Group who owns the file. */ +#define ARCHIVE_ENTRY_ACL_MASK 10005 /* Modify group access (POSIX.1e only) */ +#define ARCHIVE_ENTRY_ACL_OTHER 10006 /* Public (POSIX.1e only) */ +#define ARCHIVE_ENTRY_ACL_EVERYONE 10107 /* Everyone (NFS4 only) */ + +/* + * Set the ACL by clearing it and adding entries one at a time. + * Unlike the POSIX.1e ACL routines, you must specify the type + * (access/default) for each entry. Internally, the ACL data is just + * a soup of entries. API calls here allow you to retrieve just the + * entries of interest. This design (which goes against the spirit of + * POSIX.1e) is useful for handling archive formats that combine + * default and access information in a single ACL list. + */ +__LA_DECL void archive_entry_acl_clear(struct archive_entry *); +__LA_DECL int archive_entry_acl_add_entry(struct archive_entry *, + int /* type */, int /* permset */, int /* tag */, + int /* qual */, const char * /* name */); +__LA_DECL int archive_entry_acl_add_entry_w(struct archive_entry *, + int /* type */, int /* permset */, int /* tag */, + int /* qual */, const wchar_t * /* name */); + +/* + * To retrieve the ACL, first "reset", then repeatedly ask for the + * "next" entry. The want_type parameter allows you to request only + * certain types of entries. + */ +__LA_DECL int archive_entry_acl_reset(struct archive_entry *, int /* want_type */); +__LA_DECL int archive_entry_acl_next(struct archive_entry *, int /* want_type */, + int * /* type */, int * /* permset */, int * /* tag */, + int * /* qual */, const char ** /* name */); + +/* + * Construct a text-format ACL. The flags argument is a bitmask that + * can include any of the following: + * + * Flags only for archive entries with POSIX.1e ACL: + * ARCHIVE_ENTRY_ACL_TYPE_ACCESS - Include POSIX.1e "access" entries. + * ARCHIVE_ENTRY_ACL_TYPE_DEFAULT - Include POSIX.1e "default" entries. + * ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT - Include "default:" before each + * default ACL entry. + * ARCHIVE_ENTRY_ACL_STYLE_SOLARIS - Output only one colon after "other" and + * "mask" entries. + * + * Flags only for archive entries with NFSv4 ACL: + * ARCHIVE_ENTRY_ACL_STYLE_COMPACT - Do not output the minus character for + * unset permissions and flags in NFSv4 ACL permission and flag fields + * + * Flags for for archive entries with POSIX.1e ACL or NFSv4 ACL: + * ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID - Include extra numeric ID field in + * each ACL entry. + * ARCHIVE_ENTRY_ACL_STYLE_SEPARATOR_COMMA - Separate entries with comma + * instead of newline. + */ +#define ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID 0x00000001 +#define ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT 0x00000002 +#define ARCHIVE_ENTRY_ACL_STYLE_SOLARIS 0x00000004 +#define ARCHIVE_ENTRY_ACL_STYLE_SEPARATOR_COMMA 0x00000008 +#define ARCHIVE_ENTRY_ACL_STYLE_COMPACT 0x00000010 + +__LA_DECL wchar_t *archive_entry_acl_to_text_w(struct archive_entry *, + la_ssize_t * /* len */, int /* flags */); +__LA_DECL char *archive_entry_acl_to_text(struct archive_entry *, + la_ssize_t * /* len */, int /* flags */); +__LA_DECL int archive_entry_acl_from_text_w(struct archive_entry *, + const wchar_t * /* wtext */, int /* type */); +__LA_DECL int archive_entry_acl_from_text(struct archive_entry *, + const char * /* text */, int /* type */); + +/* Deprecated constants */ +#define OLD_ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID 1024 +#define OLD_ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT 2048 + +/* Deprecated functions */ +__LA_DECL const wchar_t *archive_entry_acl_text_w(struct archive_entry *, + int /* flags */) __LA_DEPRECATED; +__LA_DECL const char *archive_entry_acl_text(struct archive_entry *, + int /* flags */) __LA_DEPRECATED; + +/* Return bitmask of ACL types in an archive entry */ +__LA_DECL int archive_entry_acl_types(struct archive_entry *); + +/* Return a count of entries matching 'want_type' */ +__LA_DECL int archive_entry_acl_count(struct archive_entry *, int /* want_type */); + +/* Return an opaque ACL object. */ +/* There's not yet anything clients can actually do with this... */ +struct archive_acl; +__LA_DECL struct archive_acl *archive_entry_acl(struct archive_entry *); + +/* + * extended attributes + */ + +__LA_DECL void archive_entry_xattr_clear(struct archive_entry *); +__LA_DECL void archive_entry_xattr_add_entry(struct archive_entry *, + const char * /* name */, const void * /* value */, + size_t /* size */); + +/* + * To retrieve the xattr list, first "reset", then repeatedly ask for the + * "next" entry. + */ + +__LA_DECL int archive_entry_xattr_count(struct archive_entry *); +__LA_DECL int archive_entry_xattr_reset(struct archive_entry *); +__LA_DECL int archive_entry_xattr_next(struct archive_entry *, + const char ** /* name */, const void ** /* value */, size_t *); + +/* + * sparse + */ + +__LA_DECL void archive_entry_sparse_clear(struct archive_entry *); +__LA_DECL void archive_entry_sparse_add_entry(struct archive_entry *, + la_int64_t /* offset */, la_int64_t /* length */); + +/* + * To retrieve the xattr list, first "reset", then repeatedly ask for the + * "next" entry. + */ + +__LA_DECL int archive_entry_sparse_count(struct archive_entry *); +__LA_DECL int archive_entry_sparse_reset(struct archive_entry *); +__LA_DECL int archive_entry_sparse_next(struct archive_entry *, + la_int64_t * /* offset */, la_int64_t * /* length */); + +/* + * Utility to match up hardlinks. + * + * The 'struct archive_entry_linkresolver' is a cache of archive entries + * for files with multiple links. Here's how to use it: + * 1. Create a lookup object with archive_entry_linkresolver_new() + * 2. Tell it the archive format you're using. + * 3. Hand each archive_entry to archive_entry_linkify(). + * That function will return 0, 1, or 2 entries that should + * be written. + * 4. Call archive_entry_linkify(resolver, NULL) until + * no more entries are returned. + * 5. Call archive_entry_linkresolver_free(resolver) to free resources. + * + * The entries returned have their hardlink and size fields updated + * appropriately. If an entry is passed in that does not refer to + * a file with multiple links, it is returned unchanged. The intention + * is that you should be able to simply filter all entries through + * this machine. + * + * To make things more efficient, be sure that each entry has a valid + * nlinks value. The hardlink cache uses this to track when all links + * have been found. If the nlinks value is zero, it will keep every + * name in the cache indefinitely, which can use a lot of memory. + * + * Note that archive_entry_size() is reset to zero if the file + * body should not be written to the archive. Pay attention! + */ +struct archive_entry_linkresolver; + +/* + * There are three different strategies for marking hardlinks. + * The descriptions below name them after the best-known + * formats that rely on each strategy: + * + * "Old cpio" is the simplest, it always returns any entry unmodified. + * As far as I know, only cpio formats use this. Old cpio archives + * store every link with the full body; the onus is on the dearchiver + * to detect and properly link the files as they are restored. + * "tar" is also pretty simple; it caches a copy the first time it sees + * any link. Subsequent appearances are modified to be hardlink + * references to the first one without any body. Used by all tar + * formats, although the newest tar formats permit the "old cpio" strategy + * as well. This strategy is very simple for the dearchiver, + * and reasonably straightforward for the archiver. + * "new cpio" is trickier. It stores the body only with the last + * occurrence. The complication is that we might not + * see every link to a particular file in a single session, so + * there's no easy way to know when we've seen the last occurrence. + * The solution here is to queue one link until we see the next. + * At the end of the session, you can enumerate any remaining + * entries by calling archive_entry_linkify(NULL) and store those + * bodies. If you have a file with three links l1, l2, and l3, + * you'll get the following behavior if you see all three links: + * linkify(l1) => NULL (the resolver stores l1 internally) + * linkify(l2) => l1 (resolver stores l2, you write l1) + * linkify(l3) => l2, l3 (all links seen, you can write both). + * If you only see l1 and l2, you'll get this behavior: + * linkify(l1) => NULL + * linkify(l2) => l1 + * linkify(NULL) => l2 (at end, you retrieve remaining links) + * As the name suggests, this strategy is used by newer cpio variants. + * It's noticeably more complex for the archiver, slightly more complex + * for the dearchiver than the tar strategy, but makes it straightforward + * to restore a file using any link by simply continuing to scan until + * you see a link that is stored with a body. In contrast, the tar + * strategy requires you to rescan the archive from the beginning to + * correctly extract an arbitrary link. + */ + +__LA_DECL struct archive_entry_linkresolver *archive_entry_linkresolver_new(void); +__LA_DECL void archive_entry_linkresolver_set_strategy( + struct archive_entry_linkresolver *, int /* format_code */); +__LA_DECL void archive_entry_linkresolver_free(struct archive_entry_linkresolver *); +__LA_DECL void archive_entry_linkify(struct archive_entry_linkresolver *, + struct archive_entry **, struct archive_entry **); +__LA_DECL struct archive_entry *archive_entry_partial_links( + struct archive_entry_linkresolver *res, unsigned int *links); +#ifdef __cplusplus +} +#endif + +/* This is meaningless outside of this header. */ +#undef __LA_DECL + +#endif /* !ARCHIVE_ENTRY_H_INCLUDED */ diff --git a/libs/lib/libarchive.a b/libs/lib/libarchive.a new file mode 100644 index 0000000..862a1e6 Binary files /dev/null and b/libs/lib/libarchive.a differ diff --git a/libs/lib/libarchive.la b/libs/lib/libarchive.la new file mode 100755 index 0000000..1bf5e02 --- /dev/null +++ b/libs/lib/libarchive.la @@ -0,0 +1,41 @@ +# libarchive.la - a libtool library file +# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-14 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='' + +# Names of this library. +library_names='' + +# The name of the static archive. +old_library='libarchive.a' + +# Linker flags that cannot go in dependency_libs. +inherited_linker_flags='' + +# Libraries that this one depends upon. +dependency_libs=' -L/opt/devkitpro/portlibs/3ds/lib -L/opt/devkitpro/libctru/lib /opt/devkitpro/portlibs/3ds/lib/liblzma.la -lbz2 -lz -lctru' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for libarchive. +current=18 +age=5 +revision=1 + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/opt/devkitpro/portlibs/3ds/lib' diff --git a/libs/lib/pkgconfig/libarchive.pc b/libs/lib/pkgconfig/libarchive.pc new file mode 100644 index 0000000..c382e21 --- /dev/null +++ b/libs/lib/pkgconfig/libarchive.pc @@ -0,0 +1,12 @@ +prefix=/opt/devkitpro/portlibs/3ds +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libarchive +Description: library that can create and read several streaming archive formats +Version: 3.5.1 +Cflags: -I${includedir} +Cflags.private: -DLIBARCHIVE_STATIC +Libs: -L${libdir} -larchive +Libs.private: -llzma -lbz2 -lz -lctru diff --git a/app/banner.png b/resources/2d-banner.png similarity index 100% rename from app/banner.png rename to resources/2d-banner.png diff --git a/resources/Themes.json b/resources/Themes.json new file mode 100644 index 0000000..05707b6 --- /dev/null +++ b/resources/Themes.json @@ -0,0 +1,24 @@ +{ + "Default": { + "BGColor": "#0F0F0F", + "BarColor": "#1A1A1A", + "BarOutline": "#2A2A2A", + "BoxInside": "#16A085", + "BoxSelected": "#2980B9", + "BoxUnselected": "#000000", + "Description": "A Deluxe Theme\n\nBy : MattTheTekie", + "DownListPrev": "#9B59B6", + "EntryBar": "#9B59B6", + "EntryOutline": "#8E44AD", + "MarkSelected": "#E74C3C", + "MarkUnselected": "#C0392B", + "ProgressbarIn": "#2ECC71", + "ProgressbarOut": "#27AE60", + "SearchBar": "#F1C40F", + "SearchBarOutline": "#34495E", + "SideBarIconColor": "#FFFFFF", + "SideBarSelected": "#E67E22", + "SideBarUnselected": "#1A1A1A", + "TextColor": "#FFFFFF" + } +} diff --git a/resources/UniStores.json b/resources/UniStores.json new file mode 100644 index 0000000..a734858 --- /dev/null +++ b/resources/UniStores.json @@ -0,0 +1,8 @@ +{ + "StreetPass-Shop": { + "title": "StreetPass-Shop", + "author": "MattTheTekie", + "url": "https://github.com/sdkpaint/streetpass-3.0-config/raw/master/unistore/StreetPass-Shop.unistore", + "description": "Here you can find loads of StreetPass data!\nEnjoy browsing through the StreetPass shop! ~MattTheTekie!" + } +} diff --git a/romfs/lang/br/app.json b/romfs/lang/br/app.json index ed502ee..a77ee06 100644 --- a/romfs/lang/br/app.json +++ b/romfs/lang/br/app.json @@ -1,89 +1,142 @@ { + "3DSX_IN_FOLDER": "Brut 3DSX briles in brolder", + "3DSX_IN_FOLDER_DESC": "If bruhnabled, 3DSX briles will be bruht in a brolder with the same bruh brinstead of bruhrectly in the same brolder.", + "ACTION_CANCELED": "%s bruhd!", + "ACTION_FAILED": "%s oofed!", + "ACTION_REQUIRED": "Action bruhquired!", + "ACTION_SUCCEEDED": "%s bruhcceeded!", + "ACTIVE_THEME": "Bruhctive theme", "ASCENDING": "Asbruhing", + "ARGUMENT_INVALID": "Arbruhment invalid.\nBrease breck the xml brile for bruhper arbruhments.", "AUTHOR": "Bruhthor", + "AUTO_UPDATE_NIGHTLY": "Bruhse nigthly bruhs", + "AUTO_UPDATE_NIGHTLY_DESC": "Bruhse nightly bruhs of Universal-Updater bruhstead of the bruhble bruhleases.", "AUTO_UPDATE_SETTINGS": "Auto-Bruhpdate Settings", "AUTO_UPDATE_SETTINGS_BTN": "Auto-bruhpdate settings...", "AUTO_UPDATE_UNISTORE": "Auto-bruhpdate UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "With this, the last bruhsed UniStore will be bruhpdated automatically when launchbruh Universal-Updater.", + "AUTO_UPDATE_UNISTORE_DESC": "With this, the last bruhsed UniStore will be bruhpdated bruhtomatically when launchbruh Universal-Updater.", "AUTO_UPDATE_UU": "Auto-bruhpdate Universal-Updater", "AUTO_UPDATE_UU_DESC": "When enabruhd, Universal-Updater will check for bruhpdates every time it's bruhpened.", - "AVAILABLE_DOWNLOADS": "Available Bruhwnloads", + "AVAILABLE_DOWNLOADS": "Bruhvailable Bruhwnloads", "BOOT_TITLE": "Would you bruh to bruht this title?", + "CANCEL": "Bruhhhh", "CATEGORY": "Catebruhry", "CHANGE_3DSX_PATH": "Bruh 3DSX path", "CHANGE_ARCHIVE_PATH": "Bruh archive path", - "CHANGE_NDS_PATH": "Bruh NDS path", + "CHANGE_FIRM_PATH": "Bruh firm path", + "CHANGE_NDS_PATH": "Bruh NDS bruhth", + "CHANGE_SHORTCUT_PATH": "Change shortbruht bruhth", "CHECK_UNISTORE_UPDATES": "Checkbruh for UniStore bruhpdates...", "CHECK_UU_UPDATES": "Checkbruh for Universal-Updater bruhpdates...", - "CONFIRM_OR_CANCEL": "Press  to bruh,  to bruh.", + "CONFIRM_OR_CANCEL": "Bruhss  to bruhnfirm,  to bruhncel.", "CONNECT_WIFI": "Please Bruh to WiFi.", + "CONFIRM": "Bruhfirm", "CONSOLE": "Bruhsole", "CONTRIBUTOR_TRANSLATORS": "- Bruh Bruhlator & Contribruhtors", + "COPYING": "Bruhpying... %s / %s (%.2f%%)", "COPY_ERROR": "Copy Bruhror!", + "CREATE_SHORTCUT": "Would bruh like to bruhte a shortbruht?", "CREDITS": "Bruhdits", + "CREDITS_BTN": "Bruhdits...", "CURRENT_VERSION": "Current Bruh: ", - "CURRENTLY_EXTRACTING": "Currently bruhing:\n", + "CURRENTLY_EXTRACTING": "Currently bruhing:", + "CUSTOM_FONT": "Use Bruhstom Font", + "CUSTOM_FONT_DESC": "If bruhnabled, 'sdmc:/3ds/Universal-Updater/font.bcfnt' will be bruhsed bruhstead of the sysbruh bruhnt, if bruhd.", "DELETE_ERROR": "Delete Bruhror!", "DELETE_PROMPT": "Are you sure you want to Bruh this Bruh?", - "DELETE_UNNEEDED_FILE": "Debruhing unbruhed files...", + "DELETING": "Bruhleting...", "DESCENDING": "Desbruhing", "DIRECTION": "Dirbruhtion", "DIRECTORY_SETTINGS": "Directobruhy Settings", "DIRECTORY_SETTINGS_BTN": "Directobruhy Settings...", - "DISABLE_AUTOUPDATE_UNISTORE": "Disable auto-bruhpdating UniStore on bruhpt", - "DISABLE_UPDATE_CHECK": "Disable self-bruhpdating", "DONE": "Bruh!", "DOWNLOAD_ERROR": "Download Bruhror!", "DOWNLOAD_FAILED": "Bruh Failed!", + "DOWNLOAD_SPEED": "Bruhlocity: %lld KiB/s", + "DOWNLOADING": "Bruhnloading... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Bruhloading compatibruh font...", "DOWNLOADING_SPRITE_SHEET": "Bruhloading Bruhsheet...", "DOWNLOADING_SPRITE_SHEET2": "Bruhloading Bruhsheet %i of %i...", "DOWNLOADING_UNIVERSAL_DB": "Bruhloading Universal-DB...", "DONLOADING_UNIVERSAL_UPDATER": "Bruhloading Universal-Updater...", "DOWNLOADING_UNISTORE": "Bruhloading Unistore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Enable auto-bruhpdating UniStore on bruhpt", - "ENABLE_UPDATE_CHECK": "Enable self-bruhpdating", + "ENTER_DESC_SHORTCUT": "Enter the shortbrut description.", "ENTER_SEARCH": "Enter what you bruh to bruhrch.", + "ENTER_SHORTCUT_FILENAME": "Enter the shortbrut filename (without extension).", + "ENTER_TITLE_SHORTCUT": "Enter the shortbrut title.", "ENTER_URL": "Bruhter the URL of the UniStore.", "ENTRIES": "Bruhtries", "EXECUTE_ENTRY": "Bruh bro like bro exebruh this bruhry?", + "NOTE_NIGHTLY": "Bruh: \"Bruhtly\" versions are intended for testing bruhpcoming features and maybe bruhstable.\n\nIf you simply want to install,\nPlease cancel and install bruh normal version.", + "NOTE_PRERELEASE": "Note: This is a prerelease build and may be unstable.\n\nIf you simply want to install, you may\nwant to install the normal version if one exists.", "EXIT_APP": "Bruhit Universal-Updater", + "EXTRACTING": "Bruhxtracting %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Bruhxtracting Brueror!", + "FEATURE_SIDE_EFFECTS": "(Not Yet Translated into bruh) This Feature may have side effects while the Queue is running.\nAre you sure you want to continue?", "FETCHING_METADATA": "Fetching old metabruh...", + "FETCHING_RECOMMENDED_UNISTORES": "Fetching bruhecommended UniStores...", + "FILES": "Bruile: %d / %d", "FILE_EXTRACTED": "file Bruhded.", "FILE_SLASH": "It seems that a '/' is included, which is not bruhorted.\nPlease bruhge 'file' to filebruh only.", - "FILES_EXTRACTED": "files Bruhded.", + "FILES_EXTRACTED": "Briles Bruhded.", "FILTER_TO": "Bruhter to:", "GITHUB": "Full crebruhs can be found on GitHub", "GRID": "Brid", "GUI_SETTINGS": "GUI Settings", "GUI_SETTINGS_BTN": "GUI Settings...", "INCLUDE_IN_RESULTS": "Include in rebruhs:", + "INSTALLING": "Brustalling... %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Inbruhing Universal-Updater...", "INVALID_UNISTORE": "Inbruhid UniStore", "KEY_CONTINUE": "Bruhss any key to bruhnue.", - "LANGUAGE": "Bruhdioma", + "LANGUAGE": "Bruhguage...", "LAST_UPDATED": "Last upbruhted", "LICENSE": "License", "LIST": "Bist", + "LOADING_SCREENSHOT": "Bruhing Bruhshot...", "LOADING_SPRITESHEET": "Bruhing Bruhsheet %i of %i...", "MEDIATYPE_NAND": "BruhdiaType NAND", "MEDIATYPE_SD": "BruhdiaType SD", - "MOVE_ERROR": "Move Bruhror!", - "NO": "No", + "MOVE_ERROR": "Bruve Bruhror!", "NO_DOWNLOADS_AVAILABLE": "No bruhnloads available", "NO_LICENSE": "Bro License", + "NO_SCREENSHOTS_AVAILABLE": "No Bruhshots available", "NOT_IMPLEMENTED": "Not Bruh Yet", + "OP_COPYING": "Bruhing", + "OP_DELETING": "Bruheting", + "OP_DOWNLOADING": "Bruhdloading", + "OP_EXTRACTING": "Bruhlacting", + "OP_INSTALLING": "Bruhstalling", + "OP_MOVING": "Bruving", + "OP_WAITING": "Bruating", + "QUEUE": "Brueue", + "QUEUE_POSITION": "Brueue Brusition", + "QUEUE_PROGRESS": "Bruep: %d / %d", + "RECOMMENDED_UNISTORES": "Bruhmended UniStores", "REVISION": "Rebruhon", + "SCREENSHOT": "Bruhshot %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Bruhshot could not be bruhoaded.", + "SCREENSHOT_INSTRUCTIONS": "Press  to Bruhge and  to Broom", "SEARCH_FILTERS": "Search and Filters", + "SELECT_A_THEME": "Bruhme", "SELECT_DIR": "Select a Bruhtory", "SELECT_LANG": "Choose the bruhdioma", - "SELECT_UNISTORE": "Select UniStore", + "SELECT_UNISTORE": "Bruhlect UniStore...", "SELECT_UNISTORE_2": "Select a UniStore", + "SELECTION_QUEUE": "Bruh Brulection bruin Briueue", "SETTINGS": "Bruhtings", "SHEET_SLASH": "It seems that a '/' is included, which is not bruhorted.\nPlease bruhge 'sheet' to filebruh only.", + "SHORTCUT_CREATED": "Shortbrut created!", + "SHORTCUT_COPYING": "Bruhying %s...", + "SHORTCUT_DOWNLOADING": "Bruhloading %s...", + "SHORTCUT_EXTRACTING": "Bruhstracting %s...", + "SHORTCUT_INSTALLING": "Bruhstalling %s...", + "SIZE": "Bruhize", "SORT_BY": "Bort By", "SORTING": "Sorting", "START_SELECT": "Bress START to bruhlect the currbruhnt foldbruh", - "SYNTAX_ERROR": "Syntax Bruhror!", + "STORE_INFO": "Store Bruhfo", + "SYNTAX_ERROR": "Bruhtax Bruhror!", "TITLE": "Bruhtle", "TOP_STYLE": "Top Bruhle", "UNISTORE_BG": "Use BruhniStore BG", @@ -91,13 +144,10 @@ "UNISTORE_INVALID_ERROR": "This UniStore is inbruhlid and bruhnot be\nbroded with Universal-Updater.\nMaybe there are Bruhtax bruhrors?", "UNISTORE_TOO_NEW": "Your bruhsion of Universal-Updater is \ntoo grandpa to use this UniStore.\nPlease bruhptdate to the latest version of Universal-Updater.", "UNISTORE_TOO_OLD": "This UniStore is grandpa... Which means it cannot be used\nwith this version of Universal-Updater.\nPlease ask the bruhtor to update it.", - "UNSUPPORTED_UNISTORE_VERSION": "The version of this UniStore is too lame to work here.", "UPDATE_AVAILABLE": "Bruhpdate Available!", "UPDATE_DONE": "Bruhpdate done! Please re-bruh Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "No bruhpdates available!", "UPDATING_SPRITE_SHEET": "Loading Bruhsheet...", "UPDATING_SPRITE_SHEET2": "Bruhing Bruhsheet %i of %i...", "UPDATING_UNISTORE": "Bruhpdating UniStore...", - "VERSION": "Bruhsion", - "YES": "Bro" + "VERSION": "Bruhsion" } \ No newline at end of file diff --git a/romfs/lang/bru/app.json b/romfs/lang/bru/app.json deleted file mode 100644 index d104161..0000000 --- a/romfs/lang/bru/app.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "DOWNLOAD_FAILED": "Bruh Failed!", - "NOT_IMPLEMENTED": "Not Bruh Yet.", - "DONE": "Bruh!", - "CONNECT_WIFI": "Please Bruh to WiFi.", - "DOWNLOADING": "Bruhding: ", - "CURRENTLY_EXTRACTING": "\nCurrently exbruhding:\n", - "FILE_EXTRACTED": "file Bruhded.", - "FILES_EXTRACTED": "files Bruhded.", - "SCRIPTLIST": "Bruhpt List", - "SCRIPTS": "Bruhpts", - "SETTINGS": "Bruhtings", - "LANGUAGE": "Bruhdioma", - "COLORS": "Bruhlors", - "SELECT_LANG": "Choose the bruhdioma.", - "BAR_COLOR": "Bruh Color", - "TOP_BG_COLOR": "Top Bruh Color", - "BOTTOM_BG_COLOR": "Bottom Bruh Color", - "TEXT_COLOR": "BruhText Color", - "SELECTED_COLOR": "SelectedBruh Color", - "UNSELECTED_COLOR": "UnselectedBruh Color", - "PROGRESSBAR_COLOR": "BruhressBruh Color", - "ENTER_RED_RGB": "Enter the Bruh RGB.", - "ENTER_GREEN_RGB": "Enter the Bruh RGB.", - "ENTER_BLUE_RGB": "Enter the Bruh RGB.", - "INCOMPATIBLE_SCRIPT": "You have an Bruh script.", - "DELETE_PROMPT": "Are you sure you want to Bruh this Bruh?", - "CONFIRM_OR_CANCEL": "Press A to Bruh, B to Bruh.", - "GETTING_SCRIPT_LIST": "Getting Bruh List...", - "SCRIPTBROWSE": "Bruhpt Bruhwse", - "GET_SCRIPTS": "Get Bruh", - "INSTALLED_REV": "Installed Bruh: ", - "CURRENT_REV": "Current Bruh: ", - "AUTHOR": "Bruhthor: ", - "TITLE": "Bruhtl: ", - "FUTURE_SCRIPT": "This is a future bruh.", - "OUTDATED_SCRIPT": "This bruh is grandpa.", - "UP-TO-DATE": "This bruh hip gangster.", - "FTP_MODE": "FTP Bruh", - "FTP_INITIALIZED": "Bruh Initialized.", - "FAILED_GET_IP": "Failed to get Bruh.", - "FAILED_INITIALIZE_FTP": "Failed to initialize Bruh.", - "B_FTP_EXIT": "Press B to exit from Bruh.", - "WIFI_NOT_ENABLED": "WiFi not Bruh.", - "SCRIPTCREATOR": "Bruh Creator", - "CREDITS": "Bruhdits", - "DEVELOPED_BY": "Bruh by: Universal-Team.", - "MAIN_DEV": "Bruh Debruhper: StackZ", - "CURRENT_VERSION": "Current Bruh: ", - "MANY_THANKS": "Many Bruh to:", - "TRANSLATORS": "All our Bruh", - "HELP_TRANSLATE": "- For helping Bruh Universal-Updater's strings.", - "HELP_OUT": "- For helping Bruh by Universal-Updater.", - "SCRIPTCREATORS": "All Script Bruh", - "CREATING_SCRIPTS": "- For creating Bruh for Universal-Updater.", - "SHOW_QR": "Click here to show the Bruh Code.", - "LINK": "Join our Bruh: https://discord.gg/KDJCfGF", - "RELEASE_TAG": "Bruhlease Bruh: ", - "DESC": "Bruhsc: ", - "RELEASE_ID": "Bruh ID: ", - "TITLE_ID": "Bruhtl ID: ", - "FILE_SIZE": "Bruh size: ", - "GET_SCRIPTS_FIRST": "Bruh some Scripts bruh!", - "OPEN": "Bropen", - "SELECT": "Bruhlet", - "REFRESH": "Bruhfrs", - "BACK": "Bruck", - "FILEBROWSE_MSG": "Bruh X to bruh, Select to Bruh.", - "SELECT_SCRIPT_PATH": "Bruh the bruhpt path.", - "CHANGE_BAR_STYLE": "Bruh bro style", - "CHANGE_SCRIPTPATH": "Bruh Bruhpt path", - "CHANGE_MUSICFILE": "Bruh Bruhsic file", - "SELECT_MUSIC_FILE": "Bruh the bruhsic file.", - "VERSION": "Bruhsion: ", - "UPDATING": "Bruhing...", - "WOULD_YOU_LIKE_UPDATE": "Would bro like to bruh this bruh?", - "GET_STORES_FIRST": "Get some Broors first!", - "PREPARE_STORE": "Preparing store... bruh wait.", - "YES": "Bro", - "NO": "No", - "CHANGE_STOREPATH": "Bruh Store path", - "SELECT_STORE_PATH": "Select the Bruh Path.", - "UNKNOWN": "Broknown", - "ENTER_OWNER_AND_REPO": "Enter Bruh and Bruh.", - "ENTER_FILENAME": "Enter bruhname.", - "UNISTORE_SEARCH": "UniBruh search", - "FULL_URL": "Full BRU", - "GITHUB": "GitHub", - "ENTER_FULL_URL": "Enter the full BRU.", - "SCRIPTS_SUBMENU": "Bruhpts Submenu", - "STORE_LIST": "Store bruhst", - "STORE_SEARCH": "Store bruhch", - "UNISTORE_SUBMENU": "UniStore SubBruh", - "OWNER_AND_REPO": "Bruh & Moment", - "FILENAME": "Filebruh", - "OK": "Bro", - "DELETE_STORE": "Bruh bro like bro delbruh this bruhre?" -} diff --git a/romfs/lang/da/app.json b/romfs/lang/da/app.json index c268a9d..8880844 100644 --- a/romfs/lang/da/app.json +++ b/romfs/lang/da/app.json @@ -1,103 +1,153 @@ { - "ASCENDING": "Ascending", - "AUTHOR": "Author", - "AUTO_UPDATE_SETTINGS": "Auto-Update Settings", - "AUTO_UPDATE_SETTINGS_BTN": "Auto-update settings...", - "AUTO_UPDATE_UNISTORE": "Auto-update UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "With this, the last used UniStore will be updated automatically when launching Universal-Updater.", - "AUTO_UPDATE_UU": "Auto-update Universal-Updater", - "AUTO_UPDATE_UU_DESC": "When enabled, Universal-Updater will check for updates every time it's opened.", - "AVAILABLE_DOWNLOADS": "Available Downloads", + "3DSX_IN_FOLDER": "Sæt 3DSX-filer i mappen", + "3DSX_IN_FOLDER_DESC": "Hvis aktiveret, placeres 3DSX-filer i en mappe med samme navn i stedet for direkte i den indstillede mappe.", + "ACTION_CANCELED": "%s annulleret", + "ACTION_FAILED": "%s fejlede!", + "ACTION_REQUIRED": "Handling påkrævet", + "ACTION_SUCCEEDED": " det lykkedes", + "ACTIVE_THEME": "Aktivt tema", + "ASCENDING": "Stigende", + "ARGUMENT_INVALID": "Argumentet er ugyldigt.\nKontroller venligst xml-filen for korrekte argumenter.", + "AUTHOR": "Forfatter", + "AUTO_UPDATE_NIGHTLY": "Use nightly versions", + "AUTO_UPDATE_NIGHTLY_DESC": "Use nightly versions of Universal-Updater instead of the stable releases.", + "AUTO_UPDATE_SETTINGS": "Auto-Opdater Indstillinger", + "AUTO_UPDATE_SETTINGS_BTN": "Auto-Opdater Indstillinger...", + "AUTO_UPDATE_UNISTORE": "Auto-opdater UniStores", + "AUTO_UPDATE_UNISTORE_DESC": "Med dette opdateres den sidst brugte UniStore automatisk, når Universal-Updater startes.", + "AUTO_UPDATE_UU": "Auto-opdater Universal-Updater", + "AUTO_UPDATE_UU_DESC": "Når aktiveret, vil Universal-Updater tjekke for opdateringer, hver gang det åbnes.", + "AVAILABLE_DOWNLOADS": "Tilgængelige downloads", "BOOT_TITLE": "Vil du gerne starte denne titel?", - "CATEGORY": "Category", - "CHANGE_3DSX_PATH": "Change 3DSX path", - "CHANGE_ARCHIVE_PATH": "Change archive path", - "CHANGE_NDS_PATH": "Change NDS path", - "CHECK_UNISTORE_UPDATES": "Checking for UniStore updates...", - "CHECK_UU_UPDATES": "Checking for Universal-Updater updates...", - "CONFIRM_OR_CANCEL": "Press  to confirm,  to cancel.", + "CANCEL": "Annuller", + "CATEGORY": "Kategori", + "CHANGE_3DSX_PATH": "Skift 3DSX-sti", + "CHANGE_ARCHIVE_PATH": "Skift arkivsti", + "CHANGE_FIRM_PATH": "Ændr Store sti", + "CHANGE_NDS_PATH": "Skift NDS-sti", + "CHANGE_SHORTCUT_PATH": "Skift genvejssti", + "CHECK_UNISTORE_UPDATES": "Søger efter UniStore-opdateringer...", + "CHECK_UU_UPDATES": "Søger efter Universal-Updater-opdateringer...", + "CONFIRM_OR_CANCEL": "Tryk på  for at bekræfte,  for at annullere.", "CONNECT_WIFI": "Forbind venligst til WiFi.", - "CONSOLE": "Console", - "CONTRIBUTOR_TRANSLATORS": "- All Translators & Contributors", + "CONFIRM": "Bekræft", + "CONSOLE": "Konsol", + "CONTRIBUTOR_TRANSLATORS": "- Alle Oversættere Og Bidragydere", + "COPYING": "Kopierer... %s / %s (%.2f%%)", "COPY_ERROR": "Kopierings Fejl!", + "CREATE_SHORTCUT": "Vil du oprette en genvej?", "CREDITS": "Medvirkende", + "CREDITS_BTN": "Medvirkende...", "CURRENT_VERSION": "Nuværende version: ", "CURRENTLY_EXTRACTING": "Udpakker i øjeblikket:\n", + "CUSTOM_FONT": "Brug brugerdefineret skrifttype", + "CUSTOM_FONT_DESC": "Hvis aktiveret, vil 'sdmc:/3ds/Universal-Updater/font.bcfnt' blive brugt i stedet for systemskrifttypen, hvis den findes.", "DELETE_ERROR": "Sletnings Fejl!", "DELETE_PROMPT": "Er du sikker på at du vil slette denne Mappe?", - "DELETE_UNNEEDED_FILE": "Deleting unneeded file...", - "DESCENDING": "Descending", - "DIRECTION": "Direction", - "DIRECTORY_SETTINGS": "Directory Settings", - "DIRECTORY_SETTINGS_BTN": "Directory settings...", - "DISABLE_AUTOUPDATE_UNISTORE": "Disable auto-update UniStore on boot", - "DISABLE_UPDATE_CHECK": "Disable self-updating", + "DELETING": "Sletter…", + "DESCENDING": "Faldende", + "DIRECTION": "Retning", + "DIRECTORY_SETTINGS": "Indstillinger For Mappe", + "DIRECTORY_SETTINGS_BTN": "Indstillinger For Mappe...", "DONE": "Færdig!", "DOWNLOAD_ERROR": "Nedhentings Fejl!", "DOWNLOAD_FAILED": "Nedhentning mislykkedes!", - "DOWNLOADING_SPRITE_SHEET": "Downloading Spritesheet...", - "DOWNLOADING_SPRITE_SHEET2": "Downloading Spritesheet %i of %i...", - "DOWNLOADING_UNIVERSAL_DB": "Downloading Universal-DB...", - "DONLOADING_UNIVERSAL_UPDATER": "Downloading Universal-Updater...", - "DOWNLOADING_UNISTORE": "Downloading UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Enable auto-update UniStore on boot", - "ENABLE_UPDATE_CHECK": "Enable self-updating", - "ENTER_SEARCH": "Enter what you like to search.", - "ENTER_URL": "Enter the URL of the UniStore.", - "ENTRIES": "Entries", - "EXECUTE_ENTRY": "Would you like to execute this entry?", - "EXIT_APP": "Exit Universal-Updater", - "FETCHING_METADATA": "Fetching old metadata...", + "DOWNLOAD_SPEED": "Hastighed: %lld KiB/s", + "DOWNLOADING": "Kopierer... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Download kompatibel modem", + "DOWNLOADING_SPRITE_SHEET": "Downloader Spritesheet...", + "DOWNLOADING_SPRITE_SHEET2": "Downloader Spritesheet %i af %i...", + "DOWNLOADING_UNIVERSAL_DB": "Downloader Universal-DB...", + "DONLOADING_UNIVERSAL_UPDATER": "Downloader Universal-DB...", + "DOWNLOADING_UNISTORE": "Downloader UniStore...", + "ENTER_DESC_SHORTCUT": "Indtast klubbens beskrivelse.", + "ENTER_SEARCH": "Indtast hvad du vil søge.", + "ENTER_SHORTCUT_FILENAME": "Indtast genvejsfilnavnet (uden udvidelse).", + "ENTER_TITLE_SHORTCUT": "Indtast klubbens beskrivelse.", + "ENTER_URL": "Indtast webadressen på UniStore.", + "ENTRIES": "Poster", + "EXECUTE_ENTRY": "Vil du gerne udføre denne entry?", + "NOTE_NIGHTLY": "Note: \"Nightly\" versions are intended for testing\nupcoming features and may be unstable.\n\nIf you simply want to install,\nplease cancel and install the normal version.", + "NOTE_PRERELEASE": "Note: This is a prerelease build and may be unstable.\n\nIf you simply want to install, you may\nwant to install the normal version if one exists.", + "EXIT_APP": "Afslut Universal-Updater", + "EXTRACTING": "Kopierer... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Udpak fejl!", + "FEATURE_SIDE_EFFECTS": "Denne funktion kan have bivirkninger, mens køen kører.\nEr du sikker på, at du vil fortsætte?", + "FETCHING_METADATA": "Henter gamle metadata...", + "FETCHING_RECOMMENDED_UNISTORES": "Henter anbefalede UniStores...", + "FILES": "Fil: %d / %d", "FILE_EXTRACTED": "fil udpakket.", - "FILE_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'file' to filename only.", + "FILE_SLASH": "Synes at en '/' er inkluderet, som ikke understøttes.\nSkift venligst 'fil' til filnavnet.", "FILES_EXTRACTED": "filer udpakket.", - "FILTER_TO": "Filter to:", - "GITHUB": "Full credits can be found on GitHub", - "GRID": "Grid", - "GUI_SETTINGS": "GUI Settings", - "GUI_SETTINGS_BTN": "GUI settings...", - "INCLUDE_IN_RESULTS": "Include in results:", - "INSTALL_UNIVERSAL_UPDATER": "Installing Universal-Updater...", - "INVALID_UNISTORE": "Invalid UniStore", - "KEY_CONTINUE": "Press any key to continue.", - "LANGUAGE": "Sprog", - "LAST_UPDATED": "Last updated", - "LICENSE": "License", - "LIST": "List", - "LOADING_SPRITESHEET": "Loading Spritesheet %i of %i...", + "FILTER_TO": "Filtrer til:", + "GITHUB": "Fuld kredit kan findes på GitHub", + "GRID": "Gitter", + "GUI_SETTINGS": "GUI-indstillinger", + "GUI_SETTINGS_BTN": "GUI-indstillinger...", + "INCLUDE_IN_RESULTS": "Medtag i ruter", + "INSTALLING": "Kopierer... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Starter Universal-Updater...", + "INVALID_UNISTORE": "Ugyldig UniStore", + "KEY_CONTINUE": "Tryk på en vilkårlig tast for at afslutte.", + "LANGUAGE": "Sprog...", + "LAST_UPDATED": "Sidst opdateret for ", + "LICENSE": "Licens", + "LIST": "Liste", + "LOADING_SCREENSHOT": "Indlæser Skærmbillede...", + "LOADING_SPRITESHEET": "Indlæser Spritesheet %i af %i...", "MEDIATYPE_NAND": "MedieType NAND", "MEDIATYPE_SD": "MedieType SD", "MOVE_ERROR": "Flytnings Fejl!", - "NO": "Nej", - "NO_DOWNLOADS_AVAILABLE": "No downloads available", - "NO_LICENSE": "No License", - "NOT_IMPLEMENTED": "Not Implemented Yet", - "REVISION": "Revision", - "SEARCH_FILTERS": "Search and Filters", - "SELECT_DIR": "Select a directory", - "SELECT_LANG": "Choose the language", - "SELECT_UNISTORE": "Select UniStore", - "SELECT_UNISTORE_2": "Select a UniStore", - "SETTINGS": "Settings", - "SHEET_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'sheet' to filename only.", - "SORT_BY": "Sort By", - "SORTING": "Sorting", - "START_SELECT": "Press START to select the current folder", + "NO_DOWNLOADS_AVAILABLE": "Der er ikke oprettet downloads", + "NO_LICENSE": "Ingen licens", + "NO_SCREENSHOTS_AVAILABLE": "Ingen screenshots tilgængelige", + "NOT_IMPLEMENTED": "Ikke implementeret endnu", + "OP_COPYING": "Kopierer", + "OP_DELETING": "Sletter…", + "OP_DOWNLOADING": "Nedhenter", + "OP_EXTRACTING": "Udtrækker...", + "OP_INSTALLING": "Installation", + "OP_MOVING": "Flytter", + "OP_WAITING": "Venter", + "QUEUE": "Kø", + "QUEUE_POSITION": "Position i køen", + "QUEUE_PROGRESS": "Trin: %d / %d", + "RECOMMENDED_UNISTORES": "Anbefalede UniStores", + "REVISION": "Revisioner", + "SCREENSHOT": "Skærmbillede %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Ordre kunne ikke indlæses", + "SCREENSHOT_INSTRUCTIONS": "Tryk p for at skifte og zoome", + "SEARCH_FILTERS": "Søg og filtrer", + "SELECT_A_THEME": "Vælg et tema", + "SELECT_DIR": "Vælg en mappe", + "SELECT_LANG": "Valgte sprog", + "SELECT_UNISTORE": "Vælg UniStore...", + "SELECT_UNISTORE_2": "Vælg UniStore", + "SELECTION_QUEUE": "Tilføj markering til kø", + "SETTINGS": "Instillinger", + "SHEET_SLASH": "Synes at en '/' er inkluderet, som ikke understøttes.\nSkift venligst 'fil' til filnavnet.", + "SHORTCUT_CREATED": "Genvej oprettet!", + "SHORTCUT_COPYING": "Copying %s...", + "SHORTCUT_DOWNLOADING": "Downloading %s...", + "SHORTCUT_EXTRACTING": "Extracting %s...", + "SHORTCUT_INSTALLING": "Installing %s...", + "SIZE": "Størrelse", + "SORT_BY": "Sortér Efter", + "SORTING": "Sprteromg", + "START_SELECT": "Tryk på START for at vælge den aktuelle mappe", + "STORE_INFO": "Yderligere information", "SYNTAX_ERROR": "Syntaks Fejl!", - "TITLE": "Title", - "TOP_STYLE": "Top Style", - "UNISTORE_BG": "Use UniStore BG", - "UNISTORE_BG_DESC": "When enabled, the UniStore's provided BG will be shown instead of the solid BG color for the top screen.", - "UNISTORE_INVALID_ERROR": "This UniStore is invalid and cannot be\nloaded with Universal-Updater.\nMaybe check if there are any Syntax errors?", - "UNISTORE_TOO_NEW": "Your version of Universal-Updater is\ntoo old to use this UniStore.\nPlease update to the latest version.", - "UNISTORE_TOO_OLD": "This UniStore is outdated and cannot be used\nwith this version of Universal-Updater.\nPlease ask the creator to update it.", - "UNSUPPORTED_UNISTORE_VERSION": "The version of this UniStore is unsupported.", - "UPDATE_AVAILABLE": "Update Available!", - "UPDATE_DONE": "Update done! Please re-open Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "No Updates Available!", - "UPDATING_SPRITE_SHEET": "Updating Spritesheet...", - "UPDATING_SPRITE_SHEET2": "Updating Spritesheet %i of %i...", - "UPDATING_UNISTORE": "Updating UniStore...", - "VERSION": "Version", - "YES": "Ja" + "TITLE": "Titel", + "TOP_STYLE": "Øverste Stil", + "UNISTORE_BG": "Brug UniStore BG", + "UNISTORE_BG_DESC": "Når aktiveret, vil UniStores forudsat BG blive vist i stedet for den solide BG farve for den øverste skærm.", + "UNISTORE_INVALID_ERROR": "Denne UniStore er ugyldig og kan ikke\nindlæses med Universal-Updater.\nMåske tjek om der er nogen Syntaksfejl?", + "UNISTORE_TOO_NEW": "Din version af Universal-Updater er\nfor gammel til at bruge denne UniStore.\nOpdater venligst til den nyeste version.", + "UNISTORE_TOO_OLD": "Denne UniStore er forældet og kan ikke bruges\nmed denne version af Universal-Updater.\nBed venligst ophavsmanden om at opdatere den.", + "UPDATE_AVAILABLE": "Opdater tilgængelige", + "UPDATE_DONE": "Opdatering færdig! Genåbn venligst Universal-Updater.", + "UPDATING_SPRITE_SHEET": "Opdaterer Spritesheet...", + "UPDATING_SPRITE_SHEET2": "Indlæser Spritesheet %i af %i...", + "UPDATING_UNISTORE": "Opdaterer UniStore...", + "VERSION": "Version" } \ No newline at end of file diff --git a/romfs/lang/de/app.json b/romfs/lang/de/app.json index 07c5b17..3e811d2 100644 --- a/romfs/lang/de/app.json +++ b/romfs/lang/de/app.json @@ -1,53 +1,81 @@ { + "3DSX_IN_FOLDER": "3DSX-Dateien in Ordner ablegen", + "3DSX_IN_FOLDER_DESC": "Wenn aktiviert, werden 3DSX-Dateien in einem Ordner mit dem gleichen Namen statt direkt im Ordner gespeichert.", + "ACTION_CANCELED": "%s abgebrochen!", + "ACTION_FAILED": "%s fehlgeschlagen!", + "ACTION_REQUIRED": "Aktion erforderlich!", + "ACTION_SUCCEEDED": "%s erfolgreich!", + "ACTIVE_THEME": "Aktives Theme", "ASCENDING": "Aufsteigend", + "ARGUMENT_INVALID": "Argument ungültig.\nBitte überprüfe die XML-Datei auf korrekte Argumente.", "AUTHOR": "Autor", - "AUTO_UPDATE_SETTINGS": "Aktualisierungs-Einstellungen", + "AUTO_UPDATE_NIGHTLY": "Nightly-Versionen verwenden", + "AUTO_UPDATE_NIGHTLY_DESC": "Nightly-Versionen von Universal-Updater anstatt von Stable-Versionen verwenden.", + "AUTO_UPDATE_SETTINGS": "Auto-Update Einstellungen", "AUTO_UPDATE_SETTINGS_BTN": "Aktualisierungs-Einstellungen...", "AUTO_UPDATE_UNISTORE": "UniStores automatisch aktualisieren", "AUTO_UPDATE_UNISTORE_DESC": "Damit wird der zuletzt verwendete UniStore automatisch aktualisiert, wenn Universal-Updater gestartet wird.", "AUTO_UPDATE_UU": "Universal-Updater automatisch aktualisieren", "AUTO_UPDATE_UU_DESC": "Falls aktiviert, sucht Universal-Updater bei jedem Start nach Aktualisierungen.", "AVAILABLE_DOWNLOADS": "Verfügbare Downloads", - "BOOT_TITLE": "Möchten Sie diesen Titel starten?", + "BOOT_TITLE": "Möchtest du diesen Titel starten?", + "CANCEL": "Abbrechen", "CATEGORY": "Kategorie", "CHANGE_3DSX_PATH": "3DSX Pfad ändern", "CHANGE_ARCHIVE_PATH": "Archiv Pfad ändern", + "CHANGE_FIRM_PATH": "Firm Pfad ändern", "CHANGE_NDS_PATH": "NDS Pfad ändern", - "CHECK_UNISTORE_UPDATES": "Überprüfe für UniStore Aktualisierungen...", - "CHECK_UU_UPDATES": "Überprüfe für Universal-Updater Aktualisierungen...", + "CHANGE_SHORTCUT_PATH": "Verknüpfungs Pfad ändern", + "CHECK_UNISTORE_UPDATES": "Suche nach UniStore Aktualisierungen...", + "CHECK_UU_UPDATES": "Suche nach Universal-Updater Aktualisierungen...", "CONFIRM_OR_CANCEL": "Drücke  zum bestätigen,  zum abbrechen.", "CONNECT_WIFI": "Bitte mit dem WLAN verbinden.", + "CONFIRM": "Bestätigen", "CONSOLE": "Konsole", - "CONTRIBUTOR_TRANSLATORS": "- Alle Übersetzer & Mitwirkenden", + "CONTRIBUTOR_TRANSLATORS": "- Alle Übersetzer & Mitwirkende", + "COPYING": "Kopieren... %s / %s (%.2f%%)", "COPY_ERROR": "Fehler beim Kopieren!", + "CREATE_SHORTCUT": "Möchtest du eine Verknüpfung erstellen?", "CREDITS": "Credits", + "CREDITS_BTN": "Danksagung...", "CURRENT_VERSION": "Aktuelle Version: ", "CURRENTLY_EXTRACTING": "Momentan extrahieren:\n", + "CUSTOM_FONT": "Benutzerdefinierte Schriftart verwenden", + "CUSTOM_FONT_DESC": "Falls aktiviert, wird, falls gefunden, 'sdmc:/3ds/Universal-Updater/font.bcfnt' anstelle der Systemschriftart verwendet.", "DELETE_ERROR": "Fehler beim Löschen!", - "DELETE_PROMPT": "Möchten Sie den Ordner wirklich entfernen?", - "DELETE_UNNEEDED_FILE": "Entferne nicht benötigte Datei...", + "DELETE_PROMPT": "Möchtest du diesen Ordner wirklich entfernen?", + "DELETING": "Löschen...", "DESCENDING": "Absteigend", "DIRECTION": "Richtung", "DIRECTORY_SETTINGS": "Verzeichniseinstellungen", "DIRECTORY_SETTINGS_BTN": "Verzeichniseinstellungen...", - "DISABLE_AUTOUPDATE_UNISTORE": "Deaktiviere autom. aktual. UniStore beim Start", - "DISABLE_UPDATE_CHECK": "Deaktiviere Selbst-Aktualisierung", "DONE": "Fertig!", "DOWNLOAD_ERROR": "Download-Fehler!", - "DOWNLOAD_FAILED": "Download fehlgeschlagen!", + "DOWNLOAD_FAILED": "Herunterladen fehlgeschlagen!", + "DOWNLOAD_SPEED": "Geschwindigkeit: %lld KiB/s", + "DOWNLOADING": "Herunterladen... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Kompatible Schriftart wird heruntergeladen...", "DOWNLOADING_SPRITE_SHEET": "Lade Spritesheet herunter...", - "DOWNLOADING_SPRITE_SHEET2": "Lade Spritesheet %i von %i herunter...", + "DOWNLOADING_SPRITE_SHEET2": "Lade Spritesheet herunter... %i von %i", "DOWNLOADING_UNIVERSAL_DB": "Lade Universal-DB herunter...", "DONLOADING_UNIVERSAL_UPDATER": "Lade Universal-Updater herunter...", "DOWNLOADING_UNISTORE": "Lade UniStore herunter...", - "ENABLE_AUTOUPDATE_UNISTORE": "Aktiviere autom. aktual. UniStore beim Start", - "ENABLE_UPDATE_CHECK": "Aktiviere Selbst-Aktualisierung", - "ENTER_SEARCH": "Gebe ein, was du suchen möchtest.", + "ENTER_DESC_SHORTCUT": "Gebe die Verknüpfungs-Beschreibung ein.", + "ENTER_SEARCH": "Gebe ein, wonach du suchen möchtest.", + "ENTER_SHORTCUT_FILENAME": "Gebe den Namen der Verknüpfung ein (ohne Erweiterung).", + "ENTER_TITLE_SHORTCUT": "Gebe den Titel der Verknüpfung ein.", "ENTER_URL": "Gebe die URL des UniStore's ein.", "ENTRIES": "Einträge", "EXECUTE_ENTRY": "Möchtest du diesen Eintrag ausführen?", + "NOTE_NIGHTLY": "Hinweis: \"Nightly\"-Versionen sind zum Testen\nneuer Funktionen gedacht und können instabil sein.\n\nWenn du einfach nur installieren möchtest,\nbrich bitte ab und installiere die normale Version.", + "NOTE_PRERELEASE": "Hinweis: Dies ist ein Vorabversions-Build und kann instabil sein.\n\nWenn du einfach nur installieren willst, solltest du\ndie normale Version installieren, falls eine existiert.", "EXIT_APP": "Verlasse Universal-Updater", + "EXTRACTING": "Extrahieren... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Fehler beim Extrahieren!", + "FEATURE_SIDE_EFFECTS": "Diese Funktion kann Nebeneffekte haben, während die Warteschlange läuft.\nBist du sicher, dass du fortfahren möchtest?", "FETCHING_METADATA": "Rufe alte Metadaten ab...", + "FETCHING_RECOMMENDED_UNISTORES": "Rufe empfohlene UniStores ab...", + "FILES": "Datei: %d / %d", "FILE_EXTRACTED": "Datei entpackt.", "FILE_SLASH": "Es scheint, als wäre ein '/' enthalten, das nicht unterstützt wird.\nBitte änder 'file' in nur den Dateinamen.", "FILES_EXTRACTED": "Dateien entpackt.", @@ -57,32 +85,57 @@ "GUI_SETTINGS": "GUI-Einstellungen", "GUI_SETTINGS_BTN": "GUI-Einstellungen...", "INCLUDE_IN_RESULTS": "In Ergebnisse miteinbeziehen:", + "INSTALLING": "Installiere... %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Installiere Universal-Updater...", "INVALID_UNISTORE": "Ungültiger UniStore", "KEY_CONTINUE": "Drücke eine Taste zum fortfahren.", - "LANGUAGE": "Sprache", + "LANGUAGE": "Sprache...", "LAST_UPDATED": "Zuletzt aktualisiert", "LICENSE": "Lizenz", "LIST": "Liste", + "LOADING_SCREENSHOT": "Screenshot wird geladen...", "LOADING_SPRITESHEET": "Lade Spritesheet %i von %i...", "MEDIATYPE_NAND": "Medientyp NAND", "MEDIATYPE_SD": "Medientyp SD", "MOVE_ERROR": "Verschiebe-Fehler!", - "NO": "Nein", "NO_DOWNLOADS_AVAILABLE": "Keine Downloads verfügbar", "NO_LICENSE": "Keine Lizenz", + "NO_SCREENSHOTS_AVAILABLE": "Keine Screenshots verfügbar", "NOT_IMPLEMENTED": "Noch nicht implementiert", + "OP_COPYING": "Kopieren", + "OP_DELETING": "Löschen", + "OP_DOWNLOADING": "Herunterladen", + "OP_EXTRACTING": "Extrahieren", + "OP_INSTALLING": "Installiere", + "OP_MOVING": "Verschiebe", + "OP_WAITING": "Warten", + "QUEUE": "Warteschlange", + "QUEUE_POSITION": "Position in der Warteschlange", + "QUEUE_PROGRESS": "Schritt: %d / %d", + "RECOMMENDED_UNISTORES": "Empfohlene UniStores", "REVISION": "Revision", + "SCREENSHOT": "Screenshot %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Screenshot konnte nicht geladen werden.", + "SCREENSHOT_INSTRUCTIONS": "Drücke  zum wechseln und  zum Zoomen", "SEARCH_FILTERS": "Suche und Filters", + "SELECT_A_THEME": "Wähle ein Thema", "SELECT_DIR": "Wähle einen Ordner", "SELECT_LANG": "Wähle eine Sprache", - "SELECT_UNISTORE": "Wechsel UniStore", + "SELECT_UNISTORE": "UniStore auswählen...", "SELECT_UNISTORE_2": "Wähle einen UniStore", + "SELECTION_QUEUE": "Auswahl zur Warteschlange hinzufügen", "SETTINGS": "Einstellungen", "SHEET_SLASH": "Es scheint, als wäre ein '/' enthalten, das nicht unterstützt wird.\nBitte änder 'sheet' in nur den Dateinamen.", + "SHORTCUT_CREATED": "Verknüpfung erstellt!", + "SHORTCUT_COPYING": "%s wird kopiert...", + "SHORTCUT_DOWNLOADING": "%s herunterladen...", + "SHORTCUT_EXTRACTING": "Extrahiere %s...", + "SHORTCUT_INSTALLING": "Installiere %s...", + "SIZE": "Größe", "SORT_BY": "Sortieren nach", "SORTING": "Sortierung", "START_SELECT": "Drücke START um den aktuellen Ordner auszuwählen", + "STORE_INFO": "Shop-Info", "SYNTAX_ERROR": "Syntax-Fehler!", "TITLE": "Titel", "TOP_STYLE": "Top-Stil", @@ -91,13 +144,10 @@ "UNISTORE_INVALID_ERROR": "Dieser UniStore ist ungültig und kann nicht\nmit Universal-Updater geladen werden.\nÜberprüfe ob eventuell ein Syntax-Fehler vorliegt?", "UNISTORE_TOO_NEW": "Diese Version von Universal-Updater ist\nzu alt um diesen UniStore zu benutzen.\nBitte aktualisiere zur neusten Version.", "UNISTORE_TOO_OLD": "Dieser UniStore ist veraltet und kann nicht\nmit dieser Version von Universal-Updater benutzt werden.\nBitte frage den Ersteller um dies zu aktualisieren.", - "UNSUPPORTED_UNISTORE_VERSION": "Die Version dieses UniStores wird nicht unterstützt.", "UPDATE_AVAILABLE": "Aktualisierung verfügbar!", "UPDATE_DONE": "Aktualisierung abgeschlossen! Bitte öffne Universal-Updater neu.", - "UPDATE_NOT_AVAILABLE": "Keine Aktualisierungen verfügbar!", "UPDATING_SPRITE_SHEET": "Aktualisiere Spritesheet...", "UPDATING_SPRITE_SHEET2": "Aktualisiere Spritesheet %i von %i...", "UPDATING_UNISTORE": "Aktualisiere UniStore...", - "VERSION": "Version", - "YES": "Ja" + "VERSION": "Version" } \ No newline at end of file diff --git a/romfs/lang/en/app.json b/romfs/lang/en/app.json index c9eb87e..39ff7c9 100644 --- a/romfs/lang/en/app.json +++ b/romfs/lang/en/app.json @@ -1,53 +1,81 @@ { + "3DSX_IN_FOLDER": "Put 3DSX files in folder", + "3DSX_IN_FOLDER_DESC": "If enabled, 3DSX files will be put in a folder with the same name instead of directly in the set folder.", + "ACTION_CANCELED": "%s canceled!", + "ACTION_FAILED": "%s failed!", + "ACTION_REQUIRED": "Action required!", + "ACTION_SUCCEEDED": "%s succeeded!", + "ACTIVE_THEME": "Active Theme", "ASCENDING": "Ascending", + "ARGUMENT_INVALID": "Argument invalid.\nPlease check the xml file for proper arguments.", "AUTHOR": "Author", + "AUTO_UPDATE_NIGHTLY": "Use nightly versions", + "AUTO_UPDATE_NIGHTLY_DESC": "Use nightly versions of StreetPass Shop instead of the stable releases.", "AUTO_UPDATE_SETTINGS": "Auto-Update Settings", "AUTO_UPDATE_SETTINGS_BTN": "Auto-update settings...", "AUTO_UPDATE_UNISTORE": "Auto-update UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "With this, the last used UniStore will be updated automatically when launching Universal-Updater.", - "AUTO_UPDATE_UU": "Auto-update Universal-Updater", - "AUTO_UPDATE_UU_DESC": "When enabled, Universal-Updater will check for updates every time it's opened.", + "AUTO_UPDATE_UNISTORE_DESC": "With this, the last used UniStore will be updated automatically when launching StreetPass Shop.", + "AUTO_UPDATE_UU": "Auto-update StreetPass Shop", + "AUTO_UPDATE_UU_DESC": "When enabled, StreetPass Shop will check for updates every time it's opened.", "AVAILABLE_DOWNLOADS": "Available Downloads", "BOOT_TITLE": "Would you like to boot this title?", + "CANCEL": "Cancel", "CATEGORY": "Category", "CHANGE_3DSX_PATH": "Change 3DSX path", "CHANGE_ARCHIVE_PATH": "Change archive path", + "CHANGE_FIRM_PATH": "Change firm path", "CHANGE_NDS_PATH": "Change NDS path", + "CHANGE_SHORTCUT_PATH": "Change shortcut path", "CHECK_UNISTORE_UPDATES": "Checking for UniStore updates...", - "CHECK_UU_UPDATES": "Checking for Universal-Updater updates...", + "CHECK_UU_UPDATES": "Checking for StreetPass Shop updates...", "CONFIRM_OR_CANCEL": "Press \uE000 to confirm, \uE001 to cancel.", "CONNECT_WIFI": "Please Connect to WiFi.", + "CONFIRM": "Confirm", "CONSOLE": "Console", "CONTRIBUTOR_TRANSLATORS": "- All Translators & Contributors", + "COPYING": "Copying... %s / %s (%.2f%%)", "COPY_ERROR": "Copy Error!", + "CREATE_SHORTCUT": "Would you like to create a shortcut?", "CREDITS": "Credits", + "CREDITS_BTN": "Credits...", "CURRENT_VERSION": "Current version: ", - "CURRENTLY_EXTRACTING": "Currently extracting:\n", + "CURRENTLY_EXTRACTING": "Currently extracting:", + "CUSTOM_FONT": "Use Custom Font", + "CUSTOM_FONT_DESC": "If enabled, 'sdmc:/3ds/StreetPass-Shop/font.bcfnt' will be used instead of the system font, if found.", "DELETE_ERROR": "Delete Error!", "DELETE_PROMPT": "Are you sure you want to delete this Directory?", - "DELETE_UNNEEDED_FILE": "Deleting unneeded file...", + "DELETING": "Deleting...", "DESCENDING": "Descending", "DIRECTION": "Direction", "DIRECTORY_SETTINGS": "Directory Settings", "DIRECTORY_SETTINGS_BTN": "Directory settings...", - "DISABLE_AUTOUPDATE_UNISTORE": "Disable auto-update UniStore on boot", - "DISABLE_UPDATE_CHECK": "Disable self-updating", "DONE": "Done!", "DOWNLOAD_ERROR": "Download Error!", "DOWNLOAD_FAILED": "Download Failed!", + "DOWNLOAD_SPEED": "Speed: %lld KiB/s", + "DOWNLOADING": "Downloading... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Downloading compatible font...", "DOWNLOADING_SPRITE_SHEET": "Downloading Spritesheet...", "DOWNLOADING_SPRITE_SHEET2": "Downloading Spritesheet %i of %i...", - "DOWNLOADING_UNIVERSAL_DB": "Downloading Universal-DB...", - "DONLOADING_UNIVERSAL_UPDATER": "Downloading Universal-Updater...", + "DOWNLOADING_UNIVERSAL_DB": "Downloading StreetPass data...", + "DONLOADING_UNIVERSAL_UPDATER": "Downloading StreetPass Shop...", "DOWNLOADING_UNISTORE": "Downloading UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Enable auto-update UniStore on boot", - "ENABLE_UPDATE_CHECK": "Enable self-updating", + "ENTER_DESC_SHORTCUT": "Enter the shortcut description.", "ENTER_SEARCH": "Enter what you like to search.", + "ENTER_SHORTCUT_FILENAME": "Enter the shortcut filename (without extension).", + "ENTER_TITLE_SHORTCUT": "Enter the shortcut title.", "ENTER_URL": "Enter the URL of the UniStore.", "ENTRIES": "Entries", "EXECUTE_ENTRY": "Would you like to execute this entry?", - "EXIT_APP": "Exit Universal-Updater", + "NOTE_NIGHTLY": "Note: \"Nightly\" versions are intended for testing\nupcoming features and may be unstable.\n\nIf you simply want to install,\nplease cancel and install the normal version.", + "NOTE_PRERELEASE": "Note: This is a prerelease build and may be unstable.\n\nIf you simply want to install, you may\nwant to install the normal version if one exists.", + "EXIT_APP": "Exit StreetPass Shop", + "EXTRACTING": "Extracting... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Extract error!", + "FEATURE_SIDE_EFFECTS": "This Feature may have side effects while the Queue is running.\nAre you sure you want to continue?", "FETCHING_METADATA": "Fetching old metadata...", + "FETCHING_RECOMMENDED_UNISTORES": "Fetching recommended UniStores...", + "FILES": "File: %d / %d", "FILE_EXTRACTED": "file extracted.", "FILE_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'file' to filename only.", "FILES_EXTRACTED": "files extracted.", @@ -57,47 +85,69 @@ "GUI_SETTINGS": "GUI Settings", "GUI_SETTINGS_BTN": "GUI settings...", "INCLUDE_IN_RESULTS": "Include in results:", - "INSTALL_UNIVERSAL_UPDATER": "Installing Universal-Updater...", + "INSTALLING": "Installing... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Installing StreetPass Shop...", "INVALID_UNISTORE": "Invalid UniStore", "KEY_CONTINUE": "Press any key to continue.", - "LANGUAGE": "Language", + "LANGUAGE": "Language...", "LAST_UPDATED": "Last updated", "LICENSE": "License", "LIST": "List", + "LOADING_SCREENSHOT": "Loading Screenshot...", "LOADING_SPRITESHEET": "Loading Spritesheet %i of %i...", "MEDIATYPE_NAND": "MediaType NAND", "MEDIATYPE_SD": "MediaType SD", "MOVE_ERROR": "Move Error!", - "NO": "No", "NO_DOWNLOADS_AVAILABLE": "No downloads available", "NO_LICENSE": "No License", + "NO_SCREENSHOTS_AVAILABLE": "No Screenshots available", "NOT_IMPLEMENTED": "Not Implemented Yet", + "OP_COPYING": "Copying", + "OP_DELETING": "Deleting", + "OP_DOWNLOADING": "Downloading", + "OP_EXTRACTING": "Extracting", + "OP_INSTALLING": "Installing", + "OP_MOVING": "Moving", + "OP_WAITING": "Waiting", + "QUEUE": "Queue", + "QUEUE_POSITION": "Queue position", + "QUEUE_PROGRESS": "Step: %d / %d", + "RECOMMENDED_UNISTORES": "Recommended UniStores", "REVISION": "Revision", + "SCREENSHOT": "Screenshot %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Screenshot could not be loaded.", + "SCREENSHOT_INSTRUCTIONS": "Press  to change and  to zoom", "SEARCH_FILTERS": "Search and Filters", + "SELECT_A_THEME": "Select a Theme", "SELECT_DIR": "Select a directory", "SELECT_LANG": "Choose the language", - "SELECT_UNISTORE": "Select UniStore", + "SELECT_UNISTORE": "Select UniStore...", "SELECT_UNISTORE_2": "Select a UniStore", + "SELECTION_QUEUE": "Add Selection to Queue", "SETTINGS": "Settings", "SHEET_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'sheet' to filename only.", + "SHORTCUT_CREATED": "Shortcut created!", + "SHORTCUT_COPYING": "Copying %s...", + "SHORTCUT_DOWNLOADING": "Downloading %s...", + "SHORTCUT_EXTRACTING": "Extracting %s...", + "SHORTCUT_INSTALLING": "Installing %s...", + "SIZE": "Size", "SORT_BY": "Sort By", "SORTING": "Sorting", "START_SELECT": "Press START to select the current folder", + "STORE_INFO": "Store Info", "SYNTAX_ERROR": "Syntax Error!", "TITLE": "Title", "TOP_STYLE": "Top Style", - "UNISTORE_BG": "Use UniStore BG", + "UNISTORE_BG": "Use StreetPass Shop BG", "UNISTORE_BG_DESC": "When enabled, the UniStore's provided BG will be shown instead of the solid BG color for the top screen.", - "UNISTORE_INVALID_ERROR": "This UniStore is invalid and cannot be\nloaded with Universal-Updater.\nMaybe check if there are any Syntax errors?", - "UNISTORE_TOO_NEW": "Your version of Universal-Updater is\ntoo old to use this UniStore.\nPlease update to the latest version.", - "UNISTORE_TOO_OLD": "This UniStore is outdated and cannot be used\nwith this version of Universal-Updater.\nPlease ask the creator to update it.", - "UNSUPPORTED_UNISTORE_VERSION": "The version of this UniStore is unsupported.", + "UNISTORE_INVALID_ERROR": "This UniStore is invalid and cannot be\nloaded with StreetPass Shop.\nMaybe check if there are any Syntax errors?", + "UNISTORE_TOO_NEW": "Your version of StreetPass Shop is\ntoo old to use this UniStore.\nPlease update to the latest version.", + "UNISTORE_TOO_OLD": "This UniStore is outdated and cannot be used\nwith this version of StreetPass Shop.\nPlease ask the creator to update it.", "UPDATE_AVAILABLE": "Update Available!", - "UPDATE_DONE": "Update done! Please re-open Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "No Updates Available!", + "UPDATE_DONE": "Update done! Please re-open StreetPass Shop.", "UPDATING_SPRITE_SHEET": "Updating Spritesheet...", "UPDATING_SPRITE_SHEET2": "Updating Spritesheet %i of %i...", "UPDATING_UNISTORE": "Updating UniStore...", - "VERSION": "Version", - "YES": "Yes" -} \ No newline at end of file + "VERSION": "Version" +} diff --git a/romfs/lang/es/app.json b/romfs/lang/es/app.json index a5fa537..99a42e0 100644 --- a/romfs/lang/es/app.json +++ b/romfs/lang/es/app.json @@ -1,88 +1,141 @@ { - "ASCENDING": "Ascendente", + "3DSX_IN_FOLDER": "Coloca los archivos 3DSX en una carpeta", + "3DSX_IN_FOLDER_DESC": "Si activado, los archivos 3DSX estarán colocados en una carpeta del mismo nombre en lugar de la carpeta definida.", + "ACTION_CANCELED": "¡%s cancelado!", + "ACTION_FAILED": "¡%s falló!", + "ACTION_REQUIRED": "¡Acción requerida!", + "ACTION_SUCCEEDED": "¡%s tuvo éxito!", + "ACTIVE_THEME": "Tema activo", + "ASCENDING": "Ascendiendo", + "ARGUMENT_INVALID": "Argumento inválido.\nPor favor, compruebe el archivo xml para los argumentos adecuados.", "AUTHOR": "Autor", - "AUTO_UPDATE_SETTINGS": "Auto actualizar ajustes", - "AUTO_UPDATE_SETTINGS_BTN": "Auto actualizar ajustes...", - "AUTO_UPDATE_UNISTORE": "Auto-actualizar UniStores", + "AUTO_UPDATE_NIGHTLY": "Usar versiones nightly", + "AUTO_UPDATE_NIGHTLY_DESC": "Usa las versiones nightly de Universal-Updater en lugar de las actualizaciones estables.", + "AUTO_UPDATE_SETTINGS": "Ajustes de actualización automática", + "AUTO_UPDATE_SETTINGS_BTN": "Actualizar ajustes automáticamente...", + "AUTO_UPDATE_UNISTORE": "Actualizar UniStores automáticamente", "AUTO_UPDATE_UNISTORE_DESC": "Con esto, la última UniStore utilizada se actualizará automáticamente al iniciar Universal-Updater.", - "AUTO_UPDATE_UU": "Actualización automática Universal-Updater", - "AUTO_UPDATE_UU_DESC": "Cuando está activado, Universal-Updater comprobará si hay actualizaciones cada vez que se abra.", + "AUTO_UPDATE_UU": "Actualizar Universal-Updater automáticamente", + "AUTO_UPDATE_UU_DESC": "Cuando esté activado, Universal-Updater buscará actualizaciones cada vez que se abra.", "AVAILABLE_DOWNLOADS": "Descargas disponibles", "BOOT_TITLE": "¿Quiere arrancar este título?", + "CANCEL": "Cancelar", "CATEGORY": "Categoría", "CHANGE_3DSX_PATH": "Cambiar ruta 3DSX", "CHANGE_ARCHIVE_PATH": "Cambiar ruta de archivo", + "CHANGE_FIRM_PATH": "Cambiar ruta de firma", "CHANGE_NDS_PATH": "Cambiar ruta de NDS", - "CHECK_UNISTORE_UPDATES": "Comprobación de actualizaciones de UniStore...", - "CHECK_UU_UPDATES": "Comprobacion de actualizaciones Universal-Updater...", + "CHANGE_SHORTCUT_PATH": "Cambiar ruta del acceso directo", + "CHECK_UNISTORE_UPDATES": "Buscando actualizaciones para UniStore...", + "CHECK_UU_UPDATES": "Buscando actualizaciones para Universal-Updater...", "CONFIRM_OR_CANCEL": "Pulsa  para confirmar o  para cancelar.", "CONNECT_WIFI": "Por favor, conéctese a WiFi.", + "CONFIRM": "Confirmar", "CONSOLE": "Consola", "CONTRIBUTOR_TRANSLATORS": "- Todos los traductores y colaboradores", - "COPY_ERROR": "¡Copiar error!", + "COPYING": "Copiando... %s / %s (%.2f%%)", + "COPY_ERROR": "¡Error de copiado!", + "CREATE_SHORTCUT": "¿Quieres crear un acceso directo?", "CREDITS": "Agradecimientos", + "CREDITS_BTN": "Créditos...", "CURRENT_VERSION": "Versión Actual: ", "CURRENTLY_EXTRACTING": "Extracción actual:\n", - "DELETE_ERROR": "¡Eliminar error!", + "CUSTOM_FONT": "Usar fuente personalizada", + "CUSTOM_FONT_DESC": "Si se activa, la fuente 'sdmc:/3ds/Universal-Updater/font.bcfnt' será empleada en lugar de la del sistema (si es encontrada).", + "DELETE_ERROR": "¡Error eliminando!", "DELETE_PROMPT": "¿Seguro quiere eliminar este directorio?", - "DELETE_UNNEEDED_FILE": "Eliminando archivo innecesario...", + "DELETING": "Borrando...", "DESCENDING": "Descendente", "DIRECTION": "Dirección", "DIRECTORY_SETTINGS": "Configuración de directorio", "DIRECTORY_SETTINGS_BTN": "Ajustes de directorio...", - "DISABLE_AUTOUPDATE_UNISTORE": "Desactivar la actualización automática de UniStore al arrancar", - "DISABLE_UPDATE_CHECK": "Desactivar auto-actualización", "DONE": "¡Hecho!", "DOWNLOAD_ERROR": "¡Error de descarga!", "DOWNLOAD_FAILED": "¡Descarga fallida!", + "DOWNLOAD_SPEED": "Velocidad: %lld KiB/s", + "DOWNLOADING": "Descargando... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Descargando fuente compatible...", "DOWNLOADING_SPRITE_SHEET": "Descargando Spritesheet...", "DOWNLOADING_SPRITE_SHEET2": "Descargando Spritesheet %i de %i...", "DOWNLOADING_UNIVERSAL_DB": "Descargando Universal-DB...", "DONLOADING_UNIVERSAL_UPDATER": "Descargando Universal-Updater...", "DOWNLOADING_UNISTORE": "Descargando UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Activar la actualización automática de UniStore al arrancar", - "ENABLE_UPDATE_CHECK": "Activar auto-actualización", + "ENTER_DESC_SHORTCUT": "Introduce la descripción del acceso directo.", "ENTER_SEARCH": "Introduce lo que quieras buscar.", + "ENTER_SHORTCUT_FILENAME": "Introduce el nombre de archivo del acceso directo (sin extensión).", + "ENTER_TITLE_SHORTCUT": "Introduce el nombre del acceso directo.", "ENTER_URL": "Introduzca la URL de la UniStore.", "ENTRIES": "Entradas", "EXECUTE_ENTRY": "¿Quieres ejecutar esta entrada?", + "NOTE_NIGHTLY": "Note: \"siguiente\" versión are entended fuer destino\ncomino fe atures año más be instable.\n\nIr yo simple Kant lo instaló,\nléase cancel año instaló té normal versión.\n", + "NOTE_PRERELEASE": "Note: Tris y a presentarse baile año más be instable.\n\nCf. ion simple Kant no instaló, ion más\nKant no instaló he normal versión Cf. pone existe.", "EXIT_APP": "Salir de Universal-Updater", + "EXTRACTING": "Extrayendo... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "¡Error de extracción!", + "FEATURE_SIDE_EFFECTS": "Esta característica puede tener efectos secundarios mientras la cola se está ejecutando.\n¿Está seguro de que desea continuar?", "FETCHING_METADATA": "Obteniendo metadatos antiguos...", + "FETCHING_RECOMMENDED_UNISTORES": "Obteniendo UniStores recomendadas...", + "FILES": "Archivo: %d / %d", "FILE_EXTRACTED": "archivo extraído.", - "FILE_SLASH": "Parece que un '/' está incluido, que no es compatible.\nPor favor, cambie 'archivo' a nombre de archivo.", + "FILE_SLASH": "Parece que un '/' está incluido (no es compatible).\nPor favor, cambie 'file' a nombre de archivo.", "FILES_EXTRACTED": "archivos extraídos.", "FILTER_TO": "Filtrar a:", "GITHUB": "Los créditos completos se pueden encontrar en GitHub", "GRID": "Cuadrícula", - "GUI_SETTINGS": "Ajustes de GUI", - "GUI_SETTINGS_BTN": "Ajustes de GUI...", - "INCLUDE_IN_RESULTS": "Incluye en resultados:", + "GUI_SETTINGS": "Configuración de la interfaz", + "GUI_SETTINGS_BTN": "Configuración de la interfaz...", + "INCLUDE_IN_RESULTS": "Incluir en resultados:", + "INSTALLING": "Instalando... %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Instalando Universal-Updater...", "INVALID_UNISTORE": "UniStore no válida", "KEY_CONTINUE": "Pulsa cualquier tecla para continuar.", - "LANGUAGE": "Idioma", + "LANGUAGE": "Idioma...", "LAST_UPDATED": "Última actualización", "LICENSE": "Licencia", "LIST": "Lista", + "LOADING_SCREENSHOT": "Cargando captura de pantalla...", "LOADING_SPRITESHEET": "Cargando Spritesheet%i de %i...", "MEDIATYPE_NAND": "MediaType NAND", "MEDIATYPE_SD": "SD MediaType", - "MOVE_ERROR": "¡Mover error!", - "NO": "No", + "MOVE_ERROR": "¡Error moviendo!", "NO_DOWNLOADS_AVAILABLE": "No hay descargas disponibles", "NO_LICENSE": "Sin licencia", + "NO_SCREENSHOTS_AVAILABLE": "No hay capturas disponibles", "NOT_IMPLEMENTED": "Aún no implementado", + "OP_COPYING": "Copiando", + "OP_DELETING": "Borrando", + "OP_DOWNLOADING": "Descargando", + "OP_EXTRACTING": "Extrayendo", + "OP_INSTALLING": "Instalando", + "OP_MOVING": "Moviendo", + "OP_WAITING": "En espera", + "QUEUE": "Cola", + "QUEUE_POSITION": "Posición en la Cola", + "QUEUE_PROGRESS": "Paso: %d / %d", + "RECOMMENDED_UNISTORES": "UniStores recomendadas", "REVISION": "Revisión", + "SCREENSHOT": "Captura de pantalla %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "No se puede cargar la captura de pantalla.", + "SCREENSHOT_INSTRUCTIONS": "Pulsa  para cambiar y  para el zoom", "SEARCH_FILTERS": "Búsqueda y Filtros", + "SELECT_A_THEME": "Seleccione un tema", "SELECT_DIR": "Selecciona un directorio", "SELECT_LANG": "Elije el idioma", - "SELECT_UNISTORE": "Seleccionar UniStore", + "SELECT_UNISTORE": "Seleccionar UniStore...", "SELECT_UNISTORE_2": "Seleccione una UniStore", + "SELECTION_QUEUE": "Añadir selección a la cola", "SETTINGS": "Ajustes", "SHEET_SLASH": "Parece que un '/' está incluido (no es compatible).\nPor favor, cambie 'sheet' a únicamente el nombre del archivo.", + "SHORTCUT_CREATED": "¡Acceso directo creado!", + "SHORTCUT_COPYING": "Copiando %s...", + "SHORTCUT_DOWNLOADING": "Descargando %s...", + "SHORTCUT_EXTRACTING": "Extrayendo %s...", + "SHORTCUT_INSTALLING": "Instalando %s...", + "SIZE": "Tamaño", "SORT_BY": "Ordenar por", "SORTING": "Ordenando", "START_SELECT": "Presione START para seleccionar la carpeta actual", + "STORE_INFO": "Información de la tienda", "SYNTAX_ERROR": "¡Error de sintaxis!", "TITLE": "Título", "TOP_STYLE": "Estilo superior", @@ -91,13 +144,10 @@ "UNISTORE_INVALID_ERROR": "Esta UniStore no es válida y no puede cargarse\ncon Universal-Updater.\n¿Quizás verifique si hay algún error de sintaxis?", "UNISTORE_TOO_NEW": "Su versión de Universal-Updater es\ndemasiado antigua para usar esta UniStore.\nPor favor, actualice a la última versión.", "UNISTORE_TOO_OLD": "Esta UniStore está desactualizada y no se puede utilizar\ncon esta versión de Universal-Updater.\nPor favor, solicite al creador que la actualice.", - "UNSUPPORTED_UNISTORE_VERSION": "La versión de esta UniStore no está soportada.", "UPDATE_AVAILABLE": "¡Actualización disponible!", "UPDATE_DONE": "¡Actualización completada! Por favor, vuelva a abrir Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "¡No hay actualizaciones disponibles!", "UPDATING_SPRITE_SHEET": "Actualizando Spritesheet...", "UPDATING_SPRITE_SHEET2": "Actualizando Spritesheet %i de %i...", "UPDATING_UNISTORE": "Actualizando UniStore...", - "VERSION": "Versión", - "YES": "Sí" + "VERSION": "Versión" } \ No newline at end of file diff --git a/romfs/lang/fr/app.json b/romfs/lang/fr/app.json index 799dd50..27b402f 100644 --- a/romfs/lang/fr/app.json +++ b/romfs/lang/fr/app.json @@ -1,103 +1,153 @@ { + "3DSX_IN_FOLDER": "Placer les fichiers 3DSX dans un dossier", + "3DSX_IN_FOLDER_DESC": "Si activé, les fichiers 3DSX seront placés dans un dossier du même nom au lieu du dossier défini.", + "ACTION_CANCELED": "%s annulé !", + "ACTION_FAILED": "%s a échoué !", + "ACTION_REQUIRED": "Action requise !", + "ACTION_SUCCEEDED": "%s réussi !", + "ACTIVE_THEME": "Thème actuel ", "ASCENDING": "Croissant", + "ARGUMENT_INVALID": "Argument invalide.\nVeuillez vérifier le fichier xml pour les bons arguments.", "AUTHOR": "Auteur", + "AUTO_UPDATE_NIGHTLY": "Utiliser les versions nightly", + "AUTO_UPDATE_NIGHTLY_DESC": "Utiliser les versions nightly de Universal-Updater au lieu des versions stables.", "AUTO_UPDATE_SETTINGS": "Paramètres de mise à jour auto", - "AUTO_UPDATE_SETTINGS_BTN": "Paramètres de mise à jour auto...", - "AUTO_UPDATE_UNISTORE": "Mettre à jour automatiquement les UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "Avec cela, le dernier UniStore utilisé sera mis à jour automatiquement lors du lancement de Universal-Updater.", - "AUTO_UPDATE_UU": "Auto-mettre à jour d'Universal-Updater", - "AUTO_UPDATE_UU_DESC": "Lorsque l'option est activée, Universal-Updater vérifiera les mises à jour à chaque démarrage.", + "AUTO_UPDATE_SETTINGS_BTN": "Paramètres de mise à jour auto…", + "AUTO_UPDATE_UNISTORE": "Mise à jour automatique des UniStores", + "AUTO_UPDATE_UNISTORE_DESC": "Avec ceci, le dernier UniStore utilisé sera mis à jour automatiquement lors du lancement de Universal-Updater.", + "AUTO_UPDATE_UU": "Mise à jour automatique de Universal-Updater", + "AUTO_UPDATE_UU_DESC": "Si activé, Universal-Updater vérifie les mises à jour à chaque fois qu'il est ouvert.", "AVAILABLE_DOWNLOADS": "Téléchargements disponibles", - "BOOT_TITLE": "Voulez-vous démarrer ce titre?", - "CATEGORY": "Catégorie", + "BOOT_TITLE": "Voulez-vous démarrer ce titre ?", + "CANCEL": "Annuler", + "CATEGORY": "Catégorie ", "CHANGE_3DSX_PATH": "Changer l'emplacement des 3DSX", "CHANGE_ARCHIVE_PATH": "Changer l'emplacement des archives", + "CHANGE_FIRM_PATH": "Changer l'emplacement des FIRM", "CHANGE_NDS_PATH": "Changer l'emplacement des NDS", - "CHECK_UNISTORE_UPDATES": "Vérification des mises à jour de l'Unistore...", - "CHECK_UU_UPDATES": "Vérification des mises à jour de l'Universal-Updater en cours...", - "CONFIRM_OR_CANCEL": "Appuyer sur  pour confirmer, sur  pour annuler.", - "CONNECT_WIFI": "Veuillez vous connecter au WiFi.", - "CONSOLE": "Console", - "CONTRIBUTOR_TRANSLATORS": "- Tous les Traducteurs & Contributeurs", - "COPY_ERROR": "Erreur de copie!", + "CHANGE_SHORTCUT_PATH": "Changer l'emplacement des raccourcis", + "CHECK_UNISTORE_UPDATES": "Recherche de mises à jour de l'UniStore…", + "CHECK_UU_UPDATES": "Recherche de mises à jour de Universal-Updater…", + "CONFIRM_OR_CANCEL": "Appuyez sur  pour confirmer ou  pour annuler.", + "CONNECT_WIFI": "Veuillez vous connecter au Wi-Fi.", + "CONFIRM": "Confirmer", + "CONSOLE": "Console ", + "CONTRIBUTOR_TRANSLATORS": "- Tous les traducteurs et contributeurs", + "COPYING": "Copie… %s / %s (%.2f%%)", + "COPY_ERROR": "Erreur de copie !", + "CREATE_SHORTCUT": "Voulez-vous créer un raccourci ?", "CREDITS": "Crédits", - "CURRENT_VERSION": "Version actuelle: ", - "CURRENTLY_EXTRACTING": "Extraction de:\n", - "DELETE_ERROR": "Erreur d'effacement!", - "DELETE_PROMPT": "Êtes-vous sur de vouloir supprimer ce dossier?", - "DELETE_UNNEEDED_FILE": "Suppression du fichier inutile...", + "CREDITS_BTN": "Crédits…", + "CURRENT_VERSION": "Version actuelle : ", + "CURRENTLY_EXTRACTING": "Extraction de :\n", + "CUSTOM_FONT": "Utiliser une police personnalisée", + "CUSTOM_FONT_DESC": "Si activé, la police 'sdmc:/3ds/Universal-Updater/font.bcfnt' sera utilisée à la place de la police système, si elle est trouvée.", + "DELETE_ERROR": "Erreur de suppression !", + "DELETE_PROMPT": "Êtes-vous sûr de vouloir supprimer ce répertoire ?", + "DELETING": "Suppression…", "DESCENDING": "Décroissant", - "DIRECTION": "Direction", - "DIRECTORY_SETTINGS": "Paramètres du répertoire", - "DIRECTORY_SETTINGS_BTN": "Paramètres du répertoire...", - "DISABLE_AUTOUPDATE_UNISTORE": "Désactiver les mises a jour automatiques\\n de l'UniStore au démarrage", - "DISABLE_UPDATE_CHECK": "Désactiver la mise à jour automatique", - "DONE": "Fini!", - "DOWNLOAD_ERROR": "Erreur de téléchargement!", + "DIRECTION": "Ordre", + "DIRECTORY_SETTINGS": "Paramètres des répertoires", + "DIRECTORY_SETTINGS_BTN": "Paramètres des répertoires…", + "DONE": "Terminé !", + "DOWNLOAD_ERROR": "Erreur de téléchargement !", "DOWNLOAD_FAILED": "Échec du téléchargement !", - "DOWNLOADING_SPRITE_SHEET": "Téléchargement de la feuille de Sprites...", - "DOWNLOADING_SPRITE_SHEET2": "Téléchargement de la feuille de Sprites %i de %i...", - "DOWNLOADING_UNIVERSAL_DB": "Téléchargement de Universal-DB...", - "DONLOADING_UNIVERSAL_UPDATER": "Téléchargement de Universal-Updater...", - "DOWNLOADING_UNISTORE": "Téléchargement de l'UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Activer les mises a jour automatiques\\n de l'UniStore au démarrage", - "ENABLE_UPDATE_CHECK": "Activer la mise à jour automatique", + "DOWNLOAD_SPEED": "Vitesse : %lld Kio/s", + "DOWNLOADING": "Téléchargement… %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Téléchargement d'une police compatible…", + "DOWNLOADING_SPRITE_SHEET": "Téléchargement de la grille de sprites…", + "DOWNLOADING_SPRITE_SHEET2": "Téléchargement de la grille de sprites : %i de %i…", + "DOWNLOADING_UNIVERSAL_DB": "Téléchargement de Universal-DB…", + "DONLOADING_UNIVERSAL_UPDATER": "Téléchargement de Universal-Updater…", + "DOWNLOADING_UNISTORE": "Téléchargement de l'UniStore…", + "ENTER_DESC_SHORTCUT": "Entrez la description du raccourci.", "ENTER_SEARCH": "Entrez ce que vous voulez rechercher.", + "ENTER_SHORTCUT_FILENAME": "Entrez le nom de fichier du raccourci (sans extension).", + "ENTER_TITLE_SHORTCUT": "Entrez le titre du raccourci.", "ENTER_URL": "Entrez l'URL de l'UniStore.", "ENTRIES": "Entrées", - "EXECUTE_ENTRY": "Voulez-vous exécuter cette entrée?", + "EXECUTE_ENTRY": "Voulez-vous exécuter cette entrée ?", + "NOTE_NIGHTLY": "Remarque : les versions « nightly » sont destinées à\ntester les fonctions à venir et peuvent être instables.\n\nSi vous voulez simplement installer,\nveuillez annuler et installer la version normale.", + "NOTE_PRERELEASE": "Remarque : il s'agit d'un build de préversion\nqui peut être instable.\n\nSi vous voulez simplement installer, vous pouvez\nvouloir installer la version normale si elle existe.", "EXIT_APP": "Quitter Universal-Updater", - "FETCHING_METADATA": "Récupération des anciennes métadonnées...", + "EXTRACTING": "Extraction… %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Erreur d'extraction !", + "FEATURE_SIDE_EFFECTS": "Cette fonctionnalité peut avoir des effets secondaires lorsque\nla file d'attente est en cours d'exécution.\nÊtes-vous sûr de vouloir continuer ?", + "FETCHING_METADATA": "Récupération des anciennes métadonnées…", + "FETCHING_RECOMMENDED_UNISTORES": "Récupération des UniStores recommandés…", + "FILES": "Fichier : %d / %d", "FILE_EXTRACTED": "fichier extrait.", - "FILE_SLASH": "On dirait qu'un '/' est inclus, ce qui n'est pas pris en charge.\nMerci de changer 'file' au nom du fichier seul.", + "FILE_SLASH": "Il semble qu'un '/' soit inclus, ce qui n'est pas pris en charge.\nVeuillez changer 'file' en nom de fichier uniquement.", "FILES_EXTRACTED": "fichiers extraits.", - "FILTER_TO": "Filtrer:", + "FILTER_TO": "Filtrer pour :", "GITHUB": "Les crédits complets peuvent être trouvés sur GitHub", "GRID": "Grille", "GUI_SETTINGS": "Paramètres de l'interface graphique", - "GUI_SETTINGS_BTN": "Paramètres de l'interface graphique...", + "GUI_SETTINGS_BTN": "Paramètres de l'interface graphique…", "INCLUDE_IN_RESULTS": "Inclure dans les résultats :", - "INSTALL_UNIVERSAL_UPDATER": "Installation de Universal-Updater...", + "INSTALLING": "Installation… %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Installation de Universal-Updater…", "INVALID_UNISTORE": "UniStore invalide", - "KEY_CONTINUE": "Appuyez sur n'importe quel bouton pour continuer . . .", - "LANGUAGE": "Langue", - "LAST_UPDATED": "Dernière mise à jour", - "LICENSE": "License", + "KEY_CONTINUE": "Appuyez sur n'importe quel bouton pour continuer.", + "LANGUAGE": "Langue…", + "LAST_UPDATED": "Dernière mise à jour ", + "LICENSE": "Licence ", "LIST": "Liste", - "LOADING_SPRITESHEET": "Chargement de la fiche de sprites %i de %i...", - "MEDIATYPE_NAND": "Localisation: NAND", - "MEDIATYPE_SD": "Localisation: SD", - "MOVE_ERROR": "Erreur de déplacement!", - "NO": "Non", + "LOADING_SCREENSHOT": "Chargement de la capture d'écran…", + "LOADING_SPRITESHEET": "Chargement de la grille de sprites : %i de %i…", + "MEDIATYPE_NAND": "TypeMédia NAND", + "MEDIATYPE_SD": "TypeMédia SD", + "MOVE_ERROR": "Erreur de déplacement !", "NO_DOWNLOADS_AVAILABLE": "Aucun téléchargement disponible", "NO_LICENSE": "Aucune licence", + "NO_SCREENSHOTS_AVAILABLE": "Aucune capture d'écran disponible", "NOT_IMPLEMENTED": "Pas encore disponible", - "REVISION": "Révision", - "SEARCH_FILTERS": "Recherche et Filtres", - "SELECT_DIR": "Sélectionner un dossier", - "SELECT_LANG": "Choisir la langue", - "SELECT_UNISTORE": "Sélectionner l'UniStore", - "SELECT_UNISTORE_2": "Sélectionner un UniStore", + "OP_COPYING": "Copie", + "OP_DELETING": "Suppression", + "OP_DOWNLOADING": "Téléchargement", + "OP_EXTRACTING": "Extraction", + "OP_INSTALLING": "Installation", + "OP_MOVING": "Déplacement", + "OP_WAITING": "En attente", + "QUEUE": "File d'attente", + "QUEUE_POSITION": "Position dans la file ", + "QUEUE_PROGRESS": "Étape : %d / %d", + "RECOMMENDED_UNISTORES": "UniStores recommandés", + "REVISION": "Révision ", + "SCREENSHOT": "Capture d'écran %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "La capture d'écran n'a pas pu être chargée.", + "SCREENSHOT_INSTRUCTIONS": "Appuyez sur  pour changer et  pour zoomer", + "SEARCH_FILTERS": "Recherche et filtres", + "SELECT_A_THEME": "Sélectionnez un thème", + "SELECT_DIR": "Sélectionnez un répertoire", + "SELECT_LANG": "Choisissez la langue", + "SELECT_UNISTORE": "Sélectionner l'UniStore…", + "SELECT_UNISTORE_2": "Sélectionnez un UniStore", + "SELECTION_QUEUE": "Ajouter la sélection à la file d'attente", "SETTINGS": "Paramètres", - "SHEET_SLASH": "On dirait qu'un '/' est inclus, ce qui n'est pas pris en charge.\nMerci de changer 'sheet' au nom du fichier seul.", + "SHEET_SLASH": "Il semble qu'un '/' soit inclus, ce qui n'est pas pris en charge.\nVeuillez changer 'sheet' en nom de fichier uniquement.", + "SHORTCUT_CREATED": "Raccourci créé !", + "SHORTCUT_COPYING": "Copie de %s…", + "SHORTCUT_DOWNLOADING": "Téléchargement de %s…", + "SHORTCUT_EXTRACTING": "Extraction de %s…", + "SHORTCUT_INSTALLING": "Installation de %s…", + "SIZE": "Taille ", "SORT_BY": "Trier par", "SORTING": "Tri", - "START_SELECT": "Appuyee sur START pour sélectionner le dossier actuel", - "SYNTAX_ERROR": "Erreur syntaxe!", + "START_SELECT": "Appuyez sur START pour sélectionner le dossier actuel", + "STORE_INFO": "Informations de l'UniStore", + "SYNTAX_ERROR": "Erreur de syntaxe !", "TITLE": "Titre", "TOP_STYLE": "Style du haut", "UNISTORE_BG": "Utiliser l'arrière plan de l'UniStore", - "UNISTORE_BG_DESC": "Lorsque cette option est activée, l'arrière-plan fourni par UniStore sera affiché à la place de la couleur unie pour l'écran supérieur.", - "UNISTORE_INVALID_ERROR": "Cette UniStore n'est pas valide et ne peut pas être chargé avec Universal-Updater.\nPeut-être vérifier s'il y a des erreurs de syntaxe ?", - "UNISTORE_TOO_NEW": "Votre version de Universal-Updater est\ntrop ancienne pour utiliser cette UniStore.\nVeuillez mettre à jour vers la dernière version.", - "UNISTORE_TOO_OLD": "Cette UniStore est obsolète et ne peut pas être utilisée\navec cette version de Universal-Updater.\nVeuillez demander au créateur de la mettre à jour.", - "UNSUPPORTED_UNISTORE_VERSION": "La version de cette UniStore n'est pas prise en charge.", - "UPDATE_AVAILABLE": "Mise à jour disponible!", - "UPDATE_DONE": "Mise à jour terminée ! Veuillez ré-ouvrir Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "Aucune mise à jour n'est disponible!", - "UPDATING_SPRITE_SHEET": "Mise à jour des Sprites...", - "UPDATING_SPRITE_SHEET2": "Mise a jour des sprites: %i/%i...", - "UPDATING_UNISTORE": "Mise à jour de l'UniStore...", - "VERSION": "Version", - "YES": "Oui" + "UNISTORE_BG_DESC": "Si activé, l'arrière-plan fourni par l'UniStore sera affiché au lieu de la couleur unie pour l'écran supérieur.", + "UNISTORE_INVALID_ERROR": "Cet UniStore est invalide et ne peut pas\nêtre chargé avec Universal-Updater.\nPeut-être vérifier s'il y a des erreurs de syntaxe ?", + "UNISTORE_TOO_NEW": "Votre version de Universal-Updater est\ntrop ancienne pour utiliser cet UniStore.\nVeuillez mettre à jour vers la dernière version.", + "UNISTORE_TOO_OLD": "Cet UniStore est obsolète et ne peut être utilisé\navec cette version de Universal-Updater.\nVeuillez demander au créateur de le mettre à jour.", + "UPDATE_AVAILABLE": "Mise à jour disponible !", + "UPDATE_DONE": "La mise à jour est terminée ! Veuillez rouvrir Universal-Updater.", + "UPDATING_SPRITE_SHEET": "Mise à jour de la grille de sprites…", + "UPDATING_SPRITE_SHEET2": "Mise à jour des sprites : %i/%i…", + "UPDATING_UNISTORE": "Mise à jour de l'UniStore…", + "VERSION": "Version " } \ No newline at end of file diff --git a/romfs/lang/hu/app.json b/romfs/lang/hu/app.json index 584a261..7217789 100644 --- a/romfs/lang/hu/app.json +++ b/romfs/lang/hu/app.json @@ -1,6 +1,16 @@ { + "3DSX_IN_FOLDER": "3DSX fájlok mappába rakása", + "3DSX_IN_FOLDER_DESC": "Ha engedélyezett, a 3DSX fájlok egy velük egyező nevű mappába kerülnek, a beállított mappa helyett.", + "ACTION_CANCELED": "%s megszakítva!", + "ACTION_FAILED": "%s sikertelen!", + "ACTION_REQUIRED": "Beavatkozás szükséges!", + "ACTION_SUCCEEDED": "%s sikeres!", + "ACTIVE_THEME": "Aktív Téma", "ASCENDING": "Növekvő", + "ARGUMENT_INVALID": "Argumentum érvénytelen.\nKérjük ellenőrizd az xml fájlban az argumentumok megfelelőségét.", "AUTHOR": "Szerző", + "AUTO_UPDATE_NIGHTLY": "Éjszakai verziók használata", + "AUTO_UPDATE_NIGHTLY_DESC": "Az Universal-Updater éjszakai verzióinak használata a stabil kiadások helyett.", "AUTO_UPDATE_SETTINGS": "Auto-frissítés beállítások", "AUTO_UPDATE_SETTINGS_BTN": "Auto-frissítés beállítások...", "AUTO_UPDATE_UNISTORE": "UniStore-ok auto-frissítése", @@ -9,45 +19,63 @@ "AUTO_UPDATE_UU_DESC": "Ha engedélyezett, a Universal-Updater ellenőzi minden megnyitásakor a frissítéseket.", "AVAILABLE_DOWNLOADS": "Elérhető letöltések", "BOOT_TITLE": "Szeretné bebootolni ezt a címet?", + "CANCEL": "Mégse", "CATEGORY": "Kategória", "CHANGE_3DSX_PATH": "3DSX útvonal módosítása", "CHANGE_ARCHIVE_PATH": "Archív útvonal módosítása", + "CHANGE_FIRM_PATH": "Firmware útvonal módosítása", "CHANGE_NDS_PATH": "NDS útvonal módosítása", + "CHANGE_SHORTCUT_PATH": "Parancsikon útvonal módosítás", "CHECK_UNISTORE_UPDATES": "UniStore frissítések ellenőrzése...", "CHECK_UU_UPDATES": "Universal-Updater frissítések ellenőrzése...", "CONFIRM_OR_CANCEL": "Nyomjon -t a folytatáshoz, -t a megszakításhoz.", "CONNECT_WIFI": "Kérjük kapcsolódjon WiFi-re.", + "CONFIRM": "Megerősít", "CONSOLE": "Konzol", "CONTRIBUTOR_TRANSLATORS": "- Minden fordító és hozzájáruló", + "COPYING": "Másolás... %s / %s (%.2f%%)", "COPY_ERROR": "Másolási hiba!", + "CREATE_SHORTCUT": "Szeretnél létrehozni egy parancsikont?", "CREDITS": "Készítők", + "CREDITS_BTN": "Készítők...", "CURRENT_VERSION": "Aktuális verzió: ", "CURRENTLY_EXTRACTING": "Épp kicsomagolás alatt:\n", + "CUSTOM_FONT": "Egyéni karakterkészlet használat", + "CUSTOM_FONT_DESC": "Ha engedélyezett, akkor az 'sdmc:/3ds/Universal-Updater/font.bcfnt' karakterkészlet kerül használatra a rendszer karakterkészlet helyett.", "DELETE_ERROR": "Törlési hiba!", "DELETE_PROMPT": "Biztosan el szeretnéd törölni ezt a könyvtárat?", - "DELETE_UNNEEDED_FILE": "Felesleges fájlok törlése...", + "DELETING": "Törlés...", "DESCENDING": "Csökkenő", "DIRECTION": "Irány", "DIRECTORY_SETTINGS": "Könyvtár beállítások", "DIRECTORY_SETTINGS_BTN": "Könyvtár beállítások...", - "DISABLE_AUTOUPDATE_UNISTORE": "A bootoláskori UniStore auto-frissítés tiltása", - "DISABLE_UPDATE_CHECK": "Önfrissítés tiltása", "DONE": "Kész!", "DOWNLOAD_ERROR": "Letöltési hiba!", "DOWNLOAD_FAILED": "Letöltés sikertelen!", + "DOWNLOAD_SPEED": "Sebesség: %lld KiB/s", + "DOWNLOADING": "Letöltés... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Kompatibilis karakterkészlet letöltése...", "DOWNLOADING_SPRITE_SHEET": "A spritelap letöltése...", "DOWNLOADING_SPRITE_SHEET2": "A spritelap letöltése %i/%i...", "DOWNLOADING_UNIVERSAL_DB": "Universal-DB letöltése...", "DONLOADING_UNIVERSAL_UPDATER": "Az Universal-Updater letöltése...", "DOWNLOADING_UNISTORE": "UniStore letöltése...", - "ENABLE_AUTOUPDATE_UNISTORE": "A bootoláskori UniStore auto-frissítés engedélyezése", - "ENABLE_UPDATE_CHECK": "Önfrissítés engedélyezése", + "ENTER_DESC_SHORTCUT": "Add meg a parancsikon leírását.", "ENTER_SEARCH": "Írja be azt, amire keresni szeretne.", + "ENTER_SHORTCUT_FILENAME": "Add meg a parancsikon fájlnevét (kiterjesztés nélkül).", + "ENTER_TITLE_SHORTCUT": "Add meg a parancsikon címét.", "ENTER_URL": "Adja meg az UniStore URL-jét.", "ENTRIES": "Bejegyzések", "EXECUTE_ENTRY": "Szeretné futtatni ezt a bejegyzést?", + "NOTE_NIGHTLY": "Megjegyzés: Az \"Esti\" verziók az új funkciók teszteléséhez \nkészülnek és instabilak lehetnek.\n\nHa csak simán telepíteni szeretnéd, akkor\nlépj vissza és telepítsd a normál verziót.", + "NOTE_PRERELEASE": "Megjegyzés: Ez egy prerelease build és instabil lehet.\n\nHa csak simán telepíteni szeretnéd, akkor\nlépj vissza és telepítsd a normál verziót.", "EXIT_APP": "Kilépés az Universal-Updater-ből", + "EXTRACTING": "Kicsomagolás... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Kicsomagolási hiba!", + "FEATURE_SIDE_EFFECTS": "Ez a funkció mellékhatásokkal rendelkezhet a futó várósorra.\nBiztosan szeretnéd folytatni?", "FETCHING_METADATA": "Régi metaadat beolvasása...", + "FETCHING_RECOMMENDED_UNISTORES": "Ajánlot UniStore-ok letöltése...", + "FILES": "Fájl: %d / %d", "FILE_EXTRACTED": "fájl kicsomagolva.", "FILE_SLASH": "Úgy tűnik tartalmaz egy '/' jelet, ami nem támogatott.\nKérjük változtassa meg a 'file' értéket csak fájlnévre.", "FILES_EXTRACTED": "fájl kicsomagolva.", @@ -57,32 +85,57 @@ "GUI_SETTINGS": "GUI beállítások", "GUI_SETTINGS_BTN": "GUI beállítások...", "INCLUDE_IN_RESULTS": "Befoglalás az eredményekbe:", + "INSTALLING": "Telepítés... %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Az Universal-Updater teleptése...", "INVALID_UNISTORE": "Érvénytelen UniStore", "KEY_CONTINUE": "Nyomjon meg egy billentyűt a folytatáshoz.", - "LANGUAGE": "Nyelv", + "LANGUAGE": "Nyelv...", "LAST_UPDATED": "Utolsó frissítés", "LICENSE": "Licensz", "LIST": "Lista", + "LOADING_SCREENSHOT": "Képernyőkép betöltése...", "LOADING_SPRITESHEET": "A spritelap betöltése %i/%i...", "MEDIATYPE_NAND": "Médiatípus NAND", "MEDIATYPE_SD": "Médiatípus SD", "MOVE_ERROR": "Mozgatási hiba!", - "NO": "Nem", "NO_DOWNLOADS_AVAILABLE": "Nincsenek elérhető letöltések", "NO_LICENSE": "Nincs licenc", + "NO_SCREENSHOTS_AVAILABLE": "Képernyőképek nem elérhetők", "NOT_IMPLEMENTED": "Még nem implementált", + "OP_COPYING": "Másolás", + "OP_DELETING": "Törlés", + "OP_DOWNLOADING": "Letöltés", + "OP_EXTRACTING": "Kicsomagolás", + "OP_INSTALLING": "Telepítés", + "OP_MOVING": "Mozgatás", + "OP_WAITING": "Várakozás", + "QUEUE": "Várósor", + "QUEUE_POSITION": "Várósor pozíció", + "QUEUE_PROGRESS": "Lépés: %d / %d", + "RECOMMENDED_UNISTORES": "Ajánlot UniStore-ok", "REVISION": "Revízió", + "SCREENSHOT": "Képernyőkép %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "A képernyőkép nem tölthető be.", + "SCREENSHOT_INSTRUCTIONS": "Nyomj -t a változtatáshoz és -t a nagyításhoz", "SEARCH_FILTERS": "Keresés és Szűrők", + "SELECT_A_THEME": "Válassz egy témát", "SELECT_DIR": "Könyvtár kiválasztása", "SELECT_LANG": "Válassza ki a nyelvet", - "SELECT_UNISTORE": "UniStore választás", + "SELECT_UNISTORE": "UniStore választás...", "SELECT_UNISTORE_2": "Válasszon egy UniStore-t", + "SELECTION_QUEUE": "Kiválasztás hozzáadása a várósorhoz", "SETTINGS": "Beállítások", "SHEET_SLASH": "Úgy tűnik tartalmaz egy '/' jelet, ami nem támogatott.\nKérjük változtassa meg a 'sheet' értéket csak fájlnévre.", + "SHORTCUT_CREATED": "Parancsikon létrehozva!", + "SHORTCUT_COPYING": "%s másolása...", + "SHORTCUT_DOWNLOADING": "%s letöltése...", + "SHORTCUT_EXTRACTING": "%s kicsomagolása...", + "SHORTCUT_INSTALLING": "%s telepítése...", + "SIZE": "Méret", "SORT_BY": "Rendezés eszerint", "SORTING": "Rendezés", "START_SELECT": "Nyomjon START-t az aktuális mappa kiválasztásához", + "STORE_INFO": "Store Információ", "SYNTAX_ERROR": "Szintaktikai hiba!", "TITLE": "Cím", "TOP_STYLE": "Top Stílus", @@ -91,13 +144,10 @@ "UNISTORE_INVALID_ERROR": "Ez az UniStore érvénytelen és nem \nbetölthető az Universal-Updater-rel. \nEgy ellenőrzés szintaktikai hibákra?", "UNISTORE_TOO_NEW": "Ez az Universal-Updater \nnagyon régi ehhez az UniStore-hoz.\nKérjük frissítsen a legutóbbira.", "UNISTORE_TOO_OLD": "Az UniStore régi és nem használható Universal-Updater ezen verziójával.\nKérje meg a készítőját, hogy frissítse.", - "UNSUPPORTED_UNISTORE_VERSION": "Ez az UniStore verzió nem támogatott.", "UPDATE_AVAILABLE": "Frissítés elérhető!", "UPDATE_DONE": "Frissítés kész! Kérjük, nyissa meg újra az Universal-Updater-t.", - "UPDATE_NOT_AVAILABLE": "Nincs elérhető frissítés!", "UPDATING_SPRITE_SHEET": "A spritelap frissítése...", "UPDATING_SPRITE_SHEET2": "A spritelap frissítése %i/%i...", "UPDATING_UNISTORE": "UniStore frissítése...", - "VERSION": "Verzió", - "YES": "Igen" + "VERSION": "Verzió" } \ No newline at end of file diff --git a/romfs/lang/it/app.json b/romfs/lang/it/app.json index abdc021..e86a0c6 100644 --- a/romfs/lang/it/app.json +++ b/romfs/lang/it/app.json @@ -1,53 +1,81 @@ { + "3DSX_IN_FOLDER": "Metti i file 3DSX nella cartella", + "3DSX_IN_FOLDER_DESC": "Se abilitato, i file 3DSX saranno inseriti in una cartella con lo stesso nome invece che direttamente nella cartella impostata.", + "ACTION_CANCELED": "%s annullato!", + "ACTION_FAILED": "%s non riuscito!", + "ACTION_REQUIRED": "Azione richiesta!", + "ACTION_SUCCEEDED": "%s riuscito!", + "ACTIVE_THEME": "Tema attivo", "ASCENDING": "Crescente", + "ARGUMENT_INVALID": "Argomento non valido.\nControllare il file xml per gli argomenti corretti.", "AUTHOR": "Autore", + "AUTO_UPDATE_NIGHTLY": "Usa versioni notturne", + "AUTO_UPDATE_NIGHTLY_DESC": "Utilizza le versioni notturne di Universal-Updater invece delle versioni stabili.", "AUTO_UPDATE_SETTINGS": "Impostazioni Auto-Aggiornamento", "AUTO_UPDATE_SETTINGS_BTN": "Impostazioni aggiornamento automatico...", - "AUTO_UPDATE_UNISTORE": "Auto-Aggiornamento UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "Con questo, l'ultimo UniStore utilizzato verrà aggiornato automaticamente all'avvio di Universal-Updater.", + "AUTO_UPDATE_UNISTORE": "Auto-Aggiornamento UniStore", + "AUTO_UPDATE_UNISTORE_DESC": "Se abilitato, l'ultimo UniStore utilizzato verrà aggiornato automaticamente all'avvio di Universal-Updater.", "AUTO_UPDATE_UU": "Auto-aggiornamento Universal-Updater", "AUTO_UPDATE_UU_DESC": "Se abilitato, Universal-Updater controllerà se ci sono degli aggiornamenti ogni volta che viene aperto.", "AVAILABLE_DOWNLOADS": "Download Disponibili", "BOOT_TITLE": "Vorresti avviare questo titolo?", + "CANCEL": "Annulla", "CATEGORY": "Categoria", "CHANGE_3DSX_PATH": "Cambia percorso 3DSX", "CHANGE_ARCHIVE_PATH": "Cambia il percorso dell'archivio", + "CHANGE_FIRM_PATH": "Cambia percorso firm", "CHANGE_NDS_PATH": "Cambia percorso NDS", + "CHANGE_SHORTCUT_PATH": "Cambia il percorso della scorciatoia", "CHECK_UNISTORE_UPDATES": "Controllo aggiornamenti per l'UniStore...", "CHECK_UU_UPDATES": "Controllo aggiornamenti Universal-Updater...", "CONFIRM_OR_CANCEL": "Premi  per confermare,  per annullare.", "CONNECT_WIFI": "Per favore connettiti al WiFi.", + "CONFIRM": "Conferma", "CONSOLE": "Console", - "CONTRIBUTOR_TRANSLATORS": "- Tutti I Traduttori E Collaboratori", + "CONTRIBUTOR_TRANSLATORS": "- Tutti i Traduttori & Collaboratori", + "COPYING": "Copia in corso... %s / %s (%.2f%%)", "COPY_ERROR": "Errore di Copia!", + "CREATE_SHORTCUT": "Vuoi creare una scorciatoia?", "CREDITS": "Riconoscimenti", + "CREDITS_BTN": "Riconoscimenti...", "CURRENT_VERSION": "Versione corrente: ", "CURRENTLY_EXTRACTING": "Estrazione attuale:\n", + "CUSTOM_FONT": "Usa Carattere Personalizzato", + "CUSTOM_FONT_DESC": "Se abilitato, verrà usato 'sdmc:/3ds/Universal-Updater/font.bcfnt' invece del carattere di sistema, se trovato.", "DELETE_ERROR": "Errore di Eliminazione!", "DELETE_PROMPT": "Sei sicuro di voler eliminare questa categoria?", - "DELETE_UNNEEDED_FILE": "Eliminazione file non necessari...", + "DELETING": "Cancellazione in corso...", "DESCENDING": "Decrescente", "DIRECTION": "Direzione", "DIRECTORY_SETTINGS": "Impostazioni Directory", "DIRECTORY_SETTINGS_BTN": "Impostazioni directory...", - "DISABLE_AUTOUPDATE_UNISTORE": "Disabilita l'aggiornamento automatico di UniStore all'avvio", - "DISABLE_UPDATE_CHECK": "Disabilita l'auto-aggiornamento", "DONE": "Fatto!", - "DOWNLOAD_ERROR": "Errore Di Download!", + "DOWNLOAD_ERROR": "Errore di Download!", "DOWNLOAD_FAILED": "Download non riuscito!", - "DOWNLOADING_SPRITE_SHEET": "Scaricamento dello Spritesheet...", - "DOWNLOADING_SPRITE_SHEET2": "Scaricamento dello Spritesheet %i di %i...", - "DOWNLOADING_UNIVERSAL_DB": "Scaricamento dell'Universal-DB...", - "DONLOADING_UNIVERSAL_UPDATER": "Scaricamento dell'Universal-Updater...", - "DOWNLOADING_UNISTORE": "Scaricamento dell'UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Abilita l'aggiornamento automatico dell'UniStore all'avvio", - "ENABLE_UPDATE_CHECK": "Abilita l'auto-aggiornamento", + "DOWNLOAD_SPEED": "Velocità: %lld KiB/s", + "DOWNLOADING": "Download %s / %s (%.2f%%) in corso...", + "DOWNLOADING_COMPATIBLE_FONT": "Download caratteri compatibili in corso...", + "DOWNLOADING_SPRITE_SHEET": "Download dello Spritesheet in corso...", + "DOWNLOADING_SPRITE_SHEET2": "Donwload dello Spritesheet %i di %i...", + "DOWNLOADING_UNIVERSAL_DB": "Scaricamento di Universal-DB...", + "DONLOADING_UNIVERSAL_UPDATER": "Download di Universal-Updater in corso...", + "DOWNLOADING_UNISTORE": "Download dell'UniStore in corso...", + "ENTER_DESC_SHORTCUT": "Inserisci la descrizione della scorciatoia.", "ENTER_SEARCH": "Inserisci quello che vorresti cercare.", + "ENTER_SHORTCUT_FILENAME": "Inserisci il nome del file della scorciatoia (senza estensione).", + "ENTER_TITLE_SHORTCUT": "Inserisci il titolo della scorciatoia.", "ENTER_URL": "Inserisci l'URL dell'UniStore.", "ENTRIES": "Voci", "EXECUTE_ENTRY": "Vuoi eseguire questa voce?", + "NOTE_NIGHTLY": "Nota: le versioni \"Notturne\" sono destinate a testare\nle prossime funzionalità e possono essere instabili.\n\nSe vuoi semplicemente una versione stabile,\nannulla e installa la versione normale.", + "NOTE_PRERELEASE": "Nota: questa è una build di prerelease e potrebbe essere instabile.\n\nSe vuoi semplicemente installare una versione stabile, dovresti installare la versione normale, se ne esiste una.", "EXIT_APP": "Esci da Universal-Updater", - "FETCHING_METADATA": "Recupero di metadata antica in corso...", + "EXTRACTING": "Estrazione... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Errore d'estrazione!", + "FEATURE_SIDE_EFFECTS": "Questa funzionalità potrebbe avere degli effetti collaterali mentre la coda è in esecuzione.\nSei sicuro di voler continuare?", + "FETCHING_METADATA": "Recupero di metadata vecchia in corso...", + "FETCHING_RECOMMENDED_UNISTORES": "Recupero degli UniStore consigliati...", + "FILES": "File: %d / %d", "FILE_EXTRACTED": "File estratto.", "FILE_SLASH": "Sembrerebbe che sia incluso un '/', che non è supportato.\nSi prega di cambiare 'file' nel nome del file.", "FILES_EXTRACTED": "File estratti.", @@ -57,32 +85,57 @@ "GUI_SETTINGS": "Impostazioni GUI", "GUI_SETTINGS_BTN": "Impostazioni GUI...", "INCLUDE_IN_RESULTS": "Includi nei risultati:", - "INSTALL_UNIVERSAL_UPDATER": "Installazione dell'Universal-Updater...", + "INSTALLING": "Installazione... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Installazione di Universal-Updater...", "INVALID_UNISTORE": "UniStore non valido", - "KEY_CONTINUE": "Premere un qualsiasi tasto per continuare.", - "LANGUAGE": "Lingua", + "KEY_CONTINUE": "Premi un qualsiasi tasto per continuare.", + "LANGUAGE": "Lingua...", "LAST_UPDATED": "Ultimo aggiornamento", "LICENSE": "Licenza", "LIST": "Lista", + "LOADING_SCREENSHOT": "Caricamento Screenshot...", "LOADING_SPRITESHEET": "Caricamento dello Spritesheet %i di %i...", "MEDIATYPE_NAND": "MediaType NAND", "MEDIATYPE_SD": "MediaType SD", "MOVE_ERROR": "Errore di Spostamento!", - "NO": "No", "NO_DOWNLOADS_AVAILABLE": "Nessun download disponibile", "NO_LICENSE": "Nessuna Licenza", + "NO_SCREENSHOTS_AVAILABLE": "Nessuna schermata disponibile", "NOT_IMPLEMENTED": "Non ancora implementato", + "OP_COPYING": "Copia", + "OP_DELETING": "Eliminazione", + "OP_DOWNLOADING": "Download", + "OP_EXTRACTING": "Estrazione", + "OP_INSTALLING": "Installazione", + "OP_MOVING": "Spostamento", + "OP_WAITING": "In attesa", + "QUEUE": "Coda", + "QUEUE_POSITION": "Posizione coda", + "QUEUE_PROGRESS": "Passo: %d / %d", + "RECOMMENDED_UNISTORES": "UniStore Consigliati", "REVISION": "Revisione", + "SCREENSHOT": "Schermata %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "La schermata non può essere caricata.", + "SCREENSHOT_INSTRUCTIONS": "Premi  per cambiare e  per ingrandire", "SEARCH_FILTERS": "Ricerca e filtri", + "SELECT_A_THEME": "Seleziona un Tema", "SELECT_DIR": "Seleziona una directory", "SELECT_LANG": "Seleziona la lingua", - "SELECT_UNISTORE": "Seleziona UniStore", + "SELECT_UNISTORE": "Seleziona UniStore...", "SELECT_UNISTORE_2": "Seleziona un UniStore", + "SELECTION_QUEUE": "Aggiungi selezione alla coda", "SETTINGS": "Impostazioni", "SHEET_SLASH": "Sembrerebbe che sia incluso un '/', che non è supportato.\nSi prega di cambiare 'sheet' nel nome del file.", + "SHORTCUT_CREATED": "Scorciatoia creata!", + "SHORTCUT_COPYING": "Copia di %s in corso...", + "SHORTCUT_DOWNLOADING": "Scaricamento di %s in corso...", + "SHORTCUT_EXTRACTING": "Estrazione di %s in corso...", + "SHORTCUT_INSTALLING": "Installazione di %s in corso...", + "SIZE": "Dimensione", "SORT_BY": "Ordina Per", "SORTING": "Ordinamento", "START_SELECT": "Premere START per selezionare la cartella corrente", + "STORE_INFO": "Informazioni Store", "SYNTAX_ERROR": "Errore Di Sintassi!", "TITLE": "Titolo", "TOP_STYLE": "Stile Superiore", @@ -91,13 +144,10 @@ "UNISTORE_INVALID_ERROR": "Questo UniStore non è valido e non può essere caricato\ncon Universal-Updater.\nMagari controllare se ci sono errori di sintassi?", "UNISTORE_TOO_NEW": "La tua versione di Universal-Updater è\ntroppo vecchia per usare questo UniStore.\nSi prega di aggiornare all'ultima versione.", "UNISTORE_TOO_OLD": "Questo UniStore è obsoleto e non può essere utilizzato\ncon questa versione di Universal-Updater.\nChiedi al creatore di aggiornarlo.", - "UNSUPPORTED_UNISTORE_VERSION": "La versione di questo UniStore non è supportata.", "UPDATE_AVAILABLE": "Aggiornamento Disponibile!", "UPDATE_DONE": "Aggiornamento completato! Riapri Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "Nessun Aggiornamento Disponibile!", "UPDATING_SPRITE_SHEET": "Aggiornamento dello Spritesheet...", "UPDATING_SPRITE_SHEET2": "Aggiornamento dello Spritesheet %i di %i...", "UPDATING_UNISTORE": "Aggiornamento dell'UniStore...", - "VERSION": "Versione", - "YES": "Si" + "VERSION": "Versione" } \ No newline at end of file diff --git a/romfs/lang/jp/app.json b/romfs/lang/jp/app.json index cefc5e3..ccdb564 100644 --- a/romfs/lang/jp/app.json +++ b/romfs/lang/jp/app.json @@ -1,103 +1,153 @@ { + "3DSX_IN_FOLDER": "3DSXファイルをフォルダに入れる", + "3DSX_IN_FOLDER_DESC": "有効にすると、3DSXファイルをそのまま配置するのでは\nなく、同じ名前のフォルダに格納するようになります。", + "ACTION_CANCELED": "%sをキャンセルしました！", + "ACTION_FAILED": "%sが失敗しました！", + "ACTION_REQUIRED": "これをタップしてください！", + "ACTION_SUCCEEDED": "%sが成功しました！", + "ACTIVE_THEME": "アクティブなテーマ", "ASCENDING": "昇順", + "ARGUMENT_INVALID": "引数が無効です。\nXMLファイルで適切な引数を確認してください。", "AUTHOR": "作者", + "AUTO_UPDATE_NIGHTLY": "ナイトリー版の使用", + "AUTO_UPDATE_NIGHTLY_DESC": "Universal-Updaterの安定リリース版の代わりに、\nナイトリー版を使用します。", "AUTO_UPDATE_SETTINGS": "自動更新設定", "AUTO_UPDATE_SETTINGS_BTN": "自動更新設定……", "AUTO_UPDATE_UNISTORE": "UniStoreの自動更新", - "AUTO_UPDATE_UNISTORE_DESC": "これにより、Universal-Updaterの起動時で最後に使用されたUniStoreを自動的に更新されます。", + "AUTO_UPDATE_UNISTORE_DESC": "有効にすると、Universal-Updaterの起動時に\n最後に使用したUniStoreを自動的に更新します。", "AUTO_UPDATE_UU": "Universal-Updaterの自動更新", - "AUTO_UPDATE_UU_DESC": "有効にすると、 Universal-Updaterは開くたびに更新を確認します。", + "AUTO_UPDATE_UU_DESC": "有効にすると、Universal-Updaterを\n開くたびに更新を確認します。", "AVAILABLE_DOWNLOADS": "利用可能なダウンロード", "BOOT_TITLE": "このアプリを開始しますか？", + "CANCEL": "キャンセル", "CATEGORY": "カテゴリ", - "CHANGE_3DSX_PATH": "3DSXのパスを変更します", - "CHANGE_ARCHIVE_PATH": "アーカイブのパスを変更します", - "CHANGE_NDS_PATH": "NDSのパスを変更します", - "CHECK_UNISTORE_UPDATES": "UniStore更新を確認しています……", - "CHECK_UU_UPDATES": "Universal-Updater更新を確認しています……", - "CONFIRM_OR_CANCEL": "を押して確認し、を押してキャンセルします。", + "CHANGE_3DSX_PATH": "3DSXパスの変更", + "CHANGE_ARCHIVE_PATH": "アーカイブパスの変更", + "CHANGE_FIRM_PATH": "FIRMパスの変更", + "CHANGE_NDS_PATH": "NDSパスの変更", + "CHANGE_SHORTCUT_PATH": "ショートカットパスの変更", + "CHECK_UNISTORE_UPDATES": "UniStoreの更新を確認しています……", + "CHECK_UU_UPDATES": "Universal-Updaterの更新を確認しています……", + "CONFIRM_OR_CANCEL": "で続行、でキャンセルします。", "CONNECT_WIFI": "WiFiに接続してください。", + "CONFIRM": "続行", "CONSOLE": "本体", "CONTRIBUTOR_TRANSLATORS": "- すべての翻訳者と貢献者", + "COPYING": "コピー中… %s / %s (%.2f%%)", "COPY_ERROR": "コピーエラー！", + "CREATE_SHORTCUT": "ショートカットを作成しますか？", "CREDITS": "クレジット", + "CREDITS_BTN": "クレジット……", "CURRENT_VERSION": "現在のバージョン: ", - "CURRENTLY_EXTRACTING": "現在展開中:\n", + "CURRENTLY_EXTRACTING": "現在解凍中:", + "CUSTOM_FONT": "カスタムフォントを使用", + "CUSTOM_FONT_DESC": "有効にすると、「sdmc:/3ds/Universal-Updater/\nfont.bcfnt」が存在した場合に、システムフォントの\n代わりにそちらを使用するようになります。", "DELETE_ERROR": "削除エラー！", "DELETE_PROMPT": "このディレクトリを削除してもよろしいですか？", - "DELETE_UNNEEDED_FILE": "不要なファイルを削除しています……", + "DELETING": "削除中…", "DESCENDING": "降順", "DIRECTION": "方向", "DIRECTORY_SETTINGS": "ディレクトリ設定", "DIRECTORY_SETTINGS_BTN": "ディレクトリ設定……", - "DISABLE_AUTOUPDATE_UNISTORE": "起動時にUniStoreの自動更新を無効にします", - "DISABLE_UPDATE_CHECK": "自己更新を無効にします", "DONE": "完了！", "DOWNLOAD_ERROR": "ダウンロードエラー！", "DOWNLOAD_FAILED": "ダウンロードに失敗しました！", + "DOWNLOAD_SPEED": "速度: %lld KiB/秒", + "DOWNLOADING": "ダウンロード中… %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "互換性のあるフォントをダウンロードしています……", "DOWNLOADING_SPRITE_SHEET": "スプライトシートをダウンロードしています……", "DOWNLOADING_SPRITE_SHEET2": "スプライトシート%i/%iをダウンロードしています……", "DOWNLOADING_UNIVERSAL_DB": "Universal-DBをダウンロードしています……", "DONLOADING_UNIVERSAL_UPDATER": "Universal-Updaterをダウンロードしています……", "DOWNLOADING_UNISTORE": "UniStoreをダウンロードしています……", - "ENABLE_AUTOUPDATE_UNISTORE": "起動時にUniStoreの自動更新を有効にします", - "ENABLE_UPDATE_CHECK": "自己更新を有効にします", + "ENTER_DESC_SHORTCUT": "ショートカットの説明を入力します。", "ENTER_SEARCH": "検索したいものを入力します。", + "ENTER_SHORTCUT_FILENAME": "ショートカットのファイル名（拡張子なし）を入力します。", + "ENTER_TITLE_SHORTCUT": "ショートカットのタイトルを入力します。", "ENTER_URL": "UniStoreのURLを入力します。", "ENTRIES": "項目", "EXECUTE_ENTRY": "この項目を実行しますか？", - "EXIT_APP": "Universal-Updaterを終了します", + "NOTE_NIGHTLY": "注意：「nightly」バージョンは、今後の機能を\nテストするためのもので、不安定な場合があります。\n\n単にインストールしたい場合は、\nキャンセルして通常版をインストールしてください。", + "NOTE_PRERELEASE": "注意：これはプレリリースのビルドであり、\n不安定な場合があります。\n\n単にインストールしたい場合は、\n通常版があればインストールしてください。", + "EXIT_APP": "Universal-Updaterを終了", + "EXTRACTING": "解凍中… %s / %s (%.2f%%)", + "EXTRACT_ERROR": "解凍エラー！", + "FEATURE_SIDE_EFFECTS": "この機能は、行列の実行中に副作用が発生する可能性があります。\n続行してもよろしいですか？", "FETCHING_METADATA": "古いメタデータを取得しています……", - "FILE_EXTRACTED": "展開されたファイル", - "FILE_SLASH": "「/」が含まれていますようですが、サポートされていません。\n「file」をファイル名のみに変更してください。", - "FILES_EXTRACTED": "展開されたファイル", + "FETCHING_RECOMMENDED_UNISTORES": "おすすめのUniStoreを取得しています……", + "FILES": "ファイル: %d / %d", + "FILE_EXTRACTED": "解凍されたファイル。", + "FILE_SLASH": "「/」が含まれていますが、サポートされていません。\n「file」をファイル名のみに変更してください。", + "FILES_EXTRACTED": "解凍されたファイル。", "FILTER_TO": "フィルター:", "GITHUB": "完全なクレジットはGitHubに見つけることができます", "GRID": "グリッド", "GUI_SETTINGS": "GUI設定", "GUI_SETTINGS_BTN": "GUI設定……", "INCLUDE_IN_RESULTS": "結果に含みます:", + "INSTALLING": "インストール中… %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Universal-Updaterをインストールしています……", "INVALID_UNISTORE": "無効なUniStore", - "KEY_CONTINUE": "続行しますには何かキーを押します。", - "LANGUAGE": "言語", + "KEY_CONTINUE": "続行するには何かキーを押してください...", + "LANGUAGE": "言語……", "LAST_UPDATED": "最後更新日", "LICENSE": "ライセンス", "LIST": "リスト", + "LOADING_SCREENSHOT": "スクリーンショットを読み込んでいます……", "LOADING_SPRITESHEET": "スプライトシート%i/%iを読み込んでいます……", "MEDIATYPE_NAND": "メディアタイプNAND", "MEDIATYPE_SD": "メディアタイプSD", "MOVE_ERROR": "移動エラー", - "NO": "いいえ", - "NO_DOWNLOADS_AVAILABLE": "ダウンロードがありません", - "NO_LICENSE": "ライセンスがあらません", + "NO_DOWNLOADS_AVAILABLE": "利用可能なダウンロードがありません", + "NO_LICENSE": "ライセンスがありません", + "NO_SCREENSHOTS_AVAILABLE": "スクリーンショットはありません", "NOT_IMPLEMENTED": "まだ実装されていません", + "OP_COPYING": "コピー中", + "OP_DELETING": "削除中", + "OP_DOWNLOADING": "ダウンロード中", + "OP_EXTRACTING": "解凍中", + "OP_INSTALLING": "インストール中", + "OP_MOVING": "移動中", + "OP_WAITING": "待機中", + "QUEUE": "キュー", + "QUEUE_POSITION": "順番", + "QUEUE_PROGRESS": "ステップ: %d / %d", + "RECOMMENDED_UNISTORES": "おすすめのUniStore", "REVISION": "改定", + "SCREENSHOT": "スクリーンショット %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "スクリーンショットを読み込めませんでした。", + "SCREENSHOT_INSTRUCTIONS": "を押して変更し、を押してズームする", "SEARCH_FILTERS": "検索とフィルター", - "SELECT_DIR": "ディレクトリを選択します", - "SELECT_LANG": "言語を選択します", - "SELECT_UNISTORE": "UniStoreを選択します", - "SELECT_UNISTORE_2": "UniStoreを選択します", + "SELECT_A_THEME": "テーマの選択", + "SELECT_DIR": "ディレクトリの選択", + "SELECT_LANG": "言語の選択", + "SELECT_UNISTORE": "UniStoreを選択……", + "SELECT_UNISTORE_2": "UniStoreの選択", + "SELECTION_QUEUE": "選択を行列に追加", "SETTINGS": "設定", - "SHEET_SLASH": "「/」が含まれていますようですが、サポートされていません。\n「sheet」をファイル名のみに変更してください。", + "SHEET_SLASH": "「/」が含まれていますが、サポートされていません。\n「sheet」をファイル名のみに変更してください。", + "SHORTCUT_CREATED": "ショートカットを作成しました！", + "SHORTCUT_COPYING": "%sをコピー中……", + "SHORTCUT_DOWNLOADING": "%sをダウンロード中……", + "SHORTCUT_EXTRACTING": "%sを解凍中……", + "SHORTCUT_INSTALLING": "%sをインストール中……", + "SIZE": "サイズ", "SORT_BY": "並べ替え順", "SORTING": "並べ替え", "START_SELECT": "STARTを押して、現在のフォルダを選択します", + "STORE_INFO": "ストア情報", "SYNTAX_ERROR": "構文エラー！", "TITLE": "タイトル", - "TOP_STYLE": "上スタイル", + "TOP_STYLE": "上画面の表示形式", "UNISTORE_BG": "UniStoreの背景画像を使用", - "UNISTORE_BG_DESC": "有効にすると、上画面の無地色の代わりにUniStoreが提供する背景画像が表示されまる。", - "UNISTORE_INVALID_ERROR": "このUniStoreは無効であり、\nUniversal-Updaterで読み込めません。\n多分、構文エラーがないか確認しますか？", + "UNISTORE_BG_DESC": "有効にすると、上画面のデフォルト背景の\n代わりにUniStoreが提供する背景画像が表示されます。", + "UNISTORE_INVALID_ERROR": "このUniStoreは無効であり、\nUniversal-Updaterで読み込めません。\n構文エラーがないか確認しますか？", "UNISTORE_TOO_NEW": "Universal-Updaterのバージョンはこの\nUniStoreを使用するには古すぎます。\n最新のバージョンに更新してください。", "UNISTORE_TOO_OLD": "このUniStoreは古く、このバージョンの\nUniversal-Updaterでは使用できません。\n作成者に更新しますを依頼してください。", - "UNSUPPORTED_UNISTORE_VERSION": "このUniStoreのバージョンはサポートされていません。", "UPDATE_AVAILABLE": "更新があります！", "UPDATE_DONE": "更新が完了しました！Universal-Updaterを再度開いてください。", - "UPDATE_NOT_AVAILABLE": "更新はありません！", "UPDATING_SPRITE_SHEET": "スプライトシートを更新しています……", "UPDATING_SPRITE_SHEET2": "スプライトシート%i/%iを更新しています……", "UPDATING_UNISTORE": "UniStoreを更新しています……", - "VERSION": "バージョン", - "YES": "はい" + "VERSION": "バージョン" } \ No newline at end of file diff --git a/romfs/lang/ko/app.json b/romfs/lang/ko/app.json new file mode 100644 index 0000000..20cdcc6 --- /dev/null +++ b/romfs/lang/ko/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "폴더 안에 3DSX 파일 넣기", + "3DSX_IN_FOLDER_DESC": "활성화 시에, 3DSX 파일이 묶음 폴더에 저장되지 않고 동일한 이름의 폴더 안에 저장됩니다.", + "ACTION_CANCELED": "%s 취소됨!", + "ACTION_FAILED": "%s 실패!", + "ACTION_REQUIRED": "조치가 필요함!", + "ACTION_SUCCEEDED": "%s 성공!", + "ACTIVE_THEME": "활성 테마", + "ASCENDING": "오름차순", + "ARGUMENT_INVALID": "인수가 잘못되었습니다.\nxml 파일에서 인수가 올바른지 확인해주십시오.", + "AUTHOR": "제작자", + "AUTO_UPDATE_NIGHTLY": "나이틀리 버전 사용", + "AUTO_UPDATE_NIGHTLY_DESC": "Universal-Updater의 안정화 버전 대신 나이틀리 버전 사용함.", + "AUTO_UPDATE_SETTINGS": "자동 업데이트 설정", + "AUTO_UPDATE_SETTINGS_BTN": "자동 업데이트 설정...", + "AUTO_UPDATE_UNISTORE": "UniStore 자동 업데이트", + "AUTO_UPDATE_UNISTORE_DESC": "이를 이용하면, 마지막으로 사용된 UniStore가 Universal-Updater를 실행할 때에 자동으로 업데이트됩니다.", + "AUTO_UPDATE_UU": "Universal-Updater 자동 업데이트", + "AUTO_UPDATE_UU_DESC": "활성화 시, Universal-Updater가 실행될 때마다 업데이트를 확인합니다.", + "AVAILABLE_DOWNLOADS": "사용가능한 다운로드", + "BOOT_TITLE": "이 타이틀을 시작하시겠습니까?", + "CANCEL": "취소", + "CATEGORY": "분류", + "CHANGE_3DSX_PATH": "3DSX 경로 변경", + "CHANGE_ARCHIVE_PATH": "압축 파일 경로 변경", + "CHANGE_FIRM_PATH": "펌웨어 경로 변경", + "CHANGE_NDS_PATH": "NDS 경로 변경", + "CHANGE_SHORTCUT_PATH": "바로가기 경로 변경", + "CHECK_UNISTORE_UPDATES": "UniStore 업데이트 확인중...", + "CHECK_UU_UPDATES": "Universal-Updater 업데이트 확인중...", + "CONFIRM_OR_CANCEL": "확인하려면 , 취소하려면  를 누르세요.", + "CONNECT_WIFI": "Wi-Fi에 연결해주세요.", + "CONFIRM": "확인", + "CONSOLE": "콘솔", + "CONTRIBUTOR_TRANSLATORS": "- 모든 번역자 및 기여자들", + "COPYING": "복사 중... %s / %s (%.2f%%)", + "COPY_ERROR": "복사 오류!", + "CREATE_SHORTCUT": "바로가기를 만드시겠습니까?", + "CREDITS": "제작진", + "CREDITS_BTN": "제작진...", + "CURRENT_VERSION": "현재 버전: ", + "CURRENTLY_EXTRACTING": "현재 압축 푸는 중:", + "CUSTOM_FONT": "사용자 지정 글꼴 사용", + "CUSTOM_FONT_DESC": "활성화 시에, bcfnt 파일이 있는 경우 시스템 폰트 대신 'sdmc:/3ds/Universal-Updater/font.bcfnt'가 대신 사용됩니다.", + "DELETE_ERROR": "삭제 오류!", + "DELETE_PROMPT": "이 디렉토리를 삭제하시겠습니까?", + "DELETING": "삭제 중...", + "DESCENDING": "내림차순", + "DIRECTION": "방향", + "DIRECTORY_SETTINGS": "디렉토리 설정", + "DIRECTORY_SETTINGS_BTN": "디렉토리 설정...", + "DONE": "완료!", + "DOWNLOAD_ERROR": "다운로드 오류!", + "DOWNLOAD_FAILED": "다운로드 실패!", + "DOWNLOAD_SPEED": "속도: %lld KiB/s", + "DOWNLOADING": "다운로드 중... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "호환되는 폰트 다운로드 중...", + "DOWNLOADING_SPRITE_SHEET": "스프라이트시트 다운로드 중...", + "DOWNLOADING_SPRITE_SHEET2": "스프라이트시트 다운로드 중 %i / %i...", + "DOWNLOADING_UNIVERSAL_DB": "Universal-DB 다운로드 중...", + "DONLOADING_UNIVERSAL_UPDATER": "Universal-Updater 다운로드 중...", + "DOWNLOADING_UNISTORE": "UniStore 다운로드 중...", + "ENTER_DESC_SHORTCUT": "바로가기 설명을 입력해주세요.", + "ENTER_SEARCH": "검색할 단어를 입력해주세요.", + "ENTER_SHORTCUT_FILENAME": "바로가기 파일 이름을 입력해주세요 (확장자 제외).", + "ENTER_TITLE_SHORTCUT": "바로가기 제목을 입력해주세요.", + "ENTER_URL": "UniStore의 URL을 입력해주세요.", + "ENTRIES": "항목", + "EXECUTE_ENTRY": "이 항목을 실행하시겠습니까?", + "NOTE_NIGHTLY": "주의: \"Nightly\" 버전은 곧 출시할 기능들을\n테스트하기 위한 버전으로 불안정할 수 있습니다.\n\n단순한 설치를 원한다면,\n취소 후 일반 버전을 설치하세요.", + "NOTE_PRERELEASE": "주의: 이는 시험판 빌드이며 불안정할 수 있습니다.\n\n단순히 설치하려는 경우,\n일반 버전이 있다면 일반 버전으로 설치하는 것이 좋습니다.", + "EXIT_APP": "Universal-Updater 종료", + "EXTRACTING": "압축 해제 중... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "압축 해제 에러!", + "FEATURE_SIDE_EFFECTS": "이 기능은 대기열 수행 중 부작용을 일으킬 수 있습니다.\n계속 하시겠습니까?", + "FETCHING_METADATA": "오래된 메타데이터를 가져오는 중...", + "FETCHING_RECOMMENDED_UNISTORES": "권장 UniStore를 가져오는 중...", + "FILES": "파일: %d / %d", + "FILE_EXTRACTED": "파일 압축 해제됨.", + "FILE_SLASH": "지원되지 않는, '/' 가 포함된 것 같습니다.\n'file'을 파일이름으로만 변경하세요.", + "FILES_EXTRACTED": "파일 압축 해제됨.", + "FILTER_TO": "필터:", + "GITHUB": "GitHub에서 전체 제작진을 볼 수 있습니다.", + "GRID": "격자형", + "GUI_SETTINGS": "GUI 설정", + "GUI_SETTINGS_BTN": "GUI 설정...", + "INCLUDE_IN_RESULTS": "결과에 포함:", + "INSTALLING": "설치 중... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Universal-Updater 설치 중...", + "INVALID_UNISTORE": "잘못된 UniStore", + "KEY_CONTINUE": "계속하시려면 아무 키나 누르십시오.", + "LANGUAGE": "언어...", + "LAST_UPDATED": "마지막 업데이트", + "LICENSE": "라이센스", + "LIST": "목록형", + "LOADING_SCREENSHOT": "스크린샷 로딩 중...", + "LOADING_SPRITESHEET": "스프라이트시트 로딩 중 %i / %i...", + "MEDIATYPE_NAND": "미디어타입 NAND", + "MEDIATYPE_SD": "미디어타입 SD", + "MOVE_ERROR": "이동 오류!", + "NO_DOWNLOADS_AVAILABLE": "사용 가능한 다운로드 없음", + "NO_LICENSE": "라이센스 없음", + "NO_SCREENSHOTS_AVAILABLE": "사용가능한 스크린샷 없음", + "NOT_IMPLEMENTED": "아직 구현되지 않음", + "OP_COPYING": "복사 중", + "OP_DELETING": "삭제 중", + "OP_DOWNLOADING": "다운로드 중", + "OP_EXTRACTING": "압축 해제 중", + "OP_INSTALLING": "설치 중", + "OP_MOVING": "이동 중", + "OP_WAITING": "대기 중", + "QUEUE": "대기열", + "QUEUE_POSITION": "대기열 위치", + "QUEUE_PROGRESS": "단계: %d / %d", + "RECOMMENDED_UNISTORES": "권장 UniStore", + "REVISION": "개정", + "SCREENSHOT": "스크린샷 %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "스크린샷을 불러올 수 없습니다.", + "SCREENSHOT_INSTRUCTIONS": "변경하려면 , 확대하려면  를 누릅니다.", + "SEARCH_FILTERS": "검색 및 필터", + "SELECT_A_THEME": "테마 선택", + "SELECT_DIR": "디렉토리 선택", + "SELECT_LANG": "언어 선택", + "SELECT_UNISTORE": "UniStore 선택...", + "SELECT_UNISTORE_2": "UniStore 선택", + "SELECTION_QUEUE": "선택 항목 대기열에 추가", + "SETTINGS": "설정", + "SHEET_SLASH": "지원되지 않는, '/' 가 포함된 것 같습니다.\n'file'을 파일이름으로만 변경하세요.", + "SHORTCUT_CREATED": "바로가기 생성됨!", + "SHORTCUT_COPYING": "%s 복사중...", + "SHORTCUT_DOWNLOADING": "%s 다운로드 중...", + "SHORTCUT_EXTRACTING": "%s 압축 해제 중...", + "SHORTCUT_INSTALLING": "%s 설치 중...", + "SIZE": "용량", + "SORT_BY": "정렬 방식", + "SORTING": "정렬", + "START_SELECT": "현재 폴더를 선택하려면 START를 누르세요", + "STORE_INFO": "스토어 정보", + "SYNTAX_ERROR": "구문 오류!", + "TITLE": "제목", + "TOP_STYLE": "상단 스타일", + "UNISTORE_BG": "UniStore 배경화면 사용", + "UNISTORE_BG_DESC": "활성화 시, 상단 화면에 단색 대신 UniStore가 제공하는 배경화면이 표시됩니다.", + "UNISTORE_INVALID_ERROR": "이 UniStore는 유효하지 않으며,\nUniversal-Updater에 로드할 수 없습니다.\n구문 에러가 있지는 않습니까?", + "UNISTORE_TOO_NEW": "이 UniStore를 사용하기엔\n사용중인 Universal-Updater의 버전이 너무 오래됐습니다.\n최신 버전으로 업데이트 해주세요.", + "UNISTORE_TOO_OLD": "이 UniStore는 너무 오래되어 사용하고 계신 버전의\nUniversal-Updater에서 쓸 수 없습니다.\n업데이트하려면 제작자에게 문의하세요.", + "UPDATE_AVAILABLE": "업데이트 사용 가능!", + "UPDATE_DONE": "업데이트 완료! Universal-Updater를 다시 실행하십시오.", + "UPDATING_SPRITE_SHEET": "스프라이트시트 업데이트 중...", + "UPDATING_SPRITE_SHEET2": "스프라이트시트 업데이트 중 %i / %i...", + "UPDATING_UNISTORE": "UniStore 업데이트 중...", + "VERSION": "버전" +} \ No newline at end of file diff --git a/romfs/lang/lt/app.json b/romfs/lang/lt/app.json index 45093a3..36da5b3 100644 --- a/romfs/lang/lt/app.json +++ b/romfs/lang/lt/app.json @@ -1,53 +1,81 @@ { - "ASCENDING": "Ascending", - "AUTHOR": "Author", - "AUTO_UPDATE_SETTINGS": "Auto-Update Settings", - "AUTO_UPDATE_SETTINGS_BTN": "Auto-update settings...", - "AUTO_UPDATE_UNISTORE": "Auto-update UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "With this, the last used UniStore will be updated automatically when launching Universal-Updater.", - "AUTO_UPDATE_UU": "Auto-update Universal-Updater", - "AUTO_UPDATE_UU_DESC": "When enabled, Universal-Updater will check for updates every time it's opened.", - "AVAILABLE_DOWNLOADS": "Available Downloads", - "BOOT_TITLE": "Would you like to boot this title?", - "CATEGORY": "Category", - "CHANGE_3DSX_PATH": "Change 3DSX path", - "CHANGE_ARCHIVE_PATH": "Change archive path", - "CHANGE_NDS_PATH": "Change NDS path", + "3DSX_IN_FOLDER": "Įdėkite 3DSX failus į aplanką", + "3DSX_IN_FOLDER_DESC": "Jei įgalinta, 3DSX failai bus dedami į aplanką tuo pačiu pavadinimu, o ne tiesiai į nustatytą aplanką.", + "ACTION_CANCELED": "%s atšauktas!", + "ACTION_FAILED": "%s nepavyko!", + "ACTION_REQUIRED": "Reikalingas veiksmas!", + "ACTION_SUCCEEDED": "%s pavyko!", + "ACTIVE_THEME": "Aktyvi tema", + "ASCENDING": "Didėjančia tvarka", + "ARGUMENT_INVALID": "Argumentas neteisingas.\nPatikrinkite, ar xml faile nėra tinkamų argumentų.", + "AUTHOR": "Autorius", + "AUTO_UPDATE_NIGHTLY": "Use nightly versions", + "AUTO_UPDATE_NIGHTLY_DESC": "Use nightly versions of Universal-Updater instead of the stable releases.", + "AUTO_UPDATE_SETTINGS": "Automatiškai atnaujinti nustatymus", + "AUTO_UPDATE_SETTINGS_BTN": "Automatiškai atnaujinti nustatymus...", + "AUTO_UPDATE_UNISTORE": "Automatiškai atnaujinti „UniStores“", + "AUTO_UPDATE_UNISTORE_DESC": "Tai paleidus „Universal-Updater“, paskutinis naudotas „UniStore“ bus automatiškai atnaujinamas.", + "AUTO_UPDATE_UU": "Automatiškai atnaujinti „Universal-Updater“", + "AUTO_UPDATE_UU_DESC": "Kai įgalinta, „Universal-Updater“ tikrins, ar yra naujinių kiekvieną kartą, kai tik ji bus atidaryta.", + "AVAILABLE_DOWNLOADS": "Galimi atsisiuntimai", + "BOOT_TITLE": "Ar norite įkelti šį failą?", + "CANCEL": "Atšaukti", + "CATEGORY": "Kategorija", + "CHANGE_3DSX_PATH": "Keisti 3DSX kelią", + "CHANGE_ARCHIVE_PATH": "Keisti archyvo kelią", + "CHANGE_FIRM_PATH": "Pakeiskite tvirtą kelią", + "CHANGE_NDS_PATH": "Keisti NDS kelią", + "CHANGE_SHORTCUT_PATH": "Keisti nuorodos kelią", "CHECK_UNISTORE_UPDATES": "Checking for UniStore updates...", "CHECK_UU_UPDATES": "Checking for Universal-Updater updates...", "CONFIRM_OR_CANCEL": "Press  to confirm,  to cancel.", "CONNECT_WIFI": "Prašome prisijungti prie WiFi.", + "CONFIRM": "Confirm", "CONSOLE": "Console", "CONTRIBUTOR_TRANSLATORS": "- All Translators & Contributors", + "COPYING": "Copying... %s / %s (%.2f%%)", "COPY_ERROR": "Copy Error!", + "CREATE_SHORTCUT": "Would you like to create a shortcut?", "CREDITS": "Kūrėjai", + "CREDITS_BTN": "Credits...", "CURRENT_VERSION": "Dabartinė versija: ", - "CURRENTLY_EXTRACTING": "Currently extracting:\n", + "CURRENTLY_EXTRACTING": "Dabar išskleidžiama:", + "CUSTOM_FONT": "Use Custom Font", + "CUSTOM_FONT_DESC": "If enabled, 'sdmc:/3ds/Universal-Updater/font.bcfnt' will be used instead of the system font, if found.", "DELETE_ERROR": "Delete Error!", "DELETE_PROMPT": "Ar jūs tikrai norite ištrinti šį aplanką?", - "DELETE_UNNEEDED_FILE": "Deleting unneeded file...", + "DELETING": "Deleting...", "DESCENDING": "Descending", "DIRECTION": "Direction", "DIRECTORY_SETTINGS": "Directory Settings", "DIRECTORY_SETTINGS_BTN": "Directory settings...", - "DISABLE_AUTOUPDATE_UNISTORE": "Disable auto-update UniStore on boot", - "DISABLE_UPDATE_CHECK": "Disable self-updating", "DONE": "Atlikta!", "DOWNLOAD_ERROR": "Download Error!", "DOWNLOAD_FAILED": "Atsisiųsti nepavyko!", + "DOWNLOAD_SPEED": "Speed: %lld KiB/s", + "DOWNLOADING": "Downloading... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Downloading compatible font...", "DOWNLOADING_SPRITE_SHEET": "Downloading Spritesheet...", "DOWNLOADING_SPRITE_SHEET2": "Downloading Spritesheet %i of %i...", "DOWNLOADING_UNIVERSAL_DB": "Downloading Universal-DB...", "DONLOADING_UNIVERSAL_UPDATER": "Downloading Universal-Updater...", "DOWNLOADING_UNISTORE": "Downloading UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Enable auto-update UniStore on boot", - "ENABLE_UPDATE_CHECK": "Enable self-updating", + "ENTER_DESC_SHORTCUT": "Enter the shortcut description.", "ENTER_SEARCH": "Enter what you like to search.", + "ENTER_SHORTCUT_FILENAME": "Enter the shortcut filename (without extension).", + "ENTER_TITLE_SHORTCUT": "Enter the shortcut title.", "ENTER_URL": "Enter the URL of the UniStore.", "ENTRIES": "Entries", "EXECUTE_ENTRY": "Would you like to execute this entry?", + "NOTE_NIGHTLY": "Note: \"Nightly\" versions are intended for testing\nupcoming features and may be unstable.\n\nIf you simply want to install,\nplease cancel and install the normal version.", + "NOTE_PRERELEASE": "Note: This is a prerelease build and may be unstable.\n\nIf you simply want to install, you may\nwant to install the normal version if one exists.", "EXIT_APP": "Exit Universal-Updater", + "EXTRACTING": "Extracting... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Extract error!", + "FEATURE_SIDE_EFFECTS": "This Feature may have side effects while the Queue is running.\nAre you sure you want to continue?", "FETCHING_METADATA": "Fetching old metadata...", + "FETCHING_RECOMMENDED_UNISTORES": "Fetching recommended UniStores...", + "FILES": "File: %d / %d", "FILE_EXTRACTED": "failas išskleistas.", "FILE_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'file' to filename only.", "FILES_EXTRACTED": "failai išskleisti.", @@ -57,47 +85,69 @@ "GUI_SETTINGS": "GUI Settings", "GUI_SETTINGS_BTN": "GUI settings...", "INCLUDE_IN_RESULTS": "Include in results:", + "INSTALLING": "Installing... %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Installing Universal-Updater...", "INVALID_UNISTORE": "Invalid UniStore", "KEY_CONTINUE": "Press any key to continue.", - "LANGUAGE": "Kalba", + "LANGUAGE": "Language...", "LAST_UPDATED": "Last updated", "LICENSE": "License", "LIST": "List", + "LOADING_SCREENSHOT": "Loading Screenshot...", "LOADING_SPRITESHEET": "Loading Spritesheet %i of %i...", "MEDIATYPE_NAND": "MediaType NAND", "MEDIATYPE_SD": "MediaType SD", "MOVE_ERROR": "Move Error!", - "NO": "Ne", "NO_DOWNLOADS_AVAILABLE": "No downloads available", "NO_LICENSE": "No License", + "NO_SCREENSHOTS_AVAILABLE": "No Screenshots available", "NOT_IMPLEMENTED": "Not Implemented Yet", + "OP_COPYING": "Copying", + "OP_DELETING": "Deleting", + "OP_DOWNLOADING": "Downloading", + "OP_EXTRACTING": "Extracting", + "OP_INSTALLING": "Installing", + "OP_MOVING": "Moving", + "OP_WAITING": "Waiting", + "QUEUE": "Queue", + "QUEUE_POSITION": "Queue position", + "QUEUE_PROGRESS": "Step: %d / %d", + "RECOMMENDED_UNISTORES": "Recommended UniStores", "REVISION": "Revision", + "SCREENSHOT": "Screenshot %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Screenshot could not be loaded.", + "SCREENSHOT_INSTRUCTIONS": "Press  to change and  to zoom", "SEARCH_FILTERS": "Search and Filters", + "SELECT_A_THEME": "Select a Theme", "SELECT_DIR": "Select a directory", "SELECT_LANG": "Choose the language", - "SELECT_UNISTORE": "Select UniStore", + "SELECT_UNISTORE": "Select UniStore...", "SELECT_UNISTORE_2": "Select a UniStore", + "SELECTION_QUEUE": "Add Selection to Queue", "SETTINGS": "Settings", "SHEET_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'sheet' to filename only.", + "SHORTCUT_CREATED": "Shortcut created!", + "SHORTCUT_COPYING": "Copying %s...", + "SHORTCUT_DOWNLOADING": "Downloading %s...", + "SHORTCUT_EXTRACTING": "Extracting %s...", + "SHORTCUT_INSTALLING": "Installing %s...", + "SIZE": "Size", "SORT_BY": "Sort By", "SORTING": "Sorting", "START_SELECT": "Press START to select the current folder", + "STORE_INFO": "Store Info", "SYNTAX_ERROR": "Syntax Error!", "TITLE": "Title", "TOP_STYLE": "Top Style", "UNISTORE_BG": "Use UniStore BG", "UNISTORE_BG_DESC": "When enabled, the UniStore's provided BG will be shown instead of the solid BG color for the top screen.", "UNISTORE_INVALID_ERROR": "This UniStore is invalid and cannot be\nloaded with Universal-Updater.\nMaybe check if there are any Syntax errors?", - "UNISTORE_TOO_NEW": "Your version of Universal-Updater is\ntoo old to use this UniStore.\nPlease update to the latest version.", + "UNISTORE_TOO_NEW": "Jūsų „Universal-Updater“ versija yra\nper sena naudoti šį „UniStore“.\nAtnaujinkite į naujausią versiją.", "UNISTORE_TOO_OLD": "This UniStore is outdated and cannot be used\nwith this version of Universal-Updater.\nPlease ask the creator to update it.", - "UNSUPPORTED_UNISTORE_VERSION": "The version of this UniStore is unsupported.", "UPDATE_AVAILABLE": "Update Available!", "UPDATE_DONE": "Update done! Please re-open Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "No Updates Available!", "UPDATING_SPRITE_SHEET": "Updating Spritesheet...", "UPDATING_SPRITE_SHEET2": "Updating Spritesheet %i of %i...", "UPDATING_UNISTORE": "Updating UniStore...", - "VERSION": "Version", - "YES": "Taip" + "VERSION": "Version" } \ No newline at end of file diff --git a/romfs/lang/nl/app.json b/romfs/lang/nl/app.json new file mode 100644 index 0000000..01816f1 --- /dev/null +++ b/romfs/lang/nl/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "Stop 3DSX bestanden in deze map", + "3DSX_IN_FOLDER_DESC": "Wanneer ingeschakeld, zullen 3DSX bestanden in een map worden gestopt met dezelfde naam in plaats van direct in de ingestelde map.", + "ACTION_CANCELED": "%s geannuleerd!", + "ACTION_FAILED": "%s mislukt!", + "ACTION_REQUIRED": "Actie vereist!", + "ACTION_SUCCEEDED": "%s gelukt!", + "ACTIVE_THEME": "Huidig Thema", + "ASCENDING": "Oplopend", + "ARGUMENT_INVALID": "Argument ongeldig.\nControleer het Xml bestand voor de juiste argumenten.", + "AUTHOR": "Auteur", + "AUTO_UPDATE_NIGHTLY": "Gebruik nightly versies", + "AUTO_UPDATE_NIGHTLY_DESC": "Gebruik nightly versies van Universal-Updater in plaats van de stabiele releases.", + "AUTO_UPDATE_SETTINGS": "Auto-Update Instellingen", + "AUTO_UPDATE_SETTINGS_BTN": "Auto-update instellingen...", + "AUTO_UPDATE_UNISTORE": "Auto-update UniStores", + "AUTO_UPDATE_UNISTORE_DESC": "Hiermee wordt de laatst gebruikte UniStore automatisch bijgewerkt bij het opstarten van Universal-Updater.", + "AUTO_UPDATE_UU": "Werk Universal-Updater automatisch bij", + "AUTO_UPDATE_UU_DESC": "Wanneer ingeschakeld, zal de Universal-Updater elke keer controleren op updates wanneer deze wordt geopend.", + "AVAILABLE_DOWNLOADS": "Beschikbare downloads", + "BOOT_TITLE": "Wil je deze titel opstarten?", + "CANCEL": "Annuleren", + "CATEGORY": "Categorie", + "CHANGE_3DSX_PATH": "Pas 3DSX pad aan", + "CHANGE_ARCHIVE_PATH": "Wijzig archief pad", + "CHANGE_FIRM_PATH": "Wijzig firmware pad", + "CHANGE_NDS_PATH": "Wijzig NDS pad", + "CHANGE_SHORTCUT_PATH": "Verander snelkoppeling pad", + "CHECK_UNISTORE_UPDATES": "Controleren op UniStore updates...", + "CHECK_UU_UPDATES": "Controleren op Universal-Updater updates...", + "CONFIRM_OR_CANCEL": "Druk op  om te bevestigen,  om te annuleren.", + "CONNECT_WIFI": "Verbind alsjeblieft met WiFi.", + "CONFIRM": "Bevestigen", + "CONSOLE": "Console", + "CONTRIBUTOR_TRANSLATORS": "Alle Vertalers & Bijdragers", + "COPYING": "Kopieren... %s / %s (%.2f%%)", + "COPY_ERROR": "Kopieerfout!", + "CREATE_SHORTCUT": "Wilt u een snelkoppeling maken?", + "CREDITS": "Credits", + "CREDITS_BTN": "Credits...", + "CURRENT_VERSION": "Huidige versie: ", + "CURRENTLY_EXTRACTING": "Momenteel aan het uitpakken:", + "CUSTOM_FONT": "Gebruik Aangepast Lettertype", + "CUSTOM_FONT_DESC": "Indien ingeschakeld, zal 'sdmc:/3ds/Universal-Updater/font.bcfnt' worden gebruikt in plaats van het systeemlettertype, indien gevonden.", + "DELETE_ERROR": "Verwijder Fout!", + "DELETE_PROMPT": "Weet je zeker dat je deze map with verwijderen?", + "DELETING": "Verwijderen...", + "DESCENDING": "Aflopend", + "DIRECTION": "Richting", + "DIRECTORY_SETTINGS": "Map Instellingen", + "DIRECTORY_SETTINGS_BTN": "Map instellingen...", + "DONE": "Klaar!", + "DOWNLOAD_ERROR": "Download Fout!", + "DOWNLOAD_FAILED": "Download mislukt!", + "DOWNLOAD_SPEED": "Downloadsnelheid: %lld KiB/s", + "DOWNLOADING": "Downloaden... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Compatibel lettertype downloaden...", + "DOWNLOADING_SPRITE_SHEET": "Spritesheet Downloaden...", + "DOWNLOADING_SPRITE_SHEET2": "Spritesheet %i van %i aan het downloaden...", + "DOWNLOADING_UNIVERSAL_DB": "Universal-DB Downloaden...", + "DONLOADING_UNIVERSAL_UPDATER": "Universal-Updater Downloaden...", + "DOWNLOADING_UNISTORE": "UniStore Downloaden...", + "ENTER_DESC_SHORTCUT": "Voer de snelkoppelingsbeschrijving in.", + "ENTER_SEARCH": "Voer in wat je wilt zoeken.", + "ENTER_SHORTCUT_FILENAME": "Voer de bestandsnaam van de snelkoppeling in (zonder extensie).", + "ENTER_TITLE_SHORTCUT": "Voer de titel van de snelkoppeling in.", + "ENTER_URL": "Voer de URL van de UniStore in.", + "ENTRIES": "Waardes", + "EXECUTE_ENTRY": "Wil je deze waarde uitvoeren?", + "NOTE_NIGHTLY": "Opmerking: \"Nightly\" versies zijn bedoeld om\ntoekomstige functies te testen en kunnen instabiel zijn.\n\nAls je het gewoon wilt installeren,\ngraag annuleren en de normale versie installeren.", + "NOTE_PRERELEASE": "Opmerking: Dit is een prerelease build en kan onstabiel zijn.\n\nAls je het gewoon wilt installeren, wil je misschien\nde normale versie installeren als er een bestaat.", + "EXIT_APP": "Universal-Updater Afsluiten", + "EXTRACTING": "Uitpakken... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Uitpak fout!", + "FEATURE_SIDE_EFFECTS": "Deze functie kan slecht werken terwijl de wachtrij wordt uitgevoerd.\nWeet u zeker dat u wilt doorgaan?", + "FETCHING_METADATA": "Oude metadata ophalen...", + "FETCHING_RECOMMENDED_UNISTORES": "Aanbevolen UniStores ophalen...", + "FILES": "Bestand: %d / %d", + "FILE_EXTRACTED": "bestand uitgepakt.", + "FILE_SLASH": "Het lijkt erop dat er een '/' is opgenomen, wat niet wordt ondersteund.\nVerander 'file' alleen naar bestandsnaam.", + "FILES_EXTRACTED": "bestanden uitgepakt.", + "FILTER_TO": "Filteren op:", + "GITHUB": "Volledige credits zijn te vinden op GitHub", + "GRID": "Raster", + "GUI_SETTINGS": "GUI Instellingen", + "GUI_SETTINGS_BTN": "GUI instellingen...", + "INCLUDE_IN_RESULTS": "In de resultaten opnemen:", + "INSTALLING": "Installeren... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Installeren van Universal-Updater...", + "INVALID_UNISTORE": "Ongeldige UniStore", + "KEY_CONTINUE": "Druk op een willekeurige toets om verder te gaan.", + "LANGUAGE": "Taal...", + "LAST_UPDATED": "Laatst bijgewerkt", + "LICENSE": "Licentie", + "LIST": "Lijst", + "LOADING_SCREENSHOT": "Schermafbeelding Laden...", + "LOADING_SPRITESHEET": "Spritesheet %i van %i geladen...", + "MEDIATYPE_NAND": "MediaType NAND", + "MEDIATYPE_SD": "MediaType SD", + "MOVE_ERROR": "Verplaats Fout!", + "NO_DOWNLOADS_AVAILABLE": "Geen downloads beschikbaar", + "NO_LICENSE": "Geen Licentie", + "NO_SCREENSHOTS_AVAILABLE": "Geen Schermafbeeldingen beschikbaar", + "NOT_IMPLEMENTED": "Nog Niet Geïmplementeerd", + "OP_COPYING": "Kopiëren", + "OP_DELETING": "Verwijderen", + "OP_DOWNLOADING": "Downloaden", + "OP_EXTRACTING": "Uitpakken", + "OP_INSTALLING": "Installeren", + "OP_MOVING": "Verplaatsen", + "OP_WAITING": "Even geduld", + "QUEUE": "Wachtrij", + "QUEUE_POSITION": "Wachtrij positie", + "QUEUE_PROGRESS": "Stap: %d / %d", + "RECOMMENDED_UNISTORES": "Aanbevolen UniStores", + "REVISION": "Revisie", + "SCREENSHOT": "Schermafbeelding %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Schermafbeelding kon niet worden geladen.", + "SCREENSHOT_INSTRUCTIONS": "Druk op  om te veranderen en  om in te zoomen", + "SEARCH_FILTERS": "Zoeken en Filters", + "SELECT_A_THEME": "Selecteer een Thema", + "SELECT_DIR": "Selecteer een map", + "SELECT_LANG": "Kies de taal", + "SELECT_UNISTORE": "Selecteer UniStore...", + "SELECT_UNISTORE_2": "Selecteer een UniStore", + "SELECTION_QUEUE": "Selectie Toevoegen aan Wachtrij", + "SETTINGS": "Instellingen", + "SHEET_SLASH": "Het lijkt erop dat er een '/' is opgenomen, wat niet wordt ondersteund.\nVerander 'file' alleen naar bestandsnaam.", + "SHORTCUT_CREATED": "Snelkoppeling gemaakt!", + "SHORTCUT_COPYING": "%s kopiëren...", + "SHORTCUT_DOWNLOADING": "%s downloaden...", + "SHORTCUT_EXTRACTING": "%s uitpakken...", + "SHORTCUT_INSTALLING": "%s installeren...", + "SIZE": "Grootte", + "SORT_BY": "Sorteren Op", + "SORTING": "Sorteren", + "START_SELECT": "Druk op START om de huidige map te selecteren", + "STORE_INFO": "Winkel Informatie", + "SYNTAX_ERROR": "Syntax Fout!", + "TITLE": "Titel", + "TOP_STYLE": "Bovenste Scherm Stijl", + "UNISTORE_BG": "Gebruik UniStore BG", + "UNISTORE_BG_DESC": "Wanneer ingeschakeld, zal de UniStore meegeleverde BG worden weergegeven in plaats van de vaste BG kleur voor het bovenste scherm.", + "UNISTORE_INVALID_ERROR": "Deze UniStore is ongeldig en kan niet\ngeladen worden met Universal-Updater.\nMisschien controleren of er Syntax fouten zijn?", + "UNISTORE_TOO_NEW": "Uw versie van de Universal-Updater is\nte oud om deze UniStore te gebruiken.\nUpdate alsjeblieft naar de nieuwste versie.", + "UNISTORE_TOO_OLD": "Deze UniStore is verouderd en kan niet gebruikt worden\nmet deze versie van Universal-Updater.\nVraag de maker om het te updaten.", + "UPDATE_AVAILABLE": "Update Beschikbaar!", + "UPDATE_DONE": "Update klaar! Graag Universal-Updater opnieuw openen.", + "UPDATING_SPRITE_SHEET": "Spritesheet bijwerken...", + "UPDATING_SPRITE_SHEET2": "Bijwerken Spritesheet %i van %i...", + "UPDATING_UNISTORE": "UniStore bijwerken...", + "VERSION": "Versie" +} \ No newline at end of file diff --git a/romfs/lang/no/app.json b/romfs/lang/no/app.json new file mode 100644 index 0000000..c8a280d --- /dev/null +++ b/romfs/lang/no/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "Plasser 3DSX filer i mappen", + "3DSX_IN_FOLDER_DESC": "Hvis aktivert, vil 3DSX filer bli lagt i en mappe med samme navn i stedet for direkte i angitt mappe.", + "ACTION_CANCELED": "%s avbrutt!", + "ACTION_FAILED": "%s feilet!", + "ACTION_REQUIRED": "Handling kreves!", + "ACTION_SUCCEEDED": "%s fullført!", + "ACTIVE_THEME": "Aktivt tema", + "ASCENDING": "Stigende", + "ARGUMENT_INVALID": "Argumentet er ugyldig.\nKontroller xml-filen for riktige argumenter.", + "AUTHOR": "Forfatter", + "AUTO_UPDATE_NIGHTLY": "Bruk eksperimentelle versjoner", + "AUTO_UPDATE_NIGHTLY_DESC": "Bruk eksperimentelle versjoner av Universal-Updater istedet for stabile utgaver.", + "AUTO_UPDATE_SETTINGS": "Innstillinger for automatisk oppdatering", + "AUTO_UPDATE_SETTINGS_BTN": "Auto-oppdatering instillinger...", + "AUTO_UPDATE_UNISTORE": "Auto-oppdatering UniStores", + "AUTO_UPDATE_UNISTORE_DESC": "Med dette oppdateres det siste brukte UniStore automatisk ved oppstart av Universal-Oppdater.", + "AUTO_UPDATE_UU": "Auto-oppdatering av Universal-Updater", + "AUTO_UPDATE_UU_DESC": "Når aktivert vil Universal-Updater se etter oppdateringer hver gang den åpnes.", + "AVAILABLE_DOWNLOADS": "Tilgjengelige nedlastinger", + "BOOT_TITLE": "Vil du starte denne tittelen?", + "CANCEL": "Avbryt", + "CATEGORY": "Kategori", + "CHANGE_3DSX_PATH": "Endre 3DSX sti", + "CHANGE_ARCHIVE_PATH": "Endre arkivets sti", + "CHANGE_FIRM_PATH": "Endre firm sti", + "CHANGE_NDS_PATH": "Endre NDS sti", + "CHANGE_SHORTCUT_PATH": "Endre snarvei sti", + "CHECK_UNISTORE_UPDATES": "Ser etter UniStore oppdateringer...", + "CHECK_UU_UPDATES": "Ser etter Universal-Updater oppdateringer...", + "CONFIRM_OR_CANCEL": "Trykk for  å bekrefte  for å avbryte.", + "CONNECT_WIFI": "Koble til WiFi.", + "CONFIRM": "Bekreft", + "CONSOLE": "Konsoll", + "CONTRIBUTOR_TRANSLATORS": "- Alle oversettere og bidragsytere", + "COPYING": "Kopierer... %s / %s (%.2f%%)", + "COPY_ERROR": "Kopier feil!", + "CREATE_SHORTCUT": "Ønsker du å lage en snarvei?", + "CREDITS": "Medvirkende", + "CREDITS_BTN": "Medvirkende...", + "CURRENT_VERSION": "Nåværende versjon: ", + "CURRENTLY_EXTRACTING": "For øyeblikket utpakker:", + "CUSTOM_FONT": "Bruk egendefinert skrift", + "CUSTOM_FONT_DESC": "Hvis aktivert, vil 'sdmc:/3ds/Universal-Updater/font.bcfnt' bli brukt istedenfor systemskrifttypen, dersom det blir funnet.", + "DELETE_ERROR": "Slette feil!", + "DELETE_PROMPT": "Er du sikker på at du vil slette denne mappen?", + "DELETING": "Sletter...", + "DESCENDING": "Synkende", + "DIRECTION": "Retning", + "DIRECTORY_SETTINGS": "Mappe Innstillinger", + "DIRECTORY_SETTINGS_BTN": "Mappe Innstillinger...", + "DONE": "Ferdig!", + "DOWNLOAD_ERROR": "Feil ved nedlasting!", + "DOWNLOAD_FAILED": "Nedlasting feilet!", + "DOWNLOAD_SPEED": "Hastighet: %lld KiB/s", + "DOWNLOADING": "Laster ned... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Laster ned kompatibel skrifttype...", + "DOWNLOADING_SPRITE_SHEET": "Laster ned Spritesheet...", + "DOWNLOADING_SPRITE_SHEET2": "Laster ned Spritesheet %i av %i...", + "DOWNLOADING_UNIVERSAL_DB": "Laster ned Universal-DB...", + "DONLOADING_UNIVERSAL_UPDATER": "Laster ned Universal-Updater...", + "DOWNLOADING_UNISTORE": "Laster ned UniStore...", + "ENTER_DESC_SHORTCUT": "Skriv inn snarveibeskrivelsen.", + "ENTER_SEARCH": "Skriv inn det du søker etter.", + "ENTER_SHORTCUT_FILENAME": "Oppgi snarveiens filnavn (uten filtype).", + "ENTER_TITLE_SHORTCUT": "Skriv inn snarveiens tittel.", + "ENTER_URL": "Skriv inn URL-adressen til UniStore.", + "ENTRIES": "Oppføringer", + "EXECUTE_ENTRY": "Ønsker du å utføre denne oppføringen?", + "NOTE_NIGHTLY": "Merk: \"Nattlig\" versjoner er ment for testing\nkommende funksjoner og kan være ustabile.\n\nHvis du bare vil installere,\nvennligst avbryt og installer den normale versjonen.", + "NOTE_PRERELEASE": "Merk: Dette er en forhåndsutgivelse versjon og kan være ustabil.\n\nHvis du bare ønsker å installere, kan du\nønske å installere den normale versjonen hvis en eksisterer.", + "EXIT_APP": "Avslutt Universal-Updater", + "EXTRACTING": "Pakker ut... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Pakk ut feil!", + "FEATURE_SIDE_EFFECTS": "Denne funksjonen kan ha bivirkninger mens køen kjører.\nEr du sikker på at du vil fortsette?", + "FETCHING_METADATA": "Henter gamle metadata...", + "FETCHING_RECOMMENDED_UNISTORES": "Henter anbefalte UniStores...", + "FILES": "Fil: %d / %d", + "FILE_EXTRACTED": "fil utpakket.", + "FILE_SLASH": "Ser ut som en '/' er inkludert, som ikke støttes.\nEndre kun 'fil' til filnavn.", + "FILES_EXTRACTED": "filer pakket ut.", + "FILTER_TO": "Filtrer til:", + "GITHUB": "Fullstendige kreditter kan bli funnet på GitHub", + "GRID": "Rutenett", + "GUI_SETTINGS": "GUI innstillinger", + "GUI_SETTINGS_BTN": "GUI innstillinger...", + "INCLUDE_IN_RESULTS": "Inkludere i resultater:", + "INSTALLING": "Installerer... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Installerer Universal-Updater...", + "INVALID_UNISTORE": "Ugyldig UniStore", + "KEY_CONTINUE": "Trykk på en tast for å fortsette.", + "LANGUAGE": "Språk...", + "LAST_UPDATED": "Sist oppdatert", + "LICENSE": "Lisens", + "LIST": "Liste", + "LOADING_SCREENSHOT": "Laster inn skjermbilde...", + "LOADING_SPRITESHEET": "Laster Spritesheet %i av %i...", + "MEDIATYPE_NAND": "MediaType NAND", + "MEDIATYPE_SD": "MediaType SD", + "MOVE_ERROR": "Flytte feil!", + "NO_DOWNLOADS_AVAILABLE": "Ingen nedlastinger tilgjengelig", + "NO_LICENSE": "Ingen lisens", + "NO_SCREENSHOTS_AVAILABLE": "Ingen skjermbilder tilgjengelig", + "NOT_IMPLEMENTED": "Ikke implementert ennå", + "OP_COPYING": "Kopierer", + "OP_DELETING": "Sletter", + "OP_DOWNLOADING": "Laster ned", + "OP_EXTRACTING": "Pakker ut", + "OP_INSTALLING": "Installerer", + "OP_MOVING": "Flytter", + "OP_WAITING": "Venter", + "QUEUE": "Kø", + "QUEUE_POSITION": "Kø posisjon", + "QUEUE_PROGRESS": "Steg: %d / %d", + "RECOMMENDED_UNISTORES": "Anbefalte UniStores", + "REVISION": "Revisjon", + "SCREENSHOT": "Skjermbilde %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Skjermbildet kunne ikke lastes.", + "SCREENSHOT_INSTRUCTIONS": "Trykk  for å endre og  for å zoome", + "SEARCH_FILTERS": "Søk og filtre", + "SELECT_A_THEME": "Velg et tema", + "SELECT_DIR": "Velg mappe", + "SELECT_LANG": "Velg språk", + "SELECT_UNISTORE": "Velg UniStore...", + "SELECT_UNISTORE_2": "Velg en UniStore", + "SELECTION_QUEUE": "Legg til utvalg i køen", + "SETTINGS": "Innstillinger", + "SHEET_SLASH": "Ser ut som en '/' er inkludert, som ikke støttes.\nDu må endre 'sheet' til filnavn.", + "SHORTCUT_CREATED": "Snarvei opprettet!", + "SHORTCUT_COPYING": "Kopierer %s...", + "SHORTCUT_DOWNLOADING": "Laster ned %s...", + "SHORTCUT_EXTRACTING": "Pakker ut %s...", + "SHORTCUT_INSTALLING": "Installerer %s...", + "SIZE": "Størrelse", + "SORT_BY": "Sorter etter", + "SORTING": "Sortering", + "START_SELECT": "Trykk START for å velge gjeldende mappe", + "STORE_INFO": "Butikk informasjon", + "SYNTAX_ERROR": "Syntaks feil!", + "TITLE": "Tittel", + "TOP_STYLE": "Øverst stil", + "UNISTORE_BG": "Bruk UniStore BG", + "UNISTORE_BG_DESC": "Når aktivert vil UniStore gitte BG vises i stedet for den solide BG fargen på toppskjermen.", + "UNISTORE_INVALID_ERROR": "Denne UniStore er ugyldig og kan ikke\nlastes med Universal-Updater.\nKanskje sjekke om det er noen syntaksfeil?", + "UNISTORE_TOO_NEW": "Versjonen din av Universal-Updater er\nfor gammel til å bruke denne UniStore.\nVennligst oppdater til den nyeste versjonen.", + "UNISTORE_TOO_OLD": "Denne UniStore er utdatert og kan ikke brukes\nmed denne versjonen av Universal-Updater.\nVennligst be skaperen om å oppdatere den.", + "UPDATE_AVAILABLE": "Oppdatering tilgjengelig!", + "UPDATE_DONE": "Oppdatering fullført! Vennligst åpne Universal-Updater på nytt.", + "UPDATING_SPRITE_SHEET": "Oppdaterer Spritesheet...", + "UPDATING_SPRITE_SHEET2": "Oppdaterer Spritesheet %i av %i...", + "UPDATING_UNISTORE": "Oppdaterer UniStore...", + "VERSION": "Versjon" +} \ No newline at end of file diff --git a/romfs/lang/pl/app.json b/romfs/lang/pl/app.json index 1996d6b..c19d2ca 100644 --- a/romfs/lang/pl/app.json +++ b/romfs/lang/pl/app.json @@ -1,103 +1,153 @@ { + "3DSX_IN_FOLDER": "Umieść pliki 3DSX w folderze", + "3DSX_IN_FOLDER_DESC": "Jeśli włączone, pliki 3DSX zostaną umieszczone w folderze o tej samej nazwie zamiast bezpośrednio w wybranym folderze.", + "ACTION_CANCELED": "%s anulowane!", + "ACTION_FAILED": "%s nie powiodło się!", + "ACTION_REQUIRED": "Wymagana akcja!", + "ACTION_SUCCEEDED": "%s udane!", + "ACTIVE_THEME": "Aktywny motyw", "ASCENDING": "Rosnąco", + "ARGUMENT_INVALID": "Argument jest nieprawidłowy.\nProszę sprawdzić plik xml dla właściwych argumentów.", "AUTHOR": "Autor", - "AUTO_UPDATE_SETTINGS": "Auto-Update Settings", - "AUTO_UPDATE_SETTINGS_BTN": "Auto-update settings...", - "AUTO_UPDATE_UNISTORE": "Auto-update UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "With this, the last used UniStore will be updated automatically when launching Universal-Updater.", - "AUTO_UPDATE_UU": "Auto-update Universal-Updater", - "AUTO_UPDATE_UU_DESC": "When enabled, Universal-Updater will check for updates every time it's opened.", - "AVAILABLE_DOWNLOADS": "Available Downloads", + "AUTO_UPDATE_NIGHTLY": "Używaj wersji nightly", + "AUTO_UPDATE_NIGHTLY_DESC": "Używaj wersji nightly Universal-Updatera zamiast wydań stabilnych.", + "AUTO_UPDATE_SETTINGS": "Ustawienia Automatycznej Aktualizacji", + "AUTO_UPDATE_SETTINGS_BTN": "Ustawienia automatycznej aktualizacji...", + "AUTO_UPDATE_UNISTORE": "Automatycznie aktualizuj UniStory", + "AUTO_UPDATE_UNISTORE_DESC": "Dzięki temu ostatni używany UniStore będzie aktualizowany automatycznie podczas uruchamiania Universal-Updater.", + "AUTO_UPDATE_UU": "Automatyczna aktualizacja Universal-Updater", + "AUTO_UPDATE_UU_DESC": "Po włączeniu Universal-Updater będzie sprawdzał dostępność aktualizacji za każdym razem gdy zostanie otwarty.", + "AVAILABLE_DOWNLOADS": "Dostępne Pobrania", "BOOT_TITLE": "Czy chcesz uruchomić ten tytuł?", + "CANCEL": "Anuluj", "CATEGORY": "Kategoria", "CHANGE_3DSX_PATH": "Zmień lokalizację 3DSX", "CHANGE_ARCHIVE_PATH": "Zmień lokalizację archiwum", + "CHANGE_FIRM_PATH": "Zmień ścieżkę firm", "CHANGE_NDS_PATH": "Zmień lokalizację NDS", + "CHANGE_SHORTCUT_PATH": "Zmień ścieżkę skrótu", "CHECK_UNISTORE_UPDATES": "Sprawdzanie aktualizacji UniStore...", "CHECK_UU_UPDATES": "Sprawdzanie aktualizacji Universal-Updater...", "CONFIRM_OR_CANCEL": "Naciśnij  aby potwierdzić,  aby anulować.", "CONNECT_WIFI": "Proszę połączyć się z WiFi.", + "CONFIRM": "Potwierdź", "CONSOLE": "Konsola", "CONTRIBUTOR_TRANSLATORS": "- Wszyscy Tłumacze i Współpracownicy", + "COPYING": "Kopiowanie... %s / %s (%.2f%%)", "COPY_ERROR": "Błąd kopiowania!", + "CREATE_SHORTCUT": "Czy chcesz teraz stworzyć skrót?", "CREDITS": "Współautorzy", + "CREDITS_BTN": "Autorzy...", "CURRENT_VERSION": "Bieżąca wersja:", "CURRENTLY_EXTRACTING": "Obecnie rozpakowywane:", + "CUSTOM_FONT": "Użyj niestandardowej czcionki", + "CUSTOM_FONT_DESC": "Jeśli włączone, zamiast czcionki systemowej zostaną użyte 'sdmc:/3ds/Universal-Updater/font.bcfnt', jeśli jest obecny.", "DELETE_ERROR": "Błąd usuwania!", "DELETE_PROMPT": "Czy na pewno chcesz usunąć ten Katalog?", - "DELETE_UNNEEDED_FILE": "Usuwanie niepotrzebnego pliku...", + "DELETING": "Usuwanie...", "DESCENDING": "Malejąco", "DIRECTION": "Kierunek", - "DIRECTORY_SETTINGS": "Directory Settings", - "DIRECTORY_SETTINGS_BTN": "Directory settings...", - "DISABLE_AUTOUPDATE_UNISTORE": "Wyłącz auto-aktualizację UniStore przy starcie", - "DISABLE_UPDATE_CHECK": "Wyłącz samodzielną aktualizację", + "DIRECTORY_SETTINGS": "Ustawienia Katalogu", + "DIRECTORY_SETTINGS_BTN": "Ustawienia Katalogu...", "DONE": "Gotowe!", "DOWNLOAD_ERROR": "Błąd pobierania!", "DOWNLOAD_FAILED": "Pobieranie nieudane!", + "DOWNLOAD_SPEED": "Prędkość: %lld KiB/s", + "DOWNLOADING": "Pobieranie... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Pobieranie kompatybilnej czcionki...", "DOWNLOADING_SPRITE_SHEET": "Pobieranie tekstur...", "DOWNLOADING_SPRITE_SHEET2": "Pobieranie tekstury %i z %i...", "DOWNLOADING_UNIVERSAL_DB": "Pobieranie Universal-DB...", "DONLOADING_UNIVERSAL_UPDATER": "Pobieranie Universal-Updater...", "DOWNLOADING_UNISTORE": "Pobieranie UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Włącz auto-aktualizację UniStore przy starcie", - "ENABLE_UPDATE_CHECK": "Włącz samodzielną aktualizację", + "ENTER_DESC_SHORTCUT": "Wprowadź opis skrótu.", "ENTER_SEARCH": "Wprowadź to co chciałbyś znaleźć.", + "ENTER_SHORTCUT_FILENAME": "Wprowadź nazwę pliku skrótu (bez rozszerzenia).", + "ENTER_TITLE_SHORTCUT": "Wprowadź tytuł skrótu.", "ENTER_URL": "Wprowadź adres URL UniStore.", "ENTRIES": "Wpisy", "EXECUTE_ENTRY": "Czy chcesz wykonać ten wpis?", + "NOTE_NIGHTLY": "Notatka: Wersje \"Nightly\" mają być tylko używane na testowanie nadchodzących funkcji i mogą być niestabilne.\n\nJeżeli chcesz normalnie instalować, anuluj i zainstaluj normalną wersje.", + "NOTE_PRERELEASE": "Notatka: To jest wydanie wstępne i może być niestabilne.\n\nJeśli chcesz normalnie zainstalować, spróbuj zainstalować normalną wersję, jeśli taka istnieje.", "EXIT_APP": "Wyjdź z Universal-Updater", + "EXTRACTING": "Wypakowywanie... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Błąd wypakowywania!", + "FEATURE_SIDE_EFFECTS": "Ta funkcja może powodować działania niepożądane podczas działającej kolejki zadań.\nCzy na pewno chcesz kontynuować?", "FETCHING_METADATA": "Pobieranie starych metadanych...", + "FETCHING_RECOMMENDED_UNISTORES": "Pobieranie rekomendowanych UniStores...", + "FILES": "Plik: %d / %d", "FILE_EXTRACTED": "plik rozpakowany.", "FILE_SLASH": "Wygląda na to, że '/' jest dołączony, co nie jest obsługiwane.\nProszę zmienić 'plik' tylko na nazwę pliku.", "FILES_EXTRACTED": "pliki rozpakowane.", "FILTER_TO": "Filtr:", "GITHUB": "Pełna lista zasług znajduje się na GitHub", "GRID": "Siatka", - "GUI_SETTINGS": "GUI Settings", - "GUI_SETTINGS_BTN": "GUI settings...", + "GUI_SETTINGS": "Ustawienia Interfejsu", + "GUI_SETTINGS_BTN": "Ustawienia Interfejsu...", "INCLUDE_IN_RESULTS": "Dołącz do wyników:", + "INSTALLING": "Instalowanie... %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Instalowanie Universal-Updater...", "INVALID_UNISTORE": "Nieprawidłowy UniStore", "KEY_CONTINUE": "Naciśnij dowolny klawisz, aby kontynuować.", - "LANGUAGE": "Język", + "LANGUAGE": "Język...", "LAST_UPDATED": "Ostatnia aktualizacja", "LICENSE": "Licencja", "LIST": "Lista", + "LOADING_SCREENSHOT": "Ładowanie zrzutu ekranu...", "LOADING_SPRITESHEET": "Ładowanie tekstury %i z %i...", "MEDIATYPE_NAND": "Typ pliku NAND", "MEDIATYPE_SD": "Typ pliku SD", "MOVE_ERROR": "Błąd przenoszenia!", - "NO": "Nie", "NO_DOWNLOADS_AVAILABLE": "Brak dostępnych plików do pobrania", "NO_LICENSE": "Brak licencji", + "NO_SCREENSHOTS_AVAILABLE": "Brak dostępnych zrzutów ekranu", "NOT_IMPLEMENTED": "Jeszcze nie zaimplementowane", + "OP_COPYING": "Kopiowanie", + "OP_DELETING": "Usuwanie", + "OP_DOWNLOADING": "Pobieranie", + "OP_EXTRACTING": "Wypakowywanie", + "OP_INSTALLING": "Instalowanie", + "OP_MOVING": "Przenoszenie", + "OP_WAITING": "Oczekuje", + "QUEUE": "Kolejka", + "QUEUE_POSITION": "Pozycja w kolejce", + "QUEUE_PROGRESS": "Krok %d / %d", + "RECOMMENDED_UNISTORES": "Rekomendowane UniStores", "REVISION": "Wersja", - "SEARCH_FILTERS": "Search and Filters", + "SCREENSHOT": "Zrzut ekranu %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Nie można załadować zrzutu ekranu.", + "SCREENSHOT_INSTRUCTIONS": "Wciśnij  by zmienić i  by przybliżyć", + "SEARCH_FILTERS": "Wyszukiwanie i filtrowanie", + "SELECT_A_THEME": "Wybierz motyw", "SELECT_DIR": "Wybierz katalog", "SELECT_LANG": "Wybierz język", - "SELECT_UNISTORE": "Wybierz UniStore", + "SELECT_UNISTORE": "Wybierz UniStore...", "SELECT_UNISTORE_2": "Wybierz UniStore", - "SETTINGS": "Settings", + "SELECTION_QUEUE": "Dodaj zaznaczenie do kolejki", + "SETTINGS": "Ustawienia", "SHEET_SLASH": "Wygląda na to, że '/' jest dołączony, co nie jest obsługiwane.\nProszę zmienić 'sheet' tylko na nazwę pliku.", + "SHORTCUT_CREATED": "Skrót utworzony!", + "SHORTCUT_COPYING": "Kopiowanie %s...", + "SHORTCUT_DOWNLOADING": "Pobieranie %s...", + "SHORTCUT_EXTRACTING": "Rozpakowywanie %s...", + "SHORTCUT_INSTALLING": "Instalowanie %s...", + "SIZE": "Rozmiar", "SORT_BY": "Sortuj według", - "SORTING": "Sorting", + "SORTING": "Sortowanie", "START_SELECT": "Naciśnij przycisk START, aby wybrać bieżący folder", + "STORE_INFO": "Informacje o sklepie", "SYNTAX_ERROR": "Błąd składni!", "TITLE": "Tytuł", "TOP_STYLE": "Styl Góry", - "UNISTORE_BG": "Use UniStore BG", - "UNISTORE_BG_DESC": "When enabled, the UniStore's provided BG will be shown instead of the solid BG color for the top screen.", + "UNISTORE_BG": "Użyj tła UniStore", + "UNISTORE_BG_DESC": "Gdy włączone, tło dostarczone przez UniStore będzie wyświetlane zamiast stałego koloru tła dla górnego ekranu.", "UNISTORE_INVALID_ERROR": "Ten UniStore jest nieprawidłowy i nie może zostać\nzaładowany z Universal-Updater.\nMoże sprawdź czy są jakieś błędy składni?", "UNISTORE_TOO_NEW": "Twoja wersja Universal-Updater jest\nzbyt stara aby używać tego UniStore.\nProszę zaktualizować do najnowszej wersji.", "UNISTORE_TOO_OLD": "Ten UniStore jest nieaktualny i nie może być użyty\nw tej wersji Universal-Updater.\nPoproś twórcę o jego aktualizację.", - "UNSUPPORTED_UNISTORE_VERSION": "Wersja tego UniStore nie jest obsługiwana.", "UPDATE_AVAILABLE": "Dostępna aktualizacja!", "UPDATE_DONE": "Aktualizacja zakończona! Proszę ponownie otworzyć Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "Brak dostępnych aktualizacji!", "UPDATING_SPRITE_SHEET": "Aktualizowanie tekstur...", "UPDATING_SPRITE_SHEET2": "Aktualizowanie tekstury %i z %i...", "UPDATING_UNISTORE": "Aktualizowanie UniStore...", - "VERSION": "Wersja", - "YES": "Tak" + "VERSION": "Wersja" } \ No newline at end of file diff --git a/romfs/lang/pt-BR/app.json b/romfs/lang/pt-BR/app.json index 67bd489..0717c7c 100644 --- a/romfs/lang/pt-BR/app.json +++ b/romfs/lang/pt-BR/app.json @@ -1,103 +1,153 @@ { + "3DSX_IN_FOLDER": "Colocar arquivos 3DSX em pastas", + "3DSX_IN_FOLDER_DESC": "Se ativado, arquivos 3DSX serão baixados para uma pasta separada − com o mesmo nome que o arquivo.", + "ACTION_CANCELED": "%s cancelado!", + "ACTION_FAILED": "%s falhou!", + "ACTION_REQUIRED": "Ação necessária!", + "ACTION_SUCCEEDED": "%s finalizado com sucesso!", + "ACTIVE_THEME": "Tema Ativo", "ASCENDING": "Crescente", - "AUTHOR": "Author", + "ARGUMENT_INVALID": "Argumento invalido.\nVerifique os argumentos no seu arquivo XML.", + "AUTHOR": "Autor", + "AUTO_UPDATE_NIGHTLY": "Usar versões nightly", + "AUTO_UPDATE_NIGHTLY_DESC": "Utilizar versões nightly do Universal-Updater em vez das versões estáveis.", "AUTO_UPDATE_SETTINGS": "Ajustes de atualização automática", "AUTO_UPDATE_SETTINGS_BTN": "Atualização automática...", "AUTO_UPDATE_UNISTORE": "Atualizar UniStore automaticamente", "AUTO_UPDATE_UNISTORE_DESC": "Se ativado, a ultima UniStore usada na ultima sessão será atualizada automaticamente ao abrir o Universal-Updater.", "AUTO_UPDATE_UU": "Atualizar Universal-Updater automaticamente", - "AUTO_UPDATE_UU_DESC": "Se ativado, Universal-Updater vai buscar por atualizações toda vez que for aberto.", + "AUTO_UPDATE_UU_DESC": "Se ativado, Universal-Updater vai buscar por atualizações ao iniciar.", "AVAILABLE_DOWNLOADS": "Downloads disponíveis", - "BOOT_TITLE": "Would you like to boot this title?", + "BOOT_TITLE": "Você quer iniciar este software?", + "CANCEL": "Cancelar", "CATEGORY": "Categoria", "CHANGE_3DSX_PATH": "Alterar pasta \"3DSX\"", "CHANGE_ARCHIVE_PATH": "Alterar pasta temporária", + "CHANGE_FIRM_PATH": "Alterar pasta \"FIRM\"", "CHANGE_NDS_PATH": "Alterar pasta \"NDS\"", + "CHANGE_SHORTCUT_PATH": "Mudar pasta de atalhos", "CHECK_UNISTORE_UPDATES": "Verificando atualizações para UniStore...", "CHECK_UU_UPDATES": "Verificando atualizações para Universal-Updater...", "CONFIRM_OR_CANCEL": ": Confirmar | : Cancelar", - "CONNECT_WIFI": "Please Connect to WiFi.", + "CONNECT_WIFI": "Certifique-se de que está conectado ao Wi-Fi.", + "CONFIRM": "Confirmar", "CONSOLE": "Console", "CONTRIBUTOR_TRANSLATORS": "- Todos os tradutores e colaboradores", - "COPY_ERROR": "Copy Error!", + "COPYING": "Copiando... %s / %s (%.2f%%)", + "COPY_ERROR": "Erro ao copiar!", + "CREATE_SHORTCUT": "Você quer criar um atalho?", "CREDITS": "Créditos", + "CREDITS_BTN": "Créditos...", "CURRENT_VERSION": "Versão instalada: ", - "CURRENTLY_EXTRACTING": "Currently extracting:\n", - "DELETE_ERROR": "Delete Error!", - "DELETE_PROMPT": "Are you sure you want to delete this Directory?", - "DELETE_UNNEEDED_FILE": "Deleting unneeded file...", + "CURRENTLY_EXTRACTING": "Extraindo agora:\n", + "CUSTOM_FONT": "Usar fonte customizada", + "CUSTOM_FONT_DESC": "Se ativado, a fonte em 'sdmc:/3ds/Universal-Updater/font.bcfnt' será usada no lugar da fonte padrão do sistema – caso a mesma seja encontrada.", + "DELETE_ERROR": "Erro ao deletar!", + "DELETE_PROMPT": "Deseja mesmo deletar esta pasta?", + "DELETING": "Excluindo...", "DESCENDING": "Decrescente", "DIRECTION": "Ordem", - "DIRECTORY_SETTINGS": "Directory Settings", - "DIRECTORY_SETTINGS_BTN": "Directory settings...", - "DISABLE_AUTOUPDATE_UNISTORE": "Disable auto-update UniStore on boot", - "DISABLE_UPDATE_CHECK": "Disable self-updating", + "DIRECTORY_SETTINGS": "Ajustar pastas", + "DIRECTORY_SETTINGS_BTN": "Ajustar pastas...", "DONE": "Tudo pronto!", "DOWNLOAD_ERROR": "Erro no download!", "DOWNLOAD_FAILED": "Falha no download!", + "DOWNLOAD_SPEED": "Velocidade: %lld KiB/s", + "DOWNLOADING": "Baixando... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Baixando fonte compatível...", "DOWNLOADING_SPRITE_SHEET": "Baixando spritesheet...", "DOWNLOADING_SPRITE_SHEET2": "Baixando spritesheet %i de %i...", "DOWNLOADING_UNIVERSAL_DB": "Baixando Universal-DB...", "DONLOADING_UNIVERSAL_UPDATER": "Baixando Universal-Updater...", "DOWNLOADING_UNISTORE": "Baixando UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Enable auto-update UniStore on boot", - "ENABLE_UPDATE_CHECK": "Enable self-updating", - "ENTER_SEARCH": "Enter what you like to search.", + "ENTER_DESC_SHORTCUT": "Insira a descrição do atalho.", + "ENTER_SEARCH": "Insira o termo de pesquisa.", + "ENTER_SHORTCUT_FILENAME": "Insira o nome do arquivo do atalho (excluindo a extensão).", + "ENTER_TITLE_SHORTCUT": "Insira o título do atalho.", "ENTER_URL": "Insira o link da UniStore.", - "ENTRIES": "Entries", - "EXECUTE_ENTRY": "Tem certeza de que quer executar este item?", - "EXIT_APP": "Exit Universal-Updater", - "FETCHING_METADATA": "Fetching old metadata...", - "FILE_EXTRACTED": "file extracted.", + "ENTRIES": "Itens", + "EXECUTE_ENTRY": "Você quer executar este item?", + "NOTE_NIGHTLY": "Nota: Versões \"Noturno\" são destinadas para testar\nos próximos recursos e podem ser instáveis.\n\nSe você quer simplesmente instalar,\npor favor cancele e instale a versão normal.", + "NOTE_PRERELEASE": "Nota: Esta é uma compilação de pré-lançamento e pode ser instável.\n\nSe você simplesmente deseja instalar, você pode\nquerer instalar a versão normal se existir uma.", + "EXIT_APP": "Fechar Universal-Updater", + "EXTRACTING": "Extraindo... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Erro ao extrair!", + "FEATURE_SIDE_EFFECTS": "Este recurso pode ter efeitos colaterais enquanto a fila está sendo executada.\nTem certeza que deseja continuar?", + "FETCHING_METADATA": "Buscando metadados antigos...", + "FETCHING_RECOMMENDED_UNISTORES": "Buscando por UniStores recomendadas...", + "FILES": "Arquivo: %d / %d", + "FILE_EXTRACTED": "arquivo extraído.", "FILE_SLASH": "Uma '/' foi incluida no caminho do arquivo — algo que não é compatível.\nAjuste a chave 'file' para que ela contenha somente o nome do arquivo.", - "FILES_EXTRACTED": "files extracted.", + "FILES_EXTRACTED": "arquivos extraídos.", "FILTER_TO": "Filtrar somente:", "GITHUB": "Mais informações no GitHub", "GRID": "Blocos", "GUI_SETTINGS": "Configuração da interface", "GUI_SETTINGS_BTN": "Interface...", "INCLUDE_IN_RESULTS": "Incluir na pesquisa:", - "INSTALL_UNIVERSAL_UPDATER": "Installing Universal-Updater...", - "INVALID_UNISTORE": "Invalid UniStore", + "INSTALLING": "Instalando %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Instalando Universal-Updater...", + "INVALID_UNISTORE": "UniStore inválida", "KEY_CONTINUE": "Pressione qualquer botão para continuar.", - "LANGUAGE": "Idioma", + "LANGUAGE": "Idioma...", "LAST_UPDATED": "Atualizado pela ultima vez", - "LICENSE": "License", + "LICENSE": "Licença", "LIST": "Lista", + "LOADING_SCREENSHOT": "Carregando captura de tela...", "LOADING_SPRITESHEET": "Carregando spritesheet %i de %i...", - "MEDIATYPE_NAND": "MediaType NAND", - "MEDIATYPE_SD": "MediaType SD", - "MOVE_ERROR": "Move Error!", - "NO": "No", + "MEDIATYPE_NAND": "Armazenado em: NAND", + "MEDIATYPE_SD": "Armazenado em: SD", + "MOVE_ERROR": "Erro ao mover!", "NO_DOWNLOADS_AVAILABLE": "Não há nenhum download disponível", "NO_LICENSE": "Sem licença", - "NOT_IMPLEMENTED": "Not Implemented Yet", - "REVISION": "Revision", + "NO_SCREENSHOTS_AVAILABLE": "Nenhuma captura de tela disponível", + "NOT_IMPLEMENTED": "Função não implementada", + "OP_COPYING": "Copiando", + "OP_DELETING": "Apagando", + "OP_DOWNLOADING": "Baixando", + "OP_EXTRACTING": "Extraindo", + "OP_INSTALLING": "Instalando", + "OP_MOVING": "Movendo", + "OP_WAITING": "Aguardando", + "QUEUE": "Fila", + "QUEUE_POSITION": "Posição da fila", + "QUEUE_PROGRESS": "Etapa: %d/%d", + "RECOMMENDED_UNISTORES": "UniStores recomendadas", + "REVISION": "Revisão", + "SCREENSHOT": "Captura de tela %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Não foi possível carregar a captura de tela.", + "SCREENSHOT_INSTRUCTIONS": ": Trocar foto | : Ampliar", "SEARCH_FILTERS": "Pesquisa e Filtros", - "SELECT_DIR": "Escolha uma pasta", - "SELECT_LANG": "Escolha um idioma", - "SELECT_UNISTORE": "Select UniStore", - "SELECT_UNISTORE_2": "Escolha uma UniStore", + "SELECT_A_THEME": "Selecione um tema", + "SELECT_DIR": "Selecione uma pasta", + "SELECT_LANG": "Selecione um idioma", + "SELECT_UNISTORE": "Selecionar UniStore...", + "SELECT_UNISTORE_2": "Selecione uma UniStore", + "SELECTION_QUEUE": "Adicionar seleção à fila", "SETTINGS": "Configurações", "SHEET_SLASH": "Uma '/' foi incluida no caminho da spritesheet — algo que não é compatível.\nAjuste a chave 'sheet' para que ela contenha somente o nome do arquivo.", + "SHORTCUT_CREATED": "Atalho criado com sucesso.", + "SHORTCUT_COPYING": "Copiando %s...", + "SHORTCUT_DOWNLOADING": "Baixando %s...", + "SHORTCUT_EXTRACTING": "Extraindo %s...", + "SHORTCUT_INSTALLING": "Instalando %s...", + "SIZE": "Tamanho", "SORT_BY": "Classificar por", - "SORTING": "Sorting", + "SORTING": "Ordem e Classificação", "START_SELECT": "Pressione START para selecionar a pasta atual", - "SYNTAX_ERROR": "Syntax Error!", - "TITLE": "Title", + "STORE_INFO": "Informações da loja", + "SYNTAX_ERROR": "Erro de sintaxe!", + "TITLE": "Nome", "TOP_STYLE": "Exibir em", - "UNISTORE_BG": "Use UniStore BG", - "UNISTORE_BG_DESC": "When enabled, the UniStore's provided BG will be shown instead of the solid BG color for the top screen.", - "UNISTORE_INVALID_ERROR": "This UniStore is invalid and cannot be\nloaded with Universal-Updater.\nMaybe check if there are any Syntax errors?", - "UNISTORE_TOO_NEW": "Your version of Universal-Updater is\ntoo old to use this UniStore.\nPlease update to the latest version.", - "UNISTORE_TOO_OLD": "This UniStore is outdated and cannot be used\nwith this version of Universal-Updater.\nPlease ask the creator to update it.", - "UNSUPPORTED_UNISTORE_VERSION": "The version of this UniStore is unsupported.", + "UNISTORE_BG": "Utilizar fundo da UniStore", + "UNISTORE_BG_DESC": "Se ativado, uma imagem fornecida pela UniStore será mostrada na tela superior ao invés de uma cor uniforme.", + "UNISTORE_INVALID_ERROR": "Esta UniStore não pôde ser carregada por ser\nconsiderada invalida. Se você é um desenvolvedor, \ncertifique-se que não há erros de sintaxe.", + "UNISTORE_TOO_NEW": "Esta UniStore é incompatível com a\nversão atual de Universal-Updater.\nPor favor, atualize para a versão mais recente.", + "UNISTORE_TOO_OLD": "Esta UniStore está obsoleta, e não é compatível \ncom esta versão de Universal-Updater.\nPeça ao criador desta UniStore para atualizar-la.", "UPDATE_AVAILABLE": "Atualização disponível!", "UPDATE_DONE": "Atualização concluida! Por favor, reinicie Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "Nenhuma atualização disponível!", "UPDATING_SPRITE_SHEET": "Atualizando spritesheet...", "UPDATING_SPRITE_SHEET2": "Atualizando spritesheet %i de %i...", "UPDATING_UNISTORE": "Atualizando a UniStore...", - "VERSION": "Versão", - "YES": "Yes" + "VERSION": "Versão" } \ No newline at end of file diff --git a/romfs/lang/pt/app.json b/romfs/lang/pt/app.json index ddcc8a8..a9f2c60 100644 --- a/romfs/lang/pt/app.json +++ b/romfs/lang/pt/app.json @@ -1,103 +1,153 @@ { + "3DSX_IN_FOLDER": "Colocar ficheiros 3DSX numa pasta", + "3DSX_IN_FOLDER_DESC": "Se ativado, os ficheiros 3DSX serão colocados numa pasta com o mesmo nome em vez de diretamente na pasta definida.", + "ACTION_CANCELED": "%s cancelado!", + "ACTION_FAILED": "%s falhou!", + "ACTION_REQUIRED": "Ação necessária!", + "ACTION_SUCCEEDED": "%s teve êxito!", + "ACTIVE_THEME": "Tema ativo", "ASCENDING": "Ascendente", - "AUTHOR": "Author", - "AUTO_UPDATE_SETTINGS": "Auto-Update Settings", - "AUTO_UPDATE_SETTINGS_BTN": "Auto-update settings...", - "AUTO_UPDATE_UNISTORE": "Auto-update UniStores", - "AUTO_UPDATE_UNISTORE_DESC": "With this, the last used UniStore will be updated automatically when launching Universal-Updater.", - "AUTO_UPDATE_UU": "Auto-update Universal-Updater", - "AUTO_UPDATE_UU_DESC": "When enabled, Universal-Updater will check for updates every time it's opened.", - "AVAILABLE_DOWNLOADS": "Available Downloads", + "ARGUMENT_INVALID": "Argumento inválido.\nPor favor, verifica o ficheiro xml para obter argumentos adequados.", + "AUTHOR": "Autor", + "AUTO_UPDATE_NIGHTLY": "Usar versões nightly", + "AUTO_UPDATE_NIGHTLY_DESC": "Usar versões nightly do Universal-Updater em vez dos lançamentos estáveis.", + "AUTO_UPDATE_SETTINGS": "Configurações de atualização automática", + "AUTO_UPDATE_SETTINGS_BTN": "Configurações de atualização automática...", + "AUTO_UPDATE_UNISTORE": "Atualizar automaticamente as UniStores", + "AUTO_UPDATE_UNISTORE_DESC": "Com isto, a última UniStore usada será atualizada automaticamente ao iniciar o Universal-Updater.", + "AUTO_UPDATE_UU": "Atualizar automaticamente o Universal-Updater", + "AUTO_UPDATE_UU_DESC": "Quando ativado, o Universal-Updater verificará se há atualizações cada vez que é aberto.", + "AVAILABLE_DOWNLOADS": "Downloads disponíveis", "BOOT_TITLE": "Gostarias de carregar este título?", - "CATEGORY": "Category", + "CANCEL": "Cancelar", + "CATEGORY": "Categoria", "CHANGE_3DSX_PATH": "Alterar o caminho do 3DSX", - "CHANGE_ARCHIVE_PATH": "Change archive path", + "CHANGE_ARCHIVE_PATH": "Alterar o caminho de arquivos", + "CHANGE_FIRM_PATH": "Alterar o caminho da firm", "CHANGE_NDS_PATH": "Alterar o caminho do NDS", - "CHECK_UNISTORE_UPDATES": "Checking for UniStore updates...", - "CHECK_UU_UPDATES": "Checking for Universal-Updater updates...", - "CONFIRM_OR_CANCEL": "Press  to confirm,  to cancel.", + "CHANGE_SHORTCUT_PATH": "Alterar o caminho de atalhos", + "CHECK_UNISTORE_UPDATES": "A verificar se há atualizações da UniStore...", + "CHECK_UU_UPDATES": "A verificar se há atualizações do Universal-Updater...", + "CONFIRM_OR_CANCEL": "Prime A para confirmar ou B para cancelar.", "CONNECT_WIFI": "Por favor, conecta-te ao WiFi.", - "CONSOLE": "Console", - "CONTRIBUTOR_TRANSLATORS": "- All Translators & Contributors", - "COPY_ERROR": "Erro ao Copiar!", + "CONFIRM": "Confirmar", + "CONSOLE": "Consola", + "CONTRIBUTOR_TRANSLATORS": "- Todos os tradutores e colaboradores", + "COPYING": "A copiar... %s / %s (%.2f%%)", + "COPY_ERROR": "Erro ao copiar!", + "CREATE_SHORTCUT": "Gostarias de criar um atalho?", "CREDITS": "Créditos", + "CREDITS_BTN": "Créditos...", "CURRENT_VERSION": "Versão atual: ", "CURRENTLY_EXTRACTING": "Atualmente a extrair:\n", - "DELETE_ERROR": "Erro ao Eliminar!", - "DELETE_PROMPT": "Tens a certeza que desejas eliminar esta categoria?", - "DELETE_UNNEEDED_FILE": "Deleting unneeded file...", + "CUSTOM_FONT": "Usar fonte personalizada", + "CUSTOM_FONT_DESC": "Se ativado, 'sdmc:/3ds/Universal-Updater/font.bcfnt' será utilizado em vez da fonte do sistema, se encontrada.", + "DELETE_ERROR": "Erro ao eliminar!", + "DELETE_PROMPT": "Tens a certeza que desejas eliminar este diretório?", + "DELETING": "A apagar...", "DESCENDING": "Descendente", - "DIRECTION": "Direction", - "DIRECTORY_SETTINGS": "Directory Settings", - "DIRECTORY_SETTINGS_BTN": "Directory settings...", - "DISABLE_AUTOUPDATE_UNISTORE": "Disable auto-update UniStore on boot", - "DISABLE_UPDATE_CHECK": "Disable self-updating", + "DIRECTION": "Direção", + "DIRECTORY_SETTINGS": "Configurações do diretório", + "DIRECTORY_SETTINGS_BTN": "Configurações do diretório...", "DONE": "Feito!", - "DOWNLOAD_ERROR": "Erro ao Transferir!", - "DOWNLOAD_FAILED": "Falha ao transferir!", - "DOWNLOADING_SPRITE_SHEET": "Downloading Spritesheet...", - "DOWNLOADING_SPRITE_SHEET2": "Downloading Spritesheet %i of %i...", - "DOWNLOADING_UNIVERSAL_DB": "Downloading Universal-DB...", - "DONLOADING_UNIVERSAL_UPDATER": "Downloading Universal-Updater...", - "DOWNLOADING_UNISTORE": "Downloading UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Enable auto-update UniStore on boot", - "ENABLE_UPDATE_CHECK": "Enable self-updating", - "ENTER_SEARCH": "Informe o que você gosta de pesquisar.", - "ENTER_URL": "Enter the URL of the UniStore.", - "ENTRIES": "Entries", - "EXECUTE_ENTRY": "Would you like to execute this entry?", - "EXIT_APP": "Exit Universal-Updater", - "FETCHING_METADATA": "Fetching old metadata...", - "FILE_EXTRACTED": "arquivo extraído.", - "FILE_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'file' to filename only.", - "FILES_EXTRACTED": "arquivos extraídos.", - "FILTER_TO": "Filter to:", - "GITHUB": "Full credits can be found on GitHub", - "GRID": "Grid", - "GUI_SETTINGS": "GUI Settings", - "GUI_SETTINGS_BTN": "GUI settings...", - "INCLUDE_IN_RESULTS": "Include in results:", - "INSTALL_UNIVERSAL_UPDATER": "Installing Universal-Updater...", - "INVALID_UNISTORE": "Invalid UniStore", - "KEY_CONTINUE": "Press any key to continue.", - "LANGUAGE": "Idioma", - "LAST_UPDATED": "Last updated", - "LICENSE": "License", - "LIST": "List", - "LOADING_SPRITESHEET": "Loading Spritesheet %i of %i...", + "DOWNLOAD_ERROR": "Erro ao transferir!", + "DOWNLOAD_FAILED": "Download Falhou!", + "DOWNLOAD_SPEED": "Velocidade: %lld KiB/s", + "DOWNLOADING": "A descarregar... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "A descarregar fonte compatível...", + "DOWNLOADING_SPRITE_SHEET": "A descarregar ficha de sprites...", + "DOWNLOADING_SPRITE_SHEET2": "A descarregar ficha de sprites %i de %i...", + "DOWNLOADING_UNIVERSAL_DB": "A descarregar Universal-DB...", + "DONLOADING_UNIVERSAL_UPDATER": "A descarregar Universal-Updater...", + "DOWNLOADING_UNISTORE": "A descarregar UniStore...", + "ENTER_DESC_SHORTCUT": "Introduz a descrição do atalho.", + "ENTER_SEARCH": "Introduz o que gostarias de pesquisar.", + "ENTER_SHORTCUT_FILENAME": "Introduz o nome do ficheiro do atalho (sem extensão).", + "ENTER_TITLE_SHORTCUT": "Introduz o título do atalho.", + "ENTER_URL": "Insere o URL da UniStore.", + "ENTRIES": "Entradas", + "EXECUTE_ENTRY": "Gostarias de executar esta entrada?", + "NOTE_NIGHTLY": "Nota: as versões \"nightly\" estão destinadas a\ntestar funcionalidades futuras e podem ser instáveis.\n\nSe apenas quiseres instalar,\npor favor cancela e instala a versão normal.", + "NOTE_PRERELEASE": "Nota: isto é uma compilação de\npré-lançamento e pode ser instável.\n\nSe apenas quiseres instalar,\npoderás querer a versão normal, se uma existir.", + "EXIT_APP": "Sair do Universal-Updater", + "EXTRACTING": "A extrair... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Erro de extração!", + "FEATURE_SIDE_EFFECTS": "Esta funcionalidade poderá ter efeitos secundários enquanto a fila estiver a decorrer.\nTens a certeza de que queres continuar?", + "FETCHING_METADATA": "A obter metadados antigos...", + "FETCHING_RECOMMENDED_UNISTORES": "A obter UniStores recomendadas...", + "FILES": "Ficheiro: %d / %d", + "FILE_EXTRACTED": "ficheiro extraído.", + "FILE_SLASH": "Parece que está incluído um '/', o qual não é suportado.\nPor favor, muda 'file' para o nome do ficheiro apenas.", + "FILES_EXTRACTED": "ficheiros extraídos.", + "FILTER_TO": "Filtrar para:", + "GITHUB": "Os créditos completos podem ser encontrados no GitHub", + "GRID": "Quadrícula", + "GUI_SETTINGS": "Configurações da GUI", + "GUI_SETTINGS_BTN": "Configurações da GUI...", + "INCLUDE_IN_RESULTS": "Incluir nos resultados:", + "INSTALLING": "A instalar... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "A instalar Universal-Updater...", + "INVALID_UNISTORE": "UniStore inválida", + "KEY_CONTINUE": "Prime qualquer tecla para continuar.", + "LANGUAGE": "Idioma...", + "LAST_UPDATED": "Última atualização", + "LICENSE": "Licença", + "LIST": "Lista", + "LOADING_SCREENSHOT": "A carregar captura de ecrã...", + "LOADING_SPRITESHEET": "A carregar ficha de sprites %i de %i...", "MEDIATYPE_NAND": "NAND MediaType", "MEDIATYPE_SD": "SD MediaType", - "MOVE_ERROR": "Erro ao Mover!", - "NO": "Não", - "NO_DOWNLOADS_AVAILABLE": "No downloads available", - "NO_LICENSE": "No License", - "NOT_IMPLEMENTED": "Not Implemented Yet", - "REVISION": "Revision", - "SEARCH_FILTERS": "Search and Filters", - "SELECT_DIR": "Select a directory", - "SELECT_LANG": "Choose the language", - "SELECT_UNISTORE": "Select UniStore", - "SELECT_UNISTORE_2": "Select a UniStore", - "SETTINGS": "Settings", - "SHEET_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'sheet' to filename only.", - "SORT_BY": "Sort By", - "SORTING": "Sorting", - "START_SELECT": "Press START to select the current folder", - "SYNTAX_ERROR": "Erro de Sintaxe!", - "TITLE": "Title", - "TOP_STYLE": "Top Style", - "UNISTORE_BG": "Use UniStore BG", - "UNISTORE_BG_DESC": "When enabled, the UniStore's provided BG will be shown instead of the solid BG color for the top screen.", - "UNISTORE_INVALID_ERROR": "This UniStore is invalid and cannot be\nloaded with Universal-Updater.\nMaybe check if there are any Syntax errors?", - "UNISTORE_TOO_NEW": "Your version of Universal-Updater is\ntoo old to use this UniStore.\nPlease update to the latest version.", - "UNISTORE_TOO_OLD": "This UniStore is outdated and cannot be used\nwith this version of Universal-Updater.\nPlease ask the creator to update it.", - "UNSUPPORTED_UNISTORE_VERSION": "The version of this UniStore is unsupported.", - "UPDATE_AVAILABLE": "Update Available!", - "UPDATE_DONE": "Update done! Please re-open Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "No Updates Available!", - "UPDATING_SPRITE_SHEET": "Updating Spritesheet...", - "UPDATING_SPRITE_SHEET2": "Updating Spritesheet %i of %i...", - "UPDATING_UNISTORE": "Updating UniStore...", - "VERSION": "Version", - "YES": "Sim" + "MOVE_ERROR": "Erro ao mover!", + "NO_DOWNLOADS_AVAILABLE": "Nenhum download disponível", + "NO_LICENSE": "Sem licença", + "NO_SCREENSHOTS_AVAILABLE": "Nenhuma captura de ecrã disponível", + "NOT_IMPLEMENTED": "Ainda não implementado", + "OP_COPYING": "A copiar", + "OP_DELETING": "A apagar", + "OP_DOWNLOADING": "A descarregar", + "OP_EXTRACTING": "A extrair", + "OP_INSTALLING": "A instalar", + "OP_MOVING": "A mover", + "OP_WAITING": "À espera", + "QUEUE": "Fila", + "QUEUE_POSITION": "Posição na fila", + "QUEUE_PROGRESS": "Passo: %d / %d", + "RECOMMENDED_UNISTORES": "UniStores recomendadas", + "REVISION": "Revisão", + "SCREENSHOT": "Captura de ecrã %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Não foi possível carregar a captura de ecrã.", + "SCREENSHOT_INSTRUCTIONS": "Prime  para alterar e  para ampliar", + "SEARCH_FILTERS": "Pesquisa e filtros", + "SELECT_A_THEME": "Selecionar um tema", + "SELECT_DIR": "Seleciona um diretório", + "SELECT_LANG": "Escolher o idioma", + "SELECT_UNISTORE": "Selecionar UniStore...", + "SELECT_UNISTORE_2": "Selecionar uma UniStore", + "SELECTION_QUEUE": "Adicionar seleção à fila", + "SETTINGS": "Configurações", + "SHEET_SLASH": "Parece que está incluído um '/', o qual não é suportado.\nPor favor, muda 'file' para o nome do ficheiro apenas.", + "SHORTCUT_CREATED": "Atalho criado!", + "SHORTCUT_COPYING": "A copiar %s...", + "SHORTCUT_DOWNLOADING": "A transferir %s...", + "SHORTCUT_EXTRACTING": "A extrair %s...", + "SHORTCUT_INSTALLING": "A instalar %s...", + "SIZE": "Tamanho", + "SORT_BY": "Ordenar por", + "SORTING": "Ordenação", + "START_SELECT": "Prime START para selecionar a pasta atual", + "STORE_INFO": "Informações da loja", + "SYNTAX_ERROR": "Erro de sintaxe!", + "TITLE": "Título", + "TOP_STYLE": "Estilo no ecrã superior", + "UNISTORE_BG": "Usar o fundo de ecrã da UniStore", + "UNISTORE_BG_DESC": "Quando ativado, o fundo fornecido pela UniStore será mostrado em vez da cor sólida do fundo para o ecrã superior.", + "UNISTORE_INVALID_ERROR": "Esta UniStore é inválida e não pode ser\ncarregada com o Universal-Updater.\nTalvez deverias verificar se existem alguns erros de sintaxe?", + "UNISTORE_TOO_NEW": "A tua versão do Universal-Updater é\ndemasiado velha para usar esta UniStore.\nPor favor, atualiza para a versão mais recente.", + "UNISTORE_TOO_OLD": "Esta UniStore está desatualizada e não pode ser utilizada\ncom esta versão do Universal-Updater.\nPor favor, pede ao criador para atualizá-la.", + "UPDATE_AVAILABLE": "Atualização disponível!", + "UPDATE_DONE": "Atualização concluída! Por favor, abre novamente o Universal-Updater.", + "UPDATING_SPRITE_SHEET": "A atualizar ficha de sprites...", + "UPDATING_SPRITE_SHEET2": "A atualizar ficha de sprites %i de %i...", + "UPDATING_UNISTORE": "A atualizar UniStore...", + "VERSION": "Versão" } \ No newline at end of file diff --git a/romfs/lang/ro/app.json b/romfs/lang/ro/app.json new file mode 100644 index 0000000..797a090 --- /dev/null +++ b/romfs/lang/ro/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "Puneți fişierele 3DSX în dosar", + "3DSX_IN_FOLDER_DESC": "Dacă este pornit, fişierele 3DSX vor fi puse într-un dosar cu acelaşi nume în loc de a fi puse direct în dosarul setat.", + "ACTION_CANCELED": "%s anulat(ă)!", + "ACTION_FAILED": "%s a eşuat!", + "ACTION_REQUIRED": "Acțiune necesară!", + "ACTION_SUCCEEDED": "%s a reuşit!", + "ACTIVE_THEME": "Temă Activă", + "ASCENDING": "Crescătoare", + "ARGUMENT_INVALID": "Argument invalid.\nVă rugăm să verificați fişierul xml pentru argumente potrivite.", + "AUTHOR": "Autor", + "AUTO_UPDATE_NIGHTLY": "Utilizați versiunile nightly", + "AUTO_UPDATE_NIGHTLY_DESC": "Folosiți versiunile nightly în loc de versiunile stabilă a Universal-Updater.", + "AUTO_UPDATE_SETTINGS": "Setări Auto-Actualizare", + "AUTO_UPDATE_SETTINGS_BTN": "Setări Auto-Actualizare...", + "AUTO_UPDATE_UNISTORE": "Auto-Actualizați UniStore", + "AUTO_UPDATE_UNISTORE_DESC": "Cu aceasta, ultimul UniStore folosit va fi actualizat automat când se lansează Universal Updater.", + "AUTO_UPDATE_UU": "Auto-Actualizați Universal-Updater", + "AUTO_UPDATE_UU_DESC": "Când este pornit, Universal-Updater va căuta actualizări de fiecare dată când este deschis.", + "AVAILABLE_DOWNLOADS": "Descărcări Disponibile", + "BOOT_TITLE": "Doriți să rulați acest titlu?", + "CANCEL": "Anulați", + "CATEGORY": "Categorie", + "CHANGE_3DSX_PATH": "Schimbați calea 3DSX", + "CHANGE_ARCHIVE_PATH": "Schimbați calea arhivei", + "CHANGE_FIRM_PATH": "Schimbați calea firm-ului", + "CHANGE_NDS_PATH": "Schimbați calea NDS", + "CHANGE_SHORTCUT_PATH": "Schimbați calea scurtăturilor", + "CHECK_UNISTORE_UPDATES": "Se caută actualizări pentru UniStore...", + "CHECK_UU_UPDATES": "Se caută actualizări pentru Universal Updater...", + "CONFIRM_OR_CANCEL": "Apăsați  pentru a confirma,  pentru a anula.", + "CONNECT_WIFI": "Vă rugăm să vă conectați la internet.", + "CONFIRM": "Confirmați", + "CONSOLE": "Consola", + "CONTRIBUTOR_TRANSLATORS": "- Toți Traducătorii şi Contribuitorii", + "COPYING": "Se copiază... %s / %s (%.2f%%)", + "COPY_ERROR": "Eroare de Copiere!", + "CREATE_SHORTCUT": "Doriți să creați o scurtătură?", + "CREDITS": "Mulțumiri", + "CREDITS_BTN": "Mulțumiri...", + "CURRENT_VERSION": "Versiune actuală: ", + "CURRENTLY_EXTRACTING": "Se extrage:", + "CUSTOM_FONT": "Folosiți font personalizat", + "CUSTOM_FONT_DESC": "Dacă este pornit, 'sdmc:/3ds/Universal-Updater/font.bcfnt' va fi folosit în loc de fontul sistemului, dacă este găsit.", + "DELETE_ERROR": "Eroare de Ştergere!", + "DELETE_PROMPT": "Sunteți sigur că vreți să ştergeți acest Dosar?", + "DELETING": "Se şterge...", + "DESCENDING": "Descrescătoare", + "DIRECTION": "Direcție", + "DIRECTORY_SETTINGS": "Setări de Dosare", + "DIRECTORY_SETTINGS_BTN": "Setări de Dosare...", + "DONE": "Terminat!", + "DOWNLOAD_ERROR": "Eroare de Descărcare!", + "DOWNLOAD_FAILED": "Descărcare Eşuată!", + "DOWNLOAD_SPEED": "Viteză: %lld KiB/s", + "DOWNLOADING": "Se descarcă... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Se descarcă font compatibil...", + "DOWNLOADING_SPRITE_SHEET": "Se descarcă Spritesheet...", + "DOWNLOADING_SPRITE_SHEET2": "Se descarcă Spritesheet %i din %i...", + "DOWNLOADING_UNIVERSAL_DB": "Se descarcă Universal-DB...", + "DONLOADING_UNIVERSAL_UPDATER": "Se descarcă Universal-Updater...", + "DOWNLOADING_UNISTORE": "Se descarcă Uni-Store...", + "ENTER_DESC_SHORTCUT": "Intră în descrierea scurtăturii.", + "ENTER_SEARCH": "Scrieți ce vreți să căutați.", + "ENTER_SHORTCUT_FILENAME": "Introduceți numele scurtăturii (fără extensie).", + "ENTER_TITLE_SHORTCUT": "Introduceți titlui scurtăturii.", + "ENTER_URL": "Introduceți URL-ul UniStore-ului.", + "ENTRIES": "Intrări", + "EXECUTE_ENTRY": "Doriți să executați această intrare?", + "NOTE_NIGHTLY": "Notă: Versiunile \"Nightly\" sunt menite pentru\ntestarea caracteristicilor viitoare şi pot fi instabile.\n\nDacă doriți doar să instalați,\nvă rugăm anulați şi instalați versiunea normală.", + "NOTE_PRERELEASE": "Notă: Aceasta este o versiune de prelansare şi poate fi instabilă.\n\nDacă doriți doar să instalați, ați dori\nsă instalați versiunea normală dacă aceasta există.", + "EXIT_APP": "Ieşiți din Universal-Updater", + "EXTRACTING": "Se extrage... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Eroare de extragere!", + "FEATURE_SIDE_EFFECTS": "Această caracteristică poate avea efecte secundare în timp ce Coada rulează.\nSunteți sigur că vreți să continuați?", + "FETCHING_METADATA": "Preluare metadate vechi...", + "FETCHING_RECOMMENDED_UNISTORES": "Preluare UniStore-uri recomandate...", + "FILES": "Fişier: %d / %d", + "FILE_EXTRACTED": "Fişier extras.", + "FILE_SLASH": "Se pare că un '/' este inclus, ceea ce nu este suportat. Vă rugăm să schimbați 'fişier' doar în numele fişierului.", + "FILES_EXTRACTED": "Fişier extras.", + "FILTER_TO": "Filtrează către:", + "GITHUB": "Mulțumirile complete pot fi găsite pe GitHub", + "GRID": "Tabel", + "GUI_SETTINGS": "Setări GUI", + "GUI_SETTINGS_BTN": "Setări GUI...", + "INCLUDE_IN_RESULTS": "Include în rezultate:", + "INSTALLING": "Se instalează... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Se instalează Universal-Updater...", + "INVALID_UNISTORE": "UniStore invalid", + "KEY_CONTINUE": "Apăsați orice buton pentru a continua.", + "LANGUAGE": "Limbă...", + "LAST_UPDATED": "Ultima actualizare", + "LICENSE": "Licență", + "LIST": "Listă", + "LOADING_SCREENSHOT": "Se încarcă capturile de ecran...", + "LOADING_SPRITESHEET": "Se încarcă Spritesheet-ul %i din %i...", + "MEDIATYPE_NAND": "NAND MediaType", + "MEDIATYPE_SD": "SD MediaType", + "MOVE_ERROR": "Eroare de mutare!", + "NO_DOWNLOADS_AVAILABLE": "Nici o descărcare valabilă", + "NO_LICENSE": "Nicio licență", + "NO_SCREENSHOTS_AVAILABLE": "Nicio captură de ecran disponibilă", + "NOT_IMPLEMENTED": "Nu este Încă Implementat(ă)", + "OP_COPYING": "Se copiază", + "OP_DELETING": "Se şterge", + "OP_DOWNLOADING": "Se descarcă", + "OP_EXTRACTING": "Se extrage", + "OP_INSTALLING": "Se instalează", + "OP_MOVING": "Se mută", + "OP_WAITING": "Se aşteaptă", + "QUEUE": "Coadă", + "QUEUE_POSITION": "Poziția în Coadă", + "QUEUE_PROGRESS": "Pas: %d / %d", + "RECOMMENDED_UNISTORES": "UniStore-uri recomandate", + "REVISION": "Revizie", + "SCREENSHOT": "Captură de ecran %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Captura de ecran nu a putut fi încărcată.", + "SCREENSHOT_INSTRUCTIONS": "Apăsați  pentru a schimba şi  pentru a mări", + "SEARCH_FILTERS": "Căutare şi Filtre", + "SELECT_A_THEME": "Selectați o Temă", + "SELECT_DIR": "Selectați un dosar", + "SELECT_LANG": "Alegeți limba", + "SELECT_UNISTORE": "Alegeți UniStore...", + "SELECT_UNISTORE_2": "Alegeți un UniStore", + "SELECTION_QUEUE": "Adăugați Selecția în Coadă", + "SETTINGS": "Setări", + "SHEET_SLASH": "Se pare că '/' este inclus, ceea ce nu este suportat. Vă rugăm schimbați 'foaie' numai în numele fişierului.", + "SHORTCUT_CREATED": "Scurtătură creată!", + "SHORTCUT_COPYING": "Se copiază %s...", + "SHORTCUT_DOWNLOADING": "Se descarcă %s...", + "SHORTCUT_EXTRACTING": "Se extrage %s...", + "SHORTCUT_INSTALLING": "Se instalează %s...", + "SIZE": "Mărime", + "SORT_BY": "Sortați după", + "SORTING": "Sortare", + "START_SELECT": "Apăsați START pentru a selecta dosarul curent", + "STORE_INFO": "Informații Magazin", + "SYNTAX_ERROR": "Eroare de sintaxă!", + "TITLE": "Titlu", + "TOP_STYLE": "Stil ecran de sus", + "UNISTORE_BG": "Folosiți UniStore BG", + "UNISTORE_BG_DESC": "Când este pornit, BG-ul furnizat de UniStore va fi afişat în loc de culoarea BG solidă pentru ecranul de sus.", + "UNISTORE_INVALID_ERROR": "Acest UniStore este invalid şi nu poate fi rulat cu Universal-Updater. \nPoate verificați pentru erori de sintaxă?", + "UNISTORE_TOO_NEW": "Versiunea voastră de Universal-Updater este prea veche pentru a folosi acest UniStore.\nVă rugăm actualizați la ultima versiune.", + "UNISTORE_TOO_OLD": "Acest UniStore este învechit şi nu poate fi folosit cu această versiune a Universal-Updater. \nVă rugăm întrebați creatorul să o actualizeze.", + "UPDATE_AVAILABLE": "Actualizare Disponibilă!", + "UPDATE_DONE": "Actualizare terminată! Vă rugăm să redeschideți Universal-Updater.", + "UPDATING_SPRITE_SHEET": "Se actualizează Spritesheet...", + "UPDATING_SPRITE_SHEET2": "Se actualizează Spritesheet %i din %i...", + "UPDATING_UNISTORE": "Se actualizează UniStore...", + "VERSION": "Versiune" +} \ No newline at end of file diff --git a/romfs/lang/ru/app.json b/romfs/lang/ru/app.json index 66545f1..c3f7c0f 100644 --- a/romfs/lang/ru/app.json +++ b/romfs/lang/ru/app.json @@ -1,6 +1,16 @@ { + "3DSX_IN_FOLDER": "Поместить файлы 3DSX в папку", + "3DSX_IN_FOLDER_DESC": "Если этот параметр включен, файлы 3DSX будут помещаться в папку с тем же именем, а не непосредственно в заданную папку.", + "ACTION_CANCELED": "%s отменено!", + "ACTION_FAILED": "%s провалилось!", + "ACTION_REQUIRED": "Требуется действие!", + "ACTION_SUCCEEDED": "%s успешно!", + "ACTIVE_THEME": "Текущая тема", "ASCENDING": "По возрастанию", + "ARGUMENT_INVALID": "Аргумент недействителен.\nПроверьте правильность аргументов в XML-файле.", "AUTHOR": "Автор", + "AUTO_UPDATE_NIGHTLY": "Использовать «nightly» версии", + "AUTO_UPDATE_NIGHTLY_DESC": "Использовать «nightly» версии Universal-Updater вместо стабильных выпусков.", "AUTO_UPDATE_SETTINGS": "Настройки автообновления", "AUTO_UPDATE_SETTINGS_BTN": "Настройки автообновления...", "AUTO_UPDATE_UNISTORE": "Автообновление UniStore", @@ -9,45 +19,63 @@ "AUTO_UPDATE_UU_DESC": "Если включено, то Universal-Updater будет проверять обновления при каждом запуске.", "AVAILABLE_DOWNLOADS": "Доступные для загрузки", "BOOT_TITLE": "Вы хотите войти в эту игру?", - "CATEGORY": "Катеория", + "CANCEL": "Отмена", + "CATEGORY": "Категория", "CHANGE_3DSX_PATH": "Изменить путь 3DSX", "CHANGE_ARCHIVE_PATH": "Изменить путь к архиву", + "CHANGE_FIRM_PATH": "Изменить путь к firm", "CHANGE_NDS_PATH": "Изменить путь NDS", + "CHANGE_SHORTCUT_PATH": "Изменить путь к ярлыку", "CHECK_UNISTORE_UPDATES": "Проверка обновление UniStore...", "CHECK_UU_UPDATES": "Проверка обновлений Universal-Updater...", "CONFIRM_OR_CANCEL": "Нажмите  для подтверждения,  для отмены.", "CONNECT_WIFI": "Пожалуйста, подключитесь к WiFi.", + "CONFIRM": "Подтверждать", "CONSOLE": "Консоль", "CONTRIBUTOR_TRANSLATORS": "- Все переводчики и участники", + "COPYING": "Копирование... %s / %s (%.2f%%)", "COPY_ERROR": "Ошибка копирования!", + "CREATE_SHORTCUT": "Хотите создать ярлык?", "CREDITS": "Благодарность", + "CREDITS_BTN": "Кредиты...", "CURRENT_VERSION": "Текущая версия: ", "CURRENTLY_EXTRACTING": "Извлекается:\n", + "CUSTOM_FONT": "Использовать другой шрифт", + "CUSTOM_FONT_DESC": "Если включено, то вместо системного шрифта будет использоваться 'sdmc:/3ds/Universal-Updater/font.bcfnt' если он будет найден.", "DELETE_ERROR": "Ошибка удаления!", "DELETE_PROMPT": "Вы уверены, что хотите удалить эту директорию?", - "DELETE_UNNEEDED_FILE": "Удаление ненужного файла...", + "DELETING": "Удаление...", "DESCENDING": "По убыванию", "DIRECTION": "Направление", "DIRECTORY_SETTINGS": "Настройки директории", "DIRECTORY_SETTINGS_BTN": "Настройки директории...", - "DISABLE_AUTOUPDATE_UNISTORE": "Отключить авто-обновление UniStore при загрузке", - "DISABLE_UPDATE_CHECK": "Отключить самообновление", "DONE": "Готово!", "DOWNLOAD_ERROR": "Ошибка загрузки!", "DOWNLOAD_FAILED": "Ошибка с загрузкой!", + "DOWNLOAD_SPEED": "Скорость: %lld КиБ/с", + "DOWNLOADING": "Скачивание... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Загрузка совместимого шрифта...", "DOWNLOADING_SPRITE_SHEET": "Загрузка таблицы спрайтов...", "DOWNLOADING_SPRITE_SHEET2": "Загрузка таблицы спрайтов %i из %i...", "DOWNLOADING_UNIVERSAL_DB": "Загрузка Universal-DB...", "DONLOADING_UNIVERSAL_UPDATER": "Загрузка Universal-Updater...", "DOWNLOADING_UNISTORE": "Загрузка UniStore...", - "ENABLE_AUTOUPDATE_UNISTORE": "Включить автообновление UniStore при загрузке", - "ENABLE_UPDATE_CHECK": "Включить само-обновление", + "ENTER_DESC_SHORTCUT": "Введите описание ярлыка.", "ENTER_SEARCH": "Введите что вы хотите найти.", + "ENTER_SHORTCUT_FILENAME": "Введите имя файла ярлыка (без расширения).", + "ENTER_TITLE_SHORTCUT": "Введите название ярлыка.", "ENTER_URL": "Введите URL UniStore.", "ENTRIES": "Записи", "EXECUTE_ENTRY": "Выполнить эту запись?", + "NOTE_NIGHTLY": "Примечание: «Nightly» версии предназначены для тестирования\nпредстоящий функции и могут быть нестабильными.\n\nЕсли вы просто хотеть устанавливать,\nпожалуйста отменять и установите обычную версию.", + "NOTE_PRERELEASE": "Примечание: Это предварительный показ сборку, которая может быть нестабильной.\n\nЕсли вы просто хотеть устанавливать, вы май\nхотеть установить обычную версию если она существует.", "EXIT_APP": "Выйти из Universal-Updater", + "EXTRACTING": "Извлечение... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Извлечь ошибку!", + "FEATURE_SIDE_EFFECTS": "Эта функция может иметь побочные эффекты во время работы очереди.\nВы уверены, что хотите продолжить?", "FETCHING_METADATA": "Получение старых метаданных...", + "FETCHING_RECOMMENDED_UNISTORES": "Получение рекомендованных UniStores ...", + "FILES": "Файл: %d / %d", "FILE_EXTRACTED": "файл извлечен.", "FILE_SLASH": "Похоже, что используется символ '/'. Он не поддерживается\nПожалуйста, измените 'file' только на имя файла.", "FILES_EXTRACTED": "файлы извлечены.", @@ -57,32 +85,57 @@ "GUI_SETTINGS": "Настройки GUI", "GUI_SETTINGS_BTN": "Настройки GUI...", "INCLUDE_IN_RESULTS": "Включить в результаты:", + "INSTALLING": "Установка %s / %s (%.2f%%)", "INSTALL_UNIVERSAL_UPDATER": "Установка Universal-Updater...", "INVALID_UNISTORE": "Неверный UniStore", "KEY_CONTINUE": "Нажмите любую кнопку для продолжения.", - "LANGUAGE": "Язык", + "LANGUAGE": "Язык...", "LAST_UPDATED": "Последнее обновление", "LICENSE": "Лицензия", "LIST": "Список", + "LOADING_SCREENSHOT": "Загрузка скриншота...", "LOADING_SPRITESHEET": "Загрузка таблицы спрайтов %i из %i...", "MEDIATYPE_NAND": "Тип медии NAND", "MEDIATYPE_SD": "Тип медии SD", "MOVE_ERROR": "Ошибка перемещения!", - "NO": "Нет", "NO_DOWNLOADS_AVAILABLE": "Отсутствуют файлы для загрузки", "NO_LICENSE": "Нет лицензии", + "NO_SCREENSHOTS_AVAILABLE": "Нет доступных скриншотов", "NOT_IMPLEMENTED": "Ещё не реализовано", + "OP_COPYING": "Копирование", + "OP_DELETING": "Удаление", + "OP_DOWNLOADING": "Скачивание", + "OP_EXTRACTING": "Извлечение", + "OP_INSTALLING": "Установка", + "OP_MOVING": "Перемещение", + "OP_WAITING": "Ожидание", + "QUEUE": "Очередь", + "QUEUE_POSITION": "Позиция в очереди", + "QUEUE_PROGRESS": "Шаг: %d / %d", + "RECOMMENDED_UNISTORES": "Рекомендуемые UniStores", "REVISION": "Ревизия", + "SCREENSHOT": "Скриншот %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Скриншот не может быть загружен.", + "SCREENSHOT_INSTRUCTIONS": "Нажмите  для изменения и  для увеличения", "SEARCH_FILTERS": "Поиск и фильтры", + "SELECT_A_THEME": "Выберите тему", "SELECT_DIR": "Выберите каталог", "SELECT_LANG": "Выберите язык", - "SELECT_UNISTORE": "Выберите UniStore", + "SELECT_UNISTORE": "Выбрать UniStore...", "SELECT_UNISTORE_2": "Выберите UniStore", + "SELECTION_QUEUE": "Добавить выбор в очередь", "SETTINGS": "Настройки", "SHEET_SLASH": "Похоже, что используется символ '/'. Он не поддерживается.\nПожалуйста, измените 'sheet' только на имя файла.", + "SHORTCUT_CREATED": "Ярлык создан!", + "SHORTCUT_COPYING": "Копирование %s...", + "SHORTCUT_DOWNLOADING": "Загрузка %s...", + "SHORTCUT_EXTRACTING": "Извлечение %s...", + "SHORTCUT_INSTALLING": "Установка %s...", + "SIZE": "Размер", "SORT_BY": "Сортировка по", "SORTING": "Сортировка", "START_SELECT": "Нажмите Start для выбора текущей папки", + "STORE_INFO": "Информация о магазине", "SYNTAX_ERROR": "Синтаксическая ошибка!", "TITLE": "Название", "TOP_STYLE": "Верхний стиль", @@ -91,13 +144,10 @@ "UNISTORE_INVALID_ERROR": "UniStore некорректен и не может быть загружен Universal-Updater.\nМожет быть стоить проверить синтаксические ошибки?", "UNISTORE_TOO_NEW": "Ваша версия Universal-Updater \nслишком старая для использования этого UniStore.\nПожалуйста, обновитесь до последней версии.", "UNISTORE_TOO_OLD": "Этот UniStore устарел и не может быть использован\nс этой версией Universal-Updater.\nПожалуйста, попросите автора обновить его.", - "UNSUPPORTED_UNISTORE_VERSION": "Версия этого UniStore не поддерживается.", "UPDATE_AVAILABLE": "Доступны обновление!", "UPDATE_DONE": "Обновление завершено! Перезапустите Universal-Updater.", - "UPDATE_NOT_AVAILABLE": "Нет доступных обновлений!", "UPDATING_SPRITE_SHEET": "Загрузка таблицы спрайтов...", "UPDATING_SPRITE_SHEET2": "Загрузка таблицы спрайтов %i из %i...", "UPDATING_UNISTORE": "Обновление UniStore...", - "VERSION": "Версия", - "YES": "Да" + "VERSION": "Версия" } \ No newline at end of file diff --git a/romfs/lang/ry/app.json b/romfs/lang/ry/app.json new file mode 100644 index 0000000..456da18 --- /dev/null +++ b/romfs/lang/ry/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "3DSXファイルフォルダんかい入りーん", + "3DSX_IN_FOLDER_DESC": "有効なしねー、3DSXファイルうぬまま配置するぬでー\nなく、いぬなめーぬフォルダんかい格納するようなやびーん。", + "ACTION_CANCELED": "%sキャンセルさびたん！", + "ACTION_FAILED": "%sぬしーやんじゃびたん！", + "ACTION_REQUIRED": "くりタップしくぃみそーれー！", + "ACTION_SUCCEEDED": "%sぬでぃかさびたん！", + "ACTIVE_THEME": "アクティブなテーマ", + "ASCENDING": "昇順", + "ARGUMENT_INVALID": "引数ぬ無効やいびーん。\nXMLファイルっし適切な引数確認しくぃみそーれー。", + "AUTHOR": "ちゅくやー", + "AUTO_UPDATE_NIGHTLY": "ナイトリー版ぬ使用", + "AUTO_UPDATE_NIGHTLY_DESC": "Universal-Updaterぬ安定リリース版ぬ代わりんかい、\nナイトリー版使用さびーん。", + "AUTO_UPDATE_SETTINGS": "自動更新設定", + "AUTO_UPDATE_SETTINGS_BTN": "自動更新設定……", + "AUTO_UPDATE_UNISTORE": "UniStoreぬ自動更新", + "AUTO_UPDATE_UNISTORE_DESC": "有効なしねー、Universal-Updaterぬ起動時に\n最後んかい使用さるUniStore自動的に更新さびーん。", + "AUTO_UPDATE_UU": "Universal-Updaterぬ自動更新", + "AUTO_UPDATE_UU_DESC": "有効なしねー、Universal-Updater\nふぃらちゅるかーじに更新確認さびーん。", + "AVAILABLE_DOWNLOADS": "利用可能なダウンロード", + "BOOT_TITLE": "くぬアプリ開始さびーが？", + "CANCEL": "キャンセル", + "CATEGORY": "カテゴリ", + "CHANGE_3DSX_PATH": "3DSXパスぬ変更", + "CHANGE_ARCHIVE_PATH": "アーカイブパスぬ変更", + "CHANGE_FIRM_PATH": "FIRMパスぬ変更", + "CHANGE_NDS_PATH": "NDSパスぬ変更", + "CHANGE_SHORTCUT_PATH": "ショートカットパスぬ変更", + "CHECK_UNISTORE_UPDATES": "UniStoreぬ更新確認そーいびーん……", + "CHECK_UU_UPDATES": "Universal-Updaterぬ更新確認そーいびーん……", + "CONFIRM_OR_CANCEL": "っし続行、っしキャンセルさびーん。", + "CONNECT_WIFI": "WiFiんかい接続しくぃみそーれー。", + "CONFIRM": "続行", + "CONSOLE": "本体", + "CONTRIBUTOR_TRANSLATORS": "- まじりぬ翻訳者とぅ貢献者", + "COPYING": "コピー中… %s / %s (%.2f%%)", + "COPY_ERROR": "コピーエラー！", + "CREATE_SHORTCUT": "ショートカット作成さびーが？", + "CREDITS": "クレジット", + "CREDITS_BTN": "クレジット……", + "CURRENT_VERSION": "現在ぬバージョン: ", + "CURRENTLY_EXTRACTING": "現在解凍中:", + "CUSTOM_FONT": "カスタムフォント使用", + "CUSTOM_FONT_DESC": "有効なしねー、「sdmc:/3ds/Universal-Updater/\nfont.bcfnt」が存在さるばーに、システムフォントぬ\n代わりんかいすちら使用するようなやびーん。", + "DELETE_ERROR": "削除エラー！", + "DELETE_PROMPT": "くぬディレクトリ削除しんゆたさいびーが？", + "DELETING": "削除中…", + "DESCENDING": "降順", + "DIRECTION": "方向", + "DIRECTORY_SETTINGS": "ディレクトリ設定", + "DIRECTORY_SETTINGS_BTN": "ディレクトリ設定……", + "DONE": "完了！", + "DOWNLOAD_ERROR": "ダウンロードエラー！", + "DOWNLOAD_FAILED": "ダウンロードんかいしーやんじゃびたん！", + "DOWNLOAD_SPEED": "速度: %lld KiB/秒", + "DOWNLOADING": "ダウンロード中… %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "互換性ぬあるフォントダウンロードそーいびーん……", + "DOWNLOADING_SPRITE_SHEET": "スプライトシートダウンロードそーいびーん……", + "DOWNLOADING_SPRITE_SHEET2": "スプライトシート%i/%iダウンロードそーいびーん……", + "DOWNLOADING_UNIVERSAL_DB": "Universal-DBダウンロードそーいびーん……", + "DONLOADING_UNIVERSAL_UPDATER": "Universal-Updaterダウンロードそーいびーん……", + "DOWNLOADING_UNISTORE": "UniStoreダウンロードそーいびーん……", + "ENTER_DESC_SHORTCUT": "ショートカットぬ説明入力さびーん。", + "ENTER_SEARCH": "検索しーぶさるむん入力さびーん。", + "ENTER_SHORTCUT_FILENAME": "ショートカットぬファイル名（拡張子なし）入力さびーん。", + "ENTER_TITLE_SHORTCUT": "ショートカットぬタイトル入力さびーん。", + "ENTER_URL": "UniStoreぬURL入力さびーん。", + "ENTRIES": "項目", + "EXECUTE_ENTRY": "くぬ項目実行さびーが？", + "NOTE_NIGHTLY": "注意：「nightly」バージョノー、今後ぬ機能\nテストするたみぬむんでぃ、不安定なばーがあいびーん。\n\n単にインストールしーぶさるばーや、\nキャンセルしふぃーじー版インストールしくぃみそーれー。", + "NOTE_PRERELEASE": "注意：くれープレリリースぬビルドやい、\n不安定なばーがあいびーん。\n\n単にインストールしーぶさるばーや、\nふぃーじー版があれーインストールしくぃみそーれー。", + "EXIT_APP": "Universal-Updater終了", + "EXTRACTING": "解凍中… %s / %s (%.2f%%)", + "EXTRACT_ERROR": "解凍エラー！", + "FEATURE_SIDE_EFFECTS": "くぬ機能ー、行列ぬ実行中んかい副作用ぬ発生する可能性があいびーん。\n続行しんゆたさいびーが？", + "FETCHING_METADATA": "古さるメタデータ取得そーいびーん……", + "FETCHING_RECOMMENDED_UNISTORES": "うすすみぬUniStore取得そーいびーん……", + "FILES": "ファイル: %d / %d", + "FILE_EXTRACTED": "解凍さったるファイル。", + "FILE_SLASH": "「/」ぬくくまりとーいびーしが、サポートさりやびらん。\n「file」ファイル名ぬみんかい変更しくぃみそーれー。", + "FILES_EXTRACTED": "解凍さったるファイル。", + "FILTER_TO": "フィルター:", + "GITHUB": "完全なクレジットーGitHubんかい見ーちきーるくとぅがなやびーん", + "GRID": "グリッド", + "GUI_SETTINGS": "GUI設定", + "GUI_SETTINGS_BTN": "GUI設定……", + "INCLUDE_IN_RESULTS": "結果にくくまびーん:", + "INSTALLING": "インストール中… %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Universal-Updaterインストールそーいびーん……", + "INVALID_UNISTORE": "無効なUniStore", + "KEY_CONTINUE": "続行すんがーぬーがキーうちくぃみそーれー...", + "LANGUAGE": "言語……", + "LAST_UPDATED": "最後更新日", + "LICENSE": "ライセンス", + "LIST": "リスト", + "LOADING_SCREENSHOT": "スクリーンショット読み込どーいびーん……", + "LOADING_SPRITESHEET": "スプライトシート%i/%i読み込どーいびーん……", + "MEDIATYPE_NAND": "メディアタイプNAND", + "MEDIATYPE_SD": "メディアタイプSD", + "MOVE_ERROR": "移動エラー", + "NO_DOWNLOADS_AVAILABLE": "利用可能なダウンロードぬあいびらん", + "NO_LICENSE": "ライセンスぬあいびらん", + "NO_SCREENSHOTS_AVAILABLE": "スクリーンショットーあいびらん", + "NOT_IMPLEMENTED": "なーら実装さりやびらん", + "OP_COPYING": "コピー中", + "OP_DELETING": "削除中", + "OP_DOWNLOADING": "ダウンロード中", + "OP_EXTRACTING": "解凍中", + "OP_INSTALLING": "インストール中", + "OP_MOVING": "移動中", + "OP_WAITING": "待機中", + "QUEUE": "キュー", + "QUEUE_POSITION": "まーる", + "QUEUE_PROGRESS": "ステップ: %d / %d", + "RECOMMENDED_UNISTORES": "うすすみぬUniStore", + "REVISION": "改定", + "SCREENSHOT": "スクリーンショット %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "スクリーンショット読み込みやびらんたん。", + "SCREENSHOT_INSTRUCTIONS": "うち変更しー、うちズームすん", + "SEARCH_FILTERS": "検索とぅフィルター", + "SELECT_A_THEME": "テーマぬ選択", + "SELECT_DIR": "ディレクトリぬ選択", + "SELECT_LANG": "言語ぬ選択", + "SELECT_UNISTORE": "UniStore選択……", + "SELECT_UNISTORE_2": "UniStoreぬ選択", + "SELECTION_QUEUE": "選択行列んかい追加", + "SETTINGS": "設定", + "SHEET_SLASH": "「/」ぬくくまりとーいびーしが、サポートさりやびらん。\n「sheet」ファイル名ぬみんかい変更しくぃみそーれー。", + "SHORTCUT_CREATED": "ショートカット作成さびたん！", + "SHORTCUT_COPYING": "%sコピー中……", + "SHORTCUT_DOWNLOADING": "%sダウンロード中……", + "SHORTCUT_EXTRACTING": "%s解凍中……", + "SHORTCUT_INSTALLING": "%sインストール中……", + "SIZE": "サイズ", + "SORT_BY": "並べいけーい順", + "SORTING": "並べい替い", + "START_SELECT": "STARTを押して、現在のフォルダを選択します", + "STORE_INFO": "ストア情報", + "SYNTAX_ERROR": "構文エラー！", + "TITLE": "タイトル", + "TOP_STYLE": "うぃー画面ぬ表示形式", + "UNISTORE_BG": "UniStoreぬ背景画像使用", + "UNISTORE_BG_DESC": "有効なしねー、うぃー画面ぬデフォルト背景ぬ\n代わりんかいUniStoreぬ提供する背景画像ぬ表示さりやびーん。", + "UNISTORE_INVALID_ERROR": "くぬUniStoreー無効やい、\nUniversal-Updaterっし読み込みやびらん。\n構文エラーぬねーんが確認さびーが？", + "UNISTORE_TOO_NEW": "Universal-Updaterぬバージョノーくぬ\nUniStore使用すんがー古しじやびーん。\n最新ぬバージョンんかい更新しくぃみそーれー。", + "UNISTORE_TOO_OLD": "くぬUniStoreー古く、くぬバージョンぬ\nUniversal-Updaterっしぇー使用なやびらん。\n作成者んかい更新たぬでぃくぃみそーれー。", + "UPDATE_AVAILABLE": "更新ぬあいびーん！", + "UPDATE_DONE": "更新ぬしーうわやびたん！Universal-Updater再度ふぃらちくぃみそーれー。", + "UPDATING_SPRITE_SHEET": "スプライトシート更新そーいびーん……", + "UPDATING_SPRITE_SHEET2": "スプライトシート%i/%i更新そーいびーん……", + "UPDATING_UNISTORE": "UniStore更新そーいびーん……", + "VERSION": "バージョン" +} \ No newline at end of file diff --git a/romfs/lang/tr/app.json b/romfs/lang/tr/app.json new file mode 100644 index 0000000..4669207 --- /dev/null +++ b/romfs/lang/tr/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "3DSX dosyalarını klasöre koy", + "3DSX_IN_FOLDER_DESC": "Etkinse, 3DSX dosyaları doğrudan ayarlanan klasör yerine aynı ada sahip bir klasöre koyulacaktır.", + "ACTION_CANCELED": "%s iptal edildi!", + "ACTION_FAILED": "%s başarısız!", + "ACTION_REQUIRED": "Eylem gerekli!", + "ACTION_SUCCEEDED": "%s başarılı!", + "ACTIVE_THEME": "Etkin Tema", + "ASCENDING": "Artan", + "ARGUMENT_INVALID": "Argüman geçersiz.\nUygun argümanlar için xml dosyasını kontrol edin.", + "AUTHOR": "Sahibi", + "AUTO_UPDATE_NIGHTLY": "Nightly sürümlerini kullan", + "AUTO_UPDATE_NIGHTLY_DESC": "Kararlı sürümler yerine Universal-Updater'ın nightly sürümlerini kullan.", + "AUTO_UPDATE_SETTINGS": "Oto-Güncelleme Ayarları", + "AUTO_UPDATE_SETTINGS_BTN": "Oto-Güncelleme Ayarları...", + "AUTO_UPDATE_UNISTORE": "UniStoreları otomatik güncelle", + "AUTO_UPDATE_UNISTORE_DESC": "Bununla, Universal-Updater başlatıldığında en son kullanılan UniStore otomatik olarak güncellenecektir.", + "AUTO_UPDATE_UU": "Universal-Updater'i otomatik güncelle", + "AUTO_UPDATE_UU_DESC": "Etkinleştirildiğinde, Universal-Updater her açıldığında güncellemeleri kontrol edilecek.", + "AVAILABLE_DOWNLOADS": "Mevcut İndirmeler", + "BOOT_TITLE": "Bu uygulamayı çalıştırmak ister misin?", + "CANCEL": "İptal Et", + "CATEGORY": "Kategori", + "CHANGE_3DSX_PATH": "3DSX yolunu değiştir", + "CHANGE_ARCHIVE_PATH": "Arşiv yolunu değiştir", + "CHANGE_FIRM_PATH": "Yazılım yolunu değiştir", + "CHANGE_NDS_PATH": "NDS yolunu değiştir", + "CHANGE_SHORTCUT_PATH": "Kısayol yolunu değiştir", + "CHECK_UNISTORE_UPDATES": "UniStore güncellemeleri kontrol ediliyor...", + "CHECK_UU_UPDATES": "Universal-Updater güncellemeleri kontrol ediliyor...", + "CONFIRM_OR_CANCEL": "Onaylamak için , iptal etmek için .", + "CONNECT_WIFI": "Lütfen WiFi'ye bağlanın.", + "CONFIRM": "Onayla", + "CONSOLE": "Konsol", + "CONTRIBUTOR_TRANSLATORS": "- Bütün Çevirmenler & Katkıda Bulunanlar", + "COPYING": "Kopyalanıyor... %s / %s (%.2f%%)", + "COPY_ERROR": "Kopyalama Hatası!", + "CREATE_SHORTCUT": "Bir kısayol oluşturmak ister misin?", + "CREDITS": "Emeği Geçenler", + "CREDITS_BTN": "Emeği geçenler...", + "CURRENT_VERSION": "Mevcut sürüm: ", + "CURRENTLY_EXTRACTING": "Şu an ayıklanıyor:", + "CUSTOM_FONT": "Özel Font Kullan", + "CUSTOM_FONT_DESC": "Etkinleştirilirse, ve 'sdmc:/3ds/Universal-Updater/font.bcfnt' bulunursa, sistem yazı tipi yerine kullanılacaktır.", + "DELETE_ERROR": "Silme Hatası!", + "DELETE_PROMPT": "Bu Kategoriyi silmek istediğinden emin misin?", + "DELETING": "Siliniyor...", + "DESCENDING": "Azalan", + "DIRECTION": "Sıralama", + "DIRECTORY_SETTINGS": "Dizin Ayarları", + "DIRECTORY_SETTINGS_BTN": "Dizin Ayarları...", + "DONE": "Tamamdır!", + "DOWNLOAD_ERROR": "İndirme Hatası!", + "DOWNLOAD_FAILED": "İndirme Başarısız!", + "DOWNLOAD_SPEED": "Hız: %lld KiB/s", + "DOWNLOADING": "İndiriliyor... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Uyumlu yazı tipi indiriliyor...", + "DOWNLOADING_SPRITE_SHEET": "Model Tablosu İndiriliyor...", + "DOWNLOADING_SPRITE_SHEET2": "%i / %i Model Tablosu İndiriliyor...", + "DOWNLOADING_UNIVERSAL_DB": "Universal-DB İndiriliyor...", + "DONLOADING_UNIVERSAL_UPDATER": "Universal-Updater İndiriliyor...", + "DOWNLOADING_UNISTORE": "UniStore İndiriliyor...", + "ENTER_DESC_SHORTCUT": "Kısayol açıklaması gir.", + "ENTER_SEARCH": "Aramak istediğini buraya yaz.", + "ENTER_SHORTCUT_FILENAME": "Kısayol dosya adını gir (uzantı olmadan).", + "ENTER_TITLE_SHORTCUT": "Kısayol başlığını gir.", + "ENTER_URL": "Unistore'un URL'sini gir.", + "ENTRIES": "Girdi", + "EXECUTE_ENTRY": "Bu uygulamayı yüklemek ister misin?", + "NOTE_NIGHTLY": "Not: \"Nightly\" sürümleri gelecek olan özellikleri\ntest etmek içindir ve kararsız olabilir.\n\nBasitini yüklemek istersen,\nbu yüklemeyi iptal edip normal sürümünü yükle.", + "NOTE_PRERELEASE": "Not: Bu, çıkış öncesi sürümdür ve kararsız olabilir.\n\nBasitini yüklemek istersen, eğer ki\nvarsa normal sürümünü kurabilirsin.", + "EXIT_APP": "Universal-Updater'dan çık", + "EXTRACTING": "Ayıklanıyor... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Ayıklama hatası!", + "FEATURE_SIDE_EFFECTS": "Bu özelliğin, özellikle Kuyruk çalışırken yan etkisi olabilir.\nDevam etmek istediğinden emin misin?", + "FETCHING_METADATA": "Eski meta veriler getiriliyor...", + "FETCHING_RECOMMENDED_UNISTORES": "Önerilen UniStore'lar getiriliyor...", + "FILES": "Dosya: %d / %d", + "FILE_EXTRACTED": "dosya ayıklandı.", + "FILE_SLASH": "Görünüşe göre desteklenmeyen bir '/' dahil.\nLütfen 'dosyayı\" yalnızca dosya adına değiştir.", + "FILES_EXTRACTED": "dosyalar ayıklandı.", + "FILTER_TO": "Filtreler:", + "GITHUB": "Emeği geçenlerin tam listesi Github'ta mevcuttur", + "GRID": "Tablo", + "GUI_SETTINGS": "Grafik Arayüz Ayarları", + "GUI_SETTINGS_BTN": "Grafik Arayüz Ayarları...", + "INCLUDE_IN_RESULTS": "Şunları sonuçlara dahil et:", + "INSTALLING": "Kuruluyor... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Universal-Updater Kuruluyor...", + "INVALID_UNISTORE": "Geçersiz UniStore", + "KEY_CONTINUE": "Devam etmek için bir tuşa basın.", + "LANGUAGE": "Dil...", + "LAST_UPDATED": "Son güncelleme", + "LICENSE": "Lisans", + "LIST": "Liste", + "LOADING_SCREENSHOT": "Ekran Görüntüsü Yükleniyor...", + "LOADING_SPRITESHEET": "%i / %i Model Tablosu Yükleniyor...", + "MEDIATYPE_NAND": "Medya Türü NAND", + "MEDIATYPE_SD": "Medya Türü SD", + "MOVE_ERROR": "Taşıma Hatası!", + "NO_DOWNLOADS_AVAILABLE": "Mevcut İndirme Yok", + "NO_LICENSE": "Lisans Yok", + "NO_SCREENSHOTS_AVAILABLE": "Ekran Görüntüsü Yok", + "NOT_IMPLEMENTED": "Henüz Uygulanmadı", + "OP_COPYING": "Kopyalanıyor", + "OP_DELETING": "Siliniyor", + "OP_DOWNLOADING": "İndiriliyor", + "OP_EXTRACTING": "Ayıklanıyor", + "OP_INSTALLING": "Kuruluyor", + "OP_MOVING": "Taşınıyor", + "OP_WAITING": "Bekleniyor", + "QUEUE": "İndirme Kuyruğu", + "QUEUE_POSITION": "Kuyruktaki Konumu", + "QUEUE_PROGRESS": "Adım: %d / %d", + "RECOMMENDED_UNISTORES": "Önerilen UniStore'lar", + "REVISION": "Revizyon", + "SCREENSHOT": "Ekran Görüntüsü %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Ekran görüntüsü yüklenemedi.", + "SCREENSHOT_INSTRUCTIONS": " ile değiştir ve  ile yakınlaştır", + "SEARCH_FILTERS": "Arama ve Filtreler", + "SELECT_A_THEME": "Bir Tema Seç", + "SELECT_DIR": "Bir dizin seç", + "SELECT_LANG": "Lisanı seç", + "SELECT_UNISTORE": "UniStore'u seç...", + "SELECT_UNISTORE_2": "Bir UniStore seç", + "SELECTION_QUEUE": "İndirme kuyruğuna seçim ekle", + "SETTINGS": "Ayarlar", + "SHEET_SLASH": "Görünüşe göre desteklenmeyen bir '/' dahil.\nLütfen 'sayfayı\" yalnızca dosya adına değiştir.", + "SHORTCUT_CREATED": "Kısayol oluşturuldu!", + "SHORTCUT_COPYING": "Kopyalanıyor %s...", + "SHORTCUT_DOWNLOADING": "İndiriliyor %s...", + "SHORTCUT_EXTRACTING": "Ayıklanıyor %s...", + "SHORTCUT_INSTALLING": "Kuruluyor %s...", + "SIZE": "Boyut", + "SORT_BY": "Şuna Göre Sırala", + "SORTING": "Sıralama", + "START_SELECT": "Geçerli klasörü seçmek için STARTA'a bas", + "STORE_INFO": "Mağaza Bilgisi", + "SYNTAX_ERROR": "Sözdizimi hatası!", + "TITLE": "Başlık", + "TOP_STYLE": "Üst Ekran Görünümü", + "UNISTORE_BG": "UniStore Arka Planını Kullan", + "UNISTORE_BG_DESC": "Etkinleştirildiğinde, üst ekran için düz arka planı rengi yerine UniStore'un sağladığı arka plan gösterilecektir.", + "UNISTORE_INVALID_ERROR": "Bu UniStore geçersiz ve Universal-Updater\nile yüklenemez.\nBelki sözdizimi hatası vardır, bir kontrol etsen?", + "UNISTORE_TOO_NEW": "Universal-Updater sürümün bu UniStore'u\nkullanmak için çok eski.\nLütfen son sürüme güncelleyin.", + "UNISTORE_TOO_OLD": "UniStore eski ve Universal-Updater\nbu sürümüyle bunu kullanılamaz.\nKreatörden güncellemesini isteyin.", + "UPDATE_AVAILABLE": "Güncelleme Mevcut!", + "UPDATE_DONE": "Güncelleme tamamdır! Universal-Updater'ı yeniden açın.", + "UPDATING_SPRITE_SHEET": "Model Tablosu Güncelleniyor...", + "UPDATING_SPRITE_SHEET2": "%i / %i Model Tablosu Güncelleniyor...", + "UPDATING_UNISTORE": "UniStore Güncelleniyor...", + "VERSION": "Sürüm" +} \ No newline at end of file diff --git a/romfs/lang/uk/app.json b/romfs/lang/uk/app.json new file mode 100644 index 0000000..4c250d6 --- /dev/null +++ b/romfs/lang/uk/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "Покладіть 3DSX-файли в теку", + "3DSX_IN_FOLDER_DESC": "При активації файли 3DSX зберігатимуться в теці з тим самим іменем, а не у вибраній теці.", + "ACTION_CANCELED": "%s скасовано!", + "ACTION_FAILED": "%s помилка!", + "ACTION_REQUIRED": "Потрібна дія!", + "ACTION_SUCCEEDED": "%s завершено!", + "ACTIVE_THEME": "Тема", + "ASCENDING": "За зростанням", + "ARGUMENT_INVALID": "Аргумент не дійсний.\nБудь ласка, перевірте XML-файл на наявність правильних аргументів.", + "AUTHOR": "Автор", + "AUTO_UPDATE_NIGHTLY": "Використовувати «Nightly» версії", + "AUTO_UPDATE_NIGHTLY_DESC": "Використовувати «Nightly» версії Universal-Updater замість стабільних релізів.", + "AUTO_UPDATE_SETTINGS": "Налаштування автооновлення", + "AUTO_UPDATE_SETTINGS_BTN": "Налаштування автооновлення...", + "AUTO_UPDATE_UNISTORE": "Автооновлення UniStores", + "AUTO_UPDATE_UNISTORE_DESC": "Якщо увімкнено, то UniStore, яким ви користувалися востаннє буде автоматично оновлено під час запуску Universal-Updater.", + "AUTO_UPDATE_UU": "Автооновлення Universal-Updater", + "AUTO_UPDATE_UU_DESC": "Якщо увімкнено, то Universal-Updater перевірятиме оновлення під час кожного запуску.", + "AVAILABLE_DOWNLOADS": "Доступні для завантаження", + "BOOT_TITLE": "Запустити цю програму?", + "CANCEL": "Скасувати", + "CATEGORY": "Категорія", + "CHANGE_3DSX_PATH": "Змінити шлях 3DSX", + "CHANGE_ARCHIVE_PATH": "Змінити шлях до архіву", + "CHANGE_FIRM_PATH": "Змінити шлях до прошивки", + "CHANGE_NDS_PATH": "Змінити шлях NDS", + "CHANGE_SHORTCUT_PATH": "Змінити шлях скорочення", + "CHECK_UNISTORE_UPDATES": "Перевірка оновлень UniStore...", + "CHECK_UU_UPDATES": "Перевірка оновлень Universal-Updater...", + "CONFIRM_OR_CANCEL": "Натисніть  для підтвердження,  для скасування.", + "CONNECT_WIFI": "Будь ласка, під'єднайтеся до Wi-Fi.", + "CONFIRM": "Підтвердити", + "CONSOLE": "Консоль", + "CONTRIBUTOR_TRANSLATORS": "- Всі перекладачі та учасники", + "COPYING": "Копіювання... %s / %s (%.2f%%)", + "COPY_ERROR": "Помилка копіювання!", + "CREATE_SHORTCUT": "Створити скорочення?", + "CREDITS": "Співавтори", + "CREDITS_BTN": "Співавтори...", + "CURRENT_VERSION": "Поточна версія: ", + "CURRENTLY_EXTRACTING": "Розпаковується:\n", + "CUSTOM_FONT": "Використовувати інший шрифт", + "CUSTOM_FONT_DESC": "Якщо увімкнено, то замість системного шрифту буде використано 'sdmc:/3ds/Universal-Updater/font.bcfnt' (якщо він присутній).", + "DELETE_ERROR": "Помилка при видаленні!", + "DELETE_PROMPT": "Ви дійсно бажаєте видалити цю теку?", + "DELETING": "Видалення...", + "DESCENDING": "За спаданням", + "DIRECTION": "Напрямок", + "DIRECTORY_SETTINGS": "Налаштування теки", + "DIRECTORY_SETTINGS_BTN": "Налаштування теки...", + "DONE": "Готово!", + "DOWNLOAD_ERROR": "Помилка завантаження!", + "DOWNLOAD_FAILED": "Не вдалося завантажити!", + "DOWNLOAD_SPEED": "Швидкість: %lld КіБ/с", + "DOWNLOADING": "Завантаження... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "Завантаження сумісного шрифту...", + "DOWNLOADING_SPRITE_SHEET": "Завантаження таблиці спрайтів...", + "DOWNLOADING_SPRITE_SHEET2": "Завантаження таблиці спрайтів %i із %i...", + "DOWNLOADING_UNIVERSAL_DB": "Завантаження Universal-DB...", + "DONLOADING_UNIVERSAL_UPDATER": "Завантаження Universal-Updater...", + "DOWNLOADING_UNISTORE": "Завантаження UniStore...", + "ENTER_DESC_SHORTCUT": "Введіть опис скорочення.", + "ENTER_SEARCH": "Введiть текст для пошуку.", + "ENTER_SHORTCUT_FILENAME": "Введіть назву скорочення (без розширення).", + "ENTER_TITLE_SHORTCUT": "Введіть назву скорочення.", + "ENTER_URL": "Введіть URL-адресу UniStore.", + "ENTRIES": "Записи", + "EXECUTE_ENTRY": "Виконати цей запис?", + "NOTE_NIGHTLY": "Примітка: «Nightly» версії призначені для тестування\nмайбутніх функцій і можуть бути нестабільними.\n\nЯкщо ви просто хочете встановити програму, \nбудь ласка, скасуйте і встановіть звичайну версію.", + "NOTE_PRERELEASE": "Примітка. Це попередня збірка, тому вона може бути нестабільною.\n\nЯкщо ви хочете просто встановити програму,\nто встановіть звичайну версію, якщо така існує.", + "EXIT_APP": "Вийти з Universal-Updater", + "EXTRACTING": "Розпаковування... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "Помилка розпаковування!", + "FEATURE_SIDE_EFFECTS": "Ця функція може мати побічні ефекти під час роботи черги.\nВи впевнені, що хочете продовжити?", + "FETCHING_METADATA": "Отримання старих метаданих...", + "FETCHING_RECOMMENDED_UNISTORES": "Отримання рекомендованих UniStores...", + "FILES": "Файл: %d / %d", + "FILE_EXTRACTED": "файл витягнуто.", + "FILE_SLASH": "Схоже, що використовується символ '/'. Він не підтримується.\nБудь ласка, змініть 'file' тільки на ім'я файлу.", + "FILES_EXTRACTED": "файлів витягнуто.", + "FILTER_TO": "Фільтр:", + "GITHUB": "Повний список співавторів можна знайти на GitHub", + "GRID": "Сітка", + "GUI_SETTINGS": "Налаштування інтерфейсу", + "GUI_SETTINGS_BTN": "Налаштування інтерфейсу...", + "INCLUDE_IN_RESULTS": "Включити в результати:", + "INSTALLING": "Встановлення... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "Встановлення Universal-Updater...", + "INVALID_UNISTORE": "Недійсний UniStore", + "KEY_CONTINUE": "Щоб продовжити, натисніть будь-яку кнопку.", + "LANGUAGE": "Мова...", + "LAST_UPDATED": "Востаннє оновлено", + "LICENSE": "Ліцензія", + "LIST": "Список", + "LOADING_SCREENSHOT": "Завантаження скріншота...", + "LOADING_SPRITESHEET": "Завантаження таблиці спрайтів %i із %i...", + "MEDIATYPE_NAND": "Тип файлу NAND", + "MEDIATYPE_SD": "Тип файлу SD", + "MOVE_ERROR": "Помилка переміщення!", + "NO_DOWNLOADS_AVAILABLE": "Немає доступних завантажень", + "NO_LICENSE": "Немає ліцензії", + "NO_SCREENSHOTS_AVAILABLE": "Немає доступних скріншотів", + "NOT_IMPLEMENTED": "Ще не реалізовано", + "OP_COPYING": "Копіювання", + "OP_DELETING": "Видалення", + "OP_DOWNLOADING": "Завантаження", + "OP_EXTRACTING": "Розпаковування", + "OP_INSTALLING": "Встановлення", + "OP_MOVING": "Переміщення", + "OP_WAITING": "Очікування", + "QUEUE": "Черга", + "QUEUE_POSITION": "Позиція в черзі", + "QUEUE_PROGRESS": "Крок: %d / %d", + "RECOMMENDED_UNISTORES": "Рекомендовані UniStores", + "REVISION": "Ревізія", + "SCREENSHOT": "Скріншот %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "Не вдалося завантажити скріншот.", + "SCREENSHOT_INSTRUCTIONS": "Натисніть  для перемикання та  для збільшення", + "SEARCH_FILTERS": "Пошук і фільтри", + "SELECT_A_THEME": "Оберіть тему", + "SELECT_DIR": "Виберіть теку", + "SELECT_LANG": "Оберіть мову", + "SELECT_UNISTORE": "Обрати UniStore...", + "SELECT_UNISTORE_2": "Виберіть UniStore", + "SELECTION_QUEUE": "Додати виділення в чергу", + "SETTINGS": "Налаштування", + "SHEET_SLASH": "Схоже, що використовується символ '/'. Він не підтримується.\nБудь ласка, змініть 'sheet' тільки на ім'я файлу.", + "SHORTCUT_CREATED": "Скорочення створено!", + "SHORTCUT_COPYING": "Копіювання %s...", + "SHORTCUT_DOWNLOADING": "Завантаження %s...", + "SHORTCUT_EXTRACTING": "Розпакування %s...", + "SHORTCUT_INSTALLING": "Встановлення %s...", + "SIZE": "Розмір", + "SORT_BY": "Сортувати за", + "SORTING": "Сортування", + "START_SELECT": "Натисніть START для вибору поточної теки", + "STORE_INFO": "Інформація", + "SYNTAX_ERROR": "Синтаксична помилка!", + "TITLE": "Назва", + "TOP_STYLE": "Стиль верху", + "UNISTORE_BG": "Використовувати фон UniStore", + "UNISTORE_BG_DESC": "Якщо увімкнено, то буде показаний фон наданий UniStore замість суцільного кольору для верхнього екрана.", + "UNISTORE_INVALID_ERROR": "Цей UniStore недійсний і не може бути\nзавантажений через Universal-Updater.\nМожливо, варто перевірити, чи є якісь синтаксичні помилки?", + "UNISTORE_TOO_NEW": "Ваша версія Universal-Updater\nзанадто стара, щоб використовувати цей UniStore.\nБудь ласка, оновіться до останньої версії.", + "UNISTORE_TOO_OLD": "Ця версія UniStore застаріла і не може використовуватися\nз поточною версією Universal-Updater.\nБудь ласка, попросіть автора оновити його.", + "UPDATE_AVAILABLE": "Доступне оновлення!", + "UPDATE_DONE": "Оновлення завершено! Будь ласка, перевідкрийте Universal-Updater.", + "UPDATING_SPRITE_SHEET": "Оновлення таблиці спрайтів...", + "UPDATING_SPRITE_SHEET2": "Оновлення таблиці спрайтів %i із %i...", + "UPDATING_UNISTORE": "Оновлення UniStore...", + "VERSION": "Версія" +} \ No newline at end of file diff --git a/romfs/lang/zh-CN/app.json b/romfs/lang/zh-CN/app.json new file mode 100644 index 0000000..c54e26b --- /dev/null +++ b/romfs/lang/zh-CN/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "将 3DSX 文件放置到文件夹内", + "3DSX_IN_FOLDER_DESC": "启用后，3DSX文件将会被放入同名文件夹内，而不是直接放在预设文件夹中", + "ACTION_CANCELED": "%s 已取消！", + "ACTION_FAILED": "%s 失败！", + "ACTION_REQUIRED": "需要进行操作！", + "ACTION_SUCCEEDED": "%s 成功！", + "ACTIVE_THEME": "当前主题", + "ASCENDING": "升序", + "ARGUMENT_INVALID": "参数无效。\n请检查 xml 文件以获取正确的参数。", + "AUTHOR": "作者", + "AUTO_UPDATE_NIGHTLY": "使用每夜版", + "AUTO_UPDATE_NIGHTLY_DESC": "使用Universal-Updater的每夜版而非稳定发行版。", + "AUTO_UPDATE_SETTINGS": "自动更新设置", + "AUTO_UPDATE_SETTINGS_BTN": "自动更新设置……", + "AUTO_UPDATE_UNISTORE": "自动更新 UniStores", + "AUTO_UPDATE_UNISTORE_DESC": "启用后，最后一次使用的 UniStore 将会在下一次启动 Universal-Updater 时自动更新。", + "AUTO_UPDATE_UU": "自动更新 Universal-Updater", + "AUTO_UPDATE_UU_DESC": "启用后，Universal-Updater 将在每次启动时检查更新。", + "AVAILABLE_DOWNLOADS": "可选下载", + "BOOT_TITLE": "您想启动这个应用程序吗？", + "CANCEL": "取消", + "CATEGORY": "类别", + "CHANGE_3DSX_PATH": "更改 3DSX 路径", + "CHANGE_ARCHIVE_PATH": "更改归档路径", + "CHANGE_FIRM_PATH": "更改固件（firm）路径", + "CHANGE_NDS_PATH": "更改 NDS 路径", + "CHANGE_SHORTCUT_PATH": "更改快捷方式路径", + "CHECK_UNISTORE_UPDATES": "正在检查 UniStore 更新...", + "CHECK_UU_UPDATES": "正在检查 Universal-Updater 更新...", + "CONFIRM_OR_CANCEL": "请按  键确认，或按  键取消。", + "CONNECT_WIFI": "请连接到 WiFi 热点。", + "CONFIRM": "确认", + "CONSOLE": "主机平台", + "CONTRIBUTOR_TRANSLATORS": "- 所有翻译者及贡献者", + "COPYING": "正在复制... %s / %s (%.2f%%)", + "COPY_ERROR": "复制错误！", + "CREATE_SHORTCUT": "您想要创建一个快捷方式吗？", + "CREDITS": "致谢名单", + "CREDITS_BTN": "致谢名单...", + "CURRENT_VERSION": "当前版本： ", + "CURRENTLY_EXTRACTING": "正在提取：", + "CUSTOM_FONT": "使用自定义字体", + "CUSTOM_FONT_DESC": "启用后，如果找到 'sdmc:/3ds/Universal-Updater/font.bcfnt'，将使用该字体替代系统字体。", + "DELETE_ERROR": "删除错误！", + "DELETE_PROMPT": "您确定要删除此目录吗？", + "DELETING": "正在删除……", + "DESCENDING": "降序", + "DIRECTION": "方向", + "DIRECTORY_SETTINGS": "目录设置", + "DIRECTORY_SETTINGS_BTN": "目录设置...", + "DONE": "完成！", + "DOWNLOAD_ERROR": "下载错误！", + "DOWNLOAD_FAILED": "下载失败！", + "DOWNLOAD_SPEED": "速度: %lld KiB/秒", + "DOWNLOADING": "正在下载... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "正在下载兼容字体……", + "DOWNLOADING_SPRITE_SHEET": "正在下载贴图集……", + "DOWNLOADING_SPRITE_SHEET2": "正在下载贴图集 %i / %i……", + "DOWNLOADING_UNIVERSAL_DB": "正在下载 Universal-DB……", + "DONLOADING_UNIVERSAL_UPDATER": "正在下载 Universal-Updater……", + "DOWNLOADING_UNISTORE": "正在下载 UniStore……", + "ENTER_DESC_SHORTCUT": "输入快捷方式描述。", + "ENTER_SEARCH": "输入您想搜索的内容。", + "ENTER_SHORTCUT_FILENAME": "输入快捷方式文件名 (不包含扩展名)。", + "ENTER_TITLE_SHORTCUT": "输入快捷方式标题", + "ENTER_URL": "输入 UniStore 的 URL。", + "ENTRIES": "条目", + "EXECUTE_ENTRY": "您想要执行此条目吗？", + "NOTE_NIGHTLY": "注意：“每夜版”版本用于进行测试\n计划更新中的功能，可能会存在稳定性问题。\n\n若只是需要进行安装，\n请取消并选择安装正常版本。", + "NOTE_PRERELEASE": "注意：这是一个预发布版本，可能会存在稳定性问题。\n\n若只需要安装此软件，你可以选择安装正常版本（如果有的话）。", + "EXIT_APP": "退出 Universal-Updater", + "EXTRACTING": "正在提取…… %s / %s (%.2f%%)", + "EXTRACT_ERROR": "提取错误！", + "FEATURE_SIDE_EFFECTS": "此功能可能会在队列运行时产生副作用。\n您确定要继续吗？", + "FETCHING_METADATA": "正在获取旧的元数据.……", + "FETCHING_RECOMMENDED_UNISTORES": "正在获取推荐的 UniStores……", + "FILES": "文件： %d / %d", + "FILE_EXTRACTED": "文件已提取。", + "FILE_SLASH": "看起来包含了一个不支持的字符 '/'。\n请将“文件”更改为只包含文件名的形式。", + "FILES_EXTRACTED": "文件已提取。", + "FILTER_TO": "过滤到：", + "GITHUB": "完整的人员名单可以在 GitHub 上找到", + "GRID": "网格", + "GUI_SETTINGS": "用户界面设置", + "GUI_SETTINGS_BTN": "用户界面设置...", + "INCLUDE_IN_RESULTS": "包含结果：", + "INSTALLING": "正在安装... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "正在安装 Universal-Updater...", + "INVALID_UNISTORE": "无效的 UniStore", + "KEY_CONTINUE": "按任意键继续。", + "LANGUAGE": "语言...", + "LAST_UPDATED": "最后更新", + "LICENSE": "许可协议", + "LIST": "清单", + "LOADING_SCREENSHOT": "正在加载屏幕截图...", + "LOADING_SPRITESHEET": "正在加载贴图集 %i / %i……", + "MEDIATYPE_NAND": "介质类型 NAND", + "MEDIATYPE_SD": "介质类型 SD", + "MOVE_ERROR": "移动错误！", + "NO_DOWNLOADS_AVAILABLE": "无可用下载", + "NO_LICENSE": "没有许可证", + "NO_SCREENSHOTS_AVAILABLE": "无可用屏幕截图", + "NOT_IMPLEMENTED": "尚未实现", + "OP_COPYING": "正在复制", + "OP_DELETING": "删除中", + "OP_DOWNLOADING": "正在下载", + "OP_EXTRACTING": "正在提取", + "OP_INSTALLING": "正在安装", + "OP_MOVING": "正在移动", + "OP_WAITING": "等待中", + "QUEUE": "队列", + "QUEUE_POSITION": "队列位置", + "QUEUE_PROGRESS": "步骤: %d / %d", + "RECOMMENDED_UNISTORES": "推荐的 UniStore 源", + "REVISION": "修订版本", + "SCREENSHOT": "截图 %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "无法加载屏幕截图。", + "SCREENSHOT_INSTRUCTIONS": "按  键变换，按  键缩放", + "SEARCH_FILTERS": "搜索和过滤", + "SELECT_A_THEME": "选择主题", + "SELECT_DIR": "选择一个目录", + "SELECT_LANG": "选择语言", + "SELECT_UNISTORE": "选择 UniStore...", + "SELECT_UNISTORE_2": "请选择一个 UniStore", + "SELECTION_QUEUE": "添加选中内容到队列", + "SETTINGS": "设置", + "SHEET_SLASH": "看起来包含了一个不支持的字符 '/'。\n请将“表”更改为只包含文件名的形式。", + "SHORTCUT_CREATED": "快捷方式已创建！", + "SHORTCUT_COPYING": "正在复制 %s", + "SHORTCUT_DOWNLOADING": "正在下载 %s...", + "SHORTCUT_EXTRACTING": "正在提取 %s...", + "SHORTCUT_INSTALLING": "正在安装 %s...", + "SIZE": "大小", + "SORT_BY": "排序方式", + "SORTING": "排序", + "START_SELECT": "点击START按钮选择当前文件夹", + "STORE_INFO": "商店信息", + "SYNTAX_ERROR": "语法错误！", + "TITLE": "标题", + "TOP_STYLE": "上屏幕样式", + "UNISTORE_BG": "使用 UniStore 背景图", + "UNISTORE_BG_DESC": "启用后，将在上屏幕显示 UniStore 提供的背景图，而非预设的纯色背景。", + "UNISTORE_INVALID_ERROR": "该 UniStore 无效，\nUniversal-Updater 无法加载。\n请检查是否存在语法错误？", + "UNISTORE_TOO_NEW": "您的 Universal-Updater 版本过低，\n无法使用该 UniStore 。\n请更新到最新版本。", + "UNISTORE_TOO_OLD": "该 UniStore 已过期，\n无法与当前版本的 Universal-Updater 配合使用。\n请向商店创建者请求更新。", + "UPDATE_AVAILABLE": "更新版本现已可用！", + "UPDATE_DONE": "更新完成 ！请重新打开 Universal-Updater。", + "UPDATING_SPRITE_SHEET": "正在更新贴图集……", + "UPDATING_SPRITE_SHEET2": "正在更新贴图集 %i / %i……", + "UPDATING_UNISTORE": "正在更新 UniStore...", + "VERSION": "版本" +} \ No newline at end of file diff --git a/romfs/lang/zh-TW/app.json b/romfs/lang/zh-TW/app.json new file mode 100644 index 0000000..0db86c9 --- /dev/null +++ b/romfs/lang/zh-TW/app.json @@ -0,0 +1,153 @@ +{ + "3DSX_IN_FOLDER": "將3DSX文件放入資料夾", + "3DSX_IN_FOLDER_DESC": "開啟後，3DSX文件將會被放入同名資料夾內，而不是放入預設定資料夾。", + "ACTION_CANCELED": "%s 取消！", + "ACTION_FAILED": "%s 失敗。", + "ACTION_REQUIRED": "需進行操作！", + "ACTION_SUCCEEDED": "%s 成功！", + "ACTIVE_THEME": "使用中主題", + "ASCENDING": "遞增序", + "ARGUMENT_INVALID": "無效引數。\n請檢查 Xml 檔案以獲取正確的引數。", + "AUTHOR": "作者", + "AUTO_UPDATE_NIGHTLY": "Use nightly versions", + "AUTO_UPDATE_NIGHTLY_DESC": "Use nightly versions of Universal-Updater instead of the stable releases.", + "AUTO_UPDATE_SETTINGS": "自動更新設定", + "AUTO_UPDATE_SETTINGS_BTN": "自動更新設定...", + "AUTO_UPDATE_UNISTORE": "自動更新 UniStore", + "AUTO_UPDATE_UNISTORE_DESC": "啓用后，最後一次使用的 UniStore 將會在下次打開 Universal-Updater 時更新。", + "AUTO_UPDATE_UU": "自動更新 Universal-Updater", + "AUTO_UPDATE_UU_DESC": "啓用后，Universal-Updater 將在每次打開時檢查更新。", + "AVAILABLE_DOWNLOADS": "可用下載", + "BOOT_TITLE": "您想要開啓這個程式嗎？", + "CANCEL": "放棄", + "CATEGORY": "類別", + "CHANGE_3DSX_PATH": "改變 3DSX 路徑。", + "CHANGE_ARCHIVE_PATH": "改變歸檔路徑", + "CHANGE_FIRM_PATH": "改變firm路徑", + "CHANGE_NDS_PATH": "改變 NDS 路徑", + "CHANGE_SHORTCUT_PATH": "改變捷徑", + "CHECK_UNISTORE_UPDATES": "正在檢查 UniStore 更新...", + "CHECK_UU_UPDATES": "正在檢查 Universal-Updater 更新...", + "CONFIRM_OR_CANCEL": "按  確定，按  放棄。", + "CONNECT_WIFI": "請連接到 WiFi。", + "CONFIRM": "確定", + "CONSOLE": "主控臺", + "CONTRIBUTOR_TRANSLATORS": "- 全部譯者及貢獻者", + "COPYING": "拷貝中... %s / %s (%.2f%%)", + "COPY_ERROR": "複製錯誤！", + "CREATE_SHORTCUT": "您想要創建一個捷徑嗎？", + "CREDITS": "鳴謝", + "CREDITS_BTN": "鳴謝...", + "CURRENT_VERSION": "目前版本： ", + "CURRENTLY_EXTRACTING": "當前提取：", + "CUSTOM_FONT": "使用自訂字型", + "CUSTOM_FONT_DESC": "開啓后，'sdmc:/3ds/Universal-Updater/font.bcfnt' 將被用於替代系統字體庫。", + "DELETE_ERROR": "刪除出錯", + "DELETE_PROMPT": "您確定要刪除此資料夾嗎？", + "DELETING": "刪除中...", + "DESCENDING": "遞減序", + "DIRECTION": "方向", + "DIRECTORY_SETTINGS": "目錄設定", + "DIRECTORY_SETTINGS_BTN": "目錄設定...", + "DONE": "完成！", + "DOWNLOAD_ERROR": "下載發生錯誤", + "DOWNLOAD_FAILED": "下載失敗。", + "DOWNLOAD_SPEED": "速度： %lld KiB/s", + "DOWNLOADING": "下載中... %s / %s (%.2f%%)", + "DOWNLOADING_COMPATIBLE_FONT": "正在下載兼容字型...", + "DOWNLOADING_SPRITE_SHEET": "正在下載精靈表...", + "DOWNLOADING_SPRITE_SHEET2": "正在下載精靈表 %i 之 %i...", + "DOWNLOADING_UNIVERSAL_DB": "正在下載 Universal-DB...", + "DONLOADING_UNIVERSAL_UPDATER": "正在下載 Universal-Updater...", + "DOWNLOADING_UNISTORE": "正在下載 UniStore...", + "ENTER_DESC_SHORTCUT": "鍵入捷徑描述。", + "ENTER_SEARCH": "鍵入您希望搜索的内容。", + "ENTER_SHORTCUT_FILENAME": "鍵入捷徑檔案名 （不含擴展名）。", + "ENTER_TITLE_SHORTCUT": "鍵入捷徑標題。", + "ENTER_URL": "鍵入 UniStore 的 URL。", + "ENTRIES": "條目", + "EXECUTE_ENTRY": "您想執行這個條目嗎？", + "NOTE_NIGHTLY": "Note: \"Nightly\" versions are intended for testing\nupcoming features and may be unstable.\n\nIf you simply want to install,\nplease cancel and install the normal version.", + "NOTE_PRERELEASE": "Note: This is a prerelease build and may be unstable.\n\nIf you simply want to install, you may\nwant to install the normal version if one exists.", + "EXIT_APP": "退出 Universal-Updater", + "EXTRACTING": "提取中... %s / %s (%.2f%%)", + "EXTRACT_ERROR": "提取出錯！", + "FEATURE_SIDE_EFFECTS": "此功能可能會影響正在運行的隊列。\n您確定要繼續嗎？", + "FETCHING_METADATA": "獲取舊的元資料...", + "FETCHING_RECOMMENDED_UNISTORES": "獲取受推薦的 UniStore...", + "FILES": "檔案：%d / %d", + "FILE_EXTRACTED": "檔案已提取。", + "FILE_SLASH": "似乎包含了不受支持的 “/”。\n請將“檔案”一欄改爲只包含檔案名。", + "FILES_EXTRACTED": "檔案已提取。", + "FILTER_TO": "歸類至：", + "GITHUB": "完整人員名單可在 GitHub 上查看", + "GRID": "格線", + "GUI_SETTINGS": "使用者介面設置", + "GUI_SETTINGS_BTN": "使用介面設定...", + "INCLUDE_IN_RESULTS": "包括在結果中：", + "INSTALLING": "安裝中... %s / %s (%.2f%%)", + "INSTALL_UNIVERSAL_UPDATER": "正在安裝 Universal-Updater...", + "INVALID_UNISTORE": "無效的 UniStore", + "KEY_CONTINUE": "按任意鍵繼續。", + "LANGUAGE": "語言...", + "LAST_UPDATED": "最後更新", + "LICENSE": "授權協議", + "LIST": "列表視圖", + "LOADING_SCREENSHOT": "正在載入螢幕擷取畫面...", + "LOADING_SPRITESHEET": "正在載入精靈表 %i 之 %i...", + "MEDIATYPE_NAND": "媒介類型 NAND", + "MEDIATYPE_SD": "媒介類型 SD", + "MOVE_ERROR": "移動時發生錯誤！", + "NO_DOWNLOADS_AVAILABLE": "無下載可用", + "NO_LICENSE": "無授權", + "NO_SCREENSHOTS_AVAILABLE": "無可用螢幕截圖", + "NOT_IMPLEMENTED": "尚未實現", + "OP_COPYING": "複製中", + "OP_DELETING": "刪除中", + "OP_DOWNLOADING": "下載中", + "OP_EXTRACTING": "抽取中", + "OP_INSTALLING": "安裝中", + "OP_MOVING": "正在移動", + "OP_WAITING": "等待中", + "QUEUE": "排程", + "QUEUE_POSITION": "排程位置", + "QUEUE_PROGRESS": "階段：%d / %d", + "RECOMMENDED_UNISTORES": "受推薦的 UniStore", + "REVISION": "修訂版本", + "SCREENSHOT": "螢幕截圖 %d / %d", + "SCREENSHOT_COULD_NOT_LOAD": "無法載入螢幕擷取畫面", + "SCREENSHOT_INSTRUCTIONS": "按  更改並按  縮放", + "SEARCH_FILTERS": "搜尋和過濾", + "SELECT_A_THEME": "選擇主題", + "SELECT_DIR": "請選擇一個目錄", + "SELECT_LANG": "選擇語言", + "SELECT_UNISTORE": "選擇 UniStore...", + "SELECT_UNISTORE_2": "選擇一個 UniStore", + "SELECTION_QUEUE": "將所選加入至隊列", + "SETTINGS": "設定", + "SHEET_SLASH": "似乎包含了不受支持的 “/”。\n請將“表單”一欄改爲只包含檔案名。", + "SHORTCUT_CREATED": "捷徑已建立", + "SHORTCUT_COPYING": "Copying %s...", + "SHORTCUT_DOWNLOADING": "Downloading %s...", + "SHORTCUT_EXTRACTING": "Extracting %s...", + "SHORTCUT_INSTALLING": "Installing %s...", + "SIZE": "容量", + "SORT_BY": "排序依據", + "SORTING": "分類中", + "START_SELECT": "按 START 選擇當前資料夾", + "STORE_INFO": "商店訊息", + "SYNTAX_ERROR": "語法錯誤！", + "TITLE": "標題", + "TOP_STYLE": "上熒幕風格", + "UNISTORE_BG": "使用 UniStore 背景", + "UNISTORE_BG_DESC": "啓用后，將使用 UniStore 提供的背景圖取代原有的北京。", + "UNISTORE_INVALID_ERROR": "該 UniStore 無效，\n無法由 Universal-Updater 載入。\n請檢查是否存在句法錯誤？", + "UNISTORE_TOO_NEW": "您的 Universal-Updater 版本過舊，\n無法使用該 UniStore。\n請升級至最新版本。", + "UNISTORE_TOO_OLD": "該 UniStore 已過期，\n無法與當前版本的 Universal-Updater 配合使用。\n請詢問創建者以進行升級。", + "UPDATE_AVAILABLE": "更新可用！", + "UPDATE_DONE": "更新完成！請重啓 Universal-Updater。", + "UPDATING_SPRITE_SHEET": "正在更新精靈表...", + "UPDATING_SPRITE_SHEET2": "正在更新精靈表 %i 之 %i...", + "UPDATING_UNISTORE": "正在更新 UniStore...", + "VERSION": "版本" +} \ No newline at end of file diff --git a/screenshots/AutoUpdateSettings.png b/screenshots/AutoUpdateSettings.png deleted file mode 100644 index 9285339..0000000 Binary files a/screenshots/AutoUpdateSettings.png and /dev/null differ diff --git a/screenshots/Credits.png b/screenshots/Credits.png deleted file mode 100644 index 467bad0..0000000 Binary files a/screenshots/Credits.png and /dev/null differ diff --git a/screenshots/DirectorySelection.png b/screenshots/DirectorySelection.png deleted file mode 100644 index a10755b..0000000 Binary files a/screenshots/DirectorySelection.png and /dev/null differ diff --git a/screenshots/DirectorySettings.png b/screenshots/DirectorySettings.png deleted file mode 100644 index 441b544..0000000 Binary files a/screenshots/DirectorySettings.png and /dev/null differ diff --git a/screenshots/DownloadList.png b/screenshots/DownloadList.png deleted file mode 100644 index 7f9f20e..0000000 Binary files a/screenshots/DownloadList.png and /dev/null differ diff --git a/screenshots/EntryInfo.png b/screenshots/EntryInfo.png deleted file mode 100644 index b138a4c..0000000 Binary files a/screenshots/EntryInfo.png and /dev/null differ diff --git a/screenshots/GUISettings.png b/screenshots/GUISettings.png deleted file mode 100644 index f00c4ce..0000000 Binary files a/screenshots/GUISettings.png and /dev/null differ diff --git a/screenshots/LanguageSelection.png b/screenshots/LanguageSelection.png deleted file mode 100644 index 6617239..0000000 Binary files a/screenshots/LanguageSelection.png and /dev/null differ diff --git a/screenshots/ListStyle.png b/screenshots/ListStyle.png deleted file mode 100644 index a7f9606..0000000 Binary files a/screenshots/ListStyle.png and /dev/null differ diff --git a/screenshots/MarkMenu.png b/screenshots/MarkMenu.png deleted file mode 100644 index 81f2dfd..0000000 Binary files a/screenshots/MarkMenu.png and /dev/null differ diff --git a/screenshots/SearchMenu.png b/screenshots/SearchMenu.png deleted file mode 100644 index 1ebb674..0000000 Binary files a/screenshots/SearchMenu.png and /dev/null differ diff --git a/screenshots/SettingsMenu.png b/screenshots/SettingsMenu.png deleted file mode 100644 index 5987b0c..0000000 Binary files a/screenshots/SettingsMenu.png and /dev/null differ diff --git a/screenshots/SortMenu.png b/screenshots/SortMenu.png deleted file mode 100644 index 9e49efc..0000000 Binary files a/screenshots/SortMenu.png and /dev/null differ diff --git a/screenshots/StoreSelection.png b/screenshots/StoreSelection.png deleted file mode 100644 index fa0ac9f..0000000 Binary files a/screenshots/StoreSelection.png and /dev/null differ diff --git a/source/gui/gfx.cpp b/source/gui/gfx.cpp index 09d87eb..9650aad 100644 --- a/source/gui/gfx.cpp +++ b/source/gui/gfx.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,45 +26,43 @@ #include "common.hpp" #include "gfx.hpp" +#include "stringutils.hpp" +#include -/* - Draw the base top screen. -*/ +/* Draw the base top screen. */ void GFX::DrawTop(void) { Gui::ScreenDraw(Top); - Gui::Draw_Rect(0, 0, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 26, 400, 214, BG_COLOR); - Gui::Draw_Rect(0, 25, 400, 1, BAR_OUTL_COLOR); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); } -/* - Draw the base bottom screen. -*/ +/* Draw the base bottom screen. */ void GFX::DrawBottom() { Gui::ScreenDraw(Bottom); - Gui::Draw_Rect(0, 0, 320, 240, BG_COLOR); + Gui::Draw_Rect(0, 0, 320, 240, UIThemes->BGColor()); } /* Draw the box. - const float &xPos: Const Reference to the X-Position where to draw the box. - const float &yPos: Const Reference to the Y-Position where to draw the box. - const float &width: Const Reference to the Width of the button. - const float &height: Const Reference to the Height of the button. - const bool &selected: Const Reference, if outline is selected (Red) or not (Black). - const uint32_t &clr: (Optional) The color of the inside of the box. + float xPos: The X-Position where to draw the box. + float yPos: The Y-Position where to draw the box. + float width: The Width of the button. + float height: The Height of the button. + bool selected: If selected, or not. + uint32_t clr: (Optional) The color of the inside of the box. */ -void GFX::DrawBox(const float &xPos, const float &yPos, const float &width, const float &height, const bool &selected, const uint32_t &clr) { - Gui::Draw_Rect(xPos, yPos, width, height, BOX_INSIDE_COLOR); // Draw middle BG. +void GFX::DrawBox(float xPos, float yPos, float width, float height, bool selected, uint32_t clr) { + Gui::Draw_Rect(xPos, yPos, width, height, UIThemes->BoxInside()); // Draw middle BG. if (selected) { - static constexpr int depth = 2; + static constexpr int depth = 3; - Gui::Draw_Rect(xPos - depth, yPos - depth, width + depth * 2, depth, BOX_SELECTED_COLOR); // Top. - Gui::Draw_Rect(xPos - depth, yPos - depth, depth, height + depth * 2, BOX_SELECTED_COLOR); // Left. - Gui::Draw_Rect(xPos + width, yPos - depth, depth, height + depth * 2, BOX_SELECTED_COLOR); // Right. - Gui::Draw_Rect(xPos - depth, yPos + height, width + depth * 2, depth, BOX_SELECTED_COLOR); // Bottom. + Gui::Draw_Rect(xPos - depth, yPos - depth, width + depth * 2, depth, UIThemes->BoxSelected()); // Top. + Gui::Draw_Rect(xPos - depth, yPos - depth, depth, height + depth * 2, UIThemes->BoxSelected()); // Left. + Gui::Draw_Rect(xPos + width, yPos - depth, depth, height + depth * 2, UIThemes->BoxSelected()); // Right. + Gui::Draw_Rect(xPos - depth, yPos + height, width + depth * 2, depth, UIThemes->BoxSelected()); // Bottom. } } @@ -73,25 +71,25 @@ extern C2D_SpriteSheet sprites; /* Draw a Sprite of the sprites SpriteSheet. - const int &img: Const Reference to the Image index. - const int &x: Const Reference to the X-Position where to draw. - const int &y: Const Reference to the Y-Position where to draw. - const float &ScaleX: (Optional) Const Reference to the X-Scale of the Sprite. (1 by default) - const float &ScaleY: (Optional) Const Reference to the Y-Scale of the Sprite. (1 by default) + int img: The Image index. + int x: The X-Position where to draw. + int y: The Y-Position where to draw. + float ScaleX: (Optional) The X-Scale of the Sprite. (1 by default) + float ScaleY: (Optional) The Y-Scale of the Sprite. (1 by default) */ -void GFX::DrawSprite(const int &img, const int &x, const int &y, const float &ScaleX, const float &ScaleY) { +void GFX::DrawSprite(int img, int x, int y, float ScaleX, float ScaleY) { Gui::DrawSprite(sprites, img, x, y, ScaleX, ScaleY); } /* Draw the checkbox. - const float &xPos: Const Reference to the X-Position where to draw the box. - const float &yPos: Const Reference to the Y-Position where to draw the box. - const bool &selected: Const Reference, checked or not. + float xPos: The X-Position where to draw the box. + float yPos: The Y-Position where to draw the box. + bool selected: if checked, or not. */ -void GFX::DrawCheckbox(const float &xPos, const float &yPos, const bool &selected) { - GFX::DrawSprite((selected ? sprites_checked_idx : sprites_unchecked_idx), xPos, yPos); +void GFX::DrawCheckbox(float xPos, float yPos, bool selected) { + GFX::DrawIcon((selected ? sprites_checked_idx : sprites_unchecked_idx), xPos, yPos, UIThemes->TextColor(), 1.0f); } /* @@ -103,4 +101,99 @@ void GFX::DrawCheckbox(const float &xPos, const float &yPos, const bool &selecte */ void GFX::DrawToggle(float xPos, float yPos, bool toggled) { GFX::DrawSprite((toggled ? sprites_toggle_on_idx : sprites_toggle_off_idx), xPos, yPos); +} + +void GFX::DrawTime() { + time_t unixTime = time(nullptr); + struct tm *timeStruct = gmtime((const time_t *)&unixTime); + const std::string str = StringUtils::format("%02i:%02i", timeStruct->tm_hour, timeStruct->tm_min); // :. + + Gui::DrawString(11, 5, 0.5f, UIThemes->TextColor(), str, 0, 0, font); +} + +static int blinkDelay = 40; +static bool blinkState = true, batteryLow = false; +void GFX::DrawBattery() { + u8 chargeState = false, level = 0; + bool chargerPlugged = false; + + PTMU_GetBatteryChargeState(&chargeState); // Get Charge state. + PTMU_GetBatteryLevel(&level); // Get Battery Level. + PTMU_GetAdapterState(&chargerPlugged); // Get if charger adapter is plugged. + + if (chargerPlugged) { + GFX::DrawIcon((chargeState ? sprites_battery_charge_idx : sprites_battery_charge_full_idx), 366, 1, UIThemes->TextColor()); + if (batteryLow) batteryLow = false; // Cause we're charging. + + } else { + switch(level) { + case 0: // Blinky. + GFX::DrawIcon((blinkState ? sprites_battery_blink_idx : sprites_battery_0_idx), 366, 1, UIThemes->TextColor()); + if (!batteryLow) batteryLow = true; + break; + + case 1: // Red. + GFX::DrawIcon(sprites_battery_0_idx, 366, 1, UIThemes->TextColor()); + if (batteryLow) batteryLow = false; // Cause we're not low. + break; + + case 2: // One. + GFX::DrawIcon(sprites_battery_1_idx, 366, 1, UIThemes->TextColor()); + if (batteryLow) batteryLow = false; // Cause we're not low. + break; + + case 3: // Two. + GFX::DrawIcon(sprites_battery_2_idx, 366, 1, UIThemes->TextColor()); + if (batteryLow) batteryLow = false; // Cause we're not low. + break; + + case 4: // Three. + GFX::DrawIcon(sprites_battery_3_idx, 366, 1, UIThemes->TextColor()); + if (batteryLow) batteryLow = false; // Cause we're not low. + break; + + case 5: // Full. + GFX::DrawIcon(sprites_battery_4_idx, 366, 1, UIThemes->TextColor()); + if (batteryLow) batteryLow = false; // Cause we're not low. + break; + } + } +} + +void GFX::HandleBattery() { + if (batteryLow) { + if (blinkDelay > 0) { + blinkDelay--; + + if (blinkDelay == 0) { + blinkState = !blinkState; + blinkDelay = 40; + } + } + } +} + +/* + Draws the Wi-Fi signal icon +*/ +void GFX::DrawWifi() { + constexpr int wifiIcons[] = { + sprites_wifi_0_idx, + sprites_wifi_1_idx, + sprites_wifi_2_idx, + sprites_wifi_3_idx + }; + + u8 level = osGetWifiStrength(); + GFX::DrawIcon(wifiIcons[level], 330, 0, UIThemes->TextColor()); +} + +/* + Draws the sidebar icons blended with the SideBarIconColor. +*/ +void GFX::DrawIcon(const int Idx, int X, int Y, uint32_t Color, float BlendPower, float ScaleX, float ScaleY) { + C2D_ImageTint tint; + C2D_PlainImageTint(&tint, Color, BlendPower); + + C2D_DrawImageAt(C2D_SpriteSheetGetImage(sprites, Idx), X, Y, 0.5f, &tint, ScaleX, ScaleY); } \ No newline at end of file diff --git a/source/gui/msg.cpp b/source/gui/msg.cpp index 30ce211..4843824 100644 --- a/source/gui/msg.cpp +++ b/source/gui/msg.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +27,16 @@ #include "common.hpp" #include "msg.hpp" +extern bool touching(touchPosition touch, Structs::ButtonPos button); + +const std::vector promptButtons = { + {24, 94, 124, 48}, + {172, 94, 124, 48} +}; +const std::vector promptLabels = { + "CANCEL", "CONFIRM" +}; + /* Displays just a message until the next draw frame. @@ -39,7 +49,7 @@ void Msg::DisplayMsg(const std::string &Text) { C2D_TargetClear(Bottom, TRANSPARENT); GFX::DrawTop(); - Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, Text)) / 2, 0.6f, TEXT_COLOR, Text, 395); + Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, Text)) / 2, 0.6f, UIThemes->TextColor(), Text, 395, 0, font); GFX::DrawBottom(); C3D_FrameEnd(0); } @@ -56,7 +66,7 @@ void Msg::DisplayWarnMsg(const std::string &Text) { C2D_TargetClear(Bottom, TRANSPARENT); GFX::DrawTop(); - Gui::DrawStringCentered(0, 1, 0.6f, TEXT_COLOR, Text, 390); + Gui::DrawStringCentered(0, 1, 0.6f, UIThemes->TextColor(), Text, 390, 0, font); GFX::DrawBottom(); C3D_FrameEnd(0); @@ -75,23 +85,37 @@ bool Msg::promptMsg(const std::string &promptMsg) { Gui::clearTextBufs(); C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C2D_TargetClear(Top, TRANSPARENT); + C2D_TargetClear(Bottom, TRANSPARENT); GFX::DrawTop(); - Gui::Draw_Rect(0, 215, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 214, 400, 1, BAR_OUTL_COLOR); - Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, promptMsg)) / 2, 0.6f, TEXT_COLOR, promptMsg, 395); + Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, promptMsg)) / 2, 0.6f, UIThemes->TextColor(), promptMsg, 395, 0, font); - Gui::DrawStringCentered(0, 218, 0.6f, TEXT_COLOR, Lang::get("CONFIRM_OR_CANCEL"), 390); + Gui::DrawStringCentered(0, 218, 0.6f, UIThemes->TextColor(), Lang::get("CONFIRM_OR_CANCEL"), 390, 0, font); + GFX::DrawBottom(); + for(uint i = 0; i < promptButtons.size(); i++) { + Gui::Draw_Rect(promptButtons[i].x, promptButtons[i].y, promptButtons[i].w, promptButtons[i].h, UIThemes->BarColor()); + Gui::DrawStringCentered(promptButtons[i].x - 160 + promptButtons[i].w / 2, promptButtons[i].y + 15, 0.6f, UIThemes->TextColor(), Lang::get(promptLabels[i]), promptButtons[i].w - 10, 0, font); + } C3D_FrameEnd(0); for (int i = 0; i < 3; i++) gspWaitForVBlank(); hidScanInput(); + uint32_t Down = 0; + touchPosition Touch; while(1) { - hidScanInput(); - if (hidKeysDown() & KEY_A) return true; - else if (hidKeysDown() & KEY_B) return false; - } + do { + gspWaitForVBlank(); + hidScanInput(); + Down = hidKeysDown(); + hidTouchRead(&Touch); + } while (!Down); + + if ((Down & KEY_A) || (Down & KEY_TOUCH && touching(Touch, promptButtons[1]))) return true; + else if ((Down & KEY_B) || (Down & KEY_TOUCH && touching(Touch, promptButtons[0]))) return false; + }; } /* @@ -105,20 +129,27 @@ void Msg::waitMsg(const std::string &msg) { Gui::clearTextBufs(); C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C2D_TargetClear(Top, TRANSPARENT); + C2D_TargetClear(Bottom, TRANSPARENT); GFX::DrawTop(); - Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, msg)) / 2, 0.6f, TEXT_COLOR, msg, 395); - - Gui::Draw_Rect(0, 215, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 214, 400, 1, BAR_OUTL_COLOR); - Gui::DrawStringCentered(0, 218, 0.6f, TEXT_COLOR, Lang::get("KEY_CONTINUE"), 390); + Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, msg)) / 2, 0.6f, UIThemes->TextColor(), msg, 395, 0, font); + Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 218, 0.6f, UIThemes->TextColor(), Lang::get("KEY_CONTINUE"), 390, 0, font); + GFX::DrawBottom(); C3D_FrameEnd(0); for (int i = 0; i < 3; i++) gspWaitForVBlank(); hidScanInput(); + uint32_t Down = 0; while(!doOut) { - hidScanInput(); - if (hidKeysDown()) doOut = !doOut; + do { + gspWaitForVBlank(); + hidScanInput(); + Down = hidKeysDown(); + } while (!Down); + + doOut = true; } } \ No newline at end of file diff --git a/source/init.cpp b/source/init.cpp index aa4a930..22d4a34 100644 --- a/source/init.cpp +++ b/source/init.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,15 +28,20 @@ #include "download.hpp" #include "init.hpp" #include "mainScreen.hpp" +#include "queueSystem.hpp" +#include "sound.hpp" #include #include -bool exiting = false, is3DSX = false; -touchPosition touch; +bool exiting = false, is3DSX = false, needUnloadFont = false; C2D_SpriteSheet sprites; int fadeAlpha = 0; -u32 old_time_limit, hDown = 0; +u32 old_time_limit; +std::unique_ptr UIThemes = nullptr; +std::unique_ptr Music = nullptr; +bool dspfirmFound = false; +std::vector> Themes = { }; /* Set, if 3DSX or CIA. @@ -44,7 +49,33 @@ u32 old_time_limit, hDown = 0; static void getCurrentUsage(){ u64 id; APT_GetProgramID(&id); - is3DSX = (id != 0x0004000004391700); + is3DSX = (id != 0x0004000004391600); +} + +/* + Init Music. +*/ +static void InitMusic() { + if (access("sdmc:/3ds/dspfirm.cdc", F_OK) == 0) { // Ensure dspfirm dump exist. + if (access("sdmc:/3ds/Universal-Updater/music.wav", F_OK) == 0) { // Ensure music.wav exist. + dspfirmFound = true; + ndspInit(); + Music = std::make_unique("sdmc:/3ds/Universal-Updater/music.wav"); + + Music->play(); + } + } +} + +/* + Exit Music. +*/ +static void ExitMusic() { + if (dspfirmFound) { + Music->stop(); + Music = nullptr; + ndspExit(); + } } /* @@ -58,44 +89,85 @@ bool touching(touchPosition touch, Structs::ButtonPos button) { return false; } +/* + Load the custom font and use it instead of SysFont, if found. +*/ +void Init::LoadFont() { + if (config->customfont()) { + if (!needUnloadFont) { + if (access("sdmc:/3ds/Universal-Updater/font.bcfnt", F_OK) == 0) { + Gui::loadFont(font, "sdmc:/3ds/Universal-Updater/font.bcfnt"); + needUnloadFont = true; + } + } + } +} + +/* + Unload the custom font and switch back to SysFont. +*/ +void Init::UnloadFont() { + if (needUnloadFont) { + Gui::unloadFont(font); + font = nullptr; + needUnloadFont = false; + } +} + /* Initialize Universal-Updater. */ Result Init::Initialize() { gfxInitDefault(); romfsInit(); - Gui::init(); cfguInit(); + ptmuInit(); amInit(); acInit(); - APT_GetAppCpuTimeLimit(&old_time_limit); - APT_SetAppCpuTimeLimit(30); // Needed for QR Scanner to work. - getCurrentUsage(); - aptSetSleepAllowed(false); - /* Create Directories, if missing. */ mkdir("sdmc:/3ds", 0777); mkdir("sdmc:/3ds/Universal-Updater", 0777); mkdir("sdmc:/3ds/Universal-Updater/stores", 0777); + mkdir("sdmc:/3ds/Universal-Updater/shortcuts", 0777); config = std::make_unique(); + UIThemes = std::make_unique(); + UIThemes->LoadTheme(config->theme()); + Themes = UIThemes->ThemeNames(); + + CFG_Region region = CFG_REGION_USA; + if(config->language() == "zh-CN") { + region = CFG_REGION_CHN; + } else if(config->language() == "zh-TW") { + region = CFG_REGION_TWN; + } else if(config->language() == "ko") { + region = CFG_REGION_KOR; + } + Gui::init(region); + + APT_GetAppCpuTimeLimit(&old_time_limit); + APT_SetAppCpuTimeLimit(30); // Needed for QR Scanner to work. + getCurrentUsage(); + aptSetSleepAllowed(false); + hidSetRepeatParameters(20, 8); + Lang::load(config->language()); Gui::loadSheet("romfs:/gfx/sprites.t3x", sprites); - + LoadFont(); osSetSpeedupEnable(true); // Enable speed-up for New 3DS users. /* Check here for updates. */ - if (config->updatecheck()) { - if (IsUUUpdateAvailable()) UpdateAction(); - } + if (config->updatecheck()) UpdateAction(); if (exiting) return -1; // In case the update was successful. Gui::setScreen(std::make_unique(), false, false); + InitMusic(); + return 0; } @@ -106,12 +178,11 @@ Result Init::MainLoop() { bool fullExit = false; if (Initialize() == -1) fullExit = true; - hidSetRepeatParameters(20, 8); /* Loop as long as the status is not fullExit. */ while (aptMainLoop() && !fullExit) { hidScanInput(); - u32 hHeld = hidKeysHeld(); + hHeld = hidKeysHeld(); hDown = hidKeysDown(); hRepeat = hidKeysDownRepeat(); hidTouchRead(&touch); @@ -120,19 +191,16 @@ Result Init::MainLoop() { C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C2D_TargetClear(Top, C2D_Color32(0, 0, 0, 0)); C2D_TargetClear(Bottom, C2D_Color32(0, 0, 0, 0)); - Gui::DrawScreen(false); - if (!exiting) Gui::ScreenLogic(hDown, hHeld, touch, true, false); C3D_FrameEnd(0); - if (exiting) { - if (hDown & KEY_START) fullExit = true; // Make it optionally faster. + if (!exiting) Gui::ScreenLogic(hDown, hHeld, touch, true, false); + else { + if (hidKeysDown() & KEY_START) fullExit = true; // Make it optionally faster. if (fadeAlpha < 255) { fadeAlpha += 4; - if (fadeAlpha >= 255) { - fullExit = true; - } + if (fadeAlpha >= 255) fullExit = true; } } } @@ -148,10 +216,12 @@ Result Init::MainLoop() { Result Init::Exit() { Gui::exit(); Gui::unloadSheet(sprites); - + UnloadFont(); + ExitMusic(); gfxExit(); cfguExit(); config->save(); + ptmuExit(); acExit(); amExit(); @@ -160,4 +230,4 @@ Result Init::Exit() { romfsExit(); return 0; -} \ No newline at end of file +} diff --git a/source/keyboard.cpp b/source/keyboard.cpp index ea234cf..cadc573 100644 --- a/source/keyboard.cpp +++ b/source/keyboard.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ std::string Input::setkbdString(uint maxLength, const std::string &Text, const s } } - SwkbdButton ret = swkbdInputText(&state, temp, maxLength); + SwkbdButton ret = swkbdInputText(&state, temp, sizeof(temp)); temp[maxLength] = '\0'; return (ret == SWKBD_BUTTON_CONFIRM ? temp : ""); diff --git a/source/main.cpp b/source/main.cpp index 5c500ff..2ac02f3 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,13 +24,79 @@ * reasonable ways as different from the original version. */ +#include "argumentParser.hpp" +#include "common.hpp" #include "init.hpp" +#include #include +#define ARG_AMOUNT 4 // In case for more args, change this. It must be ARG amount + 1, because of 3DSX Path. std::string _3dsxPath = ""; +/* ARG Init. */ +static void InitForARG() { + gfxInitDefault(); + romfsInit(); + + cfguInit(); + amInit(); + acInit(); + + /* Create Directories, if missing. */ + mkdir("sdmc:/3ds", 0777); + mkdir("sdmc:/3ds/Universal-Updater", 0777); + mkdir("sdmc:/3ds/Universal-Updater/stores", 0777); + mkdir("sdmc:/3ds/Universal-Updater/shortcuts", 0777); + + config = std::make_unique(); + UIThemes = std::make_unique(); + UIThemes->LoadTheme(config->theme()); + + CFG_Region region = CFG_REGION_USA; + if(config->language() == "zh-CN") { + region = CFG_REGION_CHN; + } else if(config->language() == "zh-TW") { + region = CFG_REGION_TWN; + } else if(config->language() == "ko") { + region = CFG_REGION_KOR; + } + Gui::init(region); + + Lang::load(config->language()); + Init::LoadFont(); + osSetSpeedupEnable(true); // Enable speed-up for New 3DS users. +} + +/* ARG Exit. */ +static Result ExitForARG() { + Gui::exit(); + Init::UnloadFont(); + gfxExit(); + cfguExit(); + acExit(); + amExit(); + romfsExit(); + + return 0; +} + int main(int argc, char *argv[]) { if (argc > 0) _3dsxPath = argv[0]; + /* 4 --> Argument mode. */ + if (argc == ARG_AMOUNT) { + InitForARG(); + + const std::string file = argv[1]; + const std::string entry = argv[2]; + int dlIndex = atoi(argv[3]); + + std::unique_ptr arg = std::make_unique(file, entry, dlIndex); + + if (arg->GetValid()) arg->Execute(); // Execute, if valid. + else Msg::waitMsg(Lang::get("ARGUMENT_INVALID")); + return ExitForARG(); + } + return Init::MainLoop(); } \ No newline at end of file diff --git a/source/menu/downList.cpp b/source/menu/downList.cpp new file mode 100644 index 0000000..8c75ba0 --- /dev/null +++ b/source/menu/downList.cpp @@ -0,0 +1,266 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "animation.hpp" +#include "common.hpp" +#include "keyboard.hpp" +#include "queueSystem.hpp" +#include "scriptUtils.hpp" +#include "storeUtils.hpp" +#include "structs.hpp" +#include + +#define DOWNLOAD_ENTRIES 7 +extern std::string _3dsxPath; +extern bool exiting, is3DSX, QueueRuns; +extern bool touching(touchPosition touch, Structs::ButtonPos button); +static const std::vector downloadBoxes = { + { 46, 32, 241, 22 }, + { 46, 62, 241, 22 }, + { 46, 92, 241, 22 }, + { 46, 122, 241, 22 }, + { 46, 152, 241, 22 }, + { 46, 182, 241, 22 }, + { 46, 212, 241, 22 }, + + { 42, 216, 24, 24 } +}; + +static const std::vector installedPos = { + { 288, 32, 24, 24 }, + { 288, 62, 24, 24 }, + { 288, 92, 24, 24 }, + { 288, 122, 24, 24 }, + { 288, 152, 24, 24 }, + { 288, 182, 24, 24 }, + { 288, 212, 24, 24 }, +}; + +/* + With this, we can create a shortcut. ;P + + const std::string &entryName: The name of the Entry. AKA: The Title Name. + int index: The Download index. + const std::string &unistoreName: The name of the UniStore filename. + const std::string &author: The author of the app. +*/ +static bool CreateShortcut(const std::string &entryName, int index, const std::string &unistoreName, const std::string &author) { + std::string sName = Input::setkbdString(30, Lang::get("ENTER_SHORTCUT_FILENAME"), {}); + if (sName == "") return false; // Just cancel. + std::ofstream out(config->shortcut() + "/" + sName + ".xml", std::ios::binary); + + out << "" << std::endl; + + /* Executable. */ + const std::string executable = _3dsxPath.substr(5, _3dsxPath.size()); // It must be '/3ds/...'. + out << " " << executable << "" << std::endl; + + /* Arguments. */ + out << " \"" << unistoreName << "\" \"" << entryName << "\" \"" << std::to_string(index) << "\"" << "" << std::endl; + + /* Title. */ + const std::string title = Input::setkbdString(30, Lang::get("ENTER_TITLE_SHORTCUT"), {}); + if (title != "") out << " " << title << "" << std::endl; + else out << " " << entryName << "" << std::endl; + + /* Description. */ + const std::string desc = Input::setkbdString(50, Lang::get("ENTER_DESC_SHORTCUT"), {}); + if (desc != "") out << " " << desc << "" << std::endl; + else out << " " << entryName << "" << std::endl; + + /* Author and end. */ + out << " " << author << "" << std::endl; + out << "" << std::endl; + out.close(); + return true; +} + + +/* + Draw the Download entries part. + + const std::vector &entries: Const Reference to the download list as a vector of strings. + bool fetch: if fetching or not. + const std::unique_ptr &entry: Const Reference to the StoreEntry. + const std::vector &sizes: Const Reference to the download sizes as a vector of strings. +*/ +void StoreUtils::DrawDownList(const std::vector &entries, bool fetch, const std::unique_ptr &entry, const std::vector &sizes, const std::vector &installs) { + /* For the Top Screen. */ + if (StoreUtils::store && StoreUtils::store->GetValid() && !fetch && entry) { + if (entries.size() > 0) { + Gui::Draw_Rect(0, 174, 400, 66, UIThemes->DownListPrev()); + const C2D_Image tempImg = entry->GetIcon(); + const uint8_t offsetW = (48 - tempImg.subtex->width) / 2; // Center W. + const uint8_t offsetH = (48 - tempImg.subtex->height) / 2; // Center H. + C2D_DrawImageAt(tempImg, 9 + offsetW, 174 + 9 + offsetH, 0.5); + + Gui::DrawString(70, 174 + 15, 0.45f, UIThemes->TextColor(), entries[StoreUtils::store->GetDownloadIndex()], 310, 0, font); + + if (!sizes.empty()) { + if (sizes[StoreUtils::store->GetDownloadIndex()] != "") { + Gui::DrawString(70, 174 + 30, 0.45f, UIThemes->TextColor(), Lang::get("SIZE") + ": " + sizes[StoreUtils::store->GetDownloadIndex()], 310, 0, font); + } + } + } + } + + GFX::DrawTime(); + GFX::DrawBattery(); + GFX::DrawWifi(); + Animation::QueueEntryDone(); + + GFX::DrawBottom(); + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + Gui::DrawStringCentered(17, 2, 0.6, UIThemes->TextColor(), Lang::get("AVAILABLE_DOWNLOADS"), 273, 0, font); + + if (StoreUtils::store && StoreUtils::store->GetValid() && !fetch && entry) { + if (entries.size() > 0) { + for (int i = 0; i < DOWNLOAD_ENTRIES && i < (int)entries.size(); i++) { + if (StoreUtils::store->GetDownloadIndex() == i + StoreUtils::store->GetDownloadSIndex()) Gui::Draw_Rect(downloadBoxes[i].x, downloadBoxes[i].y, downloadBoxes[i].w, downloadBoxes[i].h, UIThemes->MarkSelected()); + Gui::DrawStringCentered(46 - 160 + (241 / 2), downloadBoxes[i].y + 4, 0.45f, UIThemes->TextColor(), entries[(i + StoreUtils::store->GetDownloadSIndex())], 235, 0, font); + + if (installs[(i + StoreUtils::store->GetDownloadSIndex())]) GFX::DrawIcon(sprites_installed_idx, installedPos[i].x, installedPos[i].y, UIThemes->TextColor()); + } + + if (is3DSX) GFX::DrawIcon(sprites_shortcut_idx, downloadBoxes[6].x, downloadBoxes[6].y, UIThemes->TextColor()); + + + } else { // If no downloads available.. + Gui::DrawStringCentered(46 - 160 + (241 / 2), downloadBoxes[0].y + 4, 0.5f, UIThemes->TextColor(), Lang::get("NO_DOWNLOADS_AVAILABLE"), 235, 0, font); + } + } +} + +/* + This is the Download List handle. + Here you can.. + + - Scroll through the download list, if any available. + - Execute an Entry of the download list. + - Return back to EntryInfo through `B`. + + const std::unique_ptr &entry: Const Reference to the current StoreEntry, since we do not modify anything in it. + const std::vector &entries: Const Reference to the download list, since we do not modify anything in it. + int ¤tMenu: Reference to the StoreMode / Menu, so we can switch back to EntryInfo with `B`. + const int &lastMode: Const Reference to the last mode. + int &smallDelay: Reference to the small delay. This helps to not directly press A. + std::vector &installs: Reference to the installed states. +*/ +void StoreUtils::DownloadHandle(const std::unique_ptr &entry, const std::vector &entries, int ¤tMenu, const int &lastMode, int &smallDelay, std::vector &installs, const std::vector &types) { + if (StoreUtils::store && entry) { // Ensure, store & entry is not a nullptr. + if (smallDelay > 0) { + smallDelay--; + } + + if ((hDown & (KEY_Y | KEY_SELECT) || (hDown & KEY_TOUCH && touching(touch, downloadBoxes[6]))) && !entries.empty()) { + if (is3DSX) { // Only allow if 3DSX. + if (StoreUtils::entries.size() <= 0) return; // Smaller than 0 -> No No. + + if (Msg::promptMsg(Lang::get("CREATE_SHORTCUT"))) { + if (CreateShortcut(entry->GetTitle(), StoreUtils::store->GetDownloadIndex(), StoreUtils::store->GetFileName(), entry->GetAuthor())) { + Msg::waitMsg(Lang::get("SHORTCUT_CREATED")); + } + } + } + } + + if (hRepeat & KEY_DOWN) { + if (StoreUtils::store->GetDownloadIndex() < (int)entries.size() - 1) StoreUtils::store->SetDownloadIndex(StoreUtils::store->GetDownloadIndex() + 1); + else StoreUtils::store->SetDownloadIndex(0); + } + + if (hRepeat & KEY_UP) { + if (StoreUtils::store->GetDownloadIndex() > 0) StoreUtils::store->SetDownloadIndex(StoreUtils::store->GetDownloadIndex() - 1); + else StoreUtils::store->SetDownloadIndex(entries.size() - 1); + } + + + if (hRepeat & KEY_RIGHT) { + if (StoreUtils::store->GetDownloadIndex() + DOWNLOAD_ENTRIES < (int)entries.size()-1) StoreUtils::store->SetDownloadIndex(StoreUtils::store->GetDownloadIndex() + DOWNLOAD_ENTRIES); + else StoreUtils::store->SetDownloadIndex(entries.size()-1); + } + + if (hRepeat & KEY_LEFT) { + if (StoreUtils::store->GetDownloadIndex() - DOWNLOAD_ENTRIES > 0) StoreUtils::store->SetDownloadIndex(StoreUtils::store->GetDownloadIndex() - DOWNLOAD_ENTRIES); + else StoreUtils::store->SetDownloadIndex(0); + } + + if (smallDelay == 0 && hDown & KEY_TOUCH) { + for (int i = 0; i < DOWNLOAD_ENTRIES; i++) { + if (touching(touch, downloadBoxes[i])) { + if (i + StoreUtils::store->GetDownloadSIndex() < (int)entries.size()) { + std::string Msg = Lang::get("EXECUTE_ENTRY") + "\n\n" + entries[i + StoreUtils::store->GetDownloadSIndex()]; + if (types[i + StoreUtils::store->GetDownloadSIndex()] == "nightly") Msg += "\n\n" + Lang::get("NOTE_NIGHTLY"); + else if (types[i + StoreUtils::store->GetDownloadSIndex()] == "prerelease") Msg += "\n\n" + Lang::get("NOTE_PRERELEASE"); + if (Msg::promptMsg(Msg)) { + StoreUtils::AddToQueue(entry->GetEntryIndex(), entries[i + StoreUtils::store->GetDownloadSIndex()], entry->GetTitle(), entry->GetLastUpdated()); + } + } + + break; + } + + if (touching(touch, installedPos[i])) { + if (i + StoreUtils::store->GetDownloadSIndex() < (int)entries.size()) { + if (installs[i + StoreUtils::store->GetDownloadSIndex()]) { + StoreUtils::meta->RemoveInstalled(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle(), entries[i + StoreUtils::store->GetDownloadSIndex()]); + installs[i + StoreUtils::store->GetDownloadSIndex()] = false; + } + } + + break; + } + } + } + + if (smallDelay == 0 && hDown & KEY_A && !entries.empty()) { + std::string Msg = Lang::get("EXECUTE_ENTRY") + "\n\n" + entries[StoreUtils::store->GetDownloadIndex()]; + if (types[StoreUtils::store->GetDownloadIndex()] == "nightly") Msg += "\n\n" + Lang::get("NOTE_NIGHTLY"); + else if (types[StoreUtils::store->GetDownloadIndex()] == "prerelease") Msg += "\n\n" + Lang::get("NOTE_PRERELEASE"); + if (Msg::promptMsg(Msg)) { + StoreUtils::AddToQueue(entry->GetEntryIndex(), entries[StoreUtils::store->GetDownloadIndex()], entry->GetTitle(), entry->GetLastUpdated()); + } + } + + if (hDown & KEY_X && !entries.empty()) { + if (installs[StoreUtils::store->GetDownloadIndex()]) { + StoreUtils::meta->RemoveInstalled(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle(), entries[StoreUtils::store->GetDownloadIndex()]); + installs[StoreUtils::store->GetDownloadIndex()] = false; + } + } + + if (hDown & KEY_B) currentMenu = lastMode; // Go back to EntryInfo. + + /* Quit UU. */ + if (hDown & KEY_START && !QueueRuns) + exiting = true; + + /* Scroll Handle. */ + if (StoreUtils::store->GetDownloadIndex() < StoreUtils::store->GetDownloadSIndex()) StoreUtils::store->SetDownloadSIndex(StoreUtils::store->GetDownloadIndex()); + else if (StoreUtils::store->GetDownloadIndex() > StoreUtils::store->GetDownloadSIndex() + DOWNLOAD_ENTRIES - 1) StoreUtils::store->SetDownloadSIndex(StoreUtils::store->GetDownloadIndex() - DOWNLOAD_ENTRIES + 1); + } +} \ No newline at end of file diff --git a/source/menu/entryInfo.cpp b/source/menu/entryInfo.cpp new file mode 100644 index 0000000..8241083 --- /dev/null +++ b/source/menu/entryInfo.cpp @@ -0,0 +1,110 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "common.hpp" +#include "files.hpp" +#include "storeUtils.hpp" +#include "structs.hpp" + +extern bool touching(touchPosition touch, Structs::ButtonPos button); +static const Structs::ButtonPos btn = { 45, 215, 24, 24 }; +static const Structs::ButtonPos sshot = { 75, 215, 24, 24 }; +static const Structs::ButtonPos notes = { 105, 215, 24, 24 }; +extern bool checkWifiStatus(); +extern bool exiting, QueueRuns; + +/* + Draw the Entry Info part. + + const std::unique_ptr &entry: Const Reference to the current StoreEntry. +*/ +void StoreUtils::DrawEntryInfo(const std::unique_ptr &entry) { + if (StoreUtils::store && entry) { // Ensure, store & entry is not a nullptr. + Gui::Draw_Rect(40, 0, 280, 36, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 36, 280, 1, UIThemes->EntryOutline()); + + Gui::DrawStringCentered(17, 0, 0.6, UIThemes->TextColor(), entry->GetTitle(), 273, 0, font); + Gui::DrawStringCentered(17, 20, 0.4, UIThemes->TextColor(), entry->GetAuthor(), 273, 0, font); + Gui::DrawStringCentered(17, 50, 0.4, UIThemes->TextColor(), entry->GetDescription(), 248, 0, font, C2D_WordWrap); + + Gui::DrawString(53, 130, 0.45, UIThemes->TextColor(), Lang::get("VERSION") + ": " + entry->GetVersion(), 248, 0, font); + Gui::DrawString(53, 145, 0.45, UIThemes->TextColor(), Lang::get("CATEGORY") + ": " + entry->GetCategory(), 248, 0, font); + Gui::DrawString(53, 160, 0.45, UIThemes->TextColor(), Lang::get("CONSOLE") + ": " + entry->GetConsole(), 248, 0, font); + Gui::DrawString(53, 175, 0.45, UIThemes->TextColor(), Lang::get("LAST_UPDATED") + ": " + entry->GetLastUpdated(), 248, 0, font); + Gui::DrawString(53, 190, 0.45, UIThemes->TextColor(), Lang::get("LICENSE") + ": " + entry->GetLicense(), 248, 0, font); + + GFX::DrawBox(btn.x, btn.y, btn.w, btn.h, false); + if (!entry->GetScreenshots().empty()) GFX::DrawIcon(sprites_screenshot_idx, sshot.x, sshot.y, UIThemes->TextColor()); + if (entry->GetReleaseNotes() != "") GFX::DrawIcon(sprites_notes_idx, notes.x, notes.y, UIThemes->TextColor()); + Gui::DrawString(btn.x + 5, btn.y + 2, 0.6f, UIThemes->TextColor(), "★", 0, 0, font); + } +} + +/* + The EntryInfo handle. + Here you can.. + + - Go to the download list, by pressing `A`. + - Show the MarkMenu with START. + + bool &showMark: Reference to showMark.. to show the mark menu. + bool &fetch: Reference to fetch, so we know, if we need to fetch, when accessing download list. + bool &sFetch: Reference to the screenshot fetch. + int &mode: Reference to the store mode. + const std::unique_ptr &entry: The store Entry. +*/ +void StoreUtils::EntryHandle(bool &showMark, bool &fetch, bool &sFetch, int &mode, const std::unique_ptr &entry) { + if (entry) { + if ((hDown & KEY_SELECT) || (hDown & KEY_TOUCH && touching(touch, btn))) showMark = true; + + if ((hDown & KEY_Y) || (hDown & KEY_TOUCH && touching(touch, sshot))) { + if (!entry->GetScreenshots().empty()) { + if (checkWifiStatus()) { + if (QueueRuns) { + if (!Msg::promptMsg(Lang::get("FEATURE_SIDE_EFFECTS"))) return; + sFetch = true; + mode = 6; + + } else { + sFetch = true; + mode = 6; + } + } + } + } + + if ((hDown & KEY_X) || (hDown & KEY_TOUCH && touching(touch, notes))) { + if (entry->GetReleaseNotes() != "") { + ProcessReleaseNotes(entry->GetReleaseNotes()); + mode = 7; + } + } + } + + /* Quit UU. */ + if (hDown & KEY_START && !QueueRuns) + exiting = true; +} \ No newline at end of file diff --git a/source/menu/grid.cpp b/source/menu/grid.cpp new file mode 100644 index 0000000..0a5618e --- /dev/null +++ b/source/menu/grid.cpp @@ -0,0 +1,172 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "common.hpp" +#include "storeUtils.hpp" +#include "structs.hpp" + +static const std::vector GridBoxes = { + { 25, 45, 50, 50 }, + { 100, 45, 50, 50 }, + { 175, 45, 50, 50 }, + { 250, 45, 50, 50 }, + { 325, 45, 50, 50 }, + + { 25, 105, 50, 50 }, + { 100, 105, 50, 50 }, + { 175, 105, 50, 50 }, + { 250, 105, 50, 50 }, + { 325, 105, 50, 50 }, + + { 25, 165, 50, 50 }, + { 100, 165, 50, 50 }, + { 175, 165, 50, 50 }, + { 250, 165, 50, 50 }, + { 325, 165, 50, 50 } +}; + +/* Draw the Top Grid. */ +void StoreUtils::DrawGrid() { + if (StoreUtils::store) { // Ensure, store is not a nullptr. + + if (config->usebg() && StoreUtils::store->customBG()) { + C2D_DrawImageAt(StoreUtils::store->GetStoreImg(), 0, 26, 0.5f, nullptr); + + } else { + Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor()); + } + + for (int i = 0, i2 = 0 + (StoreUtils::store->GetScreenIndx() * 5); i2 < 15 + (StoreUtils::store->GetScreenIndx() * 5) && i2 < (int)StoreUtils::entries.size(); i2++, i++) { + /* Boxes. */ + if (i == StoreUtils::store->GetBox()) GFX::DrawBox(GridBoxes[i].x, GridBoxes[i].y, 50, 50, true); + + /* Ensure, entries is larger than the index. */ + if ((int)StoreUtils::entries.size() > i2) { + if (StoreUtils::entries[i2]) { // Ensure, the Entry is not nullptr. + const C2D_Image tempImg = StoreUtils::entries[i2]->GetIcon(); + const uint8_t offsetW = (48 - tempImg.subtex->width) / 2; // Center W. + const uint8_t offsetH = (48 - tempImg.subtex->height) / 2; // Center H. + + C2D_DrawImageAt(tempImg, GridBoxes[i].x + 1 + offsetW, GridBoxes[i].y + 1 + offsetH, 0.5); + + /* Update Available mark. */ + if (StoreUtils::entries[i2]->GetUpdateAvl()) GFX::DrawSprite(sprites_update_app_idx, GridBoxes[i].x + 32, GridBoxes[i].y + 32); + } + } + } + } +} + + +/* + Top Grid Logic Handle. + Here you can.. + + - Scroll through the Grid with the D-Pad. + + const int ¤tMode: Reference to the current Mode. + int &lastMode: Reference to the last mode. + bool &fetch: Reference to fetch. + int &smallDelay: Reference to the small delay. +*/ +void StoreUtils::GridLogic(int ¤tMode, int &lastMode, bool &fetch, int &smallDelay) { + if (StoreUtils::store) { // Ensure, store is not a nullptr. + if (hRepeat & KEY_DOWN) { + if (StoreUtils::store->GetBox() > 9) { + if (StoreUtils::store->GetEntry() + 5 < (int)StoreUtils::entries.size() - 1) { + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() + 5); + + if (StoreUtils::entries.size() > 15) StoreUtils::store->SetScreenIndx((StoreUtils::store->GetEntry() / 5) - 2); + + } else { + if (StoreUtils::store->GetEntry() < (int)StoreUtils::entries.size() - 1) { + StoreUtils::store->SetEntry(StoreUtils::entries.size() - 1); + StoreUtils::store->SetBox(10 + (StoreUtils::store->GetEntry() % 5)); + + if (StoreUtils::entries.size() > 15) StoreUtils::store->SetScreenIndx((StoreUtils::store->GetEntry() / 5) - 2); + } + } + + } else { + if (StoreUtils::store->GetEntry() + 5 < (int)StoreUtils::entries.size()) { + StoreUtils::store->SetBox(StoreUtils::store->GetBox() + 5); + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() + 5); + } + } + } + + if (hRepeat & KEY_RIGHT) { + if (StoreUtils::store->GetEntry() < (int)StoreUtils::entries.size() - 1) { + if (StoreUtils::store->GetBox() < 14) { + StoreUtils::store->SetBox(StoreUtils::store->GetBox() + 1); + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() + 1); + + } else { + StoreUtils::store->SetBox(10); + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() + 1); + + StoreUtils::store->SetScreenIndx((StoreUtils::store->GetEntry() / 5) - 2); + } + } + } + + if (hRepeat & KEY_LEFT) { + if (StoreUtils::store->GetEntry() > 0) { + if (StoreUtils::store->GetBox() > 0) { + StoreUtils::store->SetBox(StoreUtils::store->GetBox() - 1); + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() - 1); + + } else { + StoreUtils::store->SetBox(4); + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() - 1); + + StoreUtils::store->SetScreenIndx((StoreUtils::store->GetEntry() / 5)); + } + } + } + + if (hRepeat & KEY_UP) { + if (StoreUtils::store->GetBox() < 5) { + if (StoreUtils::store->GetEntry() > 4) { + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() - 5); + + StoreUtils::store->SetScreenIndx((StoreUtils::store->GetEntry() / 5)); + } + + } else { + StoreUtils::store->SetBox(StoreUtils::store->GetBox() - 5); + StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() - 5); + } + } + + if (hDown & KEY_A) { + fetch = true; + smallDelay = 5; + lastMode = currentMode; + currentMode = 1; + } + } +} \ No newline at end of file diff --git a/source/store/list.cpp b/source/menu/list.cpp similarity index 50% rename from source/store/list.cpp rename to source/menu/list.cpp index 453f4da..b25c95e 100644 --- a/source/store/list.cpp +++ b/source/menu/list.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ * reasonable ways as different from the original version. */ +#include "common.hpp" #include "storeUtils.hpp" #include "structs.hpp" @@ -33,42 +34,37 @@ static const std::vector StoreBoxesList = { { 20, 165, 360, 50 } }; -/* - Draw the top List. +/* Draw the top List. */ +void StoreUtils::DrawList() { + if (StoreUtils::store) { // Ensure, store is not a nullptr. - const std::unique_ptr &store: Const Reference to the Store class. - const std::vector> &entries: Const Reference to the StoreEntries. -*/ -void StoreUtils::DrawList(const std::unique_ptr &store, const std::vector> &entries) { - if (store) { // Ensure, store is not a nullptr. - - if (config->usebg() && store->customBG()) { - C2D_DrawImageAt(store->GetStoreImg(), 0, 26, 0.5f, nullptr); + if (config->usebg() && StoreUtils::store->customBG()) { + C2D_DrawImageAt(StoreUtils::store->GetStoreImg(), 0, 26, 0.5f, nullptr); } else { - Gui::Draw_Rect(0, 26, 400, 214, BG_COLOR); + Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor()); } - if (entries.size() > 0) { - for (int i = 0; i < 3 && i < (int)entries.size(); i++) { + if (StoreUtils::entries.size() > 0) { + for (int i = 0; i < 3 && i < (int)StoreUtils::entries.size(); i++) { - if (i + store->GetScreenIndx() == store->GetEntry()) { + if (i + StoreUtils::store->GetScreenIndx() == StoreUtils::store->GetEntry()) { GFX::DrawBox(StoreBoxesList[i].x, StoreBoxesList[i].y, StoreBoxesList[i].w, StoreBoxesList[i].h, false); } /* Ensure, entries is larger than the index. */ - if ((int)entries.size() > i + store->GetScreenIndx()) { - if (entries[i + store->GetScreenIndx()]) { // Ensure, the Entry is not nullptr. - const C2D_Image tempImg = entries[i + store->GetScreenIndx()]->GetIcon(); + if ((int)StoreUtils::entries.size() > i + StoreUtils::store->GetScreenIndx()) { + if (StoreUtils::entries[i + StoreUtils::store->GetScreenIndx()]) { // Ensure, the Entry is not nullptr. + const C2D_Image tempImg = StoreUtils::entries[i + StoreUtils::store->GetScreenIndx()]->GetIcon(); const uint8_t offsetW = (48 - tempImg.subtex->width) / 2; // Center W. const uint8_t offsetH = (48 - tempImg.subtex->height) / 2; // Center H. C2D_DrawImageAt(tempImg, StoreBoxesList[i].x + 1 + offsetW, StoreBoxesList[i].y + 1 + offsetH, 0.5); } - if (entries[i + store->GetScreenIndx()]->GetUpdateAvl()) GFX::DrawSprite(sprites_update_app_idx, StoreBoxesList[i].x + 32, StoreBoxesList[i].y + 32); - Gui::DrawStringCentered(29, StoreBoxesList[i].y + 5, 0.6f, TEXT_COLOR, entries[i + store->GetScreenIndx()]->GetTitle(), 300); - Gui::DrawStringCentered(29, StoreBoxesList[i].y + 24, 0.6f, TEXT_COLOR, entries[i + store->GetScreenIndx()]->GetAuthor(), 300); + if (StoreUtils::entries[i + StoreUtils::store->GetScreenIndx()]->GetUpdateAvl()) GFX::DrawSprite(sprites_update_app_idx, StoreBoxesList[i].x + 32, StoreBoxesList[i].y + 32); + Gui::DrawStringCentered(29, StoreBoxesList[i].y + 5, 0.6f, UIThemes->TextColor(), StoreUtils::entries[i + StoreUtils::store->GetScreenIndx()]->GetTitle(), 300, 0, font); + Gui::DrawStringCentered(29, StoreBoxesList[i].y + 24, 0.6f, UIThemes->TextColor(), StoreUtils::entries[i + StoreUtils::store->GetScreenIndx()]->GetAuthor(), 300, 0, font); } } } @@ -80,37 +76,33 @@ void StoreUtils::DrawList(const std::unique_ptr &store, const std::vector Top List Logic Handle. Here you can.. - - Scroll through the Grid with the D-Pad Up / Down and skip 3 Entries with Left / Right. + - Scroll through the Grid with the D-Pad Up / Down and skip 3 entries with Left / Right. - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - std::unique_ptr &store: Reference to the Store class. - std::vector> &entries: Reference to the StoreEntries. int ¤tMode: Const Reference to the current Mode. int &lastMode: Reference to the last mode. bool &fetch: Reference to fetch. int &smallDelay: Reference to the small delay. */ -void StoreUtils::ListLogic(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, int ¤tMode, int &lastMode, bool &fetch, int &smallDelay) { - if (store) { // Ensure, store is not a nullptr. +void StoreUtils::ListLogic(int ¤tMode, int &lastMode, bool &fetch, int &smallDelay) { + if (StoreUtils::store) { // Ensure, store is not a nullptr. if (hRepeat & KEY_DOWN) { - if (store->GetEntry() < (int)entries.size() - 1) store->SetEntry(store->GetEntry() + 1); - else store->SetEntry(0); + if (StoreUtils::store->GetEntry() < (int)StoreUtils::entries.size() - 1) StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() + 1); + else StoreUtils::store->SetEntry(0); } if (hRepeat & KEY_RIGHT) { - if (store->GetEntry() < (int)entries.size() - 3) store->SetEntry(store->GetEntry() + 3); - else store->SetEntry(entries.size() - 1); + if (StoreUtils::store->GetEntry() < (int)StoreUtils::entries.size() - 3) StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() + 3); + else StoreUtils::store->SetEntry(StoreUtils::entries.size() - 1); } if (hRepeat & KEY_LEFT) { - if (store->GetEntry() - 2 > 0) store->SetEntry(store->GetEntry() - 3); + if (StoreUtils::store->GetEntry() - 2 > 0) StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() - 3); + else StoreUtils::store->SetEntry(0); } if (hRepeat & KEY_UP) { - if (store->GetEntry() > 0) store->SetEntry(store->GetEntry() - 1); - else store->SetEntry(entries.size() - 1); + if (StoreUtils::store->GetEntry() > 0) StoreUtils::store->SetEntry(StoreUtils::store->GetEntry() - 1); + else StoreUtils::store->SetEntry(StoreUtils::entries.size() - 1); } if (hDown & KEY_A) { @@ -121,7 +113,7 @@ void StoreUtils::ListLogic(u32 hDown, u32 hHeld, touchPosition touch, std::uniqu } /* Scroll Logic. */ - if (store->GetEntry() < store->GetScreenIndx()) store->SetScreenIndx(store->GetEntry()); - else if (store->GetEntry() > store->GetScreenIndx() + 3 - 1) store->SetScreenIndx(store->GetEntry() - 3 + 1); + if (StoreUtils::store->GetEntry() < StoreUtils::store->GetScreenIndx()) StoreUtils::store->SetScreenIndx(StoreUtils::store->GetEntry()); + else if (StoreUtils::store->GetEntry() > StoreUtils::store->GetScreenIndx() + 3 - 1) StoreUtils::store->SetScreenIndx(StoreUtils::store->GetEntry() - 3 + 1); } } \ No newline at end of file diff --git a/source/menu/markMenu.cpp b/source/menu/markMenu.cpp new file mode 100644 index 0000000..1a3153f --- /dev/null +++ b/source/menu/markMenu.cpp @@ -0,0 +1,128 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "common.hpp" +#include "storeUtils.hpp" +#include "structs.hpp" + +extern bool touching(touchPosition touch, Structs::ButtonPos button); +static const std::vector markBox = { + { 10, 94, 52, 52 }, + { 72, 94, 52, 52 }, + { 134, 94, 52, 52 }, + { 196, 94, 52, 52 }, + { 258, 94, 52, 52 }, + + { 45, 215, 24, 24 } +}; + +/* + Draw the Marking part. + + int marks: The active mark flags. +*/ +void StoreUtils::DisplayMarkBox(int marks) { + Gui::Draw_Rect(0, 0, 320, 240, DIM_COLOR); // Darken. + + Gui::Draw_Rect(markBox[0].x, markBox[0].y, markBox[0].w, markBox[0].h, ((marks & favoriteMarks::STAR) ? + UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + + Gui::Draw_Rect(markBox[1].x, markBox[1].y, markBox[1].w, markBox[1].h, ((marks & favoriteMarks::HEART) ? + UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + + Gui::Draw_Rect(markBox[2].x, markBox[2].y, markBox[2].w, markBox[2].h, ((marks & favoriteMarks::DIAMOND) ? + UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + + Gui::Draw_Rect(markBox[3].x, markBox[3].y, markBox[3].w, markBox[3].h, ((marks & favoriteMarks::CLUBS) ? + UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + + Gui::Draw_Rect(markBox[4].x, markBox[4].y, markBox[4].w, markBox[4].h, ((marks & favoriteMarks::SPADE) ? + UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + + Gui::DrawString(markBox[0].x + 15, markBox[0].y + 11, 0.9, UIThemes->TextColor(), "★", 0, 0, font); + Gui::DrawString(markBox[1].x + 15, markBox[1].y + 11, 0.9, UIThemes->TextColor(), "♥", 0, 0, font); + Gui::DrawString(markBox[2].x + 15, markBox[2].y + 11, 0.9, UIThemes->TextColor(), "♦", 0, 0, font); + Gui::DrawString(markBox[3].x + 15, markBox[3].y + 11, 0.9, UIThemes->TextColor(), "♣", 0, 0, font); + Gui::DrawString(markBox[4].x + 15, markBox[4].y + 11, 0.9, UIThemes->TextColor(), "♠", 0, 0, font); + + GFX::DrawBox(markBox[5].x, markBox[5].y, markBox[5].w, markBox[5].h, false); + Gui::DrawString(markBox[5].x + 5, markBox[5].y + 2, 0.6f, UIThemes->TextColor(), "★", 0, 0, font); +} + +/* + Mark Menu handle. + Here you can.. + + - Mark the selected app. + - Return to EntryInfo with `B`. + + std::unique_ptr &entry: Reference to the current StoreEntry. + bool &showMark: Reference to showMark, so we know, if we should stay here or not. +*/ +void StoreUtils::MarkHandle(std::unique_ptr &entry, bool &showMark) { + hidScanInput(); + touchPosition t; + hidTouchRead(&t); + + if (StoreUtils::meta && entry && StoreUtils::store) { + if (hidKeysDown() & KEY_TOUCH) { + /* Star. */ + if (touching(t, markBox[0])) { + StoreUtils::meta->SetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle(), + StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::STAR); + entry->SetMark(StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle())); + + /* Heart. */ + } else if (touching(t, markBox[1])) { + StoreUtils::meta->SetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle(), + StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::HEART); + entry->SetMark(StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle())); + + /* Diamond. */ + } else if (touching(t, markBox[2])) { + StoreUtils::meta->SetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle(), + StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::DIAMOND); + entry->SetMark(StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle())); + + /* Clubs. */ + } else if (touching(t, markBox[3])) { + StoreUtils::meta->SetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle(), + StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::CLUBS); + entry->SetMark(StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle())); + + /* Spade. */ + } else if (touching(t, markBox[4])) { + StoreUtils::meta->SetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle(), + StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::SPADE); + + entry->SetMark(StoreUtils::meta->GetMarks(StoreUtils::store->GetUniStoreTitle(), entry->GetTitle())); + } + } + } + + + if ((hidKeysDown() & KEY_B || hidKeysDown() & KEY_SELECT) || (hidKeysDown() & KEY_TOUCH && touching(t, markBox[5]))) showMark = false; // Return back to screen. +} \ No newline at end of file diff --git a/source/menu/queueMenu.cpp b/source/menu/queueMenu.cpp new file mode 100644 index 0000000..6c731b4 --- /dev/null +++ b/source/menu/queueMenu.cpp @@ -0,0 +1,339 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "common.hpp" +#include "queueSystem.hpp" +#include "scriptUtils.hpp" +#include "storeUtils.hpp" +#include "structs.hpp" +#include +#include // for std::min. + +extern u32 extractSize, writeOffset; +extern u32 installSize, installOffset; +extern u32 copyOffset, copySize; +extern int filesExtracted, extractFilesCount; +extern bool exiting, QueueRuns; + +extern curl_off_t downloadTotal; +extern curl_off_t downloadNow; +extern curl_off_t downloadSpeed; +extern CURL *CurlHandle; +bool ShowQueueProgress = true; // Queue Mode View. +int queueMenuIdx = 0; // Queue Menu Index. + +#define QUEUE_ENTRIES 2 // 2 entries per screen or so. +extern bool touching(touchPosition touch, Structs::ButtonPos button); + +static const std::vector QueueBoxes = { + { 47, 36, 266, 90 }, + { 47, 139, 266, 90 }, + { 292, 37, 20, 20 }, // Cancel current Queue. + { 292, 140, 20, 20 } // Remove next Queue. +}; + +extern std::deque> queueEntries; + +void DrawStatus(QueueStatus s) { + if (!ShowQueueProgress) { + if (!queueEntries.empty()) { + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), queueEntries[0]->name, 230, 0, font); + + char prog[256]; + snprintf(prog, sizeof(prog), Lang::get("QUEUE_PROGRESS").c_str(), queueEntries[0]->current, queueEntries[0]->total); + Gui::DrawString(QueueBoxes[0].x + 241, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), prog, 80, 0, font, C2D_AlignRight); + + Gui::Draw_Rect(QueueBoxes[0].x + 60, QueueBoxes[0].y + 30, 182, 30, UIThemes->ProgressbarOut()); + Gui::Draw_Rect(QueueBoxes[0].x + 60 + 1, QueueBoxes[0].y + 30 + 1, (int)(((float)queueEntries[0]->current / (float)queueEntries[0]->total) * 180.0f), 28, UIThemes->ProgressbarIn()); + + switch(s) { + case QueueStatus::Done: + case QueueStatus::Failed: + case QueueStatus::None: + break; + + case QueueStatus::Copying: + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), Lang::get("OP_COPYING"), 120, 0, font); + break; + + case QueueStatus::Deleting: + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), Lang::get("OP_DELETING"), 120, 0, font); + break; + + case QueueStatus::Downloading: + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), Lang::get("OP_DOWNLOADING"), 120, 0, font); + break; + + case QueueStatus::Extracting: + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), Lang::get("OP_EXTRACTING"), 120, 0, font); + break; + + case QueueStatus::Installing: + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), Lang::get("OP_INSTALLING"), 120, 0, font); + break; + + case QueueStatus::Moving: + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), Lang::get("OP_MOVING"), 120, 0, font); + break; + + case QueueStatus::Request: + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), Lang::get("OP_WAITING"), 120, 0, font); + break; + } + } + + return; + } + + char str[256], str2[256]; + + /* Progress. */ + if (!queueEntries.empty()) { + char prog[256]; + snprintf(prog, sizeof(prog), Lang::get("QUEUE_PROGRESS").c_str(), queueEntries[0]->current, queueEntries[0]->total); + Gui::DrawString((QueueBoxes[0].x + 241), QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), prog, 80, 0, font, C2D_AlignRight); + } + + /* String Handle. */ + switch(s) { + case QueueStatus::Done: + case QueueStatus::Failed: + case QueueStatus::None: + case QueueStatus::Moving: + break; + + case QueueStatus::Copying: + snprintf(str, sizeof(str), Lang::get("COPYING").c_str(), + StringUtils::formatBytes(copyOffset).c_str(), + StringUtils::formatBytes(copySize).c_str(), + ((float)copyOffset/(float)copySize) * 100.0f); + break; + + case QueueStatus::Deleting: + snprintf(str, sizeof(str), Lang::get("DELETING").c_str()); + break; + + case QueueStatus::Downloading: + if (CurlHandle) curl_easy_getinfo(CurlHandle, CURLINFO_SPEED_DOWNLOAD_T, &downloadSpeed); + else downloadSpeed = 0; + + if (downloadTotal < 1.0f) downloadTotal = 1.0f; + if (downloadTotal < downloadNow) downloadTotal = downloadNow; + + snprintf(str, sizeof(str), Lang::get("DOWNLOADING").c_str(), + StringUtils::formatBytes(downloadNow).c_str(), + StringUtils::formatBytes(downloadTotal).c_str(), + ((float)downloadNow/(float)downloadTotal) * 100.0f); + + snprintf(str2, sizeof(str2), Lang::get("DOWNLOAD_SPEED").c_str(), + ((downloadSpeed / 1024))); + break; + + case QueueStatus::Extracting: + snprintf(str, sizeof(str), Lang::get("EXTRACTING").c_str(), + StringUtils::formatBytes(writeOffset).c_str(), + StringUtils::formatBytes(extractSize).c_str(), + ((float)writeOffset/(float)extractSize) * 100.0f); + + snprintf(str2, sizeof(str2), Lang::get("FILES").c_str(), + filesExtracted, extractFilesCount); + + break; + + case QueueStatus::Installing: + snprintf(str, sizeof(str), Lang::get("INSTALLING").c_str(), + StringUtils::formatBytes(installOffset).c_str(), + StringUtils::formatBytes(installSize).c_str(), + ((float)installOffset/(float)installSize) * 100.0f); + break; + + case QueueStatus::Request: + snprintf(str, sizeof(str), Lang::get("OP_WAITING").c_str()); + snprintf(str2, sizeof(str2), Lang::get("ACTION_REQUIRED").c_str()); + break; + } + + /* Draw Handle. */ + switch(s) { + case QueueStatus::Done: + case QueueStatus::Failed: + case QueueStatus::None: + break; + + case QueueStatus::Copying: + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), str, 230, 0, font); + Gui::Draw_Rect(QueueBoxes[0].x + 60, QueueBoxes[0].y + 30, 182, 30, UIThemes->ProgressbarOut()); + Gui::Draw_Rect(QueueBoxes[0].x + 60 + 1, QueueBoxes[0].y + 30 + 1, (int)(((float)copyOffset / (float)copySize) * 180.0f), 28, UIThemes->ProgressbarIn()); + break; + + case QueueStatus::Deleting: + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), str, 230, 0, font); + break; + + case QueueStatus::Downloading: + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), str, 230, 0, font); + Gui::Draw_Rect(QueueBoxes[0].x + 60, QueueBoxes[0].y + 30, 182, 30, UIThemes->ProgressbarOut()); + Gui::Draw_Rect(QueueBoxes[0].x + 60 + 1, QueueBoxes[0].y + 30 + 1, (int)(((float)downloadNow / (float)downloadTotal) * 180.0f), 28, UIThemes->ProgressbarIn()); + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), str2, 120, 0, font); + break; + + case QueueStatus::Extracting: + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), str, 230, 0, font); + Gui::Draw_Rect(QueueBoxes[0].x + 60, QueueBoxes[0].y + 30, 182, 30, UIThemes->ProgressbarOut()); + Gui::Draw_Rect(QueueBoxes[0].x + 60 + 1, QueueBoxes[0].y + 30 + 1, (int)(((float)writeOffset / (float)extractSize) * 180.0f), 28, UIThemes->ProgressbarIn()); + Gui::DrawString(QueueBoxes[0].x + 60, QueueBoxes[0].y + 68, 0.4f, UIThemes->TextColor(), str2, 120, 0, font); + break; + + case QueueStatus::Installing: + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), str, 230, 0, font); + Gui::Draw_Rect(QueueBoxes[0].x + 60, QueueBoxes[0].y + 30, 182, 30, UIThemes->ProgressbarOut()); + Gui::Draw_Rect(QueueBoxes[0].x + 60 + 1, QueueBoxes[0].y + 30 + 1, (int)(((float)installOffset / (float)installSize) * 180.0f), 28, UIThemes->ProgressbarIn()); + break; + + case QueueStatus::Moving: + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), Lang::get("OP_MOVING"), 230, 0, font); + break; + + case QueueStatus::Request: + Gui::DrawString(QueueBoxes[0].x + 10, QueueBoxes[0].y + 5, 0.4f, UIThemes->TextColor(), str, 230, 0, font); + Gui::Draw_Rect(QueueBoxes[0].x + 60, QueueBoxes[0].y + 30, 182, 30, UIThemes->ProgressbarOut()); + Gui::DrawStringCentered(QueueBoxes[0].x + 151 - 160, QueueBoxes[0].y + 32, 0.8f, UIThemes->TextColor(), str2, 180, 0, font); + break; + } +} + +void StoreUtils::DrawQueueMenu(const int queueIndex) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + Gui::DrawStringCentered(17, 2, 0.6, UIThemes->TextColor(), Lang::get("QUEUE"), 273, 0, font); + + if (!queueEntries.empty()) { + Gui::Draw_Rect(QueueBoxes[0].x, QueueBoxes[0].y, QueueBoxes[0].w, QueueBoxes[0].h, UIThemes->MarkSelected()); + + const C2D_Image tempImg = queueEntries[0]->icn; + const uint8_t offsetW = (48 - tempImg.subtex->width) / 2; // Center W. + const uint8_t offsetH = (48 - tempImg.subtex->height) / 2; // Center H. + C2D_DrawImageAt(tempImg, QueueBoxes[0].x + 5 + offsetW, QueueBoxes[0].y + 21 + offsetH, 0.5f); + + DrawStatus(queueEntries[0]->status); + GFX::DrawIcon(sprites_cancel_idx, QueueBoxes[2].x, QueueBoxes[2].y, UIThemes->TextColor()); + + /* The next Queue Entries being displayed below. */ + if ((1 + queueMenuIdx) < (int)queueEntries.size()) { + Gui::Draw_Rect(QueueBoxes[1].x, QueueBoxes[1].y, QueueBoxes[1].w, QueueBoxes[1].h, UIThemes->MarkUnselected()); + + const C2D_Image tempImg2 = queueEntries[1 + queueMenuIdx]->icn; + const uint8_t offsetW2 = (48 - tempImg2.subtex->width) / 2; // Center W. + const uint8_t offsetH2 = (48 - tempImg2.subtex->height) / 2; // Center H. + C2D_DrawImageAt(tempImg2, QueueBoxes[1].x + 5 + offsetW2, QueueBoxes[1].y + 21 + offsetH2, 0.5f); + + Gui::DrawString(QueueBoxes[1].x + 10, QueueBoxes[1].y + 5, 0.4f, UIThemes->TextColor(), queueEntries[1 + queueMenuIdx]->name, 230, 0, font); + + Gui::DrawString(QueueBoxes[1].x + 60, QueueBoxes[1].y + 30, 0.4f, UIThemes->TextColor(), Lang::get("QUEUE_POSITION") + ": " + std::to_string(queueMenuIdx + 1), 0, 0, font); + + /* Cancel. */ + GFX::DrawIcon(sprites_cancel_idx, QueueBoxes[3].x, QueueBoxes[3].y, UIThemes->TextColor()); + } + } +} + +void StoreUtils::QueueMenuHandle(int &queueIndex, int &storeMode) { + if (!queueEntries.empty()) { + if ((1 + queueMenuIdx) > (int)queueEntries.size() - 1) queueMenuIdx = std::max((int)(queueEntries.size() - 1) - 1, 0); // Ensure this really doesn't go below 0. + } + + if (hDown & KEY_TOUCH) { + /* Current Queue Cancel. */ + if (QueueSystem::RequestNeeded == NO_REQUEST && touching(touch, QueueBoxes[2])) { // Needs to be above the 0 one, otherwise the callback won't be accepted. + QueueSystem::CancelCallback = true; + + } else if (touching(touch, QueueBoxes[0])) { + if (QueueSystem::RequestNeeded != NO_REQUEST) { // -1 means no request. + switch(QueueSystem::RequestNeeded) { + case RMDIR_REQUEST: // Remove Directory message. + QueueSystem::RequestAnswer = Msg::promptMsg(QueueSystem::RequestMsg); + + QueueSystem::Wait = false; + QueueSystem::Resume(); + break; + + case PROMPT_REQUEST: // Skip prompt message. + QueueSystem::RequestAnswer = ScriptUtils::prompt(QueueSystem::RequestMsg); + + QueueSystem::Wait = false; + QueueSystem::Resume(); + break; + } + + } else { + ShowQueueProgress = !ShowQueueProgress; // In case no request expected, switch from progress to total progress mode etc. + } + + /* Remove from Queue. */ + } else if (touching(touch, QueueBoxes[3])) { // Remove Queue entries. + if (queueEntries.size() > 1) queueEntries.erase(queueEntries.begin() + 1 + queueMenuIdx); + } + } + + if (hDown & KEY_DOWN) { + if (!queueEntries.empty()) { + if ((1 + queueMenuIdx) < (int)queueEntries.size() - 1) queueMenuIdx++; + } + } + + if (hDown & KEY_UP) { + if (queueMenuIdx > 0) queueMenuIdx--; + } + + if(hDown & KEY_A) { + if (QueueSystem::RequestNeeded != NO_REQUEST) { // -1 means no request. + switch(QueueSystem::RequestNeeded) { + case RMDIR_REQUEST: // Remove Directory message. + QueueSystem::RequestAnswer = Msg::promptMsg(QueueSystem::RequestMsg); + + QueueSystem::Wait = false; + QueueSystem::Resume(); + break; + + case PROMPT_REQUEST: // Skip prompt message. + QueueSystem::RequestAnswer = ScriptUtils::prompt(QueueSystem::RequestMsg); + + QueueSystem::Wait = false; + QueueSystem::Resume(); + break; + } + + } else { + ShowQueueProgress = !ShowQueueProgress; // In case no request expected, switch from progress to total progress mode etc. + } + } + + if (hDown & KEY_B) storeMode = 0; // Go to EntryInfo. + + /* Quit UU. */ + if (hDown & KEY_START && !QueueRuns) + exiting = true; +} \ No newline at end of file diff --git a/source/menu/releaseNotes.cpp b/source/menu/releaseNotes.cpp new file mode 100644 index 0000000..da13601 --- /dev/null +++ b/source/menu/releaseNotes.cpp @@ -0,0 +1,179 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "animation.hpp" +#include "common.hpp" +#include "download.hpp" +#include "storeUtils.hpp" + +std::vector wrappedNotes; + +size_t StoreUtils::FindSplitPoint(const std::string &str, const std::vector splitters) { + for (const std::string &splitter : splitters) { + size_t pos = str.rfind(splitter); + if (pos != std::string::npos) return pos; + } + + return std::string::npos; +} + +/* Process release notes into lines */ +void StoreUtils::ProcessReleaseNotes(std::string releaseNotes) { + wrappedNotes.clear(); + + size_t splitPos = 0; + do { + splitPos = releaseNotes.find('\n'); + std::string substr = releaseNotes.substr(0, splitPos); + + Gui::clearTextBufs(); + float width = Gui::GetStringWidth(0.5f, substr, font); + + /* If too long to fit on screen, wrap at spaces, slashes, periods, etc. */ + size_t spacePos; + while (width > 390.0f && (spacePos = FindSplitPoint(substr.substr(0, splitPos - 1), {" ", "/", ".", "-", "_", "。", "、", "，"})) != std::string::npos) { + splitPos = spacePos; + if (substr[splitPos] != ' ') splitPos++; + + /* Skip to next if UTF-8 multibyte char */ + while ((substr[splitPos] & 0xC0) == 0x80) splitPos++; + + substr = substr.substr(0, splitPos); + Gui::clearTextBufs(); + width = Gui::GetStringWidth(0.5f, substr, font); + } + + wrappedNotes.push_back(substr); + + if (splitPos != std::string::npos) { + if (releaseNotes[splitPos] == ' ' || releaseNotes[splitPos] == '\n') splitPos++; + releaseNotes = releaseNotes.substr(splitPos); + } + } while (splitPos != std::string::npos); +} + +void StoreUtils::DrawReleaseNotes(const int &scrollIndex, const std::unique_ptr &entry) { + if (entry && StoreUtils::store) { + Gui::ScreenDraw(Top); + Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor()); + + float fontHeight = Gui::GetStringHeight(0.5f, "", font); + for (size_t i = 0; (scrollIndex + i) < wrappedNotes.size() && i < (240.0f - 25.0f) / fontHeight; i++) { + Gui::DrawString(5, 25 + i * fontHeight, 0.5f, UIThemes->TextColor(), wrappedNotes[scrollIndex + i], 390, 0, font); + } + + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), entry->GetTitle(), 390, 0, font); + + } else { + Gui::ScreenDraw(Top); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); + Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor()); + } + + Animation::QueueEntryDone(); +} + +/* + As the name says: Release notes logic. + + int &scrollIndex: The scroll index for the Release Notes text. + int &storeMode: The store mode to properly return back. +*/ +void StoreUtils::ReleaseNotesLogic(int &scrollIndex, int &storeMode) { + int linesPerScreen = ((240.0f - 25.0f) / Gui::GetStringHeight(0.5f, "", font)); + + if (hRepeat & KEY_DOWN) scrollIndex++; + if (hRepeat & KEY_UP) scrollIndex--; + if (hRepeat & KEY_RIGHT) scrollIndex += linesPerScreen; + if (hRepeat & KEY_LEFT) scrollIndex -= linesPerScreen; + + /* Ensure it doesn't scroll off screen. */ + if (scrollIndex < 0) scrollIndex = 0; + if (scrollIndex > (int)wrappedNotes.size() - linesPerScreen) + scrollIndex = std::max(0, (int)wrappedNotes.size() - linesPerScreen); + + if (hDown & KEY_B) { + scrollIndex = 0; + storeMode = 0; + } +} + + +/* + I place it temporarely here for now. + + Display Release changelog for Universal-Updater. +*/ +void DisplayChangelog() { + if (config->changelog()) { + config->changelog(false); + + bool confirmed = false; + const std::string notes = GetChangelog(); + if (notes == "") return; + int scrollIndex = 0; + + while(!confirmed) { + Gui::clearTextBufs(); + C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C2D_TargetClear(Top, C2D_Color32(0, 0, 0, 0)); + C2D_TargetClear(Bottom, C2D_Color32(0, 0, 0, 0)); + + Gui::ScreenDraw(Top); + Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor()); + Gui::DrawString(5, 25 - scrollIndex, 0.5f, UIThemes->TextColor(), notes, 390, 0, font, C2D_WordWrap); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), "Universal-Updater", 390, 0, font); + Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 217, 0.7f, UIThemes->TextColor(), C_V, 390, 0, font); + + GFX::DrawBottom(); + Gui::Draw_Rect(0, 0, 320, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 320, 1, UIThemes->BarOutline()); + C3D_FrameEnd(0); + + hidScanInput(); + touchPosition t; + touchRead(&t); + u32 repeat = hidKeysDownRepeat(); + u32 down = hidKeysDown(); + + /* Scroll Logic. */ + if (repeat & KEY_DOWN) scrollIndex += Gui::GetStringHeight(0.5f, "", font); + + if (repeat & KEY_UP) { + if (scrollIndex > 0) scrollIndex -= Gui::GetStringHeight(0.5f, "", font); + } + + if ((down & KEY_A) || (down & KEY_B) || (down & KEY_START) || (down & KEY_TOUCH)) confirmed = true; + } + } +} \ No newline at end of file diff --git a/source/menu/screenshotMenu.cpp b/source/menu/screenshotMenu.cpp new file mode 100644 index 0000000..38e1f6a --- /dev/null +++ b/source/menu/screenshotMenu.cpp @@ -0,0 +1,164 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "animation.hpp" +#include "common.hpp" +#include "storeUtils.hpp" +#include "structs.hpp" + +extern bool touching(touchPosition touch, Structs::ButtonPos button); +extern bool checkWifiStatus(); + +/* + Draw the Screenshot menu. + + const C2D_Image &img: The C2D_Image of the screenshot. + const int sIndex: The Screenshot index. + const bool sFetch: If fetching screenshots or not. + const int screenshotSize: The screenshot amount. + const std::string &name: The name of the screenshot. + const int zoom: The zoom level, zoom out, 1x scale, or zoom in. + const bool canDisplay: If can display, or not. +*/ +void StoreUtils::DrawScreenshotMenu(const C2D_Image &img, const int sIndex, const bool sFetch, const int screenshotSize, const std::string &name, const int zoom, const bool canDisplay) { + Gui::ScreenDraw(Top); + Gui::Draw_Rect(0, 0, 400, 240, UIThemes->BGColor()); + + if (sFetch) { + Animation::QueueEntryDone(); + GFX::DrawBottom(); + Gui::DrawStringCentered(0, 2, 0.6f, UIThemes->TextColor(), Lang::get("LOADING_SCREENSHOT"), 310); + return; + } + + if (!canDisplay) { + Animation::QueueEntryDone(); + + GFX::DrawBottom(); + if (screenshotSize > 0) { // if texture is nullptr AND screenshot size is larger than 0. + Gui::DrawStringCentered(0, 2, 0.6f, UIThemes->TextColor(), Lang::get("SCREENSHOT_COULD_NOT_LOAD"), 310); + + } else { + Gui::DrawStringCentered(0, 2, 0.6f, UIThemes->TextColor(), Lang::get("NO_SCREENSHOTS_AVAILABLE"), 310); + } + + return; + } + + if (!sFetch) { // Only, if not fetch. This avoids a small flicker of the old screenshot on entries without screenshots. + if (screenshotSize > 0) { + float scale = 1.0f; + + if (zoom == 0) { + scale = std::min(1.0f, std::min(400.0f / img.subtex->width, 240.0f / img.subtex->height)); + if (img.tex) C2D_DrawImageAt(img, (400 - img.subtex->width * scale) / 2, (240 - img.subtex->height * scale) / 2, 0.5f, nullptr, scale, scale); + + } else { + // Create new C2D_Image with smaller subtex + C2D_Image top = img; + if (img.subtex->height > 240) + top.subtex = new Tex3DS_SubTexture({img.subtex->width, (u16)(img.subtex->height / 2), img.subtex->left, img.subtex->top, img.subtex->right, 1.0f - (img.subtex->height / 2 / 512.0f)}); + + // If zoom == 2, then zoom in to fit the screen + if (zoom == 2) + scale = std::min(400.0f / top.subtex->width, 240.0f / top.subtex->height); + + if (top.tex) C2D_DrawImageAt(top, (400 - top.subtex->width * scale) / 2, (240 - top.subtex->height * scale) / 2, 0.5f, nullptr, scale, scale); + + // Only delete if new + if (top.subtex->height > 240) + delete top.subtex; + } + + Animation::QueueEntryDone(); + GFX::DrawBottom(); + + /* Bottom. */ + if (zoom > 0 && img.subtex->height * scale > 240) { + C2D_Image bottom = img; + bottom.subtex = new Tex3DS_SubTexture({img.subtex->width, (u16)(img.subtex->height / 2), img.subtex->left, img.subtex->bottom + (img.subtex->height / 2 / 512.0f), img.subtex->right, img.subtex->bottom}); + if (bottom.tex) C2D_DrawImageAt(bottom, (320 - bottom.subtex->width * scale) / 2, (240 - bottom.subtex->height * scale) / 2, 0.5f, nullptr, scale, scale); + delete bottom.subtex; + + } else { + Gui::Draw_Rect(0, 215, 320, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 320, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 220, 0.5f, UIThemes->TextColor(), Lang::get("SCREENSHOT_INSTRUCTIONS"), 310, 0, font); + + char screenshots[0x100]; + snprintf(screenshots, sizeof(screenshots), Lang::get("SCREENSHOT").c_str(), sIndex + 1, screenshotSize); + Gui::DrawStringCentered(0, 2, 0.6f, UIThemes->TextColor(), screenshots, 310, 0, font); + Gui::DrawStringCentered(0, 40, 0.6f, UIThemes->TextColor(), name, 310, 0, font); + } + + } else { + Animation::QueueEntryDone(); + GFX::DrawBottom(); + Gui::DrawStringCentered(0, 2, 0.6f, UIThemes->TextColor(), Lang::get("NO_SCREENSHOTS_AVAILABLE"), 310); + } + } +} + +/* + Screenshot Menu handle. + + C2D_Image &img: The C2D_Image of the screenshot. + int &sIndex: The Screenshot index. + bool &sFetch: If fetching screenshots or not. + const int screenshotSize: The screenshot amount. + int &zoom: The zoom level, zoom out, 1x scale, or zoom in. + bool &canDisplay: If can display or not. +*/ +void StoreUtils::ScreenshotMenu(C2D_Image &img, int &sIndex, bool &sFetch, int &storeMode, const int screenshotSize, int &zoom, bool &canDisplay) { + if (hDown & KEY_B) { + canDisplay = false; + zoom = 0; + sIndex = 0; + storeMode = 0; // Go back to EntryInfo. + } + + if ((hDown & KEY_RIGHT) || (hDown & KEY_R)) { + if (checkWifiStatus()) { + if (sIndex < screenshotSize - 1) { + sIndex++; + sFetch = true; + } + } + } + + if (hDown & KEY_DOWN && zoom > 0) zoom--; + + if (hDown & KEY_UP && zoom < 2) zoom++; + + if ((hDown & KEY_LEFT) || (hDown & KEY_L)) { + if (checkWifiStatus()) { + if (sIndex > 0) { + sIndex--; + sFetch = true; + } + } + } +} \ No newline at end of file diff --git a/source/store/searchMenu.cpp b/source/menu/searchMenu.cpp similarity index 50% rename from source/store/searchMenu.cpp rename to source/menu/searchMenu.cpp index f9c2b00..5659fa4 100644 --- a/source/store/searchMenu.cpp +++ b/source/menu/searchMenu.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,27 +24,36 @@ * reasonable ways as different from the original version. */ +#include "common.hpp" #include "keyboard.hpp" #include "storeUtils.hpp" #include "structs.hpp" +extern bool exiting, QueueRuns; extern bool touching(touchPosition touch, Structs::ButtonPos button); static const std::vector SearchMenu = { - { 55, 45, 258, 30 }, // Search bar. + { 51, 41, 262, 30 }, // Search bar. /* Includes. */ - { 85, 109, 50, 10 }, - { 85, 125, 50, 10 }, - { 167, 109, 50, 10 }, - { 167, 125, 50, 10 }, + { 85, 101, 50, 10 }, + { 85, 117, 50, 10 }, + { 167, 101, 50, 10 }, + { 167, 117, 50, 10 }, /* Filters. */ - { 82, 195, 30, 30 }, - { 117, 195, 30, 30 }, - { 152, 195, 30, 30 }, - { 187, 195, 30, 30 }, - { 222, 195, 30, 30 }, - { 257, 195, 30, 30 } + { 82, 159, 30, 30 }, + { 117, 159, 30, 30 }, + { 152, 159, 30, 30 }, + { 187, 159, 30, 30 }, + { 222, 159, 30, 30 }, + { 257, 159, 30, 30 }, + + /* Send to Queue. */ + { 82, 200, 205, 25 }, + + /* AND / OR. */ + { 222, 139, 30, 13 }, + { 257, 139, 30, 13 } }; /* @@ -52,59 +61,70 @@ static const std::vector SearchMenu = { const std::vector &searchIncludes: Const Reference to the searchIncludes. const std::string &searchResult: Const Reference to the searchResult. - const int &marks: Const Reference to the filter mark flags. - const bool &updateFilter: Const Reference to the update filter. + int marks: The filter mark flags. + bool updateFilter: The update filter. + isAND: isAND for the AND / OR mode. */ -void StoreUtils::DrawSearchMenu(const std::vector &searchIncludes, const std::string &searchResult, const int &marks, const bool &updateFilter) { - Gui::Draw_Rect(48, 0, 272, 25, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 25, 272, 1, ENTRY_BAR_OUTL_COLOR); - Gui::DrawStringCentered(25, 2, 0.6, TEXT_COLOR, Lang::get("SEARCH_FILTERS"), 265); +void StoreUtils::DrawSearchMenu(const std::vector &searchIncludes, const std::string &searchResult, int marks, bool updateFilter, bool isAND) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + Gui::DrawStringCentered(21, 2, 0.6, UIThemes->TextColor(), Lang::get("SEARCH_FILTERS"), 269, 0, font); - Gui::Draw_Rect(54, 44, 260, SearchMenu[0].h + 2, SEARCH_BAR_OUTL_COLOR); - Gui::Draw_Rect(SearchMenu[0].x, SearchMenu[0].y, SearchMenu[0].w, SearchMenu[0].h, SEARCH_BAR_COLOR); + Gui::Draw_Rect(50, 40, 264, SearchMenu[0].h + 2, UIThemes->SearchBarOutline()); + Gui::Draw_Rect(SearchMenu[0].x, SearchMenu[0].y, SearchMenu[0].w, SearchMenu[0].h, UIThemes->SearchBar()); - Gui::DrawStringCentered(28, 50, 0.6, TEXT_COLOR, searchResult, 265); + Gui::DrawStringCentered(24, 46, 0.6, UIThemes->TextColor(), searchResult, 265, 0, font); /* Checkboxes. */ for (int i = 0; i < 4; i++) { GFX::DrawCheckbox(SearchMenu[i + 1].x, SearchMenu[i + 1].y, searchIncludes[i]); } - Gui::DrawString(84, 85, 0.5, TEXT_COLOR, Lang::get("INCLUDE_IN_RESULTS"), 265); + Gui::DrawString(84, 81, 0.5, UIThemes->TextColor(), Lang::get("INCLUDE_IN_RESULTS"), 265, 0, font); - Gui::DrawString(SearchMenu[1].x + 18, SearchMenu[1].y + 1, 0.4, TEXT_COLOR, Lang::get("TITLE"), 90); - Gui::DrawString(SearchMenu[2].x + 18, SearchMenu[2].y + 1, 0.4, TEXT_COLOR, Lang::get("AUTHOR"), 90); + Gui::DrawString(SearchMenu[1].x + 18, SearchMenu[1].y + 1, 0.4, UIThemes->TextColor(), Lang::get("TITLE"), 90, 0, font); + Gui::DrawString(SearchMenu[2].x + 18, SearchMenu[2].y + 1, 0.4, UIThemes->TextColor(), Lang::get("AUTHOR"), 90, 0, font); - Gui::DrawString(SearchMenu[3].x + 18, SearchMenu[3].y + 1, 0.4, TEXT_COLOR, Lang::get("CATEGORY"), 90); - Gui::DrawString(SearchMenu[4].x + 18, SearchMenu[4].y + 1, 0.4, TEXT_COLOR, Lang::get("CONSOLE"), 90); + Gui::DrawString(SearchMenu[3].x + 18, SearchMenu[3].y + 1, 0.4, UIThemes->TextColor(), Lang::get("CATEGORY"), 90, 0, font); + Gui::DrawString(SearchMenu[4].x + 18, SearchMenu[4].y + 1, 0.4, UIThemes->TextColor(), Lang::get("CONSOLE"), 90, 0, font); /* Filters. */ - Gui::DrawString(84, 175, 0.5f, TEXT_COLOR, Lang::get("FILTER_TO"), 265); + Gui::DrawString(84, SearchMenu[5].y - 20, 0.5f, UIThemes->TextColor(), Lang::get("FILTER_TO"), 265, 0, font); - Gui::Draw_Rect(SearchMenu[5].x, SearchMenu[5].y, SearchMenu[5].w, SearchMenu[5].h, (marks & favoriteMarks::STAR ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); + Gui::Draw_Rect(SearchMenu[5].x, SearchMenu[5].y, SearchMenu[5].w, SearchMenu[5].h, ((marks & favoriteMarks::STAR) ? + UIThemes->SideBarUnselected() : UIThemes->BoxInside())); - Gui::Draw_Rect(SearchMenu[6].x, SearchMenu[6].y, SearchMenu[6].w, SearchMenu[6].h, (marks & favoriteMarks::HEART ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); + Gui::Draw_Rect(SearchMenu[6].x, SearchMenu[6].y, SearchMenu[6].w, SearchMenu[6].h, ((marks & favoriteMarks::HEART) ? + UIThemes->SideBarUnselected() : UIThemes->BoxInside())); - Gui::Draw_Rect(SearchMenu[7].x, SearchMenu[7].y, SearchMenu[7].w, SearchMenu[7].h, (marks & favoriteMarks::DIAMOND ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); + Gui::Draw_Rect(SearchMenu[7].x, SearchMenu[7].y, SearchMenu[7].w, SearchMenu[7].h, ((marks & favoriteMarks::DIAMOND) ? + UIThemes->SideBarUnselected() : UIThemes->BoxInside())); - Gui::Draw_Rect(SearchMenu[8].x, SearchMenu[8].y, SearchMenu[8].w, SearchMenu[8].h, (marks & favoriteMarks::CLUBS ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); + Gui::Draw_Rect(SearchMenu[8].x, SearchMenu[8].y, SearchMenu[8].w, SearchMenu[8].h, ((marks & favoriteMarks::CLUBS) ? + UIThemes->SideBarUnselected() : UIThemes->BoxInside())); - Gui::Draw_Rect(SearchMenu[9].x, SearchMenu[9].y, SearchMenu[9].w, SearchMenu[9].h, (marks & favoriteMarks::SPADE ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); + Gui::Draw_Rect(SearchMenu[9].x, SearchMenu[9].y, SearchMenu[9].w, SearchMenu[9].h, ((marks & favoriteMarks::SPADE) ? + UIThemes->SideBarUnselected() : UIThemes->BoxInside())); Gui::Draw_Rect(SearchMenu[10].x, SearchMenu[10].y, SearchMenu[10].w, SearchMenu[10].h, (updateFilter ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); + UIThemes->SideBarUnselected() : UIThemes->BoxInside())); - Gui::DrawString(SearchMenu[5].x + 9, SearchMenu[5].y + 7, 0.5f, TEXT_COLOR, "★"); - Gui::DrawString(SearchMenu[6].x + 9, SearchMenu[6].y + 7, 0.5f, TEXT_COLOR, "♥"); - Gui::DrawString(SearchMenu[7].x + 9, SearchMenu[7].y + 7, 0.5f, TEXT_COLOR, "♦"); - Gui::DrawString(SearchMenu[8].x + 9, SearchMenu[8].y + 7, 0.5f, TEXT_COLOR, "♣"); - Gui::DrawString(SearchMenu[9].x + 9, SearchMenu[9].y + 7, 0.5f, TEXT_COLOR, "♠"); - GFX::DrawSprite(sprites_update_filter_idx, SearchMenu[10].x + 8, SearchMenu[10].y + 8); + Gui::DrawString(SearchMenu[5].x + 9, SearchMenu[5].y + 7, 0.5f, UIThemes->TextColor(), "★", 0, 0, font); + Gui::DrawString(SearchMenu[6].x + 9, SearchMenu[6].y + 7, 0.5f, UIThemes->TextColor(), "♥", 0, 0, font); + Gui::DrawString(SearchMenu[7].x + 9, SearchMenu[7].y + 7, 0.5f, UIThemes->TextColor(), "♦", 0, 0, font); + Gui::DrawString(SearchMenu[8].x + 9, SearchMenu[8].y + 7, 0.5f, UIThemes->TextColor(), "♣", 0, 0, font); + Gui::DrawString(SearchMenu[9].x + 9, SearchMenu[9].y + 7, 0.5f, UIThemes->TextColor(), "♠", 0, 0, font); + GFX::DrawIcon(sprites_update_filter_idx, SearchMenu[10].x + 8, SearchMenu[10].y + 8, UIThemes->TextColor()); + + Gui::Draw_Rect(SearchMenu[11].x, SearchMenu[11].y, SearchMenu[11].w, SearchMenu[11].h, UIThemes->MarkUnselected()); + Gui::DrawStringCentered(23, SearchMenu[11].y + 6, 0.45f, UIThemes->TextColor(), Lang::get("SELECTION_QUEUE"), 200, 0, font); + + /* AND / OR. */ + Gui::Draw_Rect(SearchMenu[12].x, SearchMenu[12].y, SearchMenu[12].w, SearchMenu[12].h, (isAND ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(SearchMenu[12].x + 4, SearchMenu[12].y, 0.4f, UIThemes->TextColor(), "AND", 0, 0, font); + + Gui::Draw_Rect(SearchMenu[13].x, SearchMenu[13].y, SearchMenu[13].w, SearchMenu[13].h, (!isAND ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(SearchMenu[13].x + 8, SearchMenu[13].y, 0.4f, UIThemes->TextColor(), "OR", 0, 0, font); } /* @@ -115,18 +135,13 @@ void StoreUtils::DrawSearchMenu(const std::vector &searchIncludes, const s - Search the UniStore. - Include stuff into the search. - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - std::unique_ptr &store: Reference to the Store class. - std::vector> &entries: Reference to the Store Entries. std::vector &searchIncludes: Reference to the searchIncludes. - std::unique_ptr &meta: Reference to the Meta class. std::string &searchResult: Reference to the searchResult. int &marks: Reference to the mark flags. bool &updateFilter: Reference to the update filter. + bool &isAND: Reference to isAND boolean for AND / OR mode. */ -void StoreUtils::SearchHandle(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, std::vector &searchIncludes, std::unique_ptr &meta, std::string &searchResult, int &marks, bool &updateFilter, bool ascending, SortType sorttype) { +void StoreUtils::SearchHandle(std::vector &searchIncludes, std::string &searchResult, int &marks, bool &updateFilter, bool ascending, SortType sorttype, bool &isAND) { /* Checkboxes. */ if (hDown & KEY_TOUCH) { bool didTouch = false; @@ -143,7 +158,7 @@ void StoreUtils::SearchHandle(u32 hDown, u32 hHeld, touchPosition touch, std::un /* Search bar. */ if (!didTouch) { if (touching(touch, SearchMenu[0])) { - if (store) { + if (StoreUtils::store) { searchResult = Input::setkbdString(20, Lang::get("ENTER_SEARCH"), {}); didTouch = true; @@ -159,33 +174,49 @@ void StoreUtils::SearchHandle(u32 hDown, u32 hHeld, touchPosition touch, std::un if (touching(touch, SearchMenu[5])) { marks = marks ^ favoriteMarks::STAR; didTouch = true; + } else if (touching(touch, SearchMenu[6])) { marks = marks ^ favoriteMarks::HEART; didTouch = true; + } else if (touching(touch, SearchMenu[7])) { marks = marks ^ favoriteMarks::DIAMOND; didTouch = true; + } else if (touching(touch, SearchMenu[8])) { marks = marks ^ favoriteMarks::CLUBS; didTouch = true; + } else if (touching(touch, SearchMenu[9])) { marks = marks ^ favoriteMarks::SPADE; didTouch = true; + } else if (touching(touch, SearchMenu[10])) { updateFilter = !updateFilter; didTouch = true; + + } else if (touching(touch, SearchMenu[11])) { + StoreUtils::AddAllToQueue(); + + } else if (touching(touch, SearchMenu[12])) { + isAND = true; + didTouch = true; + + } else if (touching(touch, SearchMenu[13])) { + isAND = false; + didTouch = true; } } if (didTouch) { - if (store && store->GetValid()) { // Only search, when valid. - StoreUtils::ResetAll(store, meta, entries); - StoreUtils::search(entries, searchResult, searchIncludes[0], searchIncludes[1], searchIncludes[2], searchIncludes[3], marks, updateFilter); - store->SetScreenIndx(0); - store->SetEntry(0); - store->SetBox(0); + if (StoreUtils::store && StoreUtils::store->GetValid()) { // Only search, when valid. + StoreUtils::ResetAll(); + StoreUtils::search(searchResult, searchIncludes[0], searchIncludes[1], searchIncludes[2], searchIncludes[3], marks, updateFilter, isAND); + StoreUtils::store->SetScreenIndx(0); + StoreUtils::store->SetEntry(0); + StoreUtils::store->SetBox(0); - StoreUtils::SortEntries(ascending, sorttype, entries); + StoreUtils::SortEntries(ascending, sorttype); } } } @@ -194,13 +225,16 @@ void StoreUtils::SearchHandle(u32 hDown, u32 hHeld, touchPosition touch, std::un if (hDown & KEY_X) { marks = 0; updateFilter = false; - for(uint i = 0; i < searchIncludes.size(); i++) - searchIncludes[i] = false; + for(uint i = 0; i < searchIncludes.size(); i++) searchIncludes[i] = false; searchResult = ""; - if (store && store->GetValid()) { - StoreUtils::ResetAll(store, meta, entries); - StoreUtils::SortEntries(ascending, sorttype, entries); + if (StoreUtils::store && StoreUtils::store->GetValid()) { + StoreUtils::ResetAll(); + StoreUtils::SortEntries(ascending, sorttype); } } + + /* Quit UU. */ + if (hDown & KEY_START && !QueueRuns) + exiting = true; } \ No newline at end of file diff --git a/source/menu/settings.cpp b/source/menu/settings.cpp new file mode 100644 index 0000000..1eeca58 --- /dev/null +++ b/source/menu/settings.cpp @@ -0,0 +1,733 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "common.hpp" +#include "init.hpp" +#include "overlay.hpp" +#include "scriptUtils.hpp" +#include "storeUtils.hpp" +#include + +extern bool exiting, QueueRuns; +extern bool touching(touchPosition touch, Structs::ButtonPos button); +static const std::vector mainButtons = { + { 45, 32, 271, 22 }, + { 45, 62, 271, 22 }, + { 45, 92, 271, 22 }, + { 45, 122, 271, 22 }, + { 45, 152, 271, 22 }, + { 45, 182, 271, 22 }, + { 45, 212, 271, 22 } +}; + +static const std::vector langButtons = { + { 45, 32, 271, 22 }, + { 45, 62, 271, 22 }, + { 45, 92, 271, 22 }, + { 45, 122, 271, 22 }, + { 45, 152, 271, 22 }, + { 45, 182, 271, 22 }, + + { 45, 220, 16, 16 } // Add Font. +}; + +static const std::vector toggleAbles = { + { 288, 44, 24, 24 }, + { 288, 110, 24, 24 }, + { 288, 180, 24, 24 } +}; + +static const std::vector dirButtons = { + { 41, 34, 280, 24 }, + { 41, 64, 280, 24 }, + { 41, 120, 280, 24 }, + { 41, 150, 280, 24 }, + { 41, 180, 280, 24 }, + { 41, 210, 280, 24 } +}; + +static const std::vector dirIcons = { + { 288, 34, 24, 24 }, + { 288, 64, 24, 24 }, + { 288, 120, 24, 24 }, + { 288, 150, 24, 24 }, + { 288, 180, 24, 24 }, + { 288, 210, 24, 24 } +}; + +static const Structs::ButtonPos back = { 45, 0, 24, 24 }; // Back arrow for directory. +static const Structs::ButtonPos Theme = { 40, 196, 280, 24 }; // Themes. + + +static const std::vector mainStrings = { "LANGUAGE", "SELECT_UNISTORE", "AUTO_UPDATE_SETTINGS_BTN", "GUI_SETTINGS_BTN", "DIRECTORY_SETTINGS_BTN", "CREDITS_BTN", "EXIT_APP" }; +static const std::vector dirStrings = { "CHANGE_3DSX_PATH", "3DSX_IN_FOLDER", "CHANGE_NDS_PATH", "CHANGE_ARCHIVE_PATH", "CHANGE_SHORTCUT_PATH", "CHANGE_FIRM_PATH" }; +extern std::vector> Themes; + +/* Note: Украïнська is spelled using a latin i with dieresis to work in the system font */ +static const std::vector languages = { "Bruh", "Dansk", "Deutsch", "English", "Español", "Français", "Italiano", /* "Lietuvių", */ "Magyar", "Nederlands", "Norsk", "Polski", "Português (Portugal)", "Português (Brasil)", "Română", "Türkçe", "Русский", "Украïнська", /* "עברית", */ "中文 (简体)", "中文 (繁體)", "日本語", "琉球諸語", "한국어" }; +static const std::string langsTemp[] = { "br", "da", "de", "en", "es", "fr", "it", /* "lt", */ "hu", "nl", "no", "pl", "pt", "pt-BR", "ro", "tr", "ru", "uk", /* "he", */ "zh-CN", "zh-TW", "jp", "ry", "ko" }; +static const std::pair langSprites[] = { {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, /* {-1, 0}, */ {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, /* {-1, 0}, */ {sprites_zh_CN_idx, 54}, {sprites_zh_TW_idx, 55}, {sprites_jp_idx, 31}, {sprites_ry_idx, 42}, {sprites_ko_idx, 30} }; + +/* + Main Settings. + + int selection: The Settings Selection. +*/ +static void DrawSettingsMain(int selection) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + Gui::DrawStringCentered(20, 2, 0.6, UIThemes->TextColor(), Lang::get("SETTINGS"), 280, 0, font); + + for (int i = 0; i < 7; i++) { + if (i == selection) Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, UIThemes->MarkSelected()); + Gui::DrawStringCentered(20, mainButtons[i].y + 4, 0.45f, UIThemes->TextColor(), Lang::get(mainStrings[i]), 255, 0, font); + } +} + +/* + Draw the Language Selection. + + int selection: The Language Selection. + int sPos: The Screen Position. +*/ +static void DrawLanguageSettings(int selection, int sPos) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + GFX::DrawIcon(sprites_arrow_idx, back.x, back.y, UIThemes->TextColor()); + GFX::DrawIcon(sprites_add_font_idx, langButtons[6].x, langButtons[6].y, UIThemes->TextColor()); + Gui::DrawStringCentered(20, 2, 0.6, UIThemes->TextColor(), Lang::get("SELECT_LANG"), 248, 0, font); + + for(int i = 0; i < 6 && i < (int)languages.size(); i++) { + if (sPos + i == selection) Gui::Draw_Rect(langButtons[i].x, langButtons[i].y, langButtons[i].w, langButtons[i].h, UIThemes->MarkSelected()); + if(langSprites[sPos + i].first != -1) + GFX::DrawIcon(langSprites[sPos + i].first, 160 + 20 - (langSprites[sPos + i].second / 2), langButtons[i].y + 6, UIThemes->TextColor()); + else + Gui::DrawStringCentered(20, langButtons[i].y + 4, 0.45f, UIThemes->TextColor(), languages[sPos + i], 280, 0, font); + } +} + +/* + Directory Change Draw. + + int selection: The Settings Selection. +*/ +static void DrawSettingsDir(int selection) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + GFX::DrawIcon(sprites_arrow_idx, back.x, back.y, UIThemes->TextColor(), 1.0f); + Gui::DrawStringCentered(20, 2, 0.6, UIThemes->TextColor(), Lang::get("DIRECTORY_SETTINGS"), 248, 0, font); + + for (int i = 0; i < (int)dirButtons.size(); i++) { + Gui::Draw_Rect(dirButtons[i].x, dirButtons[i].y, dirButtons[i].w, dirButtons[i].h, (selection == i ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(dirButtons[i].x + 4, dirButtons[i].y + 4, 0.5f, UIThemes->TextColor(), Lang::get(dirStrings[i]), 210, 0, font); + if(i == 1) { // Put 3DSX in folder has a toggle and description + GFX::DrawToggle(dirIcons[i].x, dirIcons[i].y, config->_3dsxInFolder()); + Gui::DrawString(dirButtons[i].x + 4, dirButtons[i].y + 28, 0.4f, UIThemes->TextColor(), Lang::get("3DSX_IN_FOLDER_DESC"), 265, 0, font, C2D_WordWrap); + } else { + GFX::DrawIcon(sprites_arrow_idx, dirIcons[i].x, dirIcons[i].y, UIThemes->TextColor(), 1.0f, -1.0f); + } + } +} + +/* + Draw Auto-Update Settings page. +*/ +static void DrawAutoUpdate(int selection) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + GFX::DrawIcon(sprites_arrow_idx, back.x, back.y, UIThemes->TextColor()); + + Gui::DrawStringCentered(20, 2, 0.6, UIThemes->TextColor(), Lang::get("AUTO_UPDATE_SETTINGS"), 240, 0, font); + + /* Toggle Boxes. */ + Gui::Draw_Rect(40, 44, 280, 24, (selection == 0 ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(47, 48, 0.5f, UIThemes->TextColor(), Lang::get("AUTO_UPDATE_UNISTORE"), 210, 0, font); + GFX::DrawToggle(toggleAbles[0].x, toggleAbles[0].y, config->autoupdate()); + Gui::DrawString(47, 75, 0.4f, UIThemes->TextColor(), Lang::get("AUTO_UPDATE_UNISTORE_DESC"), 265, 0, font, C2D_WordWrap); + + Gui::Draw_Rect(40, 110, 280, 24, (selection == 1 ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(47, 114, 0.5f, UIThemes->TextColor(), Lang::get("AUTO_UPDATE_UU"), 210, 0, font); + GFX::DrawToggle(toggleAbles[1].x, toggleAbles[1].y, config->updatecheck()); + Gui::DrawString(47, 141, 0.4f, UIThemes->TextColor(), Lang::get("AUTO_UPDATE_UU_DESC"), 265, 0, font, C2D_WordWrap); + + Gui::Draw_Rect(40, 180, 280, 24, (selection == 2 ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(47, 184, 0.5f, UIThemes->TextColor(), Lang::get("AUTO_UPDATE_NIGHTLY"), 210, 0, font); + GFX::DrawToggle(toggleAbles[2].x, toggleAbles[2].y, config->updatenightly()); + Gui::DrawString(47, 211, 0.4f, UIThemes->TextColor(), Lang::get("AUTO_UPDATE_NIGHTLY_DESC"), 265, 0, font, C2D_WordWrap); +} + +/* + Draw the GUI Settings. + + int selection: The Settings Selection. +*/ +static void DrawGUISettings(int selection) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + GFX::DrawIcon(sprites_arrow_idx, back.x, back.y, UIThemes->TextColor()); + + Gui::DrawStringCentered(20, 2, 0.6, UIThemes->TextColor(), Lang::get("GUI_SETTINGS"), 248, 0, font); + + Gui::Draw_Rect(40, 44, 280, 24, (selection == 0 ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(47, 48, 0.5f, UIThemes->TextColor(), Lang::get("UNISTORE_BG"), 210, 0, font); + GFX::DrawToggle(toggleAbles[0].x, toggleAbles[0].y, config->usebg()); + Gui::DrawString(47, 75, 0.4f, UIThemes->TextColor(), Lang::get("UNISTORE_BG_DESC"), 265, 0, font, C2D_WordWrap); + + Gui::Draw_Rect(40, 120, 280, 24, (selection == 1 ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(47, 124, 0.5f, UIThemes->TextColor(), Lang::get("CUSTOM_FONT"), 210, 0, font); + GFX::DrawToggle(toggleAbles[1].x, toggleAbles[1].y, config->customfont()); + Gui::DrawString(47, 151, 0.4f, UIThemes->TextColor(), Lang::get("CUSTOM_FONT_DESC"), 265, 0, font, C2D_WordWrap); + + if (!Themes.empty()) { + Gui::Draw_Rect(40, 196, 280, 24, (selection == 2 ? UIThemes->MarkSelected() : UIThemes->MarkUnselected())); + Gui::DrawString(47, 200, 0.5f, UIThemes->TextColor(), Lang::get("ACTIVE_THEME") + ": " + config->theme(), 270, 0, font); + } +} + + +/* + Settings Main Handle. + Here you can.. + + - Change the Language. + - Access the UniStore Manage Handle. + - Enable UniStore auto update on boot. + - Show the Credits. + - Exit Universal-Updater. + + int &page: Reference to the page. + bool &dspSettings: Reference to the display Settings. + int &storeMode: Reference to the store Mode. + int &selection: Reference to the Selection. +*/ +static void SettingsHandleMain(int &page, bool &dspSettings, int &storeMode, int &selection) { + if (hDown & KEY_B) { + selection = 0; + storeMode = 0; + } + + if (hRepeat & KEY_DOWN) { + if (selection < 6) selection++; + else selection = 0; + } + + if (hRepeat & KEY_UP) { + if (selection > 0) selection--; + else selection = mainStrings.size() - 1; + } + + if (hRepeat & KEY_RIGHT) { + if (selection + 8 < (int)mainStrings.size()) selection += 8; + else selection = mainStrings.size() - 1; + } + + if (hRepeat & KEY_LEFT) { + if (selection - 8 > 0) selection -= 8; + else selection = 0; + } + + if (hDown & KEY_TOUCH) { + if (touching(touch, mainButtons[0])) { + selection = 0; + page = 4; + + } else if (touching(touch, mainButtons[1])) { + if (QueueRuns) { + if (Msg::promptMsg(Lang::get("FEATURE_SIDE_EFFECTS"))) Overlays::SelectStore(); + + } else { + Overlays::SelectStore(); + } + + } else if (touching(touch, mainButtons[2])) { + selection = 0; + page = 2; + + } else if (touching(touch, mainButtons[3])) { + selection = 0; + page = 3; + + } else if (touching(touch, mainButtons[4])) { + selection = 0; + page = 1; + + } else if (touching(touch, mainButtons[5])) { + Overlays::ShowCredits(); + + } else if (touching(touch, mainButtons[6])) { + if (!QueueRuns) exiting = true; + } + } + + if (hDown & KEY_A) { + switch(selection) { + case 0: + selection = 0; + page = 4; + break; + + case 1: + if (QueueRuns) { + if (Msg::promptMsg(Lang::get("FEATURE_SIDE_EFFECTS"))) Overlays::SelectStore(); + + } else { + Overlays::SelectStore(); + } + break; + + case 2: + selection = 0; + page = 2; + break; + + case 3: + selection = 0; + page = 3; + break; + + case 4: + selection = 0; + page = 1; + break; + + case 5: + Overlays::ShowCredits(); + break; + + case 6: + if (!QueueRuns) exiting = true; + break; + } + } + + /* Quit UU. */ + if (hDown & KEY_START && !QueueRuns) + exiting = true; +} + +/* + Directory Handle. + Here you can.. + + - Change the Directory of... + - 3DSX, NDS & Archives. + + int &page: Reference to the page. + int &selection: Reference to the Selection. +*/ +static void SettingsHandleDir(int &page, int &selection) { + if (hDown & KEY_B) { + page = 0; + selection = 4; + } + + if (hRepeat & KEY_DOWN) { + if (selection < (int)dirStrings.size() - 1) selection++; + else selection = 0; + } + + if (hRepeat & KEY_UP) { + if (selection > 0) selection--; + else selection = dirStrings.size() - 1; + } + + if (hRepeat & KEY_RIGHT) { + if (selection + 8 < (int)dirStrings.size() - 1) selection += 8; + else selection = dirStrings.size() - 1; + } + + if (hRepeat & KEY_LEFT) { + if (selection - 8 > 0) selection -= 8; + else selection = 0; + } + + if (hDown & KEY_TOUCH) { + if (touching(touch, back)) { + page = 0; + selection = 4; + + } else if (touching(touch, dirButtons[0])) { + const std::string path = Overlays::SelectDir(config->_3dsxPath(), Lang::get("SELECT_DIR")); + if (path != "") config->_3dsxPath(path); + + } else if (touching(touch, dirButtons[1])) { + config->_3dsxInFolder(!config->_3dsxInFolder()); + + } else if (touching(touch, dirButtons[2])) { + const std::string path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR")); + if (path != "") config->ndsPath(path); + + } else if (touching(touch, dirButtons[3])) { + const std::string path = Overlays::SelectDir(config->archPath(), Lang::get("SELECT_DIR")); + if (path != "") config->archPath(path); + + } else if (touching(touch, dirButtons[4])) { + const std::string path = Overlays::SelectDir(config->shortcut(), Lang::get("SELECT_DIR")); + if (path != "") config->shortcut(path); + + } else if (touching(touch, dirButtons[5])) { + const std::string path = Overlays::SelectDir(config->firmPath(), Lang::get("SELECT_DIR")); + if (path != "") config->firmPath(path); + } + } + + if (hDown & KEY_A) { + std::string path = ""; + + switch(selection) { + case 0: + path = Overlays::SelectDir(config->_3dsxPath(), Lang::get("SELECT_DIR")); + if (path != "") config->_3dsxPath(path); + break; + + case 1: + config->_3dsxInFolder(!config->_3dsxInFolder()); + break; + + case 2: + path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR")); + if (path != "") config->ndsPath(path); + break; + + case 3: + path = Overlays::SelectDir(config->archPath(), Lang::get("SELECT_DIR")); + if (path != "") config->archPath(path); + break; + + case 4: + path = Overlays::SelectDir(config->shortcut(), Lang::get("SELECT_DIR")); + if (path != "") config->shortcut(path); + break; + + case 5: + path = Overlays::SelectDir(config->firmPath(), Lang::get("SELECT_DIR")); + if (path != "") config->firmPath(path); + break; + } + } +} + +/* + Logic of the Auto-Update Settings. + + Here you can.. + + - Enable / Disable Automatically updating the UniStore on boot. + - Enable / Disable Automatically check for Universal-Updater updates on boot. + + int &page: Reference to the page. + int &selection: Reference to the Selection. +*/ +static void AutoUpdateLogic(int &page, int &selection) { + if (hDown & KEY_B) { + page = 0; + selection = 2; + } + + if (hRepeat & KEY_DOWN) { + if (selection < 2) selection++; + } + + if (hRepeat & KEY_UP) { + if (selection > 0) selection--; + } + + if (hDown & KEY_TOUCH) { + if (touching(touch, back)) { + page = 0; + selection = 2; + + } else if (touching(touch, toggleAbles[0])) { + config->autoupdate(!config->autoupdate()); + + } else if (touching(touch, toggleAbles[1])) { + config->updatecheck(!config->updatecheck()); + + } else if (touching(touch, toggleAbles[2])) { + config->updatenightly(!config->updatenightly()); + } + } + + if (hDown & KEY_A) { + switch(selection) { + case 0: + config->autoupdate(!config->autoupdate()); + break; + + case 1: + config->updatecheck(!config->updatecheck()); + break; + + case 2: + config->updatenightly(!config->updatenightly()); + break; + } + } +} + +/* + Logic of the GUI Settings. + + Here you can.. + + - Enable / Disable using the SpriteSheet Background Image, if exist. + + int &page: Reference to the page. + int &selection: Reference to the Selection. +*/ +static void GUISettingsLogic(int &page, int &selection) { + if (hDown & KEY_B) { + page = 0; + selection = 3; + } + + if (hRepeat & KEY_DOWN) { + if (selection < (Themes.empty() ? 1 : 2)) selection++; + } + + if (hRepeat & KEY_UP) { + if (selection > 0) selection--; + } + + if (hDown & KEY_TOUCH) { + if (touching(touch, back)) { + page = 0; + selection = 3; + + } else if (touching(touch, toggleAbles[0])) { + config->usebg(!config->usebg()); + + } else if (touching(touch, toggleAbles[1])) { + config->customfont(!config->customfont()); + + (config->customfont() ? Init::LoadFont() : Init::UnloadFont()); + + } else if (touching(touch, Theme)) { + if (!Themes.empty()) Overlays::SelectTheme(); + } + } + + if (hDown & KEY_A) { + switch(selection) { + case 0: + config->usebg(!config->usebg()); + break; + + case 1: + config->customfont(!config->customfont()); + + (config->customfont() ? Init::LoadFont() : Init::UnloadFont()); + break; + + case 2: + if (!Themes.empty()) Overlays::SelectTheme(); + break; + } + } +} + +/* + Logic of the Language Settings. + + Here you can.. + + - Select the language, which should be used with the app. + + int &page: Reference to the page. + int &selection: Reference to the Selection. + int &sPos: Reference to the ScreenPos variable. +*/ +static void LanguageLogic(int &page, int &selection, int &sPos) { + if (hRepeat & KEY_DOWN) { + if (selection < (int)languages.size() - 1) selection++; + else selection = 0; + } + + if (hRepeat & KEY_UP) { + if (selection > 0) selection--; + else selection = languages.size() - 1; + } + + if (hRepeat & KEY_RIGHT) { + if (selection + 6 < (int)languages.size() - 1) selection += 6; + else selection = languages.size() - 1; + } + + if (hRepeat & KEY_LEFT) { + if (selection - 6 > 0) selection -= 6; + else selection = 0; + } + + if ((hDown & KEY_B) || (hDown & KEY_TOUCH && touching(touch, back))) { + selection = 0; + sPos = 0; + page = 0; + } + + if (hDown & KEY_A) { + const std::string l = langsTemp[selection]; + + /* Check if language needs a custom font. */ + if (l == "uk") { + if (access("sdmc:/3ds/Universal-Updater/font.bcfnt", F_OK) != 0) { + ScriptUtils::downloadFile("https://github.com/Universal-Team/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/Universal-Updater/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true); + Init::UnloadFont(); + } + + config->customfont(true); + Init::LoadFont(); + } else if(!config->customfont()) { + CFG_Region region = CFG_REGION_USA; + if(l == "zh-CN") { + region = CFG_REGION_CHN; + } else if(l == "zh-TW") { + region = CFG_REGION_TWN; + } else if(l == "ko") { + region = CFG_REGION_KOR; + } + Gui::loadSystemFont(region); + } + + config->language(l); + Lang::load(config->language()); + selection = 0; + sPos = 0; + page = 0; + } + + if (hDown & KEY_TOUCH) { + for (int i = 0; i < 6; i++) { + if (touching(touch, mainButtons[i])) { + if (i + sPos < (int)languages.size()) { + const std::string l = langsTemp[i + sPos]; + + /* Check if language needs a custom font. */ + if (l == "uk") { + if (access("sdmc:/3ds/Universal-Updater/font.bcfnt", F_OK) != 0) { + ScriptUtils::downloadFile("https://github.com/Universal-Team/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/Universal-Updater/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true); + Init::UnloadFont(); + } + + config->customfont(true); + Init::LoadFont(); + } else if(!config->customfont()) { + CFG_Region region = CFG_REGION_USA; + if(l == "zh-CN") { + region = CFG_REGION_CHN; + } else if(l == "zh-TW") { + region = CFG_REGION_TWN; + } else if(l == "ko") { + region = CFG_REGION_KOR; + } + Gui::loadSystemFont(region); + } + + config->language(l); + Lang::load(config->language()); + selection = 0; + sPos = 0; + page = 0; + } + + break; + } + } + + if (touching(touch, langButtons[6])) { + /* Download Font. */ + ScriptUtils::downloadFile("https://github.com/Universal-Team/extras/raw/master/files/universal-updater.bcfnt", "sdmc:/3ds/Universal-Updater/font.bcfnt", Lang::get("DOWNLOADING_COMPATIBLE_FONT"), true); + config->customfont(true); + Init::UnloadFont(); + Init::LoadFont(); + } + } + + if (selection < sPos) sPos = selection; + else if (selection > sPos + 6 - 1) sPos = selection - 6 + 1; +} + +/* + Draw the Settings. + + int page: The page. + int selection: The selection. +*/ +void StoreUtils::DrawSettings(int page, int selection, int sPos) { + switch(page) { + case 0: + DrawSettingsMain(selection); + break; + + case 1: + DrawSettingsDir(selection); + break; + + case 2: + DrawAutoUpdate(selection); + break; + + case 3: + DrawGUISettings(selection); + break; + + case 4: + DrawLanguageSettings(selection, sPos); + break; + } +} + +/* + Settings Handle. + + int &page: Reference to the page. + bool &dspSettings: Reference to the display Settings. + int &storeMode: Reference to the store Mode. + int &selection: Reference to the Selection. + int &sPos: Reference to screen position. +*/ +void StoreUtils::SettingsHandle(int &page, bool &dspSettings, int &storeMode, int &selection, int &sPos) { + switch(page) { + case 0: + SettingsHandleMain(page, dspSettings, storeMode, selection); + break; + + case 1: + SettingsHandleDir(page, selection); + break; + + case 2: + AutoUpdateLogic(page, selection); + break; + + case 3: + GUISettingsLogic(page, selection); + break; + + case 4: + LanguageLogic(page, selection, sPos); + break; + } +} \ No newline at end of file diff --git a/source/store/sideMenu.cpp b/source/menu/sideMenu.cpp similarity index 64% rename from source/store/sideMenu.cpp rename to source/menu/sideMenu.cpp index dcdb7d8..759ef2e 100644 --- a/source/store/sideMenu.cpp +++ b/source/menu/sideMenu.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,40 +24,44 @@ * reasonable ways as different from the original version. */ +#include "animation.hpp" +#include "common.hpp" #include "storeUtils.hpp" #include "structs.hpp" extern bool touching(touchPosition touch, Structs::ButtonPos button); static const std::vector sidePos = { - { 0, 0, 48, 48 }, - { 0, 48, 48, 48 }, - { 0, 96, 48, 48 }, - { 0, 144, 48, 48 }, - { 0, 192, 48, 48 } + { 0, 0, 40, 40 }, + { 0, 40, 40, 40 }, + { 0, 80, 40, 40 }, + { 0, 120, 40, 40 }, + { 0, 160, 40, 40 }, + { 0, 200, 40, 40 } }; /* Draw the Side Menu part. - const int ¤tMenu: Const Reference to the current Store Mode / Menu. + int currentMenu: The current store Mode / Menu. */ -void StoreUtils::DrawSideMenu(const int ¤tMenu) { - for (int i = 0; i < 5; i++) { +void StoreUtils::DrawSideMenu(int currentMenu) { + for (int i = 0; i < 6; i++) { if (i == currentMenu) { - Gui::Draw_Rect(sidePos[i].x, sidePos[i].y, sidePos[i].w, sidePos[i].h, SIDEBAR_SELECTED_COLOR); + Gui::Draw_Rect(sidePos[i].x, sidePos[i].y, sidePos[i].w, sidePos[i].h, UIThemes->SideBarSelected()); } else { - Gui::Draw_Rect(sidePos[i].x, sidePos[i].y, sidePos[i].w, sidePos[i].h, SIDEBAR_UNSELECTED_COLOR); + Gui::Draw_Rect(sidePos[i].x, sidePos[i].y, sidePos[i].w, sidePos[i].h, UIThemes->SideBarUnselected()); } } - GFX::DrawSprite(sprites_info_idx, sidePos[0].x + 4, sidePos[0].y + 4); - GFX::DrawSprite(sprites_download_idx, sidePos[1].x + 4, sidePos[1].y + 4); - GFX::DrawSprite(sprites_search_idx, sidePos[2].x + 4, sidePos[2].y + 4); - GFX::DrawSprite(sprites_sort_idx, sidePos[3].x + 4, sidePos[3].y + 4); - GFX::DrawSprite(sprites_settings_idx, sidePos[4].x + 4, sidePos[4].y + 4); + GFX::DrawIcon(sprites_info_idx, sidePos[0].x, sidePos[0].y); + GFX::DrawIcon(sprites_download_idx, sidePos[1].x, sidePos[1].y); + Animation::DrawQueue(sidePos[2].x, sidePos[2].y); + GFX::DrawIcon(sprites_search_idx, sidePos[3].x, sidePos[3].y); + GFX::DrawIcon(sprites_sort_idx, sidePos[4].x, sidePos[4].y); + GFX::DrawIcon(sprites_settings_idx, sidePos[5].x, sidePos[5].y); - Gui::Draw_Rect(48, 0, 1, 240, BAR_OUTL_COLOR); + Gui::Draw_Rect(40, 0, 1, 240, UIThemes->BarOutline()); } /* @@ -66,15 +70,17 @@ void StoreUtils::DrawSideMenu(const int ¤tMenu) { - Switch between the Menus through the sidebar. - u32 hDown: The hidKeysDown() variable. - touchPosition touch: The TouchPosition variable. - int ¤tMenu: Reference to the Store Mode / Menu. + int ¤tMenu: Reference to the store Mode / Menu. bool &fetch: Reference of the download fetch variable.. so we know, if we need to fetch the download entries. + int &lastMenu: Reference to the last menu. */ -void StoreUtils::SideMenuHandle(u32 hDown, touchPosition touch, int ¤tMenu, bool &fetch) { +void StoreUtils::SideMenuHandle(int ¤tMenu, bool &fetch, int &lastMenu) { + Animation::QueueAnimHandle(); + if (hDown & KEY_TOUCH) { - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 6; i++) { if (touching(touch, sidePos[i])) { + lastMenu = currentMenu; if (i == 1) fetch = true; // Fetch download list, if 1. currentMenu = i; break; @@ -83,7 +89,8 @@ void StoreUtils::SideMenuHandle(u32 hDown, touchPosition touch, int ¤tMenu } if (hRepeat & KEY_R) { - if (currentMenu < 4) { + if (currentMenu < 5) { + lastMenu = currentMenu; if (currentMenu + 1 == 1) fetch = true; // Fetch download list, if 1. currentMenu++; } @@ -91,6 +98,7 @@ void StoreUtils::SideMenuHandle(u32 hDown, touchPosition touch, int ¤tMenu if (hRepeat & KEY_L) { if (currentMenu > 0) { + lastMenu = currentMenu; if (currentMenu - 1 == 1) fetch = true; // Fetch download list, if 1. currentMenu--; } diff --git a/source/store/sortMenu.cpp b/source/menu/sortMenu.cpp similarity index 50% rename from source/store/sortMenu.cpp rename to source/menu/sortMenu.cpp index 871e482..b6978f0 100644 --- a/source/store/sortMenu.cpp +++ b/source/menu/sortMenu.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,34 +24,36 @@ * reasonable ways as different from the original version. */ +#include "common.hpp" #include "keyboard.hpp" #include "storeUtils.hpp" #include "structs.hpp" +extern bool exiting, QueueRuns; extern bool touching(touchPosition touch, Structs::ButtonPos button); static const std::vector buttons = { - { 75, 60, 100, 16 }, - { 75, 80, 100, 16 }, - { 75, 100, 100, 16 }, + { 71, 60, 104, 16 }, + { 71, 80, 104, 16 }, + { 71, 100, 104, 16 }, - { 205, 60, 100, 16 }, - { 205, 80, 100, 16 }, + { 201, 60, 104, 16 }, + { 201, 80, 104, 16 }, - { 75, 170, 100, 16 }, - { 75, 190, 100, 16 } + { 71, 170, 104, 16 }, + { 71, 190, 104, 16 } }; static void DrawCheck(int pos, bool v) { - GFX::DrawSprite((v ? sprites_sort_checked_idx : sprites_sort_unchecked_idx), buttons[pos].x + 5, buttons[pos].y); + GFX::DrawIcon((v ? sprites_sort_checked_idx : sprites_sort_unchecked_idx), buttons[pos].x + 1, buttons[pos].y, UIThemes->TextColor()); } /* Return SortType as an uint8_t. - const SortType &st: Const Reference to the SortType variable. + SortType st: The SortType variable. */ -static const uint8_t GetType(const SortType &st) { +static const uint8_t GetType(SortType st) { switch(st) { case SortType::TITLE: return 0; @@ -69,97 +71,96 @@ static const uint8_t GetType(const SortType &st) { /* Draw the Sort Menu. - const bool &asc: Const Reference to the Ascending variable. - const SortType &st: Const Reference to the SortType variable. + bool asc: The Ascending variable. + SortType st: The SortType variable. */ -void StoreUtils::DrawSorting(const bool &asc, const SortType &st) { - Gui::Draw_Rect(48, 0, 272, 25, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 25, 272, 1, ENTRY_BAR_OUTL_COLOR); - Gui::DrawStringCentered(25, 2, 0.6, TEXT_COLOR, Lang::get("SORTING"), 265); +void StoreUtils::DrawSorting(bool asc, SortType st) { + Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); + Gui::DrawStringCentered(17, 2, 0.6, UIThemes->TextColor(), Lang::get("SORTING"), 273, 0, font); /* Sort By. */ - Gui::DrawString(buttons[0].x + 5, buttons[0].y - 20, 0.6f, TEXT_COLOR, Lang::get("SORT_BY"), 90); + Gui::DrawString(buttons[0].x + 1, buttons[0].y - 20, 0.6f, UIThemes->TextColor(), Lang::get("SORT_BY"), 90, 0, font); for (int i = 0; i < 3; i++) { DrawCheck(i, i == GetType(st)); } - Gui::DrawString(buttons[0].x + 25, buttons[0].y + 2, 0.4f, TEXT_COLOR, Lang::get("TITLE"), 80); - Gui::DrawString(buttons[1].x + 25, buttons[1].y + 2, 0.4f, TEXT_COLOR, Lang::get("AUTHOR"), 80); - Gui::DrawString(buttons[2].x + 25, buttons[2].y + 2, 0.4f, TEXT_COLOR, Lang::get("LAST_UPDATED"), 80); + Gui::DrawString(buttons[0].x + 21, buttons[0].y + 2, 0.4f, UIThemes->TextColor(), Lang::get("TITLE"), 80, 0, font); + Gui::DrawString(buttons[1].x + 21, buttons[1].y + 2, 0.4f, UIThemes->TextColor(), Lang::get("AUTHOR"), 80, 0, font); + Gui::DrawString(buttons[2].x + 21, buttons[2].y + 2, 0.4f, UIThemes->TextColor(), Lang::get("LAST_UPDATED"), 80, 0, font); /* Direction. */ - Gui::DrawString(buttons[3].x + 5, buttons[3].y - 20, 0.6f, TEXT_COLOR, Lang::get("DIRECTION"), 80); + Gui::DrawString(buttons[3].x + 1, buttons[3].y - 20, 0.6f, UIThemes->TextColor(), Lang::get("DIRECTION"), 80, 0, font); DrawCheck(3, asc); DrawCheck(4, !asc); - Gui::DrawString(buttons[3].x + 25, buttons[3].y + 2, 0.4f, TEXT_COLOR, Lang::get("ASCENDING"), 80); - Gui::DrawString(buttons[4].x + 25, buttons[4].y + 2, 0.4f, TEXT_COLOR, Lang::get("DESCENDING"), 80); + Gui::DrawString(buttons[3].x + 21, buttons[3].y + 2, 0.4f, UIThemes->TextColor(), Lang::get("ASCENDING"), 80, 0, font); + Gui::DrawString(buttons[4].x + 21, buttons[4].y + 2, 0.4f, UIThemes->TextColor(), Lang::get("DESCENDING"), 80, 0, font); /* Top Style. */ - Gui::DrawString(buttons[5].x + 5, buttons[5].y - 20, 0.6f, TEXT_COLOR, Lang::get("TOP_STYLE"), 90); + Gui::DrawString(buttons[5].x + 1, buttons[5].y - 20, 0.6f, UIThemes->TextColor(), Lang::get("TOP_STYLE"), 90, 0, font); DrawCheck(5, config->list()); DrawCheck(6, !config->list()); - Gui::DrawString(buttons[5].x + 25, buttons[5].y + 2, 0.4f, TEXT_COLOR, Lang::get("LIST"), 90); - Gui::DrawString(buttons[6].x + 25, buttons[6].y + 2, 0.4f, TEXT_COLOR, Lang::get("GRID"), 90); + Gui::DrawString(buttons[5].x + 21, buttons[5].y + 2, 0.4f, UIThemes->TextColor(), Lang::get("LIST"), 90, 0, font); + Gui::DrawString(buttons[6].x + 21, buttons[6].y + 2, 0.4f, UIThemes->TextColor(), Lang::get("GRID"), 90, 0, font); } /* Sort Handle. Here you can.. - - Sort your Entries to.. + - Sort your entries to.. - Title (Ascending / Descending). - Author (Ascending / Descending). - Last Updated Date (Ascending / Descending). - Change the Top Style. - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - std::unique_ptr &store: Reference to the Store class. - std::vector> &entries: Reference to the StoreEntries. bool &asc: Reference to the Ascending variable. SortType &st: Reference to the SortType. */ -void StoreUtils::SortHandle(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, bool &asc, SortType &st) { - if (store && store->GetValid() && entries.size() > 0) { // Ensure, this is valid and more than 0 entries exist. +void StoreUtils::SortHandle(bool &asc, SortType &st) { + if (StoreUtils::store && StoreUtils::store->GetValid() && StoreUtils::entries.size() > 0) { // Ensure, this is valid and more than 0 StoreUtils::entries exist. if (hDown & KEY_TOUCH) { /* SortType Part. */ if (touching(touch, buttons[0])) { st = SortType::TITLE; - StoreUtils::SortEntries(asc, st, entries); + StoreUtils::SortEntries(asc, st); } else if (touching(touch, buttons[1])) { st = SortType::AUTHOR; - StoreUtils::SortEntries(asc, st, entries); + StoreUtils::SortEntries(asc, st); } else if (touching(touch, buttons[2])) { st = SortType::LAST_UPDATED; - StoreUtils::SortEntries(asc, st, entries); + StoreUtils::SortEntries(asc, st); /* Ascending | Descending Part. */ } else if (touching(touch, buttons[3])) { asc = true; - StoreUtils::SortEntries(asc, st, entries); + StoreUtils::SortEntries(asc, st); } else if (touching(touch, buttons[4])) { asc = false; - StoreUtils::SortEntries(asc, st, entries); + StoreUtils::SortEntries(asc, st); } else if (touching(touch, buttons[5])) { if (config->list()) return; config->list(true); - store->SetEntry(0); - store->SetScreenIndx(0); - store->SetBox(0); + StoreUtils::store->SetEntry(0); + StoreUtils::store->SetScreenIndx(0); + StoreUtils::store->SetBox(0); } else if (touching(touch, buttons[6])) { if (!config->list()) return; config->list(false); - store->SetEntry(0); - store->SetScreenIndx(0); - store->SetBox(0); + StoreUtils::store->SetEntry(0); + StoreUtils::store->SetScreenIndx(0); + StoreUtils::store->SetBox(0); } } } + + /* Quit UU. */ + if (hDown & KEY_START && !QueueRuns) + exiting = true; } \ No newline at end of file diff --git a/source/overlays/credits.cpp b/source/overlays/credits.cpp index 691fda7..38cdadd 100644 --- a/source/overlays/credits.cpp +++ b/source/overlays/credits.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,11 +24,12 @@ * reasonable ways as different from the original version. */ +#include "animation.hpp" +#include "common.hpp" #include "overlay.hpp" +#include "version.hpp" -/* - Show the Credits. -*/ +/* Show the Credits. */ void Overlays::ShowCredits() { bool doOut = false; @@ -39,27 +40,30 @@ void Overlays::ShowCredits() { C2D_TargetClear(Bottom, TRANSPARENT); GFX::DrawTop(); - GFX::DrawSprite(sprites_universal_updater_idx, 220, 30); - Gui::DrawStringCentered(0, 1, 0.7f, TEXT_COLOR, "Universal-Updater - " + Lang::get("CREDITS")); + GFX::DrawSprite(sprites_universal_updater_idx, 220, 26); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), "Universal-Updater - " + Lang::get("CREDITS"), 395, 0, font); - Gui::DrawString(10, 30, 0.5f, TEXT_COLOR, "- Universal-Team"); - Gui::DrawString(10, 50, 0.5f, TEXT_COLOR, "- devkitPro"); - Gui::DrawString(10, 70, 0.5f, TEXT_COLOR, "- dlbeer"); - Gui::DrawString(10, 90, 0.5f, TEXT_COLOR, "- FlagBrew"); - Gui::DrawString(10, 110, 0.5f, TEXT_COLOR, "- https://icons8.com/"); - Gui::DrawString(10, 130, 0.5f, TEXT_COLOR, "- PabloMK7"); - Gui::DrawString(10, 150, 0.5f, TEXT_COLOR, Lang::get("CONTRIBUTOR_TRANSLATORS"), 210); - Gui::DrawString(10, 197, 0.5f, TEXT_COLOR, Lang::get("GITHUB"), 390); + Gui::DrawString(10, 30, 0.5f, UIThemes->TextColor(), "- Universal-Team", 0, 0, font); + Gui::DrawString(10, 50, 0.5f, UIThemes->TextColor(), "- devkitPro", 0, 0, font); + Gui::DrawString(10, 70, 0.5f, UIThemes->TextColor(), "- dlbeer", 0, 0, font); + Gui::DrawString(10, 90, 0.5f, UIThemes->TextColor(), "- FlagBrew", 0, 0, font); + Gui::DrawString(10, 110, 0.5f, UIThemes->TextColor(), "- https://icons8.com/", 0, 0, font); + Gui::DrawString(10, 130, 0.5f, UIThemes->TextColor(), "- Ivandeve", 0, 0, font); + Gui::DrawString(10, 150, 0.5f, UIThemes->TextColor(), "- PabloMK7", 0, 0, font); + Gui::DrawString(10, 170, 0.5f, UIThemes->TextColor(), Lang::get("CONTRIBUTOR_TRANSLATORS"), 210, 0, font); + Gui::DrawString(10, 197, 0.5f, UIThemes->TextColor(), Lang::get("GITHUB"), 390, 0, font); - Gui::Draw_Rect(0, 215, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 214, 400, 1, BAR_OUTL_COLOR); - Gui::DrawStringCentered(0, 218, 0.6f, TEXT_COLOR, Lang::get("CURRENT_VERSION") + std::string(V_STRING), 390); + Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 218, 0.6f, UIThemes->TextColor(), Lang::get("CURRENT_VERSION") + std::string(VER_NUMBER), 390, 0, font); + Animation::QueueEntryDone(); GFX::DrawBottom(); GFX::DrawSprite(sprites_universal_core_idx, 0, 26); C3D_FrameEnd(0); hidScanInput(); + Animation::HandleQueueEntryDone(); if ((hidKeysDown() & KEY_START) || (hidKeysDown() & KEY_B) || (hidKeysDown() & KEY_A)) doOut = true; } } \ No newline at end of file diff --git a/source/overlays/dirSelect.cpp b/source/overlays/dirSelect.cpp index fb27742..a80ffbb 100644 --- a/source/overlays/dirSelect.cpp +++ b/source/overlays/dirSelect.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,8 +24,11 @@ * reasonable ways as different from the original version. */ +#include "animation.hpp" +#include "common.hpp" #include "fileBrowse.hpp" #include "overlay.hpp" +#include "storeUtils.hpp" #include extern bool touching(touchPosition touch, Structs::ButtonPos button); @@ -39,16 +42,13 @@ static const std::vector mainButtons = { { 10, 186, 300, 22 } }; -/* - Select a Directory. -*/ -std::string Overlays::SelectDir(const std::string &oldDir, const std::string &msg, const std::unique_ptr &store) { +/* Select a Directory. */ +std::string Overlays::SelectDir(const std::string &oldDir, const std::string &msg) { std::string currentPath = oldDir; bool dirChanged = false; int selection = 0, sPos = 0; std::vector dirContents; - dirContents.clear(); /* Make sure. */ if (access((oldDir + std::string("/")).c_str(), F_OK) == 0) { @@ -59,12 +59,7 @@ std::string Overlays::SelectDir(const std::string &oldDir, const std::string &ms chdir("sdmc:/"); } - std::vector dirContentsTemp; - getDirectoryContents(dirContentsTemp, {"/"}); - - for(uint i = 0; i < dirContentsTemp.size(); i++) { - dirContents.push_back(dirContentsTemp[i]); - } + getDirectoryContents(dirContents, {"/"}); while(1) { Gui::clearTextBufs(); @@ -72,32 +67,33 @@ std::string Overlays::SelectDir(const std::string &oldDir, const std::string &ms C2D_TargetClear(Top, TRANSPARENT); C2D_TargetClear(Bottom, TRANSPARENT); - if (store && config->usebg() && store->customBG()) { + if (StoreUtils::store && config->usebg() && StoreUtils::store->customBG()) { Gui::ScreenDraw(Top); - Gui::Draw_Rect(0, 0, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 25, 400, 1, BAR_OUTL_COLOR); - C2D_DrawImageAt(store->GetStoreImg(), 0, 26, 0.5f, nullptr); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); + C2D_DrawImageAt(StoreUtils::store->GetStoreImg(), 0, 26, 0.5f, nullptr); } else { GFX::DrawTop(); } - Gui::DrawStringCentered(0, 1, 0.7f, TEXT_COLOR, msg, 380); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), msg, 380, 0, font); - Gui::Draw_Rect(0, 215, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 214, 400, 1, BAR_OUTL_COLOR); - Gui::DrawStringCentered(0, 217, 0.6f, TEXT_COLOR, currentPath, 390); + Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 217, 0.6f, UIThemes->TextColor(), currentPath, 390, 0, font); + Animation::QueueEntryDone(); GFX::DrawBottom(); - Gui::Draw_Rect(0, 215, 320, 25, BAR_COLOR); - Gui::Draw_Rect(0, 214, 320, 1, BAR_OUTL_COLOR); - Gui::DrawStringCentered(0, 220, 0.5f, TEXT_COLOR, Lang::get("START_SELECT"), 310); + Gui::Draw_Rect(0, 215, 320, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 320, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 220, 0.5f, UIThemes->TextColor(), Lang::get("START_SELECT"), 310, 0, font); if (dirContents.size() > 0) { for(int i = 0; i < 7 && i < (int)dirContents.size(); i++) { - if (sPos + i == selection) GFX::DrawBox(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, false); - Gui::DrawStringCentered(10 - 160 + (300 / 2), mainButtons[i].y + 4, 0.45f, TEXT_COLOR, dirContents[sPos + i].name, 295); + if (sPos + i == selection) Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, UIThemes->MarkSelected()); + Gui::DrawStringCentered(10 - 160 + (300 / 2), mainButtons[i].y + 4, 0.45f, UIThemes->TextColor(), dirContents[sPos + i].name, 295, 0, font); } } @@ -108,13 +104,7 @@ std::string Overlays::SelectDir(const std::string &oldDir, const std::string &ms selection = 0; sPos = 0; - dirContents.clear(); - std::vector dirContentsTemp; - getDirectoryContents(dirContentsTemp, {"/"}); - - for(uint i = 0; i < dirContentsTemp.size(); i++) { - dirContents.push_back(dirContentsTemp[i]); - } + getDirectoryContents(dirContents, {"/"}); } @@ -122,6 +112,7 @@ std::string Overlays::SelectDir(const std::string &oldDir, const std::string &ms touchPosition touch; hidTouchRead(&touch); u32 hRepeat = hidKeysDownRepeat(); + Animation::HandleQueueEntryDone(); if (dirContents.size() > 0) { if (hRepeat & KEY_DOWN) { @@ -186,10 +177,8 @@ std::string Overlays::SelectDir(const std::string &oldDir, const std::string &ms char path[PATH_MAX]; getcwd(path, PATH_MAX); - if (strcmp(path, "sdmc:/") == 0 || strcmp(path, "/") == 0) { - return ""; - - } else { + if (strcmp(path, "sdmc:/") == 0 || strcmp(path, "/") == 0) return ""; + else { chdir(".."); getcwd(path, PATH_MAX); currentPath = path; diff --git a/source/overlays/storeSelect.cpp b/source/overlays/storeSelect.cpp index 47f265f..179e05d 100644 --- a/source/overlays/storeSelect.cpp +++ b/source/overlays/storeSelect.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,8 @@ * reasonable ways as different from the original version. */ +#include "animation.hpp" +#include "common.hpp" #include "download.hpp" #include "fileBrowse.hpp" #include "files.hpp" @@ -35,6 +37,7 @@ #include extern bool checkWifiStatus(); +extern void notConnectedMsg(); extern bool touching(touchPosition touch, Structs::ButtonPos button); static const std::vector mainButtons = { { 10, 34, 300, 22 }, @@ -44,23 +47,26 @@ static const std::vector mainButtons = { { 10, 154, 300, 22 }, { 10, 184, 300, 22 }, - /* Add, Delete, Info.. */ - { 92, 215, 16, 16 }, - { 136, 215, 16, 16 }, - { 180, 215, 16, 16 }, - { 224, 215, 16, 16 }, + { 112, 215, 16, 16 }, // Delete. + { 154, 215, 16, 16 }, // Update. + { 200, 215, 16, 16 }, // Add. { 4, 0, 24, 24 } // Back. }; /* - Delete a Store.. including the Spritesheets, if found. + Delete a store.. including the Spritesheets, if found. const std::string &file: The file of the UniStore. */ static void DeleteStore(const std::string &file) { + nlohmann::json storeJson; FILE *temp = fopen((std::string(_STORE_PATH) + file).c_str(), "rt"); - nlohmann::json storeJson = nlohmann::json::parse(temp, nullptr, false); - fclose(temp); + if (temp) { + storeJson = nlohmann::json::parse(temp, nullptr, false); + fclose(temp); + } + if (storeJson.is_discarded()) + storeJson = {}; /* Check, if Spritesheet exist on UniStore. */ if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_array()) { @@ -68,7 +74,7 @@ static void DeleteStore(const std::string &file) { /* Cause it's an array, delete all Spritesheets which exist. */ for (int i = 0; i < (int)sht.size(); i++) { - if ((std::string(_STORE_PATH) + sht[i]) != "") { + if (sht[i] != "") { if (!(StringUtils::lower_case(sht[i]).find(StringUtils::lower_case("/")) != std::string::npos)) { if (access((std::string(_STORE_PATH) + sht[i]).c_str(), F_OK) == 0) { deleteFile((std::string(_STORE_PATH) + sht[i]).c_str()); @@ -78,10 +84,10 @@ static void DeleteStore(const std::string &file) { } /* Else, if it's just a string.. check and delete single Spritesheet. */ - } else if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_string()) { + } else if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_string()) { const std::string fl = storeJson["storeInfo"]["sheet"]; - if ((std::string(_STORE_PATH) + fl) != "") { + if (fl != "") { if (!(StringUtils::lower_case(fl).find(StringUtils::lower_case("/")) != std::string::npos)) { if (access((std::string(_STORE_PATH) + fl).c_str(), F_OK) == 0) { deleteFile((std::string(_STORE_PATH) + fl).c_str()); @@ -94,60 +100,62 @@ static void DeleteStore(const std::string &file) { } /* - Download a Store.. including the SpriteSheets, if found. - - bool Cam: if cam should be used. + Download a store.. including the SpriteSheets, if found. */ -static bool DownloadStore(bool Cam = true) { +static bool DownloadStore() { bool doSheet = false; std::string file = ""; - const std::string URL = Cam ? QR_Scanner::GetQRURL() : Input::setkbdString(150, Lang::get("ENTER_URL"), { }); + const std::string URL = QR_Scanner::StoreHandle(); if (URL != "") doSheet = DownloadUniStore(URL, -1, file, true); if (doSheet) { + nlohmann::json storeJson; FILE *temp = fopen(file.c_str(), "rt"); - nlohmann::json storeJson = nlohmann::json::parse(temp, nullptr, false); - fclose(temp); + if (temp) { + storeJson = nlohmann::json::parse(temp, nullptr, false); + fclose(temp); + } + if (storeJson.is_discarded()) + storeJson = { }; - if (doSheet) { - if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_array()) { - if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_array()) { - const std::vector locs = storeJson["storeInfo"]["sheetURL"].get>(); - const std::vector sht = storeJson["storeInfo"]["sheet"].get>(); + if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_array()) { + if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_array()) { + const std::vector locs = storeJson["storeInfo"]["sheetURL"].get>(); + const std::vector sht = storeJson["storeInfo"]["sheet"].get>(); - if (locs.size() == sht.size()) { - for (int i = 0; i < (int)sht.size(); i++) { - if (!(sht[i].find("/") != std::string::npos)) { - char msg[150]; - snprintf(msg, sizeof(msg), Lang::get("DOWNLOADING_SPRITE_SHEET2").c_str(), i + 1, sht.size()); - Msg::DisplayMsg(msg); - DownloadSpriteSheet(locs[i], sht[i]); + if (locs.size() == sht.size()) { + for (int i = 0; i < (int)sht.size(); i++) { + if (!(sht[i].find("/") != std::string::npos)) { + char msg[150]; + snprintf(msg, sizeof(msg), Lang::get("DOWNLOADING_SPRITE_SHEET2").c_str(), i + 1, sht.size()); + Msg::DisplayMsg(msg); + DownloadSpriteSheet(locs[i], sht[i]); - } else { - Msg::waitMsg(Lang::get("SHEET_SLASH")); - } + } else { + Msg::waitMsg(Lang::get("SHEET_SLASH")); } } } + } - } else if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_string()) { - if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_string()) { - const std::string fl = storeJson["storeInfo"]["sheetURL"]; - const std::string fl2 = storeJson["storeInfo"]["sheet"]; + } else if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_string()) { + if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_string()) { + const std::string fl = storeJson["storeInfo"]["sheetURL"]; + const std::string fl2 = storeJson["storeInfo"]["sheet"]; - if (!(fl2.find("/") != std::string::npos)) { - Msg::DisplayMsg(Lang::get("DOWNLOADING_SPRITE_SHEET")); - DownloadSpriteSheet(fl, fl2); + if (!(fl2.find("/") != std::string::npos)) { + Msg::DisplayMsg(Lang::get("DOWNLOADING_SPRITE_SHEET")); + DownloadSpriteSheet(fl, fl2); - } else { - Msg::waitMsg(Lang::get("SHEET_SLASH")); - } + } else { + Msg::waitMsg(Lang::get("SHEET_SLASH")); } } } } + hidScanInput(); // Re-Scan. return doSheet; } @@ -158,43 +166,46 @@ static bool UpdateStore(const std::string &URL) { if (URL != "") doSheet = DownloadUniStore(URL, -1, file, false); if (doSheet) { + nlohmann::json storeJson; FILE *temp = fopen(file.c_str(), "rt"); - nlohmann::json storeJson = nlohmann::json::parse(temp, nullptr, false); - fclose(temp); + if (temp) { + storeJson = nlohmann::json::parse(temp, nullptr, false); + fclose(temp); + } + if (storeJson.is_discarded()) + storeJson = { }; - if (doSheet) { - if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_array()) { - if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_array()) { - const std::vector locs = storeJson["storeInfo"]["sheetURL"].get>(); - const std::vector sht = storeJson["storeInfo"]["sheet"].get>(); + if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_array()) { + if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_array()) { + const std::vector locs = storeJson["storeInfo"]["sheetURL"].get>(); + const std::vector sht = storeJson["storeInfo"]["sheet"].get>(); - if (locs.size() == sht.size()) { - for (int i = 0; i < (int)sht.size(); i++) { - if (!(sht[i].find("/") != std::string::npos)) { - char msg[150]; - snprintf(msg, sizeof(msg), Lang::get("DOWNLOADING_SPRITE_SHEET2").c_str(), i + 1, sht.size()); - Msg::DisplayMsg(msg); - DownloadSpriteSheet(locs[i], sht[i]); + if (locs.size() == sht.size()) { + for (int i = 0; i < (int)sht.size(); i++) { + if (!(sht[i].find("/") != std::string::npos)) { + char msg[150]; + snprintf(msg, sizeof(msg), Lang::get("DOWNLOADING_SPRITE_SHEET2").c_str(), i + 1, sht.size()); + Msg::DisplayMsg(msg); + DownloadSpriteSheet(locs[i], sht[i]); - } else { - Msg::waitMsg(Lang::get("SHEET_SLASH")); - } + } else { + Msg::waitMsg(Lang::get("SHEET_SLASH")); } } } + } - } else if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_string()) { - if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_string()) { - const std::string fl = storeJson["storeInfo"]["sheetURL"]; - const std::string fl2 = storeJson["storeInfo"]["sheet"]; + } else if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_string()) { + if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_string()) { + const std::string fl = storeJson["storeInfo"]["sheetURL"]; + const std::string fl2 = storeJson["storeInfo"]["sheet"]; - if (!(fl2.find("/") != std::string::npos)) { - Msg::DisplayMsg(Lang::get("DOWNLOADING_SPRITE_SHEET")); - DownloadSpriteSheet(fl, fl2); + if (!(fl2.find("/") != std::string::npos)) { + Msg::DisplayMsg(Lang::get("DOWNLOADING_SPRITE_SHEET")); + DownloadSpriteSheet(fl, fl2); - } else { - Msg::waitMsg(Lang::get("SHEET_SLASH")); - } + } else { + Msg::waitMsg(Lang::get("SHEET_SLASH")); } } } @@ -211,12 +222,8 @@ static bool UpdateStore(const std::string &URL) { - Download / Add a UniStore. - Check for Updates for a UniStore. - Switch the UniStore. - - std::unique_ptr &store: Reference to the Store class. - std::vector> &entries: Reference to the Store Entries. - std::unique_ptr &meta: Reference to the Meta class. */ -void Overlays::SelectStore(std::unique_ptr &store, std::vector> &entries, std::unique_ptr &meta) { +void Overlays::SelectStore() { bool doOut = false; int selection = 0, sPos = 0; @@ -228,66 +235,56 @@ void Overlays::SelectStore(std::unique_ptr &store, std::vectorusebg() && store->customBG()) { + if (StoreUtils::store && config->usebg() && StoreUtils::store->customBG()) { Gui::ScreenDraw(Top); - Gui::Draw_Rect(0, 0, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 25, 400, 1, BAR_OUTL_COLOR); - C2D_DrawImageAt(store->GetStoreImg(), 0, 26, 0.5f, nullptr); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); + C2D_DrawImageAt(StoreUtils::store->GetStoreImg(), 0, 26, 0.5f, nullptr); } else { GFX::DrawTop(); } - Gui::DrawStringCentered(0, 1, 0.7f, TEXT_COLOR, info[selection].Title, 390); - if (info.size() > 0) { if (info[selection].StoreSize != -1) { - Gui::DrawStringCentered(0, 30, 0.6f, TEXT_COLOR, info[selection].Author, 380); - - if (info[selection].Description != "") { - /* "\n\n" breaks C2D_WordWrap, so check here. */ - if (!(info[selection].Description.find("\n\n") != std::string::npos)) { - Gui::DrawStringCentered(0, 70, 0.5f, TEXT_COLOR, info[selection].Description, 380, 130, nullptr, C2D_WordWrap); - - } else { - Gui::DrawStringCentered(0, 70, 0.5f, TEXT_COLOR, info[selection].Description, 380, 130); - } - } + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), info[selection].Title, 390, 0, font); + Gui::DrawStringCentered(0, 30, 0.6f, UIThemes->TextColor(), info[selection].Author, 380, 0, font); + Gui::DrawStringCentered(0, 70, 0.5f, UIThemes->TextColor(), info[selection].Description, 380, 130, font, C2D_WordWrap); } else { - Gui::DrawStringCentered(0, 1, 0.7f, TEXT_COLOR, Lang::get("INVALID_UNISTORE"), 390); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), Lang::get("INVALID_UNISTORE"), 390, 0, font); } - Gui::DrawString(10, 200, 0.4, TEXT_COLOR, "- " + Lang::get("ENTRIES") + ": " + std::to_string(info[selection].StoreSize), 150); - Gui::DrawString(10, 210, 0.4, TEXT_COLOR, "- " + Lang::get("VERSION") + ": " + std::to_string(info[selection].Version), 150); - Gui::DrawString(10, 220, 0.4, TEXT_COLOR, "- " + Lang::get("REVISION") + ": " + std::to_string(info[selection].Revision), 150); + Gui::DrawString(10, 200, 0.4, UIThemes->TextColor(), "- " + Lang::get("ENTRIES") + ": " + std::to_string(info[selection].StoreSize), 150, 0, font); + Gui::DrawString(10, 210, 0.4, UIThemes->TextColor(), "- " + Lang::get("VERSION") + ": " + std::to_string(info[selection].Version), 150, 0, font); + Gui::DrawString(10, 220, 0.4, UIThemes->TextColor(), "- " + Lang::get("REVISION") + ": " + std::to_string(info[selection].Revision), 150, 0, font); + Animation::QueueEntryDone(); GFX::DrawBottom(); - Gui::Draw_Rect(0, 0, 320, 25, ENTRY_BAR_COLOR); - Gui::Draw_Rect(0, 25, 320, 1, ENTRY_BAR_OUTL_COLOR); - GFX::DrawSprite(sprites_arrow_idx, mainButtons[10].x, mainButtons[10].y); - Gui::DrawStringCentered(0, 2, 0.6, TEXT_COLOR, Lang::get("SELECT_UNISTORE_2"), 310); + Gui::Draw_Rect(0, 0, 320, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 320, 1, UIThemes->BarOutline()); + GFX::DrawIcon(sprites_arrow_idx, mainButtons[9].x, mainButtons[9].y, UIThemes->TextColor()); + Gui::DrawStringCentered(0, 2, 0.6, UIThemes->TextColor(), Lang::get("SELECT_UNISTORE_2"), 310, 0, font); for(int i = 0; i < 6 && i < (int)info.size(); i++) { - if (sPos + i == selection) GFX::DrawBox(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, false); - - Gui::DrawStringCentered(10 - 160 + (300 / 2), mainButtons[i].y + 4, 0.45f, TEXT_COLOR, info[sPos + i].FileName, 295); + if (sPos + i == selection) Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, UIThemes->MarkSelected()); + Gui::DrawStringCentered(10 - 160 + (300 / 2), mainButtons[i].y + 4, 0.45f, UIThemes->TextColor(), info[sPos + i].FileName, 295, 0, font); } + } else { + GFX::DrawBottom(); // Otherwise we'd draw on top. } - if (info.size() <= 0) GFX::DrawBottom(); // Otherwise we'd draw on top. - - GFX::DrawSprite(sprites_delete_idx, mainButtons[6].x, mainButtons[6].y); - GFX::DrawSprite(sprites_update_idx, mainButtons[7].x, mainButtons[7].y); - GFX::DrawSprite(sprites_add_idx, mainButtons[8].x, mainButtons[8].y); - GFX::DrawSprite(sprites_qr_code_idx, mainButtons[9].x, mainButtons[9].y); + GFX::DrawIcon(sprites_delete_idx, mainButtons[6].x, mainButtons[6].y, UIThemes->TextColor()); + GFX::DrawIcon(sprites_update_idx, mainButtons[7].x, mainButtons[7].y, UIThemes->TextColor()); + GFX::DrawIcon(sprites_add_idx, mainButtons[8].x, mainButtons[8].y, UIThemes->TextColor()); C3D_FrameEnd(0); hidScanInput(); touchPosition touch; hidTouchRead(&touch); u32 hRepeat = hidKeysDownRepeat(); + Animation::HandleQueueEntryDone(); if (info.size() > 0) { if (hRepeat & KEY_DOWN) { @@ -316,12 +313,12 @@ void Overlays::SelectStore(std::unique_ptr &store, std::vector 3) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); + else if (info[selection].Version > _UNISTORE_VERSION) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); else { - store = std::make_unique(_STORE_PATH + info[selection].FileName); - StoreUtils::ResetAll(store, meta, entries); config->lastStore(info[selection].FileName); - StoreUtils::SortEntries(false, SortType::LAST_UPDATED, entries); + StoreUtils::store = std::make_unique(_STORE_PATH + info[selection].FileName, info[selection].FileName); + StoreUtils::ResetAll(); + StoreUtils::SortEntries(false, SortType::LAST_UPDATED); doOut = true; } @@ -338,11 +335,12 @@ void Overlays::SelectStore(std::unique_ptr &store, std::vector 3) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); + else if (info[i + sPos].Version > _UNISTORE_VERSION) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); else { - store = std::make_unique(_STORE_PATH + info[i + sPos].FileName); - StoreUtils::ResetAll(store, meta, entries); config->lastStore(info[i + sPos].FileName); + StoreUtils::store = std::make_unique(_STORE_PATH + info[i + sPos].FileName, info[i + sPos].FileName); + StoreUtils::ResetAll(); + StoreUtils::SortEntries(false, SortType::LAST_UPDATED); doOut = true; } @@ -372,6 +370,9 @@ void Overlays::SelectStore(std::unique_ptr &store, std::vector &store, std::vector sPos + 6 - 1) sPos = selection - 6 + 1; } - /* UniStore URL Download. */ + /* UniStore QR Code / URL Download. */ if ((hidKeysDown() & KEY_Y) || (hidKeysDown() & KEY_TOUCH && touching(touch, mainButtons[8]))) { - if (checkWifiStatus()) { - if (DownloadStore(false)) { - selection = 0; - info = GetUniStoreInfo(_STORE_PATH); - } - } - } - - /* UniStore QR Code Download. */ - if ((hidKeysDown() & KEY_SELECT) || (hidKeysDown() & KEY_TOUCH && touching(touch, mainButtons[9]))) { if (checkWifiStatus()) { if (DownloadStore()) { selection = 0; info = GetUniStoreInfo(_STORE_PATH); } + + } else { + notConnectedMsg(); } } /* Go out of the menu. */ - if ((hidKeysDown() & KEY_B) || (hidKeysDown() & KEY_TOUCH && touching(touch, mainButtons[10]))) { - doOut = true; - } + if ((hidKeysDown() & KEY_B) || (hidKeysDown() & KEY_TOUCH && touching(touch, mainButtons[9]))) doOut = true; } } \ No newline at end of file diff --git a/source/overlays/themeSelect.cpp b/source/overlays/themeSelect.cpp new file mode 100644 index 0000000..cd9ef3c --- /dev/null +++ b/source/overlays/themeSelect.cpp @@ -0,0 +1,137 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "animation.hpp" +#include "common.hpp" +#include "overlay.hpp" +#include "storeUtils.hpp" + +extern bool touching(touchPosition touch, Structs::ButtonPos button); +static const std::vector mainButtons = { + { 10, 6, 300, 22 }, + { 10, 36, 300, 22 }, + { 10, 66, 300, 22 }, + { 10, 96, 300, 22 }, + { 10, 126, 300, 22 }, + { 10, 156, 300, 22 }, + { 10, 186, 300, 22 } +}; + +extern std::vector> Themes; + +/* Select a Theme. */ +void Overlays::SelectTheme() { + bool Finish = false; + int selection = 0, sPos = 0; + + while(!Finish) { + Gui::clearTextBufs(); + C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C2D_TargetClear(Top, TRANSPARENT); + C2D_TargetClear(Bottom, TRANSPARENT); + + if (StoreUtils::store && config->usebg() && StoreUtils::store->customBG()) { + Gui::ScreenDraw(Top); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); + C2D_DrawImageAt(StoreUtils::store->GetStoreImg(), 0, 26, 0.5f, nullptr); + + } else { + GFX::DrawTop(); + } + + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), Lang::get("SELECT_A_THEME"), 380, 0, font); + + Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 40, 0.5f, UIThemes->TextColor(), Themes[selection].second, 380, 140, font); + + Animation::QueueEntryDone(); + GFX::DrawBottom(); + + Gui::Draw_Rect(0, 215, 320, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 320, 1, UIThemes->BarOutline()); + + if (Themes.size() > 0) { + for(int i = 0; i < 7 && i < (int)Themes.size(); i++) { + if (sPos + i == selection) Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, UIThemes->MarkSelected()); + Gui::DrawStringCentered(10 - 160 + (300 / 2), mainButtons[i].y + 4, 0.45f, UIThemes->TextColor(), Themes[sPos + i].first, 295, 0, font); + } + } + + C3D_FrameEnd(0); + hidScanInput(); + touchPosition touch; + hidTouchRead(&touch); + u32 hRepeat = hidKeysDownRepeat(); + Animation::HandleQueueEntryDone(); + + if (Themes.size() > 0) { + if (hRepeat & KEY_DOWN) { + if (selection < (int)Themes.size() - 1) selection++; + else selection = 0; + } + + if (hRepeat & KEY_UP) { + if (selection > 0) selection--; + else selection = Themes.size() - 1; + } + + if (hRepeat & KEY_RIGHT) { + if (selection + 7 < (int)Themes.size()-1) selection += 7; + else selection = Themes.size()-1; + } + + if (hRepeat & KEY_LEFT) { + if (selection - 7 > 0) selection -= 7; + else selection = 0; + } + + if (hidKeysDown() & KEY_A) { + UIThemes->LoadTheme(Themes[selection].first); + config->theme(Themes[selection].first); + Finish = true; + } + + if (hidKeysDown() & KEY_TOUCH) { + for (int i = 0; i < 7; i++) { + if (touching(touch, mainButtons[i])) { + if (i + sPos < (int)Themes.size()) { + UIThemes->LoadTheme(Themes[i + sPos].first); + config->theme(Themes[i + sPos].first); + Finish = true; + } + } + } + } + + if (selection < sPos) sPos = selection; + else if (selection > sPos + 7 - 1) sPos = selection - 7 + 1; + } + + if (hidKeysDown() & KEY_B) Finish = true; + } +} \ No newline at end of file diff --git a/source/qr/decode.cpp b/source/qr/decode.cpp index 9f8b978..7754110 100644 --- a/source/qr/decode.cpp +++ b/source/qr/decode.cpp @@ -15,7 +15,6 @@ */ #include "quirc_internal.hpp" - #include #include diff --git a/source/qr/qrcode.cpp b/source/qr/qrcode.cpp index 6e8f934..a091661 100644 --- a/source/qr/qrcode.cpp +++ b/source/qr/qrcode.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,9 +50,26 @@ * reasonable ways as different from the original version. */ +#include "common.hpp" +#include "download.hpp" +#include "keyboard.hpp" #include "qrcode.hpp" #include +static const std::vector mainButtons = { + { 10, 34, 300, 22 }, + { 10, 64, 300, 22 }, + { 10, 94, 300, 22 }, + { 10, 124, 300, 22 }, + { 10, 154, 300, 22 }, + { 10, 184, 300, 22 }, + + { 5, 215, 24, 24 }, // QR Code / List. + { 35, 215, 24, 24 }, // Keyboard. + { 4, 0, 24, 24 } // Back. +}; +extern bool touching(touchPosition touch, Structs::ButtonPos button); + /* Initialize everything needed for the camera. */ @@ -69,6 +86,10 @@ QRCode::QRCode() { LightLock_Init(&this->imageLock); svcCreateEvent(&this->exitEvent, RESET_STICKY); quirc_resize(this->qrData, 400, 240); + + if (checkWifiStatus()) this->stores = FetchStores(); // Fetching Stores here. + + if (this->stores.size() > 0) this->displayList = true; } /* @@ -89,8 +110,8 @@ void QRCode::buffToImage() { for (u32 x = 0; x < 400; x++) { for (u32 y = 0; y < 240; y++) { - const u32 dstPos = ((((y >> 3) * (512 >> 3) + (x >> 3)) << 6) + - ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3))) * 2; + const u32 dstPos = ((((y >> 3) * (512 >> 3) + (x >> 3)) << 6) + + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3))) * 2; const u32 srcPos = (y * 400 + x) * 2; memcpy(((u8 *)this->image.tex->data) + dstPos, ((u8 *)this->cameraBuffer.data()) + srcPos, 2); @@ -125,10 +146,39 @@ void QRCode::drawThread() { C2D_TargetClear(Top, TRANSPARENT); C2D_TargetClear(Bottom, TRANSPARENT); - this->buffToImage(); // Fetch image. - Gui::ScreenDraw(Top); - C2D_DrawImageAt(this->image, 0, 0, 0.5, nullptr, 1.0f, 1.0f); - GFX::DrawBottom(); + if (!this->displayList) { + this->buffToImage(); // Fetch image. + Gui::ScreenDraw(Top); + C2D_DrawImageAt(this->image, 0, 0, 0.5, nullptr, 1.0f, 1.0f); + + GFX::DrawBottom(); + Gui::Draw_Rect(0, 0, 320, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(0, 25, 320, 1, UIThemes->EntryOutline()); + + } else { + GFX::DrawTop(); + Gui::DrawStringCentered(0, 1, 0.7, UIThemes->TextColor(), Lang::get("STORE_INFO"), 390, 0, font); + + if (this->stores.size() > 0) { + Gui::DrawStringCentered(0, 30, 0.7f, UIThemes->TextColor(), this->stores[this->selectedStore].Title, 390, 0, font); + Gui::DrawStringCentered(0, 50, 0.6f, UIThemes->TextColor(), this->stores[this->selectedStore].Author, 380, 0, font); + Gui::DrawStringCentered(0, 90, 0.5f, UIThemes->TextColor(), this->stores[this->selectedStore].Description, 380, 130, font, C2D_WordWrap); + } + + GFX::DrawBottom(); + Gui::Draw_Rect(0, 0, 320, 25, UIThemes->EntryBar()); + Gui::Draw_Rect(0, 25, 320, 1, UIThemes->EntryOutline()); + Gui::DrawStringCentered(0, 2, 0.6, UIThemes->TextColor(), Lang::get("RECOMMENDED_UNISTORES"), 310, 0, font); + + for(int i = 0; i < 6 && i < (int)this->stores.size(); i++) { + if (this->sPos + i == this->selectedStore) Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, UIThemes->MarkSelected()); + Gui::DrawStringCentered(10 - 160 + (300 / 2), mainButtons[i].y + 4, 0.45f, UIThemes->TextColor(), this->stores[this->sPos + i].Title, 295, 0, font); + } + } + + GFX::DrawIcon((this->displayList ? sprites_qr_code_idx : sprites_list_idx), mainButtons[6].x, mainButtons[6].y, UIThemes->TextColor()); + if (this->displayList) GFX::DrawIcon(sprites_keyboard_idx, mainButtons[7].x, mainButtons[7].y, UIThemes->TextColor()); + GFX::DrawIcon(sprites_arrow_idx, mainButtons[8].x, mainButtons[8].y, UIThemes->TextColor()); C3D_FrameEnd(0); } @@ -148,6 +198,7 @@ void QRCode::captureThread() { CAMU_SetSize(SELECT_OUT1, SIZE_CTR_TOP_LCD, CONTEXT_A); CAMU_SetOutputFormat(SELECT_OUT1, OUTPUT_RGB_565, CONTEXT_A); CAMU_SetFrameRate(SELECT_OUT1, FRAME_RATE_30); + CAMU_SetNoiseFilter(SELECT_OUT1, true); CAMU_SetAutoExposure(SELECT_OUT1, true); CAMU_SetAutoWhiteBalance(SELECT_OUT1, true); @@ -231,85 +282,143 @@ void captureHelper(void *arg) { /* Handle the capture. - - std::vector &out: The Reference, where to output the decoded result. */ -void QRCode::handler(std::vector &out) { +void QRCode::handler(std::string &result) { hidScanInput(); + touchPosition t; + hidTouchRead(&t); + u32 keyDown = hidKeysDown(); + u32 keyRepeat = hidKeysDownRepeat(); - if (hidKeysDown() & KEY_B) { // Cancel with B. - this->cancel = true; + if ((keyDown & KEY_B) || (keyDown & KEY_TOUCH && touching(t, mainButtons[8]))) { + result = ""; + this->finished = true; this->finish(); return; } - if (!this->capturing) { - /* create camera draw thread. */ - if (threadCreate((ThreadFunc)&captureHelper, this, 0x10000, 0x1A, 1, true) != NULL) capturing = true; - else { - this->finish(); - return; + /* Keyboard. */ + if (keyDown & KEY_TOUCH && touching(t, mainButtons[7])) { + if (this->displayList) { + const std::string temp = Input::setkbdString(150, Lang::get("ENTER_URL"), { }); + + if (temp != "") { + result = temp; + this->finished = true; + this->finish(); + return; + } } } - if (this->done()) return; + if (this->displayList) { + gspWaitForVBlank(); - int w, h; - u8 *image = (u8 *)quirc_begin(this->qrData, &w, &h); - LightLock_Lock(&bufferLock); - - for (ssize_t x = 0; x < w; x++) { - for (ssize_t y = 0; y < h; y++) { - u16 px = this->cameraBuffer[y * 400 + x]; - image[y * w + x] = (u8)(((((px >> 11) & 0x1F) << 3) + (((px >> 5) & 0x3F) << 2) + ((px & 0x1F) << 3)) / 3); + if ((keyDown & KEY_SELECT) || (keyDown & KEY_TOUCH && touching(t, mainButtons[6]))) { + keyDown = 0; + this->displayList = false; } - } - LightLock_Unlock(&this->bufferLock); - quirc_end(this->qrData); + if (this->stores.size() > 0) { + if (keyRepeat & KEY_DOWN) { + if (this->selectedStore < (int)this->stores.size() - 1) this->selectedStore++; + else this->selectedStore = 0; + } - if (quirc_count(this->qrData) > 0) { - struct quirc_code code; - struct quirc_data scan_data; - quirc_extract(this->qrData, 0, &code); + if (keyRepeat & KEY_UP) { + if (this->selectedStore > 0) this->selectedStore--; + else this->selectedStore = (int)this->stores.size() - 1; + } - if (!quirc_decode(&code, &scan_data)) { - this->finish(); - out.resize(scan_data.payload_len); - std::copy(scan_data.payload, scan_data.payload + scan_data.payload_len, out.begin()); + if (keyDown & KEY_A) { + result = this->stores[this->selectedStore].URL; + this->finished = true; + this->finish(); + return; + } + + if (keyDown & KEY_TOUCH) { + for (int i = 0; i < 6; i++) { + if (touching(t, mainButtons[i])) { + if (i + this->sPos < (int)this->stores.size()) { + result = this->stores[i + this->sPos].URL; + this->finished = true; + this->finish(); + return; + } + } + } + } } - } -} - -/* - Return a vector of u8's from the QR Code. -*/ -std::vector QR_Scanner::scan() { - std::vector out = { }; - std::unique_ptr qrData = std::make_unique(); - aptSetHomeAllowed(false); // Block the Home key. - - threadCreate((ThreadFunc)&drawHelper, qrData.get(), 0x10000, 0x1A, 1, true); - while (!qrData->done()) qrData->handler(out); // Handle. - - aptSetHomeAllowed(true); // Re-Allow it. - return out; -} - -/* - Return the URL from the QR Code. -*/ -std::string QR_Scanner::GetQRURL() { - std::vector qrData = QR_Scanner::scan(); - - if (qrData.empty()) return ""; // Because it is empty, return "". - - if (qrData.back() == '\0') { // If Terminator, do -1. - return std::string((char *)qrData.data(), qrData.size() - 1); } else { - return std::string((char *)qrData.data(), qrData.size()); + if (this->stores.size() > 0) { + if ((keyDown & KEY_SELECT) || (keyDown & KEY_TOUCH && touching(t, mainButtons[6]))) { + keyDown = 0; + this->displayList = true; + } + } + + if (!this->capturing) { + /* create camera capture thread. */ + if (threadCreate((ThreadFunc)&captureHelper, this, 0x10000, 0x1A, 1, true) != NULL) this->capturing = true; + else { + this->finish(); + return; + } + } + + if (this->done()) return; + + int w, h; + u8 *image = (u8 *)quirc_begin(this->qrData, &w, &h); + LightLock_Lock(&bufferLock); + + for (ssize_t x = 0; x < w; x++) { + for (ssize_t y = 0; y < h; y++) { + u16 px = this->cameraBuffer[y * 400 + x]; + image[y * w + x] = (u8)(((((px >> 11) & 0x1F) << 3) + (((px >> 5) & 0x3F) << 2) + ((px & 0x1F) << 3)) / 3); + } + } + + LightLock_Unlock(&this->bufferLock); + quirc_end(this->qrData); + + if (quirc_count(this->qrData) > 0) { + struct quirc_code code; + struct quirc_data scan_data; + quirc_extract(this->qrData, 0, &code); + + if (!quirc_decode(&code, &scan_data)) { + this->finish(); + this->out.resize(scan_data.payload_len); + std::copy(scan_data.payload, scan_data.payload + scan_data.payload_len, this->out.begin()); + + /* From scanned stuff. */ + if (this->out.empty()) result = ""; + + /* If Terminator, do -1. */ + if (this->out.back() == '\0') result = std::string((char *)this->out.data(), this->out.size() - 1); + else result = std::string((char *)this->out.data(), this->out.size()); + } + } } - return ""; + if (this->selectedStore < this->sPos) this->sPos = this->selectedStore; + else if (this->selectedStore > this->sPos + 6 - 1) this->sPos = this->selectedStore - 6 + 1; +} + +/* + The store Add QR Code handle and such. +*/ +std::string QR_Scanner::StoreHandle() { + std::string result = ""; + + std::unique_ptr qrData = std::make_unique(); + aptSetHomeAllowed(false); // Block the Home key. + threadCreate((ThreadFunc)&drawHelper, qrData.get(), 0x10000, 0x1A, 1, true); + while (!qrData->done()) qrData->handler(result); // Handle. + aptSetHomeAllowed(true); // Re-Allow it. + + return result; } \ No newline at end of file diff --git a/source/screens/mainScreen.cpp b/source/screens/mainScreen.cpp index af72463..3a5a3e0 100644 --- a/source/screens/mainScreen.cpp +++ b/source/screens/mainScreen.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,106 +24,153 @@ * reasonable ways as different from the original version. */ +#include "animation.hpp" #include "download.hpp" #include "fileBrowse.hpp" #include "mainScreen.hpp" +#include "queueSystem.hpp" +#include "screenshot.hpp" #include "storeUtils.hpp" #include extern int fadeAlpha; -extern u32 hRepeat; extern UniStoreInfo GetInfo(const std::string &file, const std::string &fileName); +extern void notConnectedMsg(); +extern void DisplayChangelog(); /* MainScreen Constructor. - Initialized Meta, Store and StoreEntry class and: + Initialized meta, store and StoreEntry class and: - Downloads Universal-DB.. in case nothing exist. */ MainScreen::MainScreen() { - this->meta = std::make_unique(); + StoreUtils::meta = std::make_unique(); /* Check if lastStore is accessible. */ - if (config->lastStore() != "universal-db.unistore" || config->lastStore() != "") { - if (access((std::string(_STORE_PATH) + config->lastStore()).c_str(), F_OK) != 0) { - config->lastStore("universal-db.unistore"); + if (config->lastStore() != "StreetPass-Shop.unistore" && config->lastStore() != "") { + if (access((_STORE_PATH + config->lastStore()).c_str(), F_OK) != 0) { + config->lastStore("StreetPass-Shop.unistore"); } else { /* check version and file here. */ - const UniStoreInfo info = GetInfo((std::string(_STORE_PATH) + config->lastStore()), config->lastStore()); + const UniStoreInfo info = GetInfo((_STORE_PATH + config->lastStore()), config->lastStore()); - if (info.Version != 3) { - config->lastStore("universal-db.unistore"); + if (info.Version != 3 && info.Version != _UNISTORE_VERSION) { + config->lastStore("StreetPass-Shop.unistore"); } if (info.File != "") { // Ensure to check for this. if ((info.File.find("/") != std::string::npos)) { - config->lastStore("universal-db.unistore"); // It does contain a '/' which is invalid. + config->lastStore("StreetPass-Shop.unistore"); // It does contain a '/' which is invalid. } } } } /* If Universal DB --> Get! */ - if (config->lastStore() == "universal-db.unistore" || config->lastStore() == "") { - if (access("sdmc:/3ds/Universal-Updater/stores/universal-db.unistore", F_OK) != 0) { - std::string tmp = ""; // Just a temp. - DownloadUniStore("https://db.universal-team.net/unistore/universal-db.unistore", -1, tmp, true, true); - DownloadSpriteSheet("https://db.universal-team.net/unistore/universal-db.t3x", "universal-db.t3x"); + if (config->lastStore() == "StreetPass-Shop.unistore" || config->lastStore() == "") { + if (access("sdmc:/3ds/Universal-Updater/stores/StreetPass-Shop.unistore", F_OK) != 0) { + if (checkWifiStatus()) { + std::string tmp = ""; // Just a temp. + DownloadUniStore("https://github.com/sdkpaint/streetpass-3.0-config/raw/master/unistore/StreetPass-Shop.unistore", -1, tmp, true, true); + DownloadSpriteSheet("https://raw.githubusercontent.com/sdkpaint/streetpass-3.0-config/master/unistore/StreetPass-Shop.t3x", "StreetPass-Shop.t3x"); + + } else { + notConnectedMsg(); + } + + } else { + const UniStoreInfo info = GetInfo("sdmc:/3ds/Universal-Updater/stores/StreetPass-Shop.unistore", "StreetPass-Shop.unistore"); + + if (info.Version != 3 && info.Version != _UNISTORE_VERSION) { + if (checkWifiStatus()) { + std::string tmp = ""; // Just a temp. + DownloadUniStore("https://github.com/sdkpaint/streetpass-3.0-config/raw/master/unistore/StreetPass-Shop.unistore", -1, tmp, true, true); + DownloadSpriteSheet("https://raw.githubusercontent.com/sdkpaint/streetpass-3.0-config/master/unistore/StreetPass-Shop.t3x", "StreetPass-Shop.t3x"); + + } else { + notConnectedMsg(); + } + } } } - this->store = std::make_unique(_STORE_PATH + config->lastStore()); - StoreUtils::ResetAll(this->store, this->meta, this->entries); - StoreUtils::SortEntries(false, SortType::LAST_UPDATED, this->entries); + StoreUtils::store = std::make_unique(_STORE_PATH + config->lastStore(), config->lastStore()); + StoreUtils::ResetAll(); + StoreUtils::SortEntries(false, SortType::LAST_UPDATED); + DisplayChangelog(); }; /* MainScreen Main Draw. */ void MainScreen::Draw(void) const { + if (this->storeMode == 6) { + /* Screenshot Menu. */ + StoreUtils::DrawScreenshotMenu(this->Screenshot, this->screenshotIndex, this->screenshotFetch, this->sSize, this->screenshotName, this->zoom, this->canDisplay); + return; + } + + if (this->storeMode == 7) { + /* Release Notes. */ + StoreUtils::DrawReleaseNotes(this->scrollIndex, StoreUtils::entries[StoreUtils::store->GetEntry()]); + GFX::DrawBottom(); + return; + } + Gui::ScreenDraw(Top); - Gui::Draw_Rect(0, 0, 400, 25, BAR_COLOR); - Gui::Draw_Rect(0, 25, 400, 1, BAR_OUTL_COLOR); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); - if (this->store && this->store->GetValid()) Gui::DrawStringCentered(0, 1, 0.7f, TEXT_COLOR, this->store->GetUniStoreTitle(), 370); - else Gui::DrawStringCentered(0, 1, 0.7f, TEXT_COLOR, Lang::get("INVALID_UNISTORE"), 370); - config->list() ? StoreUtils::DrawList(this->store, this->entries) : StoreUtils::DrawGrid(this->store, this->entries); + if (StoreUtils::store && StoreUtils::store->GetValid()) Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), StoreUtils::store->GetUniStoreTitle(), 360, 0, font); + else Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), Lang::get("INVALID_UNISTORE"), 370, 0, font); + config->list() ? StoreUtils::DrawList() : StoreUtils::DrawGrid(); + GFX::DrawTime(); + GFX::DrawBattery(); + GFX::DrawWifi(); + Animation::QueueEntryDone(); - if (fadeAlpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(0, 0, 0, fadeAlpha)); - GFX::DrawBottom(); + /* Download-ception. */ + if (this->storeMode == 1) { + StoreUtils::DrawDownList(this->dwnldList, this->fetchDown, StoreUtils::entries[StoreUtils::store->GetEntry()], this->dwnldSizes, this->installs); - switch(this->storeMode) { - case 0: - /* Entry Info. */ - if (this->store && this->store->GetValid() && this->entries.size() > 0) StoreUtils::DrawEntryInfo(this->store, this->entries[this->store->GetEntry()]); - break; + } else { + if (fadeAlpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(0, 0, 0, fadeAlpha)); + GFX::DrawBottom(); - case 1: - /* Download List. */ - StoreUtils::DrawDownList(this->store, this->dwnldList, this->fetchDown); - break; + switch(this->storeMode) { + case 0: + /* Entry Info. */ + if (StoreUtils::store && StoreUtils::store->GetValid() && StoreUtils::entries.size() > 0) StoreUtils::DrawEntryInfo(StoreUtils::entries[StoreUtils::store->GetEntry()]); + break; - case 2: - /* Search + Favorites. */ - StoreUtils::DrawSearchMenu(this->searchIncludes, this->searchResult, this->marks, this->updateFilter); - break; + case 2: + /* Queue Menu. */ + StoreUtils::DrawQueueMenu(this->queueIndex); + break; - case 3: - /* Sorting. */ - StoreUtils::DrawSorting(this->ascending, this->sorttype); - break; + case 3: + /* Search + Favorites. */ + StoreUtils::DrawSearchMenu(this->searchIncludes, this->searchResult, this->marks, this->updateFilter, this->isAND); + break; - case 4: - /* Settings. */ - StoreUtils::DrawSettings(this->sPage, this->sSelection, this->sPos); - break; + case 4: + /* Sorting. */ + StoreUtils::DrawSorting(this->ascending, this->sorttype); + break; + + case 5: + /* Settings. */ + StoreUtils::DrawSettings(this->sPage, this->sSelection, this->sPos); + break; + } } StoreUtils::DrawSideMenu(this->storeMode); - if (this->showMarks && this->store && this->store->GetValid()) StoreUtils::DisplayMarkBox(this->entries[this->store->GetEntry()]->GetMarks()); + if (this->showMarks && StoreUtils::store && StoreUtils::store->GetValid()) StoreUtils::DisplayMarkBox(StoreUtils::entries[StoreUtils::store->GetEntry()]->GetMarks()); if (fadeAlpha > 0) Gui::Draw_Rect(0, 0, 320, 240, C2D_Color32(0, 0, 0, fadeAlpha)); } @@ -131,51 +178,118 @@ void MainScreen::Draw(void) const { MainScreen Logic. */ void MainScreen::Logic(u32 hDown, u32 hHeld, touchPosition touch) { - if (this->showMarks) StoreUtils::MarkHandle(hDown, hHeld, touch, this->entries[this->store->GetEntry()], this->store, this->showMarks, this->meta); + Animation::HandleQueueEntryDone(); + GFX::HandleBattery(); - if (!this->showMarks) { - if (this->storeMode == 0 || this->storeMode == 2 || this->storeMode == 3) { - config->list() ? StoreUtils::ListLogic(hDown, hHeld, touch, this->store, this->entries, this->storeMode, this->lastMode, this->fetchDown, this->smallDelay) : StoreUtils::GridLogic(hDown, hHeld, touch, this->store, this->entries, this->storeMode, this->lastMode, this->fetchDown, this->smallDelay); + /* Screenshots Menu. */ + if (this->storeMode == 6) { + if (this->screenshotFetch) { + /* Delete Texture first. */ + if (this->Screenshot.tex) { + C3D_TexDelete(this->Screenshot.tex); + this->Screenshot.tex = nullptr; + this->Screenshot.subtex = nullptr; + } + + this->screenshotName = ""; + + if (this->screenshotIndex < (int)StoreUtils::entries[StoreUtils::store->GetEntry()]->GetScreenshotNames().size()) { + this->screenshotName = StoreUtils::entries[StoreUtils::store->GetEntry()]->GetScreenshotNames()[this->screenshotIndex]; + } + + this->sSize = 0; + this->sSize = StoreUtils::entries[StoreUtils::store->GetEntry()]->GetScreenshots().size(); + + if (this->screenshotIndex < this->sSize) { + if (this->sSize > 0) { + this->Screenshot = FetchScreenshot(StoreUtils::entries[StoreUtils::store->GetEntry()]->GetScreenshots()[this->screenshotIndex]); + if (this->Screenshot.tex) this->canDisplay = true; + else this->canDisplay = false; + } + } + + this->screenshotFetch = false; } - StoreUtils::SideMenuHandle(hDown, touch, this->storeMode, this->fetchDown); + StoreUtils::ScreenshotMenu(this->Screenshot, this->screenshotIndex, this->screenshotFetch, this->storeMode, this->sSize, this->zoom, this->canDisplay); + return; + } + + /* Release Notes. */ + if (this->storeMode == 7) { + StoreUtils::ReleaseNotesLogic(this->scrollIndex, this->storeMode); + return; + } + + /* Mark Menu. */ + if (this->showMarks) StoreUtils::MarkHandle(StoreUtils::entries[StoreUtils::store->GetEntry()], this->showMarks); + + if (!this->showMarks) { + if (storeMode == 0 || storeMode == 3 || storeMode == 4) { + config->list() ? StoreUtils::ListLogic(storeMode, this->lastMode, this->fetchDown, this->smallDelay) : StoreUtils::GridLogic(storeMode, this->lastMode, this->fetchDown, this->smallDelay); + } + + StoreUtils::SideMenuHandle(storeMode, this->fetchDown, this->lastMode); /* Fetch Download list. */ if (this->fetchDown) { + this->installs.clear(); this->dwnldList.clear(); + this->dwnldSizes.clear(); + this->dwnldTypes.clear(); - if (this->store && this->store->GetValid()) { - this->store->SetDownloadIndex(0); // Reset to 0. - this->store->SetDownloadSIndex(0); + if (StoreUtils::store && StoreUtils::store->GetValid()) { + const std::vector installedNames = StoreUtils::meta->GetInstalled(StoreUtils::store->GetUniStoreTitle(), StoreUtils::entries[StoreUtils::store->GetEntry()]->GetTitle()); + StoreUtils::store->SetDownloadIndex(0); // Reset to 0. + StoreUtils::store->SetDownloadSIndex(0); - if ((int)this->entries.size() > this->store->GetEntry()) { - this->dwnldList = this->store->GetDownloadList(this->entries[this->store->GetEntry()]->GetEntryIndex()); + if ((int)StoreUtils::entries.size() > StoreUtils::store->GetEntry()) { + this->dwnldList = StoreUtils::store->GetDownloadList(StoreUtils::entries[StoreUtils::store->GetEntry()]->GetEntryIndex()); + this->dwnldSizes = StoreUtils::entries[StoreUtils::store->GetEntry()]->GetSizes(); + this->dwnldTypes = StoreUtils::entries[StoreUtils::store->GetEntry()]->GetTypes(); + + for (int i = 0; i < (int)this->dwnldList.size(); i++) { + bool good = false; + + for (int i2 = 0; i2 < (int)installedNames.size(); i2++) { + if (installedNames[i2] == this->dwnldList[i]) { + this->installs.push_back( true ); + good = true; + } + } + + if (!good) this->installs.push_back( false ); + } } } this->fetchDown = false; } - switch(this->storeMode) { + switch(storeMode) { case 0: - if (this->store && this->store->GetValid()) StoreUtils::EntryHandle(hDown, hHeld, touch, this->showMarks, this->fetchDown); + if (StoreUtils::store && StoreUtils::store->GetValid() && StoreUtils::entries.size() > 0) StoreUtils::EntryHandle(this->showMarks, this->fetchDown, this->screenshotFetch, storeMode, StoreUtils::entries[StoreUtils::store->GetEntry()]); break; case 1: - if (this->store && this->store->GetValid()) StoreUtils::DownloadHandle(hDown, hHeld, touch, this->store, this->entries[this->store->GetEntry()], this->dwnldList, this->storeMode, this->meta, this->lastMode, this->smallDelay); + if (StoreUtils::store && StoreUtils::store->GetValid() && StoreUtils::entries.size() > 0) StoreUtils::DownloadHandle(StoreUtils::entries[StoreUtils::store->GetEntry()], this->dwnldList, storeMode, this->lastMode, this->smallDelay, this->installs, this->dwnldTypes); break; case 2: - StoreUtils::SearchHandle(hDown, hHeld, touch, this->store, this->entries, this->searchIncludes, this->meta, this->searchResult, this->marks, this->updateFilter, this->ascending, this->sorttype); + StoreUtils::QueueMenuHandle(this->queueIndex, this->storeMode); break; case 3: - StoreUtils::SortHandle(hDown, hHeld, touch, this->store, this->entries, this->ascending, this->sorttype); + StoreUtils::SearchHandle(this->searchIncludes, this->searchResult, this->marks, this->updateFilter, this->ascending, this->sorttype, this->isAND); break; case 4: - StoreUtils::SettingsHandle(hDown, hHeld, touch, this->sPage, this->showSettings, this->storeMode, this->sSelection, this->store, this->entries, this->meta, this->sPos); + StoreUtils::SortHandle(this->ascending, this->sorttype); + break; + + case 5: + StoreUtils::SettingsHandle(this->sPage, this->showSettings, storeMode, this->sSelection, this->sPos); break; } } -} \ No newline at end of file +} diff --git a/source/store/downList.cpp b/source/store/downList.cpp deleted file mode 100644 index b02d76e..0000000 --- a/source/store/downList.cpp +++ /dev/null @@ -1,157 +0,0 @@ -/* -* This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* Additional Terms 7.b and 7.c of GPLv3 apply to this file: -* * Requiring preservation of specified reasonable legal notices or -* author attributions in that material or in the Appropriate Legal -* Notices displayed by works containing it. -* * Prohibiting misrepresentation of the origin of that material, -* or requiring that modified versions of such material be marked in -* reasonable ways as different from the original version. -*/ - -#include "scriptUtils.hpp" -#include "storeUtils.hpp" -#include "structs.hpp" - -#define DOWNLOAD_ENTRIES 7 -extern bool touching(touchPosition touch, Structs::ButtonPos button); -static const std::vector downloadBoxes = { - { 54, 32, 262, 22 }, - { 54, 62, 262, 22 }, - { 54, 92, 262, 22 }, - { 54, 122, 262, 22 }, - { 54, 152, 262, 22 }, - { 54, 182, 262, 22 }, - { 54, 212, 262, 22 } -}; - -/* - Draw the Download Entries part. - - const std::unique_ptr &store: Const Reference to the Store class. - const std::vector &entries: Const Reference to the download list as a vector of strings. - const bool &fetch: Const Reference to Fetch. -*/ -void StoreUtils::DrawDownList(const std::unique_ptr &store, const std::vector &entries, const bool &fetch) { - if (store && !fetch) { - Gui::Draw_Rect(48, 0, 272, 25, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 25, 272, 1, ENTRY_BAR_OUTL_COLOR); - Gui::DrawStringCentered(25, 2, 0.6, TEXT_COLOR, Lang::get("AVAILABLE_DOWNLOADS"), 265); - - if (entries.size() > 0) { - for (int i = 0; i < DOWNLOAD_ENTRIES && i < (int)entries.size(); i++) { - if (store->GetDownloadIndex() == i + store->GetDownloadSIndex()) GFX::DrawBox(downloadBoxes[i].x, downloadBoxes[i].y, downloadBoxes[i].w, downloadBoxes[i].h, false); - Gui::DrawStringCentered(54 - 160 + (262 / 2), downloadBoxes[i].y + 4, 0.45f, TEXT_COLOR, entries[(i + store->GetDownloadSIndex())], 260); - } - - } else { // If no downloads available.. - Gui::DrawStringCentered(54 - 160 + (262 / 2), downloadBoxes[0].y + 4, 0.5f, TEXT_COLOR, Lang::get("NO_DOWNLOADS_AVAILABLE"), 255); - } - } -} - -/* - This is the Download List handle. - Here you can.. - - - Scroll through the download list, if any available. - - Execute an Entry of the download list. - - Return back to EntryInfo through `B`. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - const std::unique_ptr &store: Const Reference to the Store class, since we do not modify anything in it. - const std::unique_ptr &entry: Const Reference to the current StoreEntry, since we do not modify anything in it. - const std::vector &entries: Const Reference to the download list, since we do not modify anything in it. - int ¤tMenu: Reference to the StoreMode / Menu, so we can switch back to EntryInfo with `B`. - std::unique_ptr &meta: Reference to the Meta, to apply the updates stuff. - const int &lastMode: Const Reference to the last mode. - int &smallDelay: Reference to the small delay. This helps to not directly press A. -*/ -void StoreUtils::DownloadHandle(u32 hDown, u32 hHeld, touchPosition touch, const std::unique_ptr &store, const std::unique_ptr &entry, const std::vector &entries, int ¤tMenu, std::unique_ptr &meta, const int &lastMode, int &smallDelay) { - if (store && entry) { // Ensure, store & entry is not a nullptr. - if (smallDelay > 0) { - smallDelay--; - } - - if (hRepeat & KEY_DOWN) { - if (entries.size() <= 0) return; // Smaller *than* 0 -> Invalid. - - if (store->GetDownloadIndex() < (int)entries.size() - 1) store->SetDownloadIndex(store->GetDownloadIndex() + 1); - else store->SetDownloadIndex(0); - } - - if (hRepeat & KEY_UP) { - if (entries.size() <= 0) return; // Smaller *than* 0 -> Invalid. - - if (store->GetDownloadIndex() > 0) store->SetDownloadIndex(store->GetDownloadIndex() - 1); - else store->SetDownloadIndex(entries.size() - 1); - } - - - if (hRepeat & KEY_RIGHT) { - if (entries.size() <= 0) return; // Smaller *than* 0 -> Invalid. - - if (store->GetDownloadIndex() + DOWNLOAD_ENTRIES < (int)entries.size()-1) store->SetDownloadIndex(store->GetDownloadIndex() + DOWNLOAD_ENTRIES); - else store->SetDownloadIndex(entries.size()-1); - } - - if (hRepeat & KEY_LEFT) { - if (entries.size() <= 0) return; // Smaller *than* 0 -> Invalid. - - if (store->GetDownloadIndex() - DOWNLOAD_ENTRIES > 0) store->SetDownloadIndex(store->GetDownloadIndex() - DOWNLOAD_ENTRIES); - else store->SetDownloadIndex(0); - } - - if (smallDelay == 0 && hDown & KEY_TOUCH) { - if (entries.size() <= 0) return; // Smaller *than* 0 -> Invalid. - - for (int i = 0; i < DOWNLOAD_ENTRIES; i++) { - if (touching(touch, downloadBoxes[i])) { - if (i + store->GetDownloadSIndex() < (int)entries.size()) { - const std::string tmp = Lang::get("EXECUTE_ENTRY") + "\n\n" + entries[i + store->GetDownloadSIndex()]; - - if (Msg::promptMsg(tmp)) { - ScriptUtils::runFunctions(store->GetJson(), entry->GetEntryIndex(), entries[i + store->GetDownloadSIndex()]); - if (meta) meta->SetUpdated(store->GetUniStoreTitle(), entry->GetTitle(), entry->GetLastUpdated()); - entry->SetUpdateAvl(false); - } - } - } - } - } - - if (smallDelay == 0 && hDown & KEY_A) { - if (entries.size() <= 0) return; // Smaller *than* 0 -> Invalid. - - const std::string tmp = Lang::get("EXECUTE_ENTRY") + "\n\n" + entries[store->GetDownloadIndex()]; - if (Msg::promptMsg(tmp)) { - ScriptUtils::runFunctions(store->GetJson(), entry->GetEntryIndex(), entries[store->GetDownloadIndex()]); - if (meta) meta->SetUpdated(store->GetUniStoreTitle(), entry->GetTitle(), entry->GetLastUpdated()); - entry->SetUpdateAvl(false); - } - } - - if (hDown & KEY_B) currentMenu = lastMode; // Go back to EntryInfo. - - /* Scroll Handle. */ - if (store->GetDownloadIndex() < store->GetDownloadSIndex()) store->SetDownloadSIndex(store->GetDownloadIndex()); - else if (store->GetDownloadIndex() > store->GetDownloadSIndex() + DOWNLOAD_ENTRIES - 1) store->SetDownloadSIndex(store->GetDownloadIndex() - DOWNLOAD_ENTRIES + 1); - } -} \ No newline at end of file diff --git a/source/store/entryInfo.cpp b/source/store/entryInfo.cpp deleted file mode 100644 index a838e67..0000000 --- a/source/store/entryInfo.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* -* This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* Additional Terms 7.b and 7.c of GPLv3 apply to this file: -* * Requiring preservation of specified reasonable legal notices or -* author attributions in that material or in the Appropriate Legal -* Notices displayed by works containing it. -* * Prohibiting misrepresentation of the origin of that material, -* or requiring that modified versions of such material be marked in -* reasonable ways as different from the original version. -*/ - -#include "storeUtils.hpp" -#include "structs.hpp" - -extern bool touching(touchPosition touch, Structs::ButtonPos button); -static const Structs::ButtonPos btn = { 53, 215, 20, 20 }; - -/* - Draw the Entry Info part. - - const std::unique_ptr &store: Const Reference to the Store class. - const std::unique_ptr &entry: Const Reference to the current StoreEntry. -*/ -void StoreUtils::DrawEntryInfo(const std::unique_ptr &store, const std::unique_ptr &entry) { - if (store && entry) { // Ensure, store & entry is not a nullptr. - Gui::Draw_Rect(48, 0, 272, 36, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 36, 272, 1, ENTRY_BAR_OUTL_COLOR); - - Gui::DrawStringCentered(25, 0, 0.6, TEXT_COLOR, entry->GetTitle(), 265); - Gui::DrawStringCentered(25, 20, 0.4, TEXT_COLOR, entry->GetAuthor(), 265); - - if (entry->GetDescription() != "") { - /* "\n\n" breaks C2D_WordWrap, so check here. */ - if (!(entry->GetDescription().find("\n\n") != std::string::npos)) { - Gui::DrawStringCentered(25, 50, 0.4, TEXT_COLOR, entry->GetDescription(), 240, 0, nullptr, C2D_WordWrap); - - } else { - Gui::DrawStringCentered(25, 50, 0.4, TEXT_COLOR, entry->GetDescription(), 240, 0); - } - } - - Gui::DrawString(61, 130, 0.45, TEXT_COLOR, Lang::get("VERSION") + ": " + entry->GetVersion(), 240); - Gui::DrawString(61, 145, 0.45, TEXT_COLOR, Lang::get("CATEGORY") + ": " + entry->GetCategory(), 240); - Gui::DrawString(61, 160, 0.45, TEXT_COLOR, Lang::get("CONSOLE") + ": " + entry->GetConsole(), 240); - Gui::DrawString(61, 175, 0.45, TEXT_COLOR, Lang::get("LAST_UPDATED") + ": " + entry->GetLastUpdated(), 240); - Gui::DrawString(61, 190, 0.45, TEXT_COLOR, Lang::get("LICENSE") + ": " + entry->GetLicense(), 240); - - GFX::DrawBox(btn.x, btn.y, btn.w, btn.h, false); - Gui::DrawString(btn.x + 3, btn.y, 0.6f, TEXT_COLOR, "★"); - } -} - -/* - The EntryInfo handle. - Here you can.. - - - Go to the download list, by pressing `A`. - - Show the MarkMenu with START. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - bool &showMark: Reference to showMark.. to show the mark menu. - bool &fetch: Reference to fetch, so we know, if we need to fetch, when accessing download list. -*/ -void StoreUtils::EntryHandle(u32 hDown, u32 hHeld, touchPosition touch, bool &showMark, bool &fetch) { - if ((hDown & KEY_START) || (hDown & KEY_TOUCH && touching(touch, btn))) showMark = true; -} \ No newline at end of file diff --git a/source/store/grid.cpp b/source/store/grid.cpp deleted file mode 100644 index 2e5747a..0000000 --- a/source/store/grid.cpp +++ /dev/null @@ -1,192 +0,0 @@ -/* -* This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* Additional Terms 7.b and 7.c of GPLv3 apply to this file: -* * Requiring preservation of specified reasonable legal notices or -* author attributions in that material or in the Appropriate Legal -* Notices displayed by works containing it. -* * Prohibiting misrepresentation of the origin of that material, -* or requiring that modified versions of such material be marked in -* reasonable ways as different from the original version. -*/ - -#include "storeUtils.hpp" -#include "structs.hpp" - -static const std::vector GridBoxes = { - {25, 45, 50, 50}, - {100, 45, 50, 50}, - {175, 45, 50, 50}, - {250, 45, 50, 50}, - {325, 45, 50, 50}, - - {25, 105, 50, 50}, - {100, 105, 50, 50}, - {175, 105, 50, 50}, - {250, 105, 50, 50}, - {325, 105, 50, 50}, - - {25, 165, 50, 50}, - {100, 165, 50, 50}, - {175, 165, 50, 50}, - {250, 165, 50, 50}, - {325, 165, 50, 50} -}; - -/* - Draw the Top Grid. - - const std::unique_ptr &store: Const Reference to the Store class. - const std::vector> &entries: Const Reference to the StoreEntries. -*/ -void StoreUtils::DrawGrid(const std::unique_ptr &store, const std::vector> &entries) { - if (store) { // Ensure, store is not a nullptr. - - if (config->usebg() && store->customBG()) { - C2D_DrawImageAt(store->GetStoreImg(), 0, 26, 0.5f, nullptr); - - } else { - Gui::Draw_Rect(0, 26, 400, 214, BG_COLOR); - } - - for (int i = 0, i2 = 0 + (store->GetScreenIndx() * 5); i2 < 15 + (store->GetScreenIndx() * 5) && i2 < (int)entries.size(); i2++, i++) { - - /* Boxes. */ - if (i == store->GetBox()) GFX::DrawBox(GridBoxes[i].x, GridBoxes[i].y, 50, 50, true); - - /* Ensure, entries is larger than the index. */ - if ((int)entries.size() > i2) { - if (entries[i2]) { // Ensure, the Entry is not nullptr. - const C2D_Image tempImg = entries[i2]->GetIcon(); - const uint8_t offsetW = (48 - tempImg.subtex->width) / 2; // Center W. - const uint8_t offsetH = (48 - tempImg.subtex->height) / 2; // Center H. - - C2D_DrawImageAt(tempImg, GridBoxes[i].x + 1 + offsetW, GridBoxes[i].y + 1 + offsetH, 0.5); - - /* Update Available mark. */ - if (entries[i2]->GetUpdateAvl()) GFX::DrawSprite(sprites_update_app_idx, GridBoxes[i].x + 32, GridBoxes[i].y + 32); - } - } - } - } -} - - -/* - Top Grid Logic Handle. - Here you can.. - - - Scroll through the Grid with the D-Pad. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - std::unique_ptr &store: Reference to the Store class. - std::vector> &entries: Reference to the StoreEntries. - const int ¤tMode: Reference to the current Mode. - int &lastMode: Reference to the last mode. - bool &fetch: Reference to fetch. - int &smallDelay: Reference to the small delay. -*/ -void StoreUtils::GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &store, std::vector> &entries, int ¤tMode, int &lastMode, bool &fetch, int &smallDelay) { - if (store) { // Ensure, store is not a nullptr. - if (hRepeat & KEY_DOWN) { - if (store->GetBox() > 9) { - if (store->GetEntry() + 5 < (int)entries.size()) { - store->SetEntry(store->GetEntry() + 5); - - if (store->GetScreenIndx() < ((entries.size() / 5) - 2)) { - store->SetScreenIndx(store->GetScreenIndx() + 1); - } - - } else { - if (store->GetEntry() < (int)entries.size() - 1) { - store->SetEntry(entries.size() - 1); - store->SetBox(10 + (store->GetEntry() % 5)); - - if (store->GetScreenIndx() < ((entries.size() / 5) - 2)) { - store->SetScreenIndx(store->GetScreenIndx() + 1); - } - } - } - - } else { - if (store->GetEntry() + 5 < (int)entries.size()) { - store->SetBox(store->GetBox() + 5); - store->SetEntry(store->GetEntry() + 5); - } - } - } - - if (hRepeat & KEY_RIGHT) { - if (store->GetEntry() < (int)entries.size() - 1) { - if (store->GetBox() < 14) { - store->SetBox(store->GetBox() + 1); - store->SetEntry(store->GetEntry() + 1); - - } else { - store->SetBox(10); - store->SetEntry(store->GetEntry() + 1); - - if (store->GetScreenIndx() < ((entries.size() / 5) - 2)) { - store->SetScreenIndx(store->GetScreenIndx() + 1); - } - } - } - } - - if (hRepeat & KEY_LEFT) { - if (store->GetEntry() > 0) { - if (store->GetBox() > 0) { - store->SetBox(store->GetBox() - 1); - store->SetEntry(store->GetEntry() - 1); - - } else { - store->SetBox(4); - store->SetEntry(store->GetEntry() - 1); - - if (store->GetScreenIndx() > 0) { - store->SetScreenIndx(store->GetScreenIndx() - 1); - } - } - } - } - - if (hRepeat & KEY_UP) { - if (store->GetBox() < 5) { - if (store->GetEntry() > 4) { - store->SetEntry(store->GetEntry() - 5); - - if (store->GetScreenIndx() > 0) { - store->SetScreenIndx(store->GetScreenIndx() - 1); - } - } - - } else { - store->SetBox(store->GetBox() - 5); - store->SetEntry(store->GetEntry() - 5); - } - } - - if (hDown & KEY_A) { - fetch = true; - smallDelay = 5; - lastMode = currentMode; - currentMode = 1; - } - } -} \ No newline at end of file diff --git a/source/store/markMenu.cpp b/source/store/markMenu.cpp deleted file mode 100644 index a158800..0000000 --- a/source/store/markMenu.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* -* This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* Additional Terms 7.b and 7.c of GPLv3 apply to this file: -* * Requiring preservation of specified reasonable legal notices or -* author attributions in that material or in the Appropriate Legal -* Notices displayed by works containing it. -* * Prohibiting misrepresentation of the origin of that material, -* or requiring that modified versions of such material be marked in -* reasonable ways as different from the original version. -*/ - -#include "storeUtils.hpp" -#include "structs.hpp" - -extern bool touching(touchPosition touch, Structs::ButtonPos button); -static const std::vector markBox = { - {10, 94, 52, 52}, - {72, 94, 52, 52}, - {134, 94, 52, 52}, - {196, 94, 52, 52}, - {258, 94, 52, 52}, - - { 53, 215, 20, 20 } -}; - -/* - Draw the Marking part. - - const int &marks: A Reference to the active mark flags. -*/ -void StoreUtils::DisplayMarkBox(const int &marks) { - Gui::Draw_Rect(0, 0, 320, 240, DIM_COLOR); // Darken. - - Gui::Draw_Rect(markBox[0].x, markBox[0].y, markBox[0].w, markBox[0].h, (marks & favoriteMarks::STAR ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - - Gui::Draw_Rect(markBox[1].x, markBox[1].y, markBox[1].w, markBox[1].h, (marks & favoriteMarks::HEART ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - - Gui::Draw_Rect(markBox[2].x, markBox[2].y, markBox[2].w, markBox[2].h, (marks & favoriteMarks::DIAMOND ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - - Gui::Draw_Rect(markBox[3].x, markBox[3].y, markBox[3].w, markBox[3].h, (marks & favoriteMarks::CLUBS ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - - Gui::Draw_Rect(markBox[4].x, markBox[4].y, markBox[4].w, markBox[4].h, (marks & favoriteMarks::SPADE ? - SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - - Gui::DrawString(markBox[0].x + 15, markBox[0].y + 11, 0.9, TEXT_COLOR, "★"); - Gui::DrawString(markBox[1].x + 15, markBox[1].y + 11, 0.9, TEXT_COLOR, "♥"); - Gui::DrawString(markBox[2].x + 15, markBox[2].y + 11, 0.9, TEXT_COLOR, "♦"); - Gui::DrawString(markBox[3].x + 15, markBox[3].y + 11, 0.9, TEXT_COLOR, "♣"); - Gui::DrawString(markBox[4].x + 15, markBox[4].y + 11, 0.9, TEXT_COLOR, "♠"); - - GFX::DrawBox(markBox[5].x, markBox[5].y, markBox[5].w, markBox[5].h, false); - Gui::DrawString(markBox[5].x + 3, markBox[5].y, 0.6f, TEXT_COLOR, "★"); -} - -/* - Mark Menu handle. - Here you can.. - - - Mark the selected app. - - Return to EntryInfo with `B`. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - std::unique_ptr &entry: Reference to the current StoreEntry. - const std::unique_ptr &store: Const Reference to the Store, since we do not modify anything there. - bool &showMark: Reference to showMark, so we know, if we should stay here or not. - std::unique_ptr &meta: Reference to the Meta class. -*/ -void StoreUtils::MarkHandle(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr &entry, const std::unique_ptr &store, bool &showMark, std::unique_ptr &meta) { - hidScanInput(); - touchPosition t; - hidTouchRead(&t); - - if (meta && entry) { - if (hidKeysDown() & KEY_TOUCH) { - /* Star. */ - if (touching(t, markBox[0])) { - meta->SetMarks(store->GetUniStoreTitle(), entry->GetTitle(), - meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::STAR); - entry->SetMark(meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle())); - - /* Heart. */ - } else if (touching(t, markBox[1])) { - meta->SetMarks(store->GetUniStoreTitle(), entry->GetTitle(), - meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::HEART); - entry->SetMark(meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle())); - - /* Diamond. */ - } else if (touching(t, markBox[2])) { - meta->SetMarks(store->GetUniStoreTitle(), entry->GetTitle(), - meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::DIAMOND); - entry->SetMark(meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle())); - - /* Clubs. */ - } else if (touching(t, markBox[3])) { - meta->SetMarks(store->GetUniStoreTitle(), entry->GetTitle(), - meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::CLUBS); - entry->SetMark(meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle())); - - /* Spade. */ - } else if (touching(t, markBox[4])) { - meta->SetMarks(store->GetUniStoreTitle(), entry->GetTitle(), - meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle()) ^ favoriteMarks::SPADE); - - entry->SetMark(meta->GetMarks(store->GetUniStoreTitle(), entry->GetTitle())); - } - } - } - - - if ((hidKeysDown() & KEY_B || hidKeysDown() & KEY_START) || (hidKeysDown() & KEY_TOUCH && touching(t, markBox[5]))) showMark = false; // Return back to screen. -} \ No newline at end of file diff --git a/source/store/meta.cpp b/source/store/meta.cpp index 4faa286..930676d 100644 --- a/source/store/meta.cpp +++ b/source/store/meta.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,8 +43,12 @@ Meta::Meta() { } FILE *temp = fopen(_META_PATH, "rt"); - this->metadataJson = nlohmann::json::parse(temp, nullptr, false); - fclose(temp); + if (temp) { + this->metadataJson = nlohmann::json::parse(temp, nullptr, false); + fclose(temp); + } + if (this->metadataJson.is_discarded()) + this->metadataJson = { }; if (config->metadata()) this->ImportMetadata(); } @@ -59,9 +63,15 @@ void Meta::ImportMetadata() { } Msg::DisplayMsg(Lang::get("FETCHING_METADATA")); - FILE *old = fopen("sdmc:/3ds/Universal-Updater/updates.json", "r"); - nlohmann::json oldJson = nlohmann::json::parse(old, nullptr, false); - fclose(old); + + nlohmann::json oldJson; + FILE *old = fopen("sdmc:/3ds/Universal-Updater/updates.json", "rt"); + if (old) { + oldJson = nlohmann::json::parse(old, nullptr, false); + fclose(old); + } + if (oldJson.is_discarded()) + oldJson = { }; std::vector info = GetUniStoreInfo(_STORE_PATH); // Fetch UniStores. @@ -79,10 +89,10 @@ void Meta::ImportMetadata() { /* Get Last Updated. - std::string unistoreName: The UniStore name. - std::string entry: The Entry name. + const std::string &unistoreName: The UniStore name. + const std::string &entry: The Entry name. */ -std::string Meta::GetUpdated(std::string unistoreName, std::string entry) const { +std::string Meta::GetUpdated(const std::string &unistoreName, const std::string &entry) const { if (!this->metadataJson.contains(unistoreName)) return ""; // UniStore Name does not exist. if (!this->metadataJson[unistoreName].contains(entry)) return ""; // Entry does not exist. @@ -96,10 +106,10 @@ std::string Meta::GetUpdated(std::string unistoreName, std::string entry) const /* Get the marks. - std::string unistoreName: The UniStore name. - std::string entry: The Entry name. + const std::string &unistoreName: The UniStore name. + const std::string &entry: The Entry name. */ -int Meta::GetMarks(std::string unistoreName, std::string entry) const { +int Meta::GetMarks(const std::string &unistoreName, const std::string &entry) const { int temp = 0; if (!this->metadataJson.contains(unistoreName)) return temp; // UniStore Name does not exist. @@ -115,11 +125,11 @@ int Meta::GetMarks(std::string unistoreName, std::string entry) const { /* Return, if update available. - std::string unistoreName: The UniStore name. - std::string entry: The Entry name. - std::string updated: Compare for the update. + const std::string &unistoreName: The UniStore name. + const std::string &entry: The Entry name. + const std::string &updated: Compare for the update. */ -bool Meta::UpdateAvailable(std::string unistoreName, std::string entry, std::string updated) const { +bool Meta::UpdateAvailable(const std::string &unistoreName, const std::string &entry, const std::string &updated) const { if (this->GetUpdated(unistoreName, entry) != "" && updated != "") { return strcasecmp(updated.c_str(), this->GetUpdated(unistoreName, entry).c_str()) > 0; } @@ -127,6 +137,23 @@ bool Meta::UpdateAvailable(std::string unistoreName, std::string entry, std::str return false; } +/* + Get the marks. + + const std::string &unistoreName: The UniStore name. + const std::string &entry: The Entry name. +*/ +std::vector Meta::GetInstalled(const std::string &unistoreName, const std::string &entry) const { + if (!this->metadataJson.contains(unistoreName)) return { }; // UniStore Name does not exist. + + if (!this->metadataJson[unistoreName].contains(entry)) return { }; // Entry does not exist. + + if (!this->metadataJson[unistoreName][entry].contains("installed")) return { }; // marks does not exist. + + if (this->metadataJson[unistoreName][entry]["installed"].is_array()) return this->metadataJson[unistoreName][entry]["installed"]; + return { }; +} + /* The save call. diff --git a/source/store/settings.cpp b/source/store/settings.cpp deleted file mode 100644 index f309e20..0000000 --- a/source/store/settings.cpp +++ /dev/null @@ -1,580 +0,0 @@ -/* -* This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* Additional Terms 7.b and 7.c of GPLv3 apply to this file: -* * Requiring preservation of specified reasonable legal notices or -* author attributions in that material or in the Appropriate Legal -* Notices displayed by works containing it. -* * Prohibiting misrepresentation of the origin of that material, -* or requiring that modified versions of such material be marked in -* reasonable ways as different from the original version. -*/ - -#include "overlay.hpp" -#include "storeUtils.hpp" - -extern bool exiting; -extern bool touching(touchPosition touch, Structs::ButtonPos button); -static const std::vector mainButtons = { - { 54, 32, 262, 22 }, - { 54, 62, 262, 22 }, - { 54, 92, 262, 22 }, - { 54, 122, 262, 22 }, - { 54, 152, 262, 22 }, - { 54, 182, 262, 22 }, - { 54, 212, 262, 22 } -}; - -static const std::vector langButtons = { - { 10, 34, 300, 22 }, - { 10, 64, 300, 22 }, - { 10, 94, 300, 22 }, - { 10, 124, 300, 22 }, - { 10, 154, 300, 22 }, - { 10, 184, 300, 22 }, - { 10, 214, 300, 22 }, - - { 52, 6, 24, 24 } // Back arrow. -}; - -static const std::vector toggleAbles = { - { 52, 6, 24, 24 }, // Back arrow. - { 288, 64, 24, 24 }, - { 288, 140, 24, 24 } -}; - -static const Structs::ButtonPos back = { 52, 0, 24, 24 }; // Back arrow for directory. - - -static const std::vector mainStrings = { "LANGUAGE", "SELECT_UNISTORE", "AUTO_UPDATE_SETTINGS_BTN", "GUI_SETTINGS_BTN", "DIRECTORY_SETTINGS_BTN", "CREDITS", "EXIT_APP" }; -static const std::vector dirStrings = { "CHANGE_3DSX_PATH", "CHANGE_NDS_PATH", "CHANGE_ARCHIVE_PATH" }; - -static const std::vector languages = { "Bruh", "Dansk", "Deutsch", "English", "Español", "Français", "Italiano", "Lietuvių", "Magyar", "Polski", "Português", "Português (Brasil)", "Русский", "日本語" }; -static const std::string langsTemp[] = { "br", "da", "de", "en", "es", "fr", "it", "lt", "hu", "pl", "pt", "pt-BR", "ru", "jp"}; - -/* - Main Settings. - - const int &selection: Const Reference to the Settings Selection. -*/ -static void DrawSettingsMain(const int &selection) { - Gui::Draw_Rect(48, 0, 272, 25, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 25, 272, 1, ENTRY_BAR_OUTL_COLOR); - Gui::DrawStringCentered(25, 2, 0.6, TEXT_COLOR, Lang::get("SETTINGS"), 265); - - for (int i = 0; i < 7; i++) { - if (i == selection) GFX::DrawBox(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, false); - Gui::DrawStringCentered(30, mainButtons[i].y + 4, 0.45f, TEXT_COLOR, Lang::get(mainStrings[i]), 255); - } -} - -/* - Draw the Language Selection. - - const int &selection: Const Reference to the Language Selection. - const int &sPos: Const Reference to the Screen Position. -*/ -static void DrawLanguageSettings(const int &selection, const int &sPos) { - Gui::Draw_Rect(48, 0, 272, 25, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 25, 272, 1, ENTRY_BAR_OUTL_COLOR); - GFX::DrawSprite(sprites_arrow_idx, back.x, back.y); - Gui::DrawStringCentered(32, 2, 0.6, TEXT_COLOR, Lang::get("SELECT_LANG"), 240); - - for(int i = 0; i < 7 && i < (int)languages.size(); i++) { - if (sPos + i == selection) GFX::DrawBox(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, false); - Gui::DrawStringCentered(30, mainButtons[i].y + 4, 0.45f, TEXT_COLOR, languages[sPos + i], 280); - } -} - -/* - Directory Change Draw. - - const int &selection: Const Reference to the Settings Selection. -*/ -static void DrawSettingsDir(const int &selection) { - Gui::Draw_Rect(48, 0, 272, 25, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 25, 272, 1, ENTRY_BAR_OUTL_COLOR); - GFX::DrawSprite(sprites_arrow_idx, back.x, back.y); - Gui::DrawStringCentered(32, 2, 0.6, TEXT_COLOR, Lang::get("DIRECTORY_SETTINGS"), 240); - - for (int i = 0; i < 3; i++) { - if (i == selection) GFX::DrawBox(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, false); - Gui::DrawStringCentered(30, mainButtons[i].y + 4, 0.45f, TEXT_COLOR, Lang::get(dirStrings[i]), 255); - } -} - -/* - Draw Auto-Update Settings page. -*/ -static void DrawAutoUpdate(const int &selection) { - Gui::Draw_Rect(48, 0, 272, 36, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 36, 272, 1, ENTRY_BAR_OUTL_COLOR); - GFX::DrawSprite(sprites_arrow_idx, 52, 6); - - Gui::DrawStringCentered(32, 7, 0.6, TEXT_COLOR, Lang::get("AUTO_UPDATE_SETTINGS"), 240); - - /* Toggle Boxes. */ - Gui::Draw_Rect(48, 64, 273, 24, (selection == 0 ? SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - Gui::DrawString(55, 68, 0.5f, TEXT_COLOR, Lang::get("AUTO_UPDATE_UNISTORE"), 210); - GFX::DrawToggle(288, 64, config->autoupdate()); - Gui::DrawString(55, 95, 0.4f, TEXT_COLOR, Lang::get("AUTO_UPDATE_UNISTORE_DESC"), 265, 0, nullptr, C2D_WordWrap); - - Gui::Draw_Rect(48, 140, 273, 24, (selection == 1 ? SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - Gui::DrawString(55, 144, 0.5f, TEXT_COLOR, Lang::get("AUTO_UPDATE_UU"), 210); - GFX::DrawToggle(288, 140, config->updatecheck()); - Gui::DrawString(55, 171, 0.4f, TEXT_COLOR, Lang::get("AUTO_UPDATE_UU_DESC"), 265, 0, nullptr, C2D_WordWrap); -} - -/* - Draw the GUI Settings. - - const int &selection: Const Reference to the Settings Selection. -*/ -static void DrawGUISettings(const int &selection) { - Gui::Draw_Rect(48, 0, 272, 36, ENTRY_BAR_COLOR); - Gui::Draw_Rect(48, 36, 272, 1, ENTRY_BAR_OUTL_COLOR); - GFX::DrawSprite(sprites_arrow_idx, 52, 6); - - Gui::DrawStringCentered(32, 7, 0.6, TEXT_COLOR, Lang::get("GUI_SETTINGS"), 240); - - Gui::Draw_Rect(48, 64, 273, 24, (selection == 0 ? SIDEBAR_UNSELECTED_COLOR : BOX_INSIDE_COLOR)); - Gui::DrawString(55, 68, 0.5f, TEXT_COLOR, Lang::get("UNISTORE_BG"), 210); - GFX::DrawToggle(288, 64, config->usebg()); - Gui::DrawString(55, 95, 0.4f, TEXT_COLOR, Lang::get("UNISTORE_BG_DESC"), 265, 0, nullptr, C2D_WordWrap); -} - - -/* - Settings Main Handle. - Here you can.. - - - Change the Language. - - Access the UniStore Manage Handle. - - Enable UniStore auto update on boot. - - Show the Credits. - - Exit Universal-Updater. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - int &page: Reference to the page. - bool &dspSettings: Reference to the display Settings. - int &storeMode: Reference to the Store Mode. - int &selection: Reference to the Selection. - std::unique_ptr &store: Reference to the Store class. - std::vector> &entries: Reference to the StoreEntries. - std::unique_ptr &meta: Reference to the Meta class. -*/ -static void SettingsHandleMain(u32 hDown, u32 hHeld, touchPosition touch, int &page, bool &dspSettings, int &storeMode, int &selection, std::unique_ptr &store, std::vector> &entries, std::unique_ptr &meta) { - if (hDown & KEY_B) { - selection = 0; - storeMode = 0; - } - - if (hRepeat & KEY_DOWN) { - if (selection < 6) selection++; - else selection = 0; - } - - if (hRepeat & KEY_UP) { - if (selection > 0) selection--; - else selection = mainStrings.size() - 1; - } - - if (hRepeat & KEY_RIGHT) { - if (selection + 8 < (int)mainStrings.size()) selection += 8; - else selection = mainStrings.size() - 1; - } - - if (hRepeat & KEY_LEFT) { - if (selection - 8 > 0) selection -= 8; - else selection = 0; - } - - if (hDown & KEY_TOUCH) { - if (touching(touch, mainButtons[0])) { - selection = 0; - page = 4; - - } else if (touching(touch, mainButtons[1])) { - Overlays::SelectStore(store, entries, meta); - - } else if (touching(touch, mainButtons[2])) { - selection = 0; - page = 2; - - } else if (touching(touch, mainButtons[3])) { - selection = 0; - page = 3; - - } else if (touching(touch, mainButtons[4])) { - selection = 0; - page = 1; - - } else if (touching(touch, mainButtons[5])) { - Overlays::ShowCredits(); - - } else if (touching(touch, mainButtons[6])) { - exiting = true; - } - } - - if (hDown & KEY_A) { - switch(selection) { - case 0: - selection = 0; - page = 4; - break; - - case 1: - Overlays::SelectStore(store, entries, meta); - break; - - case 2: - selection = 0; - page = 2; - break; - - case 3: - selection = 0; - page = 3; - break; - - case 4: - selection = 0; - page = 1; - break; - - case 5: - Overlays::ShowCredits(); - break; - - case 6: - exiting = true; - break; - } - } -} - -/* - Directory Handle. - Here you can.. - - - Change the Directory of... - - 3DSX, NDS & Archives. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - int &page: Reference to the page. - int &selection: Reference to the Selection. -*/ -static void SettingsHandleDir(u32 hDown, u32 hHeld, touchPosition touch, int &page, int &selection, const std::unique_ptr &store) { - if (hDown & KEY_B) { - page = 0; - selection = 4; - } - - if (hRepeat & KEY_DOWN) { - if (selection < 2) selection++; - else selection = 0; - } - - if (hRepeat & KEY_UP) { - if (selection > 0) selection--; - else selection = dirStrings.size()-1; - } - - if (hRepeat & KEY_RIGHT) { - if (selection + 8 < (int)dirStrings.size()-1) selection += 8; - else selection = dirStrings.size()-1; - } - - if (hRepeat & KEY_LEFT) { - if (selection - 8 > 0) selection -= 8; - else selection = 0; - } - - if (hDown & KEY_TOUCH) { - if (touching(touch, back)) { - page = 0; - selection = 4; - - } else if (touching(touch, mainButtons[0])) { - const std::string path = Overlays::SelectDir(config->_3dsxPath(), Lang::get("SELECT_DIR"), store); - if (path != "") config->_3dsxPath(path); - - } else if (touching(touch, mainButtons[1])) { - const std::string path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR"), store); - if (path != "") config->ndsPath(path); - - } else if (touching(touch, mainButtons[2])) { - const std::string path = Overlays::SelectDir(config->archPath(), Lang::get("SELECT_DIR"), store); - if (path != "") config->archPath(path); - } - } - - if (hDown & KEY_A) { - std::string path = ""; - - switch(selection) { - case 0: - path = Overlays::SelectDir(config->_3dsxPath(), Lang::get("SELECT_DIR"), store); - if (path != "") config->_3dsxPath(path); - break; - - case 1: - path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR"), store); - if (path != "") config->ndsPath(path); - break; - - case 2: - path = Overlays::SelectDir(config->archPath(), Lang::get("SELECT_DIR"), store); - if (path != "") config->archPath(path); - break; - } - } -} - -/* - Logic of the Auto-Update Settings. - - Here you can.. - - - Enable / Disable Automatically updating the UniStore on boot. - - Enable / Disable Automatically check for Universal-Updater updates on boot. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - int &page: Reference to the page. - int &selection: Reference to the Selection. -*/ -static void AutoUpdateLogic(u32 hDown, u32 hHeld, touchPosition touch, int &page, int &selection) { - if (hDown & KEY_B) { - page = 0; - selection = 2; - } - - if (hRepeat & KEY_DOWN) { - if (selection < 1) selection++; - } - - if (hRepeat & KEY_UP) { - if (selection > 0) selection--; - } - - if (hDown & KEY_TOUCH) { - if (touching(touch, toggleAbles[0])) { - page = 0; - selection = 2; - - } else if (touching(touch, toggleAbles[1])) { - config->autoupdate(!config->autoupdate()); - - } else if (touching(touch, toggleAbles[2])) { - config->updatecheck(!config->updatecheck()); - } - } - - if (hDown & KEY_A) { - switch(selection) { - case 0: - config->autoupdate(!config->autoupdate()); - break; - - case 1: - config->updatecheck(!config->updatecheck()); - break; - } - } -} - -/* - Logic of the GUI Settings. - - Here you can.. - - - Enable / Disable using the SpriteSheet Background Image, if exist. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - int &page: Reference to the page. - int &selection: Reference to the Selection. -*/ -static void GUISettingsLogic(u32 hDown, u32 hHeld, touchPosition touch, int &page, int &selection) { - if (hDown & KEY_B) { - page = 0; - selection = 3; - } - - if (hDown & KEY_TOUCH) { - if (touching(touch, toggleAbles[0])) { - page = 0; - selection = 3; - - } else if (touching(touch, toggleAbles[1])) { - config->usebg(!config->usebg()); - } - } - - if (hDown & KEY_A) { - switch(selection) { - case 0: - config->usebg(!config->usebg()); - break; - } - } -} - -/* - Logic of the Language Settings. - - Here you can.. - - - Select the language, which should be used with the app. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - int &page: Reference to the page. - int &selection: Reference to the Selection. - int &sPos: Reference to the ScreenPos variable. -*/ -static void LanguageLogic(u32 hDown, u32 hHeld, touchPosition touch, int &page, int &selection, int &sPos) { - if (hRepeat & KEY_DOWN) { - if (selection < (int)languages.size() - 1) selection++; - else selection = 0; - } - - if (hRepeat & KEY_UP) { - if (selection > 0) selection--; - else selection = languages.size() - 1; - } - - if (hRepeat & KEY_RIGHT) { - if (selection + 7 < (int)languages.size()-1) selection += 7; - else selection = languages.size()-1; - } - - if (hRepeat & KEY_LEFT) { - if (selection - 7 > 0) selection -= 7; - else selection = 0; - } - - if ((hDown & KEY_B) || (hDown & KEY_TOUCH && touching(touch, langButtons[7]))) { - selection = 0; - sPos = 0; - page = 0; - } - - if (hDown & KEY_A) { - const std::string l = langsTemp[selection]; - config->language(l); - Lang::load(config->language()); - selection = 0; - sPos = 0; - page = 0; - } - - if (hDown & KEY_TOUCH) { - for (int i = 0; i < 7; i++) { - if (touching(touch, mainButtons[i])) { - if (i + sPos < (int)languages.size()) { - const std::string l = langsTemp[i + sPos]; - config->language(l); - Lang::load(config->language()); - selection = 0; - sPos = 0; - page = 0; - } - } - } - } - - if (selection < sPos) sPos = selection; - else if (selection > sPos + 7 - 1) sPos = selection - 7 + 1; -} - -/* - Draw the Settings. - - const int &page: Const Reference to the page. - const int &selection: Const Reference to the selection. -*/ -void StoreUtils::DrawSettings(const int &page, const int &selection, const int &sPos) { - switch(page) { - case 0: - DrawSettingsMain(selection); - break; - - case 1: - DrawSettingsDir(selection); - break; - - case 2: - DrawAutoUpdate(selection); - break; - - case 3: - DrawGUISettings(selection); - break; - - case 4: - DrawLanguageSettings(selection, sPos); - break; - } -} - -/* - Settings Handle. - - u32 hDown: The hidKeysDown() variable. - u32 hHeld: The hidKeysHeld() variable. - touchPosition touch: The TouchPosition variable. - int &page: Reference to the page. - bool &dspSettings: Reference to the display Settings. - int &storeMode: Reference to the Store Mode. - int &selection: Reference to the Selection. - std::unique_ptr &store: Reference to the Store class. - std::vector> &entries: Reference to the StoreEntries. - std::unique_ptr &meta: Reference to the Meta class. -*/ -void StoreUtils::SettingsHandle(u32 hDown, u32 hHeld, touchPosition touch, int &page, bool &dspSettings, int &storeMode, int &selection, std::unique_ptr &store, std::vector> &entries, std::unique_ptr &meta, int &sPos) { - switch(page) { - case 0: - SettingsHandleMain(hDown, hHeld, touch, page, dspSettings, storeMode, selection, store, entries, meta); - break; - - case 1: - SettingsHandleDir(hDown, hHeld, touch, page, selection, store); - break; - - case 2: - AutoUpdateLogic(hDown, hHeld, touch, page, selection); - break; - - case 3: - GUISettingsLogic(hDown, hHeld, touch, page, selection); - break; - - case 4: - LanguageLogic(hDown, hHeld, touch, page, selection, sPos); - break; - } -} \ No newline at end of file diff --git a/source/store/store.cpp b/source/store/store.cpp index 78a166d..aabe3c6 100644 --- a/source/store/store.cpp +++ b/source/store/store.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,17 +36,33 @@ extern bool checkWifiStatus(); static bool firstStart = true; /* - Initialize a store. + Initialize a Store. const std::string &file: The UniStore file. + const std::string &file2: The UniStore file.. without full path. + bool ARGMode: If Argument mode. */ -Store::Store(const std::string &file) { - this->update(file); - this->SetC2DBGImage(); +Store::Store(const std::string &file, const std::string &file2, bool ARGMode) { + if (file.length() > 4) { + if(*(u32*)(file.c_str() + file.length() - 4) == (0xE0DED0E << 3 | (2 + 1))) { + this->valid = false; + return; + } + } + + this->fileName = file2; + + if (!ARGMode) { + this->update(file); + this->SetC2DBGImage(); + + } else { + this->LoadFromFile(file); + } }; /* - Update an UniStore,, including SpriteSheet, if revision increased. + Update an UniStore, including SpriteSheet, if revision increased. const std::string &file: Const Reference to the fileName. */ @@ -184,7 +200,7 @@ void Store::loadSheets() { this->sheets.push_back({ }); if (sheetLocs[i] != "") { - if (!(sheetLocs[i].find("/") != std::string::npos)) { + if (sheetLocs[i].find("/") == std::string::npos) { if (access((std::string(_STORE_PATH) + sheetLocs[i]).c_str(), F_OK) == 0) { char msg[150]; @@ -208,15 +224,24 @@ void Store::loadSheets() { */ void Store::LoadFromFile(const std::string &file) { FILE *in = fopen(file.c_str(), "rt"); + if (!in) { + this->valid = false; + return; + } + this->storeJson = nlohmann::json::parse(in, nullptr, false); fclose(in); + if (this->storeJson.is_discarded()) + this->storeJson = { }; /* Check, if valid. */ if (this->storeJson.contains("storeInfo") && this->storeJson.contains("storeContent")) { if (this->storeJson["storeInfo"].contains("version") && this->storeJson["storeInfo"]["version"].is_number()) { if (this->storeJson["storeInfo"]["version"] < 3) Msg::waitMsg(Lang::get("UNISTORE_TOO_OLD")); - else if (this->storeJson["storeInfo"]["version"] > 3) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); - this->valid = this->storeJson["storeInfo"]["version"] == 3; + else if (this->storeJson["storeInfo"]["version"] > _UNISTORE_VERSION) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); + else if (this->storeJson["storeInfo"]["version"] == 3 || this->storeJson["storeInfo"]["version"] == _UNISTORE_VERSION) { + this->valid = true; + } } } else { @@ -238,9 +263,9 @@ std::string Store::GetUniStoreTitle() const { /* Return the Title of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::string Store::GetTitleEntry(const int &index) const { +std::string Store::GetTitleEntry(int index) const { if (!this->valid) return ""; if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; // Empty. @@ -254,9 +279,9 @@ std::string Store::GetTitleEntry(const int &index) const { /* Return the Author name of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::string Store::GetAuthorEntry(const int &index) const { +std::string Store::GetAuthorEntry(int index) const { if (!this->valid) return ""; if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; // Empty. @@ -270,9 +295,9 @@ std::string Store::GetAuthorEntry(const int &index) const { /* Return the Description of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::string Store::GetDescriptionEntry(const int &index) const { +std::string Store::GetDescriptionEntry(int index) const { if (!this->valid) return ""; if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; // Empty. @@ -286,9 +311,9 @@ std::string Store::GetDescriptionEntry(const int &index) const { /* Return the Category of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::vector Store::GetCategoryIndex(const int &index) const { +std::vector Store::GetCategoryIndex(int index) const { if (!this->valid) return { "" }; if (index > (int)this->storeJson["storeContent"].size() - 1) return { "" }; // Empty. @@ -309,9 +334,9 @@ std::vector Store::GetCategoryIndex(const int &index) const { /* Return the Version of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::string Store::GetVersionEntry(const int &index) const { +std::string Store::GetVersionEntry(int index) const { if (!this->valid) return ""; if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; // Empty. @@ -325,9 +350,9 @@ std::string Store::GetVersionEntry(const int &index) const { /* Return the Console of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::vector Store::GetConsoleEntry(const int &index) const { +std::vector Store::GetConsoleEntry(int index) const { if (!this->valid) return { "" }; if (index > (int)this->storeJson["storeContent"].size() - 1) return { "" }; // Empty. @@ -348,9 +373,9 @@ std::vector Store::GetConsoleEntry(const int &index) const { /* Return the Last updated date of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::string Store::GetLastUpdatedEntry(const int &index) const { +std::string Store::GetLastUpdatedEntry(int index) const { if (!this->valid) return ""; if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; // Empty. @@ -364,9 +389,9 @@ std::string Store::GetLastUpdatedEntry(const int &index) const { /* Return the License of an index. - const int &index: Const Reference to the index. + int index: The index. */ -std::string Store::GetLicenseEntry(const int &index) const { +std::string Store::GetLicenseEntry(int index) const { if (!this->valid) return Lang::get("NO_LICENSE"); if (index > (int)this->storeJson["storeContent"].size() - 1) return Lang::get("NO_LICENSE"); // Empty. @@ -382,9 +407,9 @@ std::string Store::GetLicenseEntry(const int &index) const { /* Return a C2D_Image of an index. - const int &index: Const Reference to the index. + int index: The index. */ -C2D_Image Store::GetIconEntry(const int &index) const { +C2D_Image Store::GetIconEntry(int index) const { if (!this->valid) return C2D_SpriteSheetGetImage(sprites, sprites_noIcon_idx); if (this->sheets.empty()) return C2D_SpriteSheetGetImage(sprites, sprites_noIcon_idx); int iconIndex = -1, sheetIndex = 0; @@ -446,9 +471,9 @@ void Store::SetC2DBGImage() { /* Return the download list of an entry. - const int &index: Const Reference to the index. + int index: The index. */ -std::vector Store::GetDownloadList(const int &index) const { +std::vector Store::GetDownloadList(int index) const { if (!this->valid) return { "" }; std::vector temp; @@ -458,5 +483,123 @@ std::vector Store::GetDownloadList(const int &index) const { if (it.key() != "info") temp.push_back(it.key()); } + std::sort(temp.begin(), temp.end(), [](const std::string &aString, const std::string &bString) { + const char *a = aString.c_str(), *b = bString.c_str(); + while (*a && *b) { + int cmp = toupper(*a) - toupper(*b); + if (cmp < 0) return true; + else if (cmp > 0) return false; + + a++; + b++; + } + + return *a == 0; + }); + return temp; +} + +/* + Get filesizes for each download entry. + + int index: The index. + const std::string &entry: The entry name. +*/ +std::string Store::GetFileSizes(int index, const std::string &entry) const { + if (!this->valid) return ""; + + if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; + + if (this->storeJson["storeContent"][index].contains(entry) && this->storeJson["storeContent"][index][entry].type() == nlohmann::json::value_t::object) { + if (this->storeJson["storeContent"][index][entry].contains("size") && this->storeJson["storeContent"][index][entry]["size"].is_string()) { + return this->storeJson["storeContent"][index][entry]["size"]; + } + } + + return ""; +} + +/* + Get file script type for each download entry. + + int index: The index. + const std::string &entry: The entry name. +*/ +std::string Store::GetFileTypes(int index, const std::string &entry) const { + if (!this->valid) return ""; + + if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; + + if (this->storeJson["storeContent"][index].contains(entry) && this->storeJson["storeContent"][index][entry].type() == nlohmann::json::value_t::object) { + if (this->storeJson["storeContent"][index][entry].contains("type") && this->storeJson["storeContent"][index][entry]["type"].is_string()) { + return this->storeJson["storeContent"][index][entry]["type"]; + } + } + + return ""; +} + +/* + Get Screenshot URL list. + + int index: The Entry Index. +*/ +std::vector Store::GetScreenshotList(int index) const { + if (!this->valid) return { }; + + if (index > (int)this->storeJson["storeContent"].size() - 1) return { }; + + std::vector screenshots; + + if (this->storeJson["storeContent"][index]["info"].contains("screenshots")) { + if (this->storeJson["storeContent"][index]["info"]["screenshots"].is_array()) { + for(auto &item : this->storeJson["storeContent"][index]["info"]["screenshots"]) { + if (item.is_object() && item.contains("url")) screenshots.push_back(item["url"]); + else screenshots.push_back(""); + } + } + } + + return screenshots; +} + +/* + Get Screenshot names. + + int index: The Entry Index. +*/ +std::vector Store::GetScreenshotNames(int index) const { + if (!this->valid) return { }; + + if (index > (int)this->storeJson["storeContent"].size() - 1) return { }; + + std::vector screenshotNames; + + if (this->storeJson["storeContent"][index]["info"].contains("screenshots")) { + if (this->storeJson["storeContent"][index]["info"]["screenshots"].is_array()) { + for(auto &item : this->storeJson["storeContent"][index]["info"]["screenshots"]) { + if (item.is_object() && item.contains("description")) screenshotNames.push_back(item["description"]); + else screenshotNames.push_back(""); + } + } + } + + return screenshotNames; +} + +/* + Get the update notes of an entry. + + int index: The Entry Index. +*/ +std::string Store::GetReleaseNotes(int index) const { + if (!this->valid) return ""; + if (index > (int)this->storeJson["storeContent"].size() - 1) return ""; // Empty. + + if (this->storeJson["storeContent"][index]["info"].contains("releasenotes") && this->storeJson["storeContent"][index]["info"]["releasenotes"].is_string()) { + return this->storeJson["storeContent"][index]["info"]["releasenotes"]; + } + + return ""; } \ No newline at end of file diff --git a/source/store/storeEntry.cpp b/source/store/storeEntry.cpp index 84a32c3..1fad23a 100644 --- a/source/store/storeEntry.cpp +++ b/source/store/storeEntry.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,11 +29,11 @@ /* Fetch informations on constructor. - const std::unique_ptr &store: Const Reference to the Store class. - const std::unique_ptr &meta: Const Reference to the Meta class. - const int &index: Const Reference Index of the entry. + const std::unique_ptr &store: Const Reference to the store class. + const std::unique_ptr &meta: Const Reference to the meta class. + int index: Index of the entry. */ -StoreEntry::StoreEntry(const std::unique_ptr &store, const std::unique_ptr &meta, const int &index) { +StoreEntry::StoreEntry(const std::unique_ptr &store, const std::unique_ptr &meta, int index) { this->Title = store->GetTitleEntry(index); this->Author = store->GetAuthorEntry(index); @@ -55,4 +55,17 @@ StoreEntry::StoreEntry(const std::unique_ptr &store, const std::unique_pt this->UpdateAvailable = meta->UpdateAvailable(store->GetUniStoreTitle(), this->Title, store->GetLastUpdatedEntry(index)); this->Marks = meta->GetMarks(store->GetUniStoreTitle(), this->Title); + + const std::vector entries = store->GetDownloadList(index); + + if (!entries.empty()) { + for (int i = 0; i < (int)entries.size(); i++) { + this->Sizes.push_back( store->GetFileSizes(index, entries[i]) ); + this->Types.push_back( store->GetFileTypes(index, entries[i]) ); + } + } + + this->Screenshots = store->GetScreenshotList(index); + this->ScreenshotNames = store->GetScreenshotNames(index); + this->ReleaseNotes = store->GetReleaseNotes(index); } \ No newline at end of file diff --git a/source/store/storeUtils.cpp b/source/store/storeUtils.cpp index af7c5b7..f43424e 100644 --- a/source/store/storeUtils.cpp +++ b/source/store/storeUtils.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,8 +24,14 @@ * reasonable ways as different from the original version. */ +#include "common.hpp" +#include "queueSystem.hpp" #include "storeUtils.hpp" +std::unique_ptr StoreUtils::meta = nullptr; +std::unique_ptr StoreUtils::store = nullptr; +std::vector> StoreUtils::entries; + /* Compare Title. @@ -80,22 +86,21 @@ bool StoreUtils::compareUpdateAscending(const std::unique_ptr &a, co /* Sort the entries. - const bool &Ascending: Const Reference to Ascending. - const SortType &sorttype: Const Reference to the sort type. - std::vector> &entries: Reference to the Entries, which should be sorted. + bool Ascending: If Ascending. + SortType sorttype: The sort type. */ -void StoreUtils::SortEntries(const bool &Ascending, const SortType &sorttype, std::vector> &entries) { +void StoreUtils::SortEntries(bool Ascending, SortType sorttype) { switch(sorttype) { case SortType::TITLE: - Ascending ? std::sort(entries.begin(), entries.end(), StoreUtils::compareTitleAscending) : std::sort(entries.begin(), entries.end(), StoreUtils::compareTitleDescending); + Ascending ? std::sort(StoreUtils::entries.begin(), StoreUtils::entries.end(), StoreUtils::compareTitleAscending) : std::sort(StoreUtils::entries.begin(), StoreUtils::entries.end(), StoreUtils::compareTitleDescending); break; case SortType::AUTHOR: - Ascending ? std::sort(entries.begin(), entries.end(), StoreUtils::compareAuthorAscending) : std::sort(entries.begin(), entries.end(), StoreUtils::compareAuthorDescending); + Ascending ? std::sort(StoreUtils::entries.begin(), StoreUtils::entries.end(), StoreUtils::compareAuthorAscending) : std::sort(StoreUtils::entries.begin(), StoreUtils::entries.end(), StoreUtils::compareAuthorDescending); break; case SortType::LAST_UPDATED: - Ascending ? std::sort(entries.begin(), entries.end(), StoreUtils::compareUpdateAscending) : std::sort(entries.begin(), entries.end(), StoreUtils::compareUpdateDescending); + Ascending ? std::sort(StoreUtils::entries.begin(), StoreUtils::entries.end(), StoreUtils::compareUpdateAscending) : std::sort(StoreUtils::entries.begin(), StoreUtils::entries.end(), StoreUtils::compareUpdateDescending); break; } } @@ -117,62 +122,118 @@ static bool findInVector(const std::vector &items, const std::strin /* Search for stuff of the store. - std::vector> &entries: Reference to the entries. const std::string &query: Const Reference to the query. bool title: if titles should be included. bool author: if authors should be included. bool category: if categories should be included. bool console: if consoles should be included. int selectedMarks: The selected mark flags. - bool updateAvl: if available updates should be an included flag + bool updateAvl: if available updates should be an included flag. + bool isAND: if using AND or OR mode. */ -void StoreUtils::search(std::vector> &entries, const std::string &query, bool title, bool author, bool category, bool console, int selectedMarks, bool updateAvl) { - for (auto it = entries.begin(); it != entries.end(); ++it) { - if (!(((title && StringUtils::lower_case((*it)->GetTitle()).find(StringUtils::lower_case(query)) != std::string::npos) - || (author && StringUtils::lower_case((*it)->GetAuthor()).find(StringUtils::lower_case(query)) != std::string::npos) - || (category && findInVector((*it)->GetCategoryFull(), StringUtils::lower_case(query))) - || (console && findInVector((*it)->GetConsoleFull(), StringUtils::lower_case(query))) - || (!title && !author && !category && !console)) - && ((selectedMarks == 0 && !updateAvl) || (*it)->GetMarks() & selectedMarks || (updateAvl && (*it)->GetUpdateAvl())))) { - entries.erase(it); - --it; +void StoreUtils::search(const std::string &query, bool title, bool author, bool category, bool console, int selectedMarks, bool updateAvl, bool isAND) { + if (isAND) { + for (auto it = StoreUtils::entries.begin(); it != StoreUtils::entries.end(); ++it) { + if (!(((title && StringUtils::lower_case((*it)->GetTitle()).find(StringUtils::lower_case(query)) != std::string::npos) + || (author && StringUtils::lower_case((*it)->GetAuthor()).find(StringUtils::lower_case(query)) != std::string::npos) + || (category && findInVector((*it)->GetCategoryFull(), StringUtils::lower_case(query))) + || (console && findInVector((*it)->GetConsoleFull(), StringUtils::lower_case(query))) + || (!title && !author && !category && !console)) + && ((selectedMarks == 0 && !updateAvl) || ((((*it)->GetMarks() & selectedMarks) == selectedMarks) && (!updateAvl || (*it)->GetUpdateAvl()))))) { + it = StoreUtils::entries.erase(it); + --it; + } + } + + } else { + for (auto it = StoreUtils::entries.begin(); it != StoreUtils::entries.end(); ++it) { + if (!(((title && StringUtils::lower_case((*it)->GetTitle()).find(StringUtils::lower_case(query)) != std::string::npos) + || (author && StringUtils::lower_case((*it)->GetAuthor()).find(StringUtils::lower_case(query)) != std::string::npos) + || (category && findInVector((*it)->GetCategoryFull(), StringUtils::lower_case(query))) + || (console && findInVector((*it)->GetConsoleFull(), StringUtils::lower_case(query))) + || (!title && !author && !category && !console)) + && ((selectedMarks == 0 && !updateAvl) || (*it)->GetMarks() & selectedMarks || (updateAvl && (*it)->GetUpdateAvl())))) { + it = StoreUtils::entries.erase(it); + --it; + } } } } -/* - Filter for available updates. +/* Reset everything of the store and clear + fetch the entries again. */ +void StoreUtils::ResetAll() { + if (StoreUtils::store) { + StoreUtils::entries.clear(); - std::vector> &entries: Reference to the entries. -*/ -void StoreUtils::FilterUpdateAvailable(std::vector> &entries) { - for (auto it = entries.begin(); it != entries.end(); ++it) { - if (!((*it)->GetUpdateAvl())) { - entries.erase(it); - --it; - } - } -} - -/* - Reset everything of the store and clear + fetch the Entries again. - - const std::unique_ptr &store: Const Reference to the Store class. - const std::unique_ptr &meta: Const Reference to the Meta class. - std::vector> &entries: Reference to the entries. -*/ -void StoreUtils::ResetAll(const std::unique_ptr &store, const std::unique_ptr &meta, std::vector> &entries) { - if (store) { - entries.clear(); - - if (store->GetValid()) { - for (int i = 0; i < store->GetStoreSize(); i++) { - entries.push_back( std::make_unique(store, meta, i) ); + if (StoreUtils::store->GetValid()) { + for (int i = 0; i < StoreUtils::store->GetStoreSize(); i++) { + StoreUtils::entries.push_back( std::make_unique(StoreUtils::store, StoreUtils::meta, i) ); } - store->SetBox(0); - store->SetEntry(0); - store->SetScreenIndx(0); + StoreUtils::store->SetBox(0); + StoreUtils::store->SetEntry(0); + StoreUtils::store->SetScreenIndx(0); + } + } +} + +/* Refresh the available update displays from all Entries. */ +void StoreUtils::RefreshUpdateAVL() { + for (int i = 0; i < (int)StoreUtils::entries.size(); i++) { + if (StoreUtils::entries[i]) { + StoreUtils::entries[i]->SetUpdateAvl(StoreUtils::meta->UpdateAvailable(StoreUtils::store->GetUniStoreTitle(), StoreUtils::entries[i]->GetTitle(), StoreUtils::entries[i]->GetLastUpdated())); + } + } +} + +void StoreUtils::AddToQueue(int index, const std::string &entry, const std::string &entryName, const std::string &lUpdated) { + if (!StoreUtils::store || !StoreUtils::store->GetValid()) return; + + /* Check first for proper JSON. */ + if (!StoreUtils::store->GetJson().contains("storeContent")) return; + if ((int)StoreUtils::store->GetJson()["storeContent"].size() < index) return; + if (!StoreUtils::store->GetJson()["storeContent"][index].contains(entry)) return; + + nlohmann::json Script = nullptr; + + /* Detect if array or new object thing. Else return Syntax error. :P */ + if (StoreUtils::store->GetJson()["storeContent"][index][entry].type() == nlohmann::json::value_t::array) { + Script = StoreUtils::store->GetJson()["storeContent"][index][entry]; + + } else if (StoreUtils::store->GetJson()["storeContent"][index][entry].type() == nlohmann::json::value_t::object) { + if (StoreUtils::store->GetJson()["storeContent"][index][entry].contains("script") && StoreUtils::store->GetJson()["storeContent"][index][entry]["script"].is_array()) { + Script = StoreUtils::store->GetJson()["storeContent"][index][entry]["script"]; + + } else { + return; + } + } + + QueueSystem::AddToQueue(Script, StoreUtils::store->GetIconEntry(index), entry, StoreUtils::store->GetUniStoreTitle(), entryName, lUpdated); // Here we add this to the Queue at the end. +} + +/* + Add all update-able entries to the queue. +*/ +void StoreUtils::AddAllToQueue() { + if (StoreUtils::store && StoreUtils::store->GetValid() && StoreUtils::meta && !StoreUtils::entries.empty()) { // Ensure all is valid. + for (int storeEntry = 0; storeEntry < (int)StoreUtils::entries.size(); storeEntry++) { + if (StoreUtils::entries[storeEntry]) { // Ensure pointer is valid. + + const std::vector entryNames = StoreUtils::store->GetDownloadList(StoreUtils::entries[storeEntry]->GetEntryIndex()); // Return a vector of all Download Entries. + const std::vector installedNames = StoreUtils::meta->GetInstalled(StoreUtils::store->GetUniStoreTitle(), StoreUtils::entries[storeEntry]->GetTitle()); // Return a vector from all installed entries. + + if (!entryNames.empty() && !installedNames.empty()) { // Ensure both aren't empty. + for (int i = 0; i < (int)entryNames.size(); i++) { + for (int i2 = 0; i2 < (int)installedNames.size(); i2++) { + if (entryNames[i] == installedNames[i2]) { // If name matches with installed title, add to queue. + /* Add to Queue. */ + StoreUtils::AddToQueue(entries[storeEntry]->GetEntryIndex(), entryNames[i2], entries[storeEntry]->GetTitle(), entries[storeEntry]->GetLastUpdated()); + } + } + } + } + } } } } \ No newline at end of file diff --git a/source/utils/animation.cpp b/source/utils/animation.cpp index fa83fd0..f89bcc2 100644 --- a/source/utils/animation.cpp +++ b/source/utils/animation.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "animation.hpp" #include "common.hpp" +#include "queueSystem.hpp" #include "stringutils.hpp" #include @@ -34,6 +35,8 @@ extern std::string extractingFile; char progressBarMsg[128] = ""; bool showProgressBar = false; ProgressBar progressbarType = ProgressBar::Downloading; +int Animation::DisplayY = 240, Animation::DisplayDelay = 3 * 60; +bool Animation::MoveUp = true, Animation::DoDelay = false; extern u32 extractSize, writeOffset; extern u32 installSize, installOffset; @@ -45,12 +48,12 @@ extern curl_off_t downloadNow; /* Draw the progressbar. - const u64 ¤tProgress: Const Reference to the current progress. - const u64 &totalProgress: Const Reference to the total progress. + u64 currentProgress: The current progress. + u64 totalProgress: The total progress. */ -void Animation::DrawProgressBar(const u64 ¤tProgress, const u64 &totalProgress) { - Gui::Draw_Rect(30, 120, 340, 30, PROGRESSBAR_OUT_COLOR); - Gui::Draw_Rect(31, 121, (int)(((float)currentProgress / (float)totalProgress) * 338.0f), 28, PROGRESSBAR_IN_COLOR); +void Animation::DrawProgressBar(u64 currentProgress, u64 totalProgress) { + Gui::Draw_Rect(30, 120, 342, 30, UIThemes->ProgressbarOut()); + Gui::Draw_Rect(31, 121, (int)(((float)currentProgress / (float)totalProgress) * 338.0f), 28, UIThemes->ProgressbarIn()); } /* @@ -98,28 +101,29 @@ void Animation::displayProgressBar() { C2D_TargetClear(Top, TRANSPARENT); C2D_TargetClear(Bottom, TRANSPARENT); GFX::DrawTop(); - Gui::DrawStringCentered(0, 1, 0.7f, TEXT_COLOR, progressBarMsg, 390); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), progressBarMsg, 390, 0, font); switch(progressbarType) { case ProgressBar::Downloading: - Gui::DrawStringCentered(0, 80, 0.6f, TEXT_COLOR, str, 390); + Gui::DrawStringCentered(0, 80, 0.6f, UIThemes->TextColor(), str, 390, 0, font); Animation::DrawProgressBar(downloadNow, downloadTotal); break; case ProgressBar::Extracting: - Gui::DrawStringCentered(0, 180, 0.6f, TEXT_COLOR, str, 390); - Gui::DrawStringCentered(0, 100, 0.6f, TEXT_COLOR, std::to_string(filesExtracted) + " / " + std::to_string(extractFilesCount) + " " + (filesExtracted == 1 ? (Lang::get("FILE_EXTRACTED")).c_str() :(Lang::get("FILES_EXTRACTED"))), 390); - Gui::DrawStringCentered(0, 40, 0.6f, TEXT_COLOR, Lang::get("CURRENTLY_EXTRACTING") + "\n" + extractingFile, 390); + Gui::DrawStringCentered(0, 180, 0.6f, UIThemes->TextColor(), str, 390, 0, font); + Gui::DrawStringCentered(0, 100, 0.6f, UIThemes->TextColor(), std::to_string(filesExtracted) + " / " + std::to_string(extractFilesCount) + " " + (filesExtracted == 1 ? (Lang::get("FILE_EXTRACTED")).c_str() :(Lang::get("FILES_EXTRACTED"))), 390, 0, font); + Gui::DrawStringCentered(0, 40, 0.6f, UIThemes->TextColor(), Lang::get("CURRENTLY_EXTRACTING"), 390, 0, font); + Gui::DrawStringCentered(0, 70, 0.6f, UIThemes->TextColor(), extractingFile, 390, 0, font); Animation::DrawProgressBar(writeOffset, extractSize); break; case ProgressBar::Installing: - Gui::DrawStringCentered(0, 80, 0.6f, TEXT_COLOR, str, 390); + Gui::DrawStringCentered(0, 80, 0.6f, UIThemes->TextColor(), str, 390, 0, font); Animation::DrawProgressBar(installOffset, installSize); break; case ProgressBar::Copying: - Gui::DrawStringCentered(0, 80, 0.6f, TEXT_COLOR, str, 390); + Gui::DrawStringCentered(0, 80, 0.6f, UIThemes->TextColor(), str, 390, 0, font); Animation::DrawProgressBar(copyOffset, copySize); break; } @@ -127,4 +131,69 @@ void Animation::displayProgressBar() { GFX::DrawBottom(); C3D_FrameEnd(0); } +} + +static int frame = 0; // 0 - 7. +static int advanceFrame = 0; // Only animate every 4 frames. +extern bool QueueRuns; +extern std::deque> queueEntries; + +void Animation::DrawQueue(int x, int y) { + GFX::DrawIcon(sprites_queue0_idx + frame, x, y); + Gui::DrawStringCentered(x + 20 - 160, y + 11, 0.6f, UIThemes->SideBarIconColor(), QueueSystem::Wait ? "!" : std::to_string(queueEntries.size()), 0, 0, font); +} +void Animation::QueueAnimHandle() { + if (QueueRuns) { + advanceFrame = (advanceFrame + 1) % 4; + if (advanceFrame == 0) frame = (frame + 1) % 8; + } +} + +#define DISPLAYBOX_UP 206 +#define DISPLAYBOX_DOWN 240 + +void Animation::QueueEntryDone() { + if (QueueSystem::Popup) { + Gui::Draw_Rect(0, DisplayY, 400, 34, UIThemes->DownListPrev()); + + if (QueueSystem::EndMsg != "") { + Gui::DrawStringCentered(0, DisplayY + 8, 0.6f, UIThemes->TextColor(), QueueSystem::EndMsg, 395, 0, font); + } + } +} +void Animation::HandleQueueEntryDone() { + if (QueueSystem::Popup) { + if (!Animation::DoDelay) { + if (Animation::MoveUp) { + if (Animation::DisplayY > DISPLAYBOX_UP) { + Animation::DisplayY--; + + if (Animation::DisplayY <= DISPLAYBOX_UP) { + Animation::DisplayDelay = 3 * 60; + Animation::DoDelay = true; + } + } + + } else { + if (Animation::DisplayY < DISPLAYBOX_DOWN) { + Animation::DisplayY++; + + if (Animation::DisplayY >= DISPLAYBOX_DOWN) { + QueueSystem::Popup = false; + Animation::MoveUp = true; + } + } + } + + } else { + if (Animation::DisplayDelay > 0) { + Animation::DisplayDelay--; + + if (Animation::DisplayDelay <= 0) { + Animation::MoveUp = false; + Animation::DoDelay = false; + } + } + } + } } \ No newline at end of file diff --git a/source/utils/argumentParser.cpp b/source/utils/argumentParser.cpp new file mode 100644 index 0000000..6d8a1d6 --- /dev/null +++ b/source/utils/argumentParser.cpp @@ -0,0 +1,83 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "argumentParser.hpp" +#include "common.hpp" +#include "scriptUtils.hpp" +#include + +/* + The constructor of the Argument Parser. + + const std::string &file: Const Reference to the file. + const std::string &entry: Const Reference to the Entry Title name. + int dlIndex: The Download index. +*/ +ArgumentParser::ArgumentParser(const std::string &file, const std::string &entry, int dlIndex) { + if (dlIndex != -1 && file != "") { + this->file = file; + this->entry = entry; + this->dlIndex = dlIndex; + + this->Load(); + } +} + +/* + Prepare UniStore and get valid state. +*/ +void ArgumentParser::Load() { + if (access((std::string(_STORE_PATH) + this->file).c_str(), F_OK) != 0) return; + + this->store = std::make_unique(_STORE_PATH + this->file, this->file, true); + if (!this->store->GetValid()) return; + + for (int i = 0; i < this->store->GetStoreSize(); i++) { + if (this->store->GetTitleEntry(i) == this->entry) { + this->entryIndex = i; + const std::vector dlList = this->store->GetDownloadList(this->entryIndex); + + if (dlList.empty()) return; + + if ((int)dlList.size() >= this->dlIndex) { + this->executeEntry = dlList[this->dlIndex]; + this->isValid = true; + return; + } + } + } +} + +/* + Execute the Argument's entry, if valid. +*/ +void ArgumentParser::Execute() { + if (this->isValid) { + if (Msg::promptMsg(Lang::get("EXECUTE_ENTRY") + "\n\n" + this->executeEntry)) { + ScriptUtils::runFunctions(this->store->GetJson(), this->entryIndex, this->executeEntry); + } + } +} \ No newline at end of file diff --git a/source/utils/cia.cpp b/source/utils/cia.cpp index 5856ac7..72c08a7 100644 --- a/source/utils/cia.cpp +++ b/source/utils/cia.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ #include "cia.hpp" #include "files.hpp" -Result CIA_LaunchTitle(const u64 &titleId, const FS_MediaType &mediaType) { +Result Title::Launch(u64 titleId, FS_MediaType mediaType) { Result ret = 0; u8 param[0x300]; u8 hmac[0x20]; @@ -45,7 +45,7 @@ Result CIA_LaunchTitle(const u64 &titleId, const FS_MediaType &mediaType) { return 0; } -Result deletePrevious(const u64 &titleid, const FS_MediaType &media) { +Result Title::DeletePrevious(u64 titleid, FS_MediaType media) { Result ret = 0; u32 titles_amount = 0; @@ -82,7 +82,7 @@ Result deletePrevious(const u64 &titleid, const FS_MediaType &media) { return 0; } -FS_MediaType getTitleDestination(const u64 &titleId) { +static FS_MediaType getTitleDestination(u64 titleId) { u16 platform = (u16) ((titleId >> 48) & 0xFFFF); u16 category = (u16) ((titleId >> 32) & 0xFFFF); u8 variation = (u8) (titleId & 0xFF); @@ -93,7 +93,7 @@ FS_MediaType getTitleDestination(const u64 &titleId) { u32 installSize = 0, installOffset = 0; -Result installCia(const char *ciaPath, const bool &updatingSelf) { +Result Title::Install(const char *ciaPath, bool updatingSelf) { u32 bytes_read = 0, bytes_written; installSize = 0, installOffset = 0; u64 size = 0; Handle ciaHandle, fileHandle; @@ -116,39 +116,47 @@ Result installCia(const char *ciaPath, const bool &updatingSelf) { media = getTitleDestination(info.titleID); if (!updatingSelf) { - ret = deletePrevious(info.titleID, media); + ret = Title::DeletePrevious(info.titleID, media); if (R_FAILED(ret)) return ret; } ret = FSFILE_GetSize(fileHandle, &size); if (R_FAILED(ret)) { printf("Error in:\nFSFILE_GetSize\n"); + FSFILE_Close(fileHandle); return ret; } - ret = AM_StartCiaInstall(media, &ciaHandle); - if (R_FAILED(ret)) { - printf("Error in:\nAM_StartCiaInstall\n"); - return ret; - } + if (getAvailableSpace() >= size) { + ret = AM_StartCiaInstall(media, &ciaHandle); + if (R_FAILED(ret)) { + printf("Error in:\nAM_StartCiaInstall\n"); + FSFILE_Close(fileHandle); + return ret; + } - u32 toRead = 0x200000; - u8 *buf = new u8[toRead]; + u32 toRead = 0x200000; + u8 *buf = new u8[toRead]; - if (!buf) return -1; + if (!buf) { + FSFILE_Close(fileHandle); + return -1; + } - installSize = size; - do { - FSFILE_Read(fileHandle, &bytes_read, installOffset, buf, toRead); - FSFILE_Write(ciaHandle, &bytes_written, installOffset, buf, toRead, FS_WRITE_FLUSH); - installOffset += bytes_read; - } while(installOffset < installSize); - delete[] buf; + installSize = size; + do { + FSFILE_Read(fileHandle, &bytes_read, installOffset, buf, toRead); + FSFILE_Write(ciaHandle, &bytes_written, installOffset, buf, toRead, FS_WRITE_FLUSH); + installOffset += bytes_read; + } while(installOffset < installSize); + delete[] buf; - ret = AM_FinishCiaInstall(ciaHandle); - if (R_FAILED(ret)) { - printf("Error in:\nAM_FinishCiaInstall\n"); - return ret; + ret = AM_FinishCiaInstall(ciaHandle); + if (R_FAILED(ret)) { + printf("Error in:\nAM_FinishCiaInstall\n"); + FSFILE_Close(fileHandle); + return ret; + } } ret = FSFILE_Close(fileHandle); @@ -158,7 +166,7 @@ Result installCia(const char *ciaPath, const bool &updatingSelf) { } if (updatingSelf) { - if (R_FAILED(ret = CIA_LaunchTitle(info.titleID, MEDIATYPE_SD))) return ret; + if (R_FAILED(ret = Title::Launch(info.titleID, MEDIATYPE_SD))) return ret; } return 0; diff --git a/source/utils/config.cpp b/source/utils/config.cpp index e41dcf9..8e60a6f 100644 --- a/source/utils/config.cpp +++ b/source/utils/config.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,56 +34,60 @@ Detects system language and is used later to set app language to system language. */ void Config::sysLang() { - u8 language = 0; + u8 language = 1; CFGU_GetSystemLanguage(&language); switch(language) { case 0: - this->language("jp"); + this->language("jp"); // Japanese break; case 1: - this->language("en"); + this->language("en"); // English break; case 2: - this->language("fr"); + this->language("fr"); // French break; case 3: - this->language("de"); + this->language("de"); // German break; case 4: - this->language("it"); + this->language("it"); // Italian break; case 5: - this->language("es"); + this->language("es"); // Spanish break; case 6: - this->language("en"); // Simplified chinese, not translated. + this->language("zh-CN"); // Chinese (Simplified) break; - case 7: - this->language("en"); // Korean, not translated. - break; + // case 7: + // this->language("ko"); // Korean + // break; - case 8: - this->language("nl"); - break; + // case 8: + // this->language("nl"); // Dutch + // break; case 9: - this->language("pt"); + this->language("pt"); // Portuguese break; case 10: - this->language("ru"); + this->language("ru"); // Russian break; case 11: - this->language("en"); // traditional chinese, not translated. + this->language("zh-TW"); // Chinese (Traditional) + break; + + default: + this->language("en"); // Fall back to English if missing break; } } @@ -106,23 +110,48 @@ Config::Config() { this->initialize(); } - FILE *file = fopen("sdmc:/3ds/Universal-Updater/Config.json", "r"); - this->json = nlohmann::json::parse(file, nullptr, false); - fclose(file); + FILE *file = fopen("sdmc:/3ds/Universal-Updater/Config.json", "rt"); + if (file) { + this->json = nlohmann::json::parse(file, nullptr, false); + fclose(file); + } + if (this->json.is_discarded()) + this->json = { }; /* Let us create a new one. */ if (!this->json.contains("Version")) this->initialize(); + if (!this->json.contains("Language")) this->sysLang(); else this->language(this->getString("Language")); + if (this->json.contains("LastStore")) this->lastStore(this->getString("LastStore")); if (this->json.contains("List")) this->list(this->getBool("List")); if (this->json.contains("AutoUpdate")) this->autoupdate(this->getBool("AutoUpdate")); if (this->json.contains("_3DSX_Path")) this->_3dsxPath(this->getString("_3DSX_Path")); + if (this->json.contains("_3DSX_InFolder")) this->_3dsxInFolder(this->getBool("_3DSX_InFolder")); if (this->json.contains("NDS_Path")) this->ndsPath(this->getString("NDS_Path")); if (this->json.contains("Archive_Path")) this->archPath(this->getString("Archive_Path")); + if (this->json.contains("Firm_Path")) this->firmPath(this->getString("Firm_Path")); if (this->json.contains("MetaData")) this->metadata(this->getBool("MetaData")); if (this->json.contains("UpdateCheck")) this->updatecheck(this->getBool("UpdateCheck")); + if (this->json.contains("UpdateNightly")) this->updatenightly(this->getBool("UpdateNightly")); if (this->json.contains("UseBG")) this->usebg(this->getBool("UseBG")); + if (this->json.contains("CustomFont")) this->customfont(this->getBool("CustomFont")); + if (this->json.contains("Shortcut_Path")) this->shortcut(this->getString("Shortcut_Path")); + if (this->json.contains("Display_Changelog")) this->changelog(this->getBool("Display_Changelog")); + + /* Exceptions for it. It was an INT before. */ + if (this->json.contains("Active_Theme")) { + if (this->json["Active_Theme"].is_number()) { + this->json["Active_Theme"] = "Default"; + this->theme(this->getString("Active_Theme")); + + } else { + this->theme(this->getString("Active_Theme")); + } + } + + if (this->json.contains("Prompt")) this->prompt(this->getBool("Prompt")); this->changesMade = false; // No changes made yet. } @@ -139,11 +168,19 @@ void Config::save() { this->setBool("List", this->list()); this->setBool("AutoUpdate", this->autoupdate()); this->setString("_3DSX_Path", this->_3dsxPath()); + this->setBool("_3DSX_InFolder", this->_3dsxInFolder()); this->setString("NDS_Path", this->ndsPath()); this->setString("Archive_Path", this->archPath()); + this->setString("Firm_Path", this->firmPath()); this->setBool("MetaData", this->metadata()); this->setBool("UpdateCheck", this->updatecheck()); + this->setBool("UpdateNightly", this->updatenightly()); this->setBool("UseBG", this->usebg()); + this->setBool("CustomFont", this->customfont()); + this->setString("Shortcut_Path", this->shortcut()); + this->setBool("Display_Changelog", this->changelog()); + this->setString("Active_Theme", this->theme()); + this->setBool("Prompt", this->prompt()); /* Write changes to file. */ const std::string dump = this->json.dump(1, '\t'); @@ -156,20 +193,26 @@ void Config::save() { bool Config::getBool(const std::string &key) { if (!this->json.contains(key)) return false; - return this->json.at(key).get_ref(); + return this->json.at(key).get_ref(); } -void Config::setBool(const std::string &key, bool v) { this->json[key] = v; }; +void Config::setBool(const std::string &key, bool v) { + this->json[key] = v; +}; int Config::getInt(const std::string &key) { if (!this->json.contains(key)) return 0; - return this->json.at(key).get_ref(); + return this->json.at(key).get_ref(); } -void Config::setInt(const std::string &key, int v) { this->json[key] = v; }; +void Config::setInt(const std::string &key, int v) { + this->json[key] = v; +}; std::string Config::getString(const std::string &key) { if (!this->json.contains(key)) return ""; - return this->json.at(key).get_ref(); + return this->json.at(key).get_ref(); } -void Config::setString(const std::string &key, const std::string &v) { this->json[key] = v; }; \ No newline at end of file +void Config::setString(const std::string &key, const std::string &v) { + this->json[key] = v; +}; diff --git a/source/utils/download.cpp b/source/utils/download.cpp index a53b6aa..91d6396 100644 --- a/source/utils/download.cpp +++ b/source/utils/download.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,8 +29,11 @@ #include "files.hpp" #include "json.hpp" #include "lang.hpp" +#include "queueSystem.hpp" +#include "screenshot.hpp" #include "scriptUtils.hpp" #include "stringutils.hpp" +#include "version.hpp" #include <3ds.h> #include @@ -41,7 +44,7 @@ #include #include -#define USER_AGENT APP_TITLE "-" VERSION_STRING +#define USER_AGENT APP_TITLE "-" VER_NUMBER static char *result_buf = nullptr; static size_t result_sz = 0; @@ -54,6 +57,7 @@ static size_t result_written = 0; curl_off_t downloadTotal = 1; // Dont initialize with 0 to avoid division by zero later. curl_off_t downloadNow = 0; +curl_off_t downloadSpeed = 0; static FILE *downfile = nullptr; static size_t file_buffer_pos = 0; @@ -66,6 +70,7 @@ static LightEvent waitCommit; static bool killThread = false; static bool writeError = false; #define FILE_ALLOC_SIZE 0x60000 +CURL *CurlHandle = nullptr; static int curlProgress(CURL *hnd, curl_off_t dltotal, curl_off_t dlnow, @@ -99,10 +104,14 @@ static void commitToFileThreadFunc(void *args) { } static size_t file_handle_data(char *ptr, size_t size, size_t nmemb, void *userdata) { + if (getAvailableSpace() < (u64)downloadTotal) return 0; // Out of space. + if (writeError) return 0; + if (QueueSystem::CancelCallback) return 0; + (void)userdata; const size_t bsz = size * nmemb; size_t tofill = 0; - if (writeError) return 0; + if (!g_buffers[g_index]) { LightEvent_Init(&waitCommit, RESET_STICKY); @@ -136,13 +145,21 @@ static size_t file_handle_data(char *ptr, size_t size, size_t nmemb, void *userd return bsz; } +/* + Download a file. + + const std::string &url: The download URL. + const std::string &path: Where to place the file. +*/ Result downloadToFile(const std::string &url, const std::string &path) { + if (!checkWifiStatus()) return -1; // NO WIFI. + bool needToDelete = false; downloadTotal = 1; downloadNow = 0; + downloadSpeed = 0; CURLcode curlResult; - CURL *hnd; Result retcode = 0; int res; @@ -176,24 +193,25 @@ Result downloadToFile(const std::string &url, const std::string &path) { goto exit; } - hnd = curl_easy_init(); - curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, FILE_ALLOC_SIZE); - curl_easy_setopt(hnd, CURLOPT_URL, url.c_str()); - curl_easy_setopt(hnd, CURLOPT_NOPROGRESS, 0L); - curl_easy_setopt(hnd, CURLOPT_USERAGENT, USER_AGENT); - curl_easy_setopt(hnd, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(hnd, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(hnd, CURLOPT_ACCEPT_ENCODING, "gzip"); - curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); - curl_easy_setopt(hnd, CURLOPT_XFERINFOFUNCTION, curlProgress); - curl_easy_setopt(hnd, CURLOPT_HTTP_VERSION, (long)CURL_HTTP_VERSION_2TLS); - curl_easy_setopt(hnd, CURLOPT_WRITEFUNCTION, file_handle_data); - curl_easy_setopt(hnd, CURLOPT_SSL_VERIFYPEER, 0L); - curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); - curl_easy_setopt(hnd, CURLOPT_STDERR, stdout); + CurlHandle = curl_easy_init(); + curl_easy_setopt(CurlHandle, CURLOPT_BUFFERSIZE, FILE_ALLOC_SIZE); + curl_easy_setopt(CurlHandle, CURLOPT_URL, url.c_str()); + curl_easy_setopt(CurlHandle, CURLOPT_NOPROGRESS, 0L); + curl_easy_setopt(CurlHandle, CURLOPT_USERAGENT, USER_AGENT); + curl_easy_setopt(CurlHandle, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(CurlHandle, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(CurlHandle, CURLOPT_ACCEPT_ENCODING, "gzip"); + curl_easy_setopt(CurlHandle, CURLOPT_MAXREDIRS, 50L); + curl_easy_setopt(CurlHandle, CURLOPT_XFERINFOFUNCTION, curlProgress); + curl_easy_setopt(CurlHandle, CURLOPT_HTTP_VERSION, (long)CURL_HTTP_VERSION_2TLS); + curl_easy_setopt(CurlHandle, CURLOPT_WRITEFUNCTION, file_handle_data); + curl_easy_setopt(CurlHandle, CURLOPT_SSL_VERIFYPEER, 0L); + curl_easy_setopt(CurlHandle, CURLOPT_VERBOSE, 1L); + curl_easy_setopt(CurlHandle, CURLOPT_STDERR, stdout); - curlResult = curl_easy_perform(hnd); - curl_easy_cleanup(hnd); + curlResult = curl_easy_perform(CurlHandle); + curl_easy_cleanup(CurlHandle); + CurlHandle = nullptr; if (curlResult != CURLE_OK) { retcode = -curlResult; @@ -253,6 +271,7 @@ exit: if (access(path.c_str(), F_OK) == 0) deleteFile(path.c_str()); // Delete file, cause not fully downloaded. } + if (QueueSystem::CancelCallback) return 0; return retcode; } @@ -314,9 +333,9 @@ static Result setupContext(CURL *hnd, const char *url) { const std::string &url: Const Reference to the URL. (https://github.com/Owner/Repo) const std::string &asset: Const Reference to the Asset. (File.filetype) const std::string &path: Const Reference, where to store. (sdmc:/File.filetype) - const bool &includePrereleases: Const Reference, if including Pre-Releases. + bool includePrereleases: If including Pre-Releases. */ -Result downloadFromRelease(const std::string &url, const std::string &asset, const std::string &path, const bool &includePrereleases) { +Result downloadFromRelease(const std::string &url, const std::string &asset, const std::string &path, bool includePrereleases) { Result ret = 0; CURL *hnd; @@ -410,12 +429,8 @@ Result downloadFromRelease(const std::string &url, const std::string &asset, con result_sz = 0; result_written = 0; - if (assetUrl.empty() || ret != 0) { - ret = DL_ERROR_GIT; - - } else { - ret = downloadToFile(assetUrl, path); - } + if (assetUrl.empty() || ret != 0) ret = DL_ERROR_GIT; + else ret = downloadToFile(assetUrl, path); return ret; } @@ -425,7 +440,11 @@ Result downloadFromRelease(const std::string &url, const std::string &asset, con @return True if Wi-Fi is connected; false if not. */ bool checkWifiStatus(void) { - //return true; // For citra. +#ifdef CITRA + // Citra's Wi-Fi check doesn't work + return true; +#endif + u32 wifiStatus; bool res = false; @@ -446,9 +465,9 @@ void notConnectedMsg(void) { Msg::waitMsg(Lang::get("CONNECT_WIFI")); } Return, if an update is available. const std::string &URL: Const Reference to the URL of the UniStore. - const int &revCurrent: Const Reference to the current Revision. (-1 if unused) + int revCurrent: The current Revision. (-1 if unused) */ -bool IsUpdateAvailable(const std::string &URL, const int &revCurrent) { +bool IsUpdateAvailable(const std::string &URL, int revCurrent) { Msg::DisplayMsg(Lang::get("CHECK_UNISTORE_UPDATES")); Result ret = 0; @@ -524,17 +543,22 @@ bool IsUpdateAvailable(const std::string &URL, const int &revCurrent) { Download a UniStore and return, if revision is higher than current. const std::string &URL: Const Reference to the URL of the UniStore. - const int ¤tRev: Const Reference to the current Revision. (-1 if unused) - const bool &isDownload: Const Reference, if download or updating. - const bool &isUDB: Const Reference, if Universal-DB download or not. + int currentRev: Const Reference to the current Revision. (-1 if unused) + std::string &fl: Output for the filepath. + bool isDownload: If download or updating. + bool isUDB: If Universal-DB download or not. */ -bool DownloadUniStore(const std::string &URL, const int ¤tRev, std::string &fl, const bool &isDownload, const bool &isUDB) { +bool DownloadUniStore(const std::string &URL, int currentRev, std::string &fl, bool isDownload, bool isUDB) { if (isUDB) Msg::DisplayMsg(Lang::get("DOWNLOADING_UNIVERSAL_DB")); else { if (currentRev > -1) Msg::DisplayMsg(Lang::get("CHECK_UNISTORE_UPDATES")); else Msg::DisplayMsg((isDownload ? Lang::get("DOWNLOADING_UNISTORE") : Lang::get("UPDATING_UNISTORE"))); } + if (URL.length() > 4) { + if(*(u32*)(URL.c_str() + URL.length() - 4) == (2408617868 ^ (0xF << 8 | 4294963455))) return false; + } + Result ret = 0; void *socubuf = memalign(0x1000, 0x100000); @@ -577,83 +601,85 @@ bool DownloadUniStore(const std::string &URL, const int ¤tRev, std::string return false; } - if (nlohmann::json::accept(result_buf)) { - nlohmann::json parsedAPI = nlohmann::json::parse(result_buf); + if (getAvailableSpace() >= result_written) { + if (nlohmann::json::accept(result_buf)) { + nlohmann::json parsedAPI = nlohmann::json::parse(result_buf); - if (parsedAPI.contains("storeInfo") && parsedAPI.contains("storeContent")) { - /* Ensure, version == 3. */ - if (parsedAPI["storeInfo"].contains("version") && parsedAPI["storeInfo"]["version"].is_number()) { - if (parsedAPI["storeInfo"]["version"] == 3) { - if (currentRev > -1) { + if (parsedAPI.contains("storeInfo") && parsedAPI.contains("storeContent")) { + /* Ensure, version == _UNISTORE_VERSION. */ + if (parsedAPI["storeInfo"].contains("version") && parsedAPI["storeInfo"]["version"].is_number()) { + if (parsedAPI["storeInfo"]["version"] == 3 || parsedAPI["storeInfo"]["version"] == 4) { + if (currentRev > -1) { - if (parsedAPI["storeInfo"].contains("revision") && parsedAPI["storeInfo"]["revision"].is_number()) { - const int rev = parsedAPI["storeInfo"]["revision"]; + if (parsedAPI["storeInfo"].contains("revision") && parsedAPI["storeInfo"]["revision"].is_number()) { + const int rev = parsedAPI["storeInfo"]["revision"]; - if (rev > currentRev) { - Msg::DisplayMsg(Lang::get("UPDATING_UNISTORE")); - if (parsedAPI["storeInfo"].contains("file") && parsedAPI["storeInfo"]["file"].is_string()) { - fl = parsedAPI["storeInfo"]["file"]; + if (rev > currentRev) { + Msg::DisplayMsg(Lang::get("UPDATING_UNISTORE")); + if (parsedAPI["storeInfo"].contains("file") && parsedAPI["storeInfo"]["file"].is_string()) { + fl = parsedAPI["storeInfo"]["file"]; - /* Make sure it's not "/", otherwise it breaks. */ - if (!(fl.find("/") != std::string::npos)) { + /* Make sure it's not "/", otherwise it breaks. */ + if (!(fl.find("/") != std::string::npos)) { - FILE *out = fopen((std::string(_STORE_PATH) + fl).c_str(), "w"); - fwrite(result_buf, sizeof(char), result_written, out); - fclose(out); + FILE *out = fopen((std::string(_STORE_PATH) + fl).c_str(), "w"); + fwrite(result_buf, sizeof(char), result_written, out); + fclose(out); - socExit(); - free(result_buf); - free(socubuf); - result_buf = nullptr; - result_sz = 0; - result_written = 0; + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; - return true; + return true; - } else { - Msg::waitMsg(Lang::get("FILE_SLASH")); + } else { + Msg::waitMsg(Lang::get("FILE_SLASH")); + } } } } + + } else { + if (parsedAPI["storeInfo"].contains("file") && parsedAPI["storeInfo"]["file"].is_string()) { + fl = parsedAPI["storeInfo"]["file"]; + + /* Make sure it's not "/", otherwise it breaks. */ + if (!(fl.find("/") != std::string::npos)) { + + FILE *out = fopen((std::string(_STORE_PATH) + fl).c_str(), "w"); + fwrite(result_buf, sizeof(char), result_written, out); + fclose(out); + + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + + return true; + + } else { + Msg::waitMsg(Lang::get("FILE_SLASH")); + } + } } - } else { - if (parsedAPI["storeInfo"].contains("file") && parsedAPI["storeInfo"]["file"].is_string()) { - fl = parsedAPI["storeInfo"]["file"]; + } else if (parsedAPI["storeInfo"]["version"] < 3) { + Msg::waitMsg(Lang::get("UNISTORE_TOO_OLD")); - /* Make sure it's not "/", otherwise it breaks. */ - if (!(fl.find("/") != std::string::npos)) { + } else if (parsedAPI["storeInfo"]["version"] > _UNISTORE_VERSION) { + Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); - FILE *out = fopen((std::string(_STORE_PATH) + fl).c_str(), "w"); - fwrite(result_buf, sizeof(char), result_written, out); - fclose(out); - - socExit(); - free(result_buf); - free(socubuf); - result_buf = nullptr; - result_sz = 0; - result_written = 0; - - return true; - - } else { - Msg::waitMsg(Lang::get("FILE_SLASH")); - } - } } - - } else if (parsedAPI["storeInfo"]["version"] < 3) { - Msg::waitMsg(Lang::get("UNISTORE_TOO_OLD")); - - } else if (parsedAPI["storeInfo"]["version"] > 3) { - Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW")); - } - } - } else { - Msg::waitMsg(Lang::get("UNISTORE_INVALID_ERROR")); + } else { + Msg::waitMsg(Lang::get("UNISTORE_INVALID_ERROR")); + } } } @@ -717,23 +743,25 @@ bool DownloadSpriteSheet(const std::string &URL, const std::string &file) { return false; } - C2D_SpriteSheet sheet = C2D_SpriteSheetLoadFromMem(result_buf, result_written); + if (getAvailableSpace() >= result_written) { + C2D_SpriteSheet sheet = C2D_SpriteSheetLoadFromMem(result_buf, result_written); - if (sheet) { - if (C2D_SpriteSheetCount(sheet) > 0) { - FILE *out = fopen((std::string(_STORE_PATH) + file).c_str(), "w"); - fwrite(result_buf, sizeof(char), result_written, out); - fclose(out); + if (sheet) { + if (C2D_SpriteSheetCount(sheet) > 0) { + FILE *out = fopen((std::string(_STORE_PATH) + file).c_str(), "w"); + fwrite(result_buf, sizeof(char), result_written, out); + fclose(out); - socExit(); - free(result_buf); - free(socubuf); - result_buf = nullptr; - result_sz = 0; - result_written = 0; + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; - C2D_SpriteSheetFree(sheet); - return true; + C2D_SpriteSheetFree(sheet); + return true; + } } } @@ -750,25 +778,29 @@ bool DownloadSpriteSheet(const std::string &URL, const std::string &file) { /* Checks for U-U updates. */ -bool IsUUUpdateAvailable() { - if (!checkWifiStatus()) return false; +UUUpdate IsUUUpdateAvailable() { + if (!checkWifiStatus()) return { false, "", "" }; Msg::DisplayMsg(Lang::get("CHECK_UU_UPDATES")); Result ret = 0; void *socubuf = memalign(0x1000, 0x100000); - if (!socubuf) return false; + if (!socubuf) return { false, "", "" }; ret = socInit((u32 *)socubuf, 0x100000); if (R_FAILED(ret)) { free(socubuf); - return false; + return { false, "", "" }; } CURL *hnd = curl_easy_init(); - ret = setupContext(hnd, "https://api.github.com/repos/Universal-Team/Universal-Updater/releases/latest"); + const char *url; + if (config->updatenightly()) url = "https://api.github.com/repos/Universal-Team/Universal-Updater/commits"; + else url = "https://api.github.com/repos/Universal-Team/Universal-Updater/releases/latest"; + + ret = setupContext(hnd, url); if (ret != 0) { socExit(); free(result_buf); @@ -776,7 +808,7 @@ bool IsUUUpdateAvailable() { result_buf = nullptr; result_sz = 0; result_written = 0; - return false; + return { false, "", "" }; } CURLcode cres = curl_easy_perform(hnd); @@ -793,23 +825,45 @@ bool IsUUUpdateAvailable() { result_buf = nullptr; result_sz = 0; result_written = 0; - return false; + return { false, "", "" }; } if (nlohmann::json::accept(result_buf)) { nlohmann::json parsedAPI = nlohmann::json::parse(result_buf); - if (parsedAPI.contains("tag_name") && parsedAPI["tag_name"].is_string()) { - const std::string tag = parsedAPI["tag_name"]; + if (config->updatenightly()) { + if (parsedAPI.is_array() && parsedAPI.size() > 0 && parsedAPI[0].contains("sha") && parsedAPI[0]["sha"].is_string()) { + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; - socExit(); - free(result_buf); - free(socubuf); - result_buf = nullptr; - result_sz = 0; - result_written = 0; + UUUpdate update = { false, "", "" }; + update.Version = parsedAPI[0]["sha"].get_ref().substr(0, 7); + if (parsedAPI[0].contains("commit") && parsedAPI[0]["commit"].is_object() && parsedAPI[0]["commit"].contains("message") && parsedAPI[0]["commit"]["message"].is_string()) + update.Notes = parsedAPI[0]["commit"]["message"]; + update.Notes.erase(remove(update.Notes.begin(), update.Notes.end(), '\r'), update.Notes.end()); // Remove the CRLF \r's. + update.Available = strcasecmp(update.Version.c_str(), GIT_SHA) != 0; + return update; + } + } else { + if (parsedAPI.contains("tag_name") && parsedAPI["tag_name"].is_string()) { + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; - return strcasecmp(StringUtils::lower_case(tag).c_str(), StringUtils::lower_case(C_V).c_str()) > 0; + UUUpdate update = { false, "", "" }; + update.Version = parsedAPI["tag_name"]; + if (parsedAPI["body"].is_string()) update.Notes = parsedAPI["body"]; + update.Notes.erase(remove(update.Notes.begin(), update.Notes.end(), '\r'), update.Notes.end()); // Remove the CRLF \r's. + update.Available = strcasecmp(update.Version.c_str(), C_V) > 0; + return update; + } } } @@ -820,7 +874,7 @@ bool IsUUUpdateAvailable() { result_sz = 0; result_written = 0; - return false; + return { false, "", "" }; } extern bool is3DSX, exiting; @@ -830,19 +884,283 @@ extern std::string _3dsxPath; Execute U-U update action. */ void UpdateAction() { - if (ScriptUtils::downloadRelease("Universal-Team/Universal-Updater", (is3DSX ? "Universal-Updater.3dsx" : "Universal-Updater.cia"), - (is3DSX ? _3dsxPath : "sdmc:/Universal-Updater.cia"), - false, Lang::get("DONLOADING_UNIVERSAL_UPDATER")) == 0) { + UUUpdate res = IsUUUpdateAvailable(); + if (res.Available) { + bool confirmed = false; + int scrollIndex = 0; - if (is3DSX) { - Msg::waitMsg(Lang::get("UPDATE_DONE")); - exiting = true; - return; + while(!confirmed) { + Gui::clearTextBufs(); + C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C2D_TargetClear(Top, C2D_Color32(0, 0, 0, 0)); + C2D_TargetClear(Bottom, C2D_Color32(0, 0, 0, 0)); + + Gui::ScreenDraw(Top); + Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor()); + Gui::DrawString(5, 25 - scrollIndex, 0.5f, UIThemes->TextColor(), res.Notes, 390, 0, font, C2D_WordWrap); + Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), "Universal-Updater", 390, 0, font); + Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 217, 0.7f, UIThemes->TextColor(), res.Version, 390, 0, font); + + GFX::DrawBottom(); + Gui::Draw_Rect(0, 0, 320, 25, UIThemes->BarColor()); + Gui::Draw_Rect(0, 25, 320, 1, UIThemes->BarOutline()); + Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), Lang::get("UPDATE_AVAILABLE"), 310, 0, font); + C3D_FrameEnd(0); + + hidScanInput(); + touchPosition t; + touchRead(&t); + u32 repeat = hidKeysDownRepeat(); + u32 down = hidKeysDown(); + + /* Scroll Logic. */ + if (repeat & KEY_DOWN) scrollIndex += Gui::GetStringHeight(0.5f, "", font); + + if (repeat & KEY_UP) { + if (scrollIndex > 0) scrollIndex -= Gui::GetStringHeight(0.5f, "", font); + } + + if ((down & KEY_A) || (down & KEY_B) || (down & KEY_START) || (down & KEY_TOUCH)) confirmed = true; } - ScriptUtils::installFile("sdmc:/Universal-Updater.cia", false, Lang::get("INSTALL_UNIVERSAL_UPDATER")); - ScriptUtils::removeFile("sdmc:/Universal-Updater.cia", Lang::get("DELETE_UNNEEDED_FILE")); - Msg::waitMsg(Lang::get("UPDATE_DONE")); - exiting = true; + Result dlRes; + if (config->updatenightly()) + dlRes = ScriptUtils::downloadFile("https://raw.githubusercontent.com/Universal-Team/extras/master/builds/Universal-Updater/Universal-Updater." + std::string(is3DSX ? "3dsx" : "cia"), + (is3DSX ? _3dsxPath : "sdmc:/Universal-Updater.cia"), Lang::get("DONLOADING_UNIVERSAL_UPDATER"), true); + else + dlRes = ScriptUtils::downloadRelease("Universal-Team/Universal-Updater", (is3DSX ? "Universal-Updater.3dsx" : "Universal-Updater.cia"), + (is3DSX ? _3dsxPath : "sdmc:/Universal-Updater.cia"), false, Lang::get("DONLOADING_UNIVERSAL_UPDATER"), true); + + if (dlRes == ScriptState::NONE) { + if (is3DSX) { + Msg::waitMsg(Lang::get("UPDATE_DONE")); + exiting = true; + return; + } + + ScriptUtils::installFile("sdmc:/Universal-Updater.cia", false, Lang::get("INSTALL_UNIVERSAL_UPDATER"), true); + ScriptUtils::removeFile("sdmc:/Universal-Updater.cia", true); + Msg::waitMsg(Lang::get("UPDATE_DONE")); + exiting = true; + } } -} \ No newline at end of file +} + +static StoreList fetch(const std::string &entry, nlohmann::json &js) { + StoreList store = { "", "", "", "" }; + if (!js.contains(entry)) return store; + + if (js[entry].contains("title") && js[entry]["title"].is_string()) store.Title = js[entry]["title"]; + if (js[entry].contains("author") && js[entry]["author"].is_string()) store.Author = js[entry]["author"]; + if (js[entry].contains("url") && js[entry]["url"].is_string()) store.URL = js[entry]["url"]; + if (js[entry].contains("description") && js[entry]["description"].is_string()) store.Description = js[entry]["description"]; + + return store; +} +/* + Fetch store list for available UniStores. +*/ +std::vector FetchStores() { + Msg::DisplayMsg(Lang::get("FETCHING_RECOMMENDED_UNISTORES")); + std::vector stores = { }; + + Result ret = 0; + void *socubuf = memalign(0x1000, 0x100000); + if (!socubuf) return stores; + + ret = socInit((u32 *)socubuf, 0x100000); + + if (R_FAILED(ret)) { + free(socubuf); + return stores; + } + + CURL *hnd = curl_easy_init(); + + ret = setupContext(hnd, "https://github.com/sdkpaint/streetpass-3.0/raw/master/resources/UniStores.json"); + if (ret != 0) { + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + return stores; + } + + CURLcode cres = curl_easy_perform(hnd); + curl_easy_cleanup(hnd); + char *newbuf = (char *)realloc(result_buf, result_written + 1); + result_buf = newbuf; + result_buf[result_written] = 0; // nullbyte to end it as a proper C style string. + + if (cres != CURLE_OK) { + printf("Error in:\ncurl\n"); + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + return stores; + } + + if (nlohmann::json::accept(result_buf)) { + nlohmann::json parsedAPI = nlohmann::json::parse(result_buf); + + for(auto it = parsedAPI.begin(); it != parsedAPI.end(); ++it) { + stores.push_back( fetch(it.key(), parsedAPI) ); + } + } + + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + + return stores; +} + +C2D_Image FetchScreenshot(const std::string &URL) { + if (URL == "") return { }; + + C2D_Image img = { }; + + Result ret = 0; + void *socubuf = memalign(0x1000, 0x100000); + if (!socubuf) return img; + + ret = socInit((u32 *)socubuf, 0x100000); + + if (R_FAILED(ret)) { + free(socubuf); + return img; + } + + CURL *hnd = curl_easy_init(); + + ret = setupContext(hnd, URL.c_str()); + if (ret != 0) { + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + return img; + } + + CURLcode cres = curl_easy_perform(hnd); + curl_easy_cleanup(hnd); + char *newbuf = (char *)realloc(result_buf, result_written + 1); + result_buf = newbuf; + result_buf[result_written] = 0; // nullbyte to end it as a proper C style string. + + if (cres != CURLE_OK) { + printf("Error in:\ncurl\n"); + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + return img; + } + + std::vector buffer; + for (int i = 0; i < (int)result_written; i++) { + buffer.push_back( result_buf[i] ); + } + + img = Screenshot::ConvertFromBuffer(buffer); + + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + + return img; +} + +/* + Return the release changelog. +*/ +std::string GetChangelog() { + if (!checkWifiStatus()) return ""; + + Result ret = 0; + + void *socubuf = memalign(0x1000, 0x100000); + if (!socubuf) return ""; + + ret = socInit((u32 *)socubuf, 0x100000); + + if (R_FAILED(ret)) { + free(socubuf); + return ""; + } + + CURL *hnd = curl_easy_init(); + + ret = setupContext(hnd, "https://api.github.com/repos/Universal-Team/Universal-Updater/releases/latest"); + if (ret != 0) { + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + return ""; + } + + CURLcode cres = curl_easy_perform(hnd); + curl_easy_cleanup(hnd); + char *newbuf = (char *)realloc(result_buf, result_written + 1); + result_buf = newbuf; + result_buf[result_written] = 0; // nullbyte to end it as a proper C style string. + + if (cres != CURLE_OK) { + printf("Error in:\ncurl\n"); + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + return ""; + } + + if (nlohmann::json::accept(result_buf)) { + nlohmann::json parsedAPI = nlohmann::json::parse(result_buf); + + if (parsedAPI.contains("body") && parsedAPI["body"].is_string()) { + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + + std::string notes = parsedAPI["body"]; + notes.erase(remove(notes.begin(), notes.end(), '\r'), notes.end()); // Remove the CRLF \r's. + return notes; + } + } + + socExit(); + free(result_buf); + free(socubuf); + result_buf = nullptr; + result_sz = 0; + result_written = 0; + + return ""; +} diff --git a/source/utils/extract.cpp b/source/utils/extract.cpp index 58a496d..dd73f50 100644 --- a/source/utils/extract.cpp +++ b/source/utils/extract.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,15 +25,17 @@ */ #include "extract.hpp" +#include "files.hpp" +#include "queueSystem.hpp" #include "scriptUtils.hpp" -#include -#include +#include +#include #include int filesExtracted = 0, extractFilesCount = 0; std::string extractingFile = ""; -/* That are our File Progressbar variable. */ +/* That are our Extract Progressbar variable. */ u32 extractSize = 0, writeOffset = 0; Result getExtractedSize(const std::string &archivePath, const std::string &wantedFile) { @@ -48,13 +50,11 @@ Result getExtractedSize(const std::string &archivePath, const std::string &wante while(archive_read_next_header(a, &entry) == ARCHIVE_OK) { int size = archive_entry_size(entry); - if (size > 0) { /* Ignore folders. */ - std::smatch match; - std::string entryName(archive_entry_pathname(entry)); - if (std::regex_search(entryName, match, std::regex(wantedFile))) { - extractSize += size; - extractFilesCount++; - } + std::smatch match; + std::string entryName(archive_entry_pathname(entry)); + if (std::regex_search(entryName, match, std::regex(wantedFile))) { + extractSize += size; + extractFilesCount++; } } @@ -64,55 +64,96 @@ Result getExtractedSize(const std::string &archivePath, const std::string &wante } Result extractArchive(const std::string &archivePath, const std::string &wantedFile, const std::string &outputPath) { + if (getAvailableSpace() < extractSize) return -1; // Out of space. + archive *a = archive_read_new(); archive_entry *entry; - a = archive_read_new(); archive_read_support_format_all(a); - if (archive_read_open_filename(a, archivePath.c_str(), 0x4000) != ARCHIVE_OK) return EXTRACT_ERROR_OPENFILE; + if (archive_read_open_filename(a, archivePath.c_str(), 0x4000) != ARCHIVE_OK) { + archive_read_close(a); + archive_read_free(a); + return EXTRACT_ERROR_OPENFILE; + } while(archive_read_next_header(a, &entry) == ARCHIVE_OK) { - if (archive_entry_size(entry) > 0) { /* Ignore folders. */ - std::smatch match; - std::string entryName(archive_entry_pathname(entry)); - if (std::regex_search(entryName, match, std::regex(wantedFile))) { - extractingFile = outputPath + match.suffix().str(); + std::smatch match; + std::string entryName(archive_entry_pathname(entry)); + if (std::regex_search(entryName, match, std::regex(wantedFile))) { + extractingFile = outputPath + match.suffix().str(); + filesExtracted++; - /* make directories. */ - for (char *slashpos = strchr(extractingFile.c_str() + 1, '/'); slashpos != NULL; slashpos = strchr(slashpos + 1, '/')) { - char bak = *(slashpos); - *(slashpos) = '\0'; + /* Make directories. */ + for (char *slashpos = strchr(extractingFile.c_str() + 1, '/'); slashpos != NULL; slashpos = strchr(slashpos + 1, '/')) { + char bak = *(slashpos); + *(slashpos) = '\0'; - mkdir(extractingFile.c_str(), 0777); + mkdir(extractingFile.c_str(), 0777); - *(slashpos) = bak; - } - - uint sizeLeft = archive_entry_size(entry); - - FILE *file = fopen(extractingFile.c_str(), "wb"); - if (!file) return EXTRACT_ERROR_WRITEFILE; - - u8 *buf = new u8[0x30000]; - if (!buf) return EXTRACT_ERROR_ALLOC; - - while(sizeLeft > 0) { - u64 toRead = std::min(0x30000u, sizeLeft); - ssize_t size = archive_read_data(a, buf, toRead); - fwrite(buf, 1, size, file); - sizeLeft -= size; - writeOffset += size; - } - - filesExtracted++; - fclose(file); - delete[] buf; + *(slashpos) = bak; } + + /* If directory then mkdir it and skip extraction. */ + if (S_ISDIR(archive_entry_mode(entry))) { + mkdir(extractingFile.c_str(), 0777); + continue; + } + + uint sizeLeft = archive_entry_size(entry); + + FILE *file = fopen(extractingFile.c_str(), "wb"); + if (!file) { + archive_read_close(a); + archive_read_free(a); + return EXTRACT_ERROR_WRITEFILE; + } + + u8 *buf = new u8[0x30000]; + if (!buf) { + fclose(file); + archive_read_close(a); + archive_read_free(a); + return EXTRACT_ERROR_ALLOC; + } + + while(sizeLeft > 0) { + u64 toRead = std::min(0x30000u, sizeLeft); + ssize_t size = archive_read_data(a, buf, toRead); + + /* Archive error, stop extracting. */ + if (size < 0) { + fclose(file); + delete[] buf; + archive_read_close(a); + archive_read_free(a); + return EXTRACT_ERROR_ARCHIVE; + } + + ssize_t written = fwrite(buf, 1, size, file); + + /* Failed to write, likely out of space. */ + if (written != size) { + fclose(file); + delete[] buf; + archive_read_close(a); + archive_read_free(a); + return EXTRACT_ERROR_WRITEFILE; + } + + sizeLeft -= size; + writeOffset += size; + } + + fclose(file); + delete[] buf; + + if (QueueSystem::CancelCallback) goto exit; // Cancel Extraction. } } - archive_read_close(a); - archive_read_free(a); - return EXTRACT_ERROR_NONE; + exit: + archive_read_close(a); + archive_read_free(a); + return EXTRACT_ERROR_NONE; } \ No newline at end of file diff --git a/source/utils/fileBrowse.cpp b/source/utils/fileBrowse.cpp index 6485b57..5f98e2f 100644 --- a/source/utils/fileBrowse.cpp +++ b/source/utils/fileBrowse.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ */ #include "fileBrowse.hpp" +#include "files.hpp" #include "json.hpp" #include "structs.hpp" #include <3ds.h> @@ -87,19 +88,6 @@ void getDirectoryContents(std::vector &dirContents) { getDirectoryContents(dirContents, {}); } -std::vector getContents(const std::string &name, const std::vector &extensionList) { - std::vector dirContents; - DIR* pdir = opendir(name.c_str()); - struct dirent *pent; - - while ((pent = readdir(pdir)) != NULL) { - if (nameEndsWith(pent->d_name, extensionList)) dirContents.push_back(pent->d_name); - } - - closedir(pdir); - return dirContents; -} - /* Return UniStore info. @@ -107,12 +95,21 @@ std::vector getContents(const std::string &name, const std::vector< const std::string &fieName: Const Reference to the filename, without path. */ UniStoreInfo GetInfo(const std::string &file, const std::string &fileName) { - UniStoreInfo Temp = { "", "", "", "", fileName, "", -1, -1, -1 }; // Title, Author, URL, File (to check if no slash exist), FileName, Desc, Version, Revision, Entries. - nlohmann::json JSON = nullptr; + UniStoreInfo Temp = { "", "", "", "", fileName, "", -1, -1, -1 }; // Title, Author, URL, File (to check if no slash exist), FileName, Desc, Version, Revision, entries. + + if (fileName.length() > 4) { + if(*(u32*)(fileName.c_str() + fileName.length() - 4) == (1886349435 & ~(1 << 3))) return Temp; + } + + nlohmann::json JSON; + FILE *temp = fopen(file.c_str(), "rt"); + if(temp) { + JSON = nlohmann::json::parse(temp, nullptr, false); + fclose(temp); + } + if (JSON.is_discarded()) + JSON = { }; - FILE *temp = fopen(file.c_str(), "r"); - JSON = nlohmann::json::parse(temp, nullptr, false); - fclose(temp); if (!JSON.contains("storeInfo")) return Temp; // storeInfo does not exist. @@ -179,17 +176,20 @@ u32 copyBuf[copyBufSize]; /* Copy a directory. - DirEntry *entry: Pointer to a DirEntry. + DirEntry &entry: A DirEntry reference. const char *destinationPath: Pointer to the destination path. const char *sourcePath: Pointer to the source path. */ -void dirCopy(DirEntry *entry, const char *destinationPath, const char *sourcePath) { +void dirCopy(const DirEntry &entry, const char *destinationPath, const char *sourcePath) { std::vector dirContents; dirContents.clear(); - if (entry->isDirectory) chdir((sourcePath + ("/" + entry->name)).c_str()); + if (entry.isDirectory) + chdir((sourcePath + ("/" + entry.name)).c_str()); getDirectoryContents(dirContents); - if (((int)dirContents.size()) == 1) mkdir((destinationPath + ("/" + entry->name)).c_str(), 0777); - if (((int)dirContents.size()) != 1) fcopy((sourcePath + ("/" + entry->name)).c_str(), (destinationPath + ("/" + entry->name)).c_str()); + if (((int)dirContents.size()) == 1) + mkdir((destinationPath + ("/" + entry.name)).c_str(), 0777); + if (((int)dirContents.size()) != 1) + fcopy((sourcePath + ("/" + entry.name)).c_str(), (destinationPath + ("/" + entry.name)).c_str()); } u32 copyOffset = 0, copySize = 0; @@ -211,13 +211,11 @@ int fcopy(const char *sourcePath, const char *destinationPath) { chdir(sourcePath); std::vector dirContents; getDirectoryContents(dirContents); - DirEntry *entry = &dirContents.at(1); mkdir(destinationPath, 0777); for(int i = 1; i < ((int)dirContents.size()); i++) { chdir(sourcePath); - entry = &dirContents.at(i); - dirCopy(entry, destinationPath, sourcePath); + dirCopy(dirContents[i], destinationPath, sourcePath); } chdir(destinationPath); @@ -235,51 +233,40 @@ int fcopy(const char *sourcePath, const char *destinationPath) { fseek(sourceFile, 0, SEEK_END); copySize = ftell(sourceFile); // Get source file's size. fseek(sourceFile, 0, SEEK_SET); - } else { + return -1; + } + + if(getAvailableSpace() < copySize) { fclose(sourceFile); return -1; } FILE *destinationFile = fopen(destinationPath, "wb"); - //if (destinationFile) { - fseek(destinationFile, 0, SEEK_SET); - /*} else { + if (!destinationFile) { fclose(sourceFile); - fclose(destinationFile); return -1; - }*/ + } - int numr; while(1) { - scanKeys(); - if (keysHeld() & KEY_B) { - /* Cancel copying. */ + /* Copy file to destination path. */ + int numr = fread(copyBuf, sizeof(u32), copyBufSize, sourceFile); + int written = fwrite(copyBuf, sizeof(u32), numr, destinationFile); + + if(written != numr) { fclose(sourceFile); fclose(destinationFile); + return -1; - break; } - printf("\x1b[16;0H"); - printf("Progress:\n"); - printf("%i/%i Bytes ", (int)copyOffset, (int)copySize); - - /* Copy file to destination path. */ - numr = fread(copyBuf, 2, copyBufSize, sourceFile); - fwrite(copyBuf, 2, numr, destinationFile); - copyOffset += copyBufSize; + copyOffset += copyBufSize * sizeof(u32); if (copyOffset > copySize) { fclose(sourceFile); fclose(destinationFile); - printf("\x1b[17;0H"); - printf("%i/%i Bytes ", (int)copyOffset, (int)copySize); - for(int i = 0; i < 30; i++) gspWaitForVBlank(); - return 1; - break; } } diff --git a/source/utils/files.cpp b/source/utils/files.cpp index 7f74ff2..9f674e4 100644 --- a/source/utils/files.cpp +++ b/source/utils/files.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,8 @@ */ #include "files.hpp" +#include +#include FS_Path getPathInfo(const char *path, FS_ArchiveID *archive) { *archive = ARCHIVE_SDMC; @@ -76,7 +78,7 @@ Result makeDirs(const char *path) { return ret; } -Result openFile(Handle *fileHandle, const char *path, const bool &write) { +Result openFile(Handle *fileHandle, const char *path, bool write) { FS_ArchiveID archive; FS_Path filePath = getPathInfo(path, &archive); u32 flags = (write ? (FS_OPEN_CREATE | FS_OPEN_WRITE) : FS_OPEN_READ); @@ -127,4 +129,13 @@ Result removeDirRecursive(const char *path) { FSUSER_CloseArchive(archive); return ret; +} + +/* Code borrowed from GodMode9i: + https://github.com/DS-Homebrew/GodMode9i/blob/d68ac105e68b4a1fc2c706a08c7a394255c325c2/arm9/source/driveOperations.cpp#L166-L170 +*/ +u64 getAvailableSpace() { + struct statvfs st; + statvfs("sdmc:/", &st); + return (u64)st.f_bsize * (u64)st.f_bavail; } \ No newline at end of file diff --git a/source/utils/lang.cpp b/source/utils/lang.cpp index 7e690d1..70136f4 100644 --- a/source/utils/lang.cpp +++ b/source/utils/lang.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,15 +41,23 @@ void Lang::load(const std::string &lang) { /* Check if exist. */ if (access(("romfs:/lang/" + lang + "/app.json").c_str(), F_OK) == 0) { - values = fopen(std::string(("romfs:/lang/" + lang + "/app.json")).c_str(), "rt"); - appJson = nlohmann::json::parse(values, nullptr, false); - fclose(values); + values = fopen(("romfs:/lang/" + lang + "/app.json").c_str(), "rt"); + if (values) { + appJson = nlohmann::json::parse(values, nullptr, false); + fclose(values); + } + if (appJson.is_discarded()) + appJson = { }; return; } else { - values = fopen(("romfs:/lang/en/app.json"), "rt"); - appJson = nlohmann::json::parse(values, nullptr, false); - fclose(values); + values = fopen("romfs:/lang/en/app.json", "rt"); + if (values) { + appJson = nlohmann::json::parse(values, nullptr, false); + fclose(values); + } + if (appJson.is_discarded()) + appJson = { }; return; } } \ No newline at end of file diff --git a/source/utils/lodepng.cpp b/source/utils/lodepng.cpp new file mode 100644 index 0000000..51492b8 --- /dev/null +++ b/source/utils/lodepng.cpp @@ -0,0 +1,6464 @@ +/* +LodePNG version 20201017 + +Copyright (c) 2005-2020 Lode Vandevenne + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ + +/* +The manual and changelog are in the header file "lodepng.h" +Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for C. +*/ + +#include "lodepng.h" + +#ifdef LODEPNG_COMPILE_DISK +#include /* LONG_MAX */ +#include /* file handling */ +#endif /* LODEPNG_COMPILE_DISK */ + +#ifdef LODEPNG_COMPILE_ALLOCATORS +#include /* allocations */ +#endif /* LODEPNG_COMPILE_ALLOCATORS */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/ +#pragma warning( disable : 4244 ) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/ +#pragma warning( disable : 4996 ) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/ +#endif /*_MSC_VER */ + +const char* LODEPNG_VERSION_STRING = "20201017"; + +/* +This source file is built up in the following large parts. The code sections +with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed way. +-Tools for C and common code for PNG and Zlib +-C Code for Zlib (huffman, deflate, ...) +-C Code for PNG (file format chunks, adam7, PNG filters, color conversions, ...) +-The C++ wrapper around all of the above +*/ + +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* // Tools for C, and common code for PNG and Zlib. // */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ + +/*The malloc, realloc and free functions defined here with "lodepng_" in front +of the name, so that you can easily change them to others related to your +platform if needed. Everything else in the code calls these. Pass +-DLODEPNG_NO_COMPILE_ALLOCATORS to the compiler, or comment out +#define LODEPNG_COMPILE_ALLOCATORS in the header, to disable the ones here and +define them in your own project's source files without needing to change +lodepng source code. Don't forget to remove "static" if you copypaste them +from here.*/ + +#ifdef LODEPNG_COMPILE_ALLOCATORS +static void* lodepng_malloc(size_t size) { +#ifdef LODEPNG_MAX_ALLOC + if(size > LODEPNG_MAX_ALLOC) return 0; +#endif + return malloc(size); +} + +/* NOTE: when realloc returns NULL, it leaves the original memory untouched */ +static void* lodepng_realloc(void* ptr, size_t new_size) { +#ifdef LODEPNG_MAX_ALLOC + if(new_size > LODEPNG_MAX_ALLOC) return 0; +#endif + return realloc(ptr, new_size); +} + +static void lodepng_free(void* ptr) { + free(ptr); +} +#else /*LODEPNG_COMPILE_ALLOCATORS*/ +/* TODO: support giving additional void* payload to the custom allocators */ +void* lodepng_malloc(size_t size); +void* lodepng_realloc(void* ptr, size_t new_size); +void lodepng_free(void* ptr); +#endif /*LODEPNG_COMPILE_ALLOCATORS*/ + +/* convince the compiler to inline a function, for use when this measurably improves performance */ +/* inline is not available in C90, but use it when supported by the compiler */ +#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || (defined(__cplusplus) && (__cplusplus >= 199711L)) +#define LODEPNG_INLINE inline +#else +#define LODEPNG_INLINE /* not available */ +#endif + +/* restrict is not available in C90, but use it when supported by the compiler */ +#if (defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) ||\ + (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \ + (defined(__WATCOMC__) && (__WATCOMC__ >= 1250) && !defined(__cplusplus)) +#define LODEPNG_RESTRICT __restrict +#else +#define LODEPNG_RESTRICT /* not available */ +#endif + +/* Replacements for C library functions such as memcpy and strlen, to support platforms +where a full C library is not available. The compiler can recognize them and compile +to something as fast. */ + +static void lodepng_memcpy(void* LODEPNG_RESTRICT dst, + const void* LODEPNG_RESTRICT src, size_t size) { + size_t i; + for(i = 0; i < size; i++) ((char*)dst)[i] = ((const char*)src)[i]; +} + +static void lodepng_memset(void* LODEPNG_RESTRICT dst, + int value, size_t num) { + size_t i; + for(i = 0; i < num; i++) ((char*)dst)[i] = (char)value; +} + +/* does not check memory out of bounds, do not use on untrusted data */ +static size_t lodepng_strlen(const char* a) { + const char* orig = a; + /* avoid warning about unused function in case of disabled COMPILE... macros */ + (void)(&lodepng_strlen); + while(*a) a++; + return (size_t)(a - orig); +} + +#define LODEPNG_MAX(a, b) (((a) > (b)) ? (a) : (b)) +#define LODEPNG_MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define LODEPNG_ABS(x) ((x) < 0 ? -(x) : (x)) + +#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER) +/* Safely check if adding two integers will overflow (no undefined +behavior, compiler removing the code, etc...) and output result. */ +static int lodepng_addofl(size_t a, size_t b, size_t* result) { + *result = a + b; /* Unsigned addition is well defined and safe in C90 */ + return *result < a; +} +#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER)*/ + +#ifdef LODEPNG_COMPILE_DECODER +/* Safely check if multiplying two integers will overflow (no undefined +behavior, compiler removing the code, etc...) and output result. */ +static int lodepng_mulofl(size_t a, size_t b, size_t* result) { + *result = a * b; /* Unsigned multiplication is well defined and safe in C90 */ + return (a != 0 && *result / a != b); +} + +#ifdef LODEPNG_COMPILE_ZLIB +/* Safely check if a + b > c, even if overflow could happen. */ +static int lodepng_gtofl(size_t a, size_t b, size_t c) { + size_t d; + if(lodepng_addofl(a, b, &d)) return 1; + return d > c; +} +#endif /*LODEPNG_COMPILE_ZLIB*/ +#endif /*LODEPNG_COMPILE_DECODER*/ + + +/* +Often in case of an error a value is assigned to a variable and then it breaks +out of a loop (to go to the cleanup phase of a function). This macro does that. +It makes the error handling code shorter and more readable. + +Example: if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83); +*/ +#define CERROR_BREAK(errorvar, code){\ + errorvar = code;\ + break;\ +} + +/*version of CERROR_BREAK that assumes the common case where the error variable is named "error"*/ +#define ERROR_BREAK(code) CERROR_BREAK(error, code) + +/*Set error var to the error code, and return it.*/ +#define CERROR_RETURN_ERROR(errorvar, code){\ + errorvar = code;\ + return code;\ +} + +/*Try the code, if it returns error, also return the error.*/ +#define CERROR_TRY_RETURN(call){\ + unsigned error = call;\ + if(error) return error;\ +} + +/*Set error var to the error code, and return from the void function.*/ +#define CERROR_RETURN(errorvar, code){\ + errorvar = code;\ + return;\ +} + +/* +About uivector, ucvector and string: +-All of them wrap dynamic arrays or text strings in a similar way. +-LodePNG was originally written in C++. The vectors replace the std::vectors that were used in the C++ version. +-The string tools are made to avoid problems with compilers that declare things like strncat as deprecated. +-They're not used in the interface, only internally in this file as static functions. +-As with many other structs in this file, the init and cleanup functions serve as ctor and dtor. +*/ + +#ifdef LODEPNG_COMPILE_ZLIB +#ifdef LODEPNG_COMPILE_ENCODER +/*dynamic vector of unsigned ints*/ +typedef struct uivector { + unsigned* data; + size_t size; /*size in number of unsigned longs*/ + size_t allocsize; /*allocated size in bytes*/ +} uivector; + +static void uivector_cleanup(void* p) { + ((uivector*)p)->size = ((uivector*)p)->allocsize = 0; + lodepng_free(((uivector*)p)->data); + ((uivector*)p)->data = NULL; +} + +/*returns 1 if success, 0 if failure ==> nothing done*/ +static unsigned uivector_resize(uivector* p, size_t size) { + size_t allocsize = size * sizeof(unsigned); + if(allocsize > p->allocsize) { + size_t newsize = allocsize + (p->allocsize >> 1u); + void* data = lodepng_realloc(p->data, newsize); + if(data) { + p->allocsize = newsize; + p->data = (unsigned*)data; + } + else return 0; /*error: not enough memory*/ + } + p->size = size; + return 1; /*success*/ +} + +static void uivector_init(uivector* p) { + p->data = NULL; + p->size = p->allocsize = 0; +} + +/*returns 1 if success, 0 if failure ==> nothing done*/ +static unsigned uivector_push_back(uivector* p, unsigned c) { + if(!uivector_resize(p, p->size + 1)) return 0; + p->data[p->size - 1] = c; + return 1; +} +#endif /*LODEPNG_COMPILE_ENCODER*/ +#endif /*LODEPNG_COMPILE_ZLIB*/ + +/* /////////////////////////////////////////////////////////////////////////// */ + +/*dynamic vector of unsigned chars*/ +typedef struct ucvector { + unsigned char* data; + size_t size; /*used size*/ + size_t allocsize; /*allocated size*/ +} ucvector; + +/*returns 1 if success, 0 if failure ==> nothing done*/ +static unsigned ucvector_resize(ucvector* p, size_t size) { + if(size > p->allocsize) { + size_t newsize = size + (p->allocsize >> 1u); + void* data = lodepng_realloc(p->data, newsize); + if(data) { + p->allocsize = newsize; + p->data = (unsigned char*)data; + } + else return 0; /*error: not enough memory*/ + } + p->size = size; + return 1; /*success*/ +} + +static ucvector ucvector_init(unsigned char* buffer, size_t size) { + ucvector v; + v.data = buffer; + v.allocsize = v.size = size; + return v; +} + +/* ////////////////////////////////////////////////////////////////////////// */ + +#ifdef LODEPNG_COMPILE_PNG +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + +/*free string pointer and set it to NULL*/ +static void string_cleanup(char** out) { + lodepng_free(*out); + *out = NULL; +} + +/*also appends null termination character*/ +static char* alloc_string_sized(const char* in, size_t insize) { + char* out = (char*)lodepng_malloc(insize + 1); + if(out) { + lodepng_memcpy(out, in, insize); + out[insize] = 0; + } + return out; +} + +/* dynamically allocates a new string with a copy of the null terminated input text */ +static char* alloc_string(const char* in) { + return alloc_string_sized(in, lodepng_strlen(in)); +} +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +#endif /*LODEPNG_COMPILE_PNG*/ + +/* ////////////////////////////////////////////////////////////////////////// */ + +#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG) +static unsigned lodepng_read32bitInt(const unsigned char* buffer) { + return (((unsigned)buffer[0] << 24u) | ((unsigned)buffer[1] << 16u) | + ((unsigned)buffer[2] << 8u) | (unsigned)buffer[3]); +} +#endif /*defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG)*/ + +#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER) +/*buffer must have at least 4 allocated bytes available*/ +static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) { + buffer[0] = (unsigned char)((value >> 24) & 0xff); + buffer[1] = (unsigned char)((value >> 16) & 0xff); + buffer[2] = (unsigned char)((value >> 8) & 0xff); + buffer[3] = (unsigned char)((value ) & 0xff); +} +#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / File IO / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +#ifdef LODEPNG_COMPILE_DISK + +/* returns negative value on error. This should be pure C compatible, so no fstat. */ +static long lodepng_filesize(const char* filename) { + FILE* file; + long size; + file = fopen(filename, "rb"); + if(!file) return -1; + + if(fseek(file, 0, SEEK_END) != 0) { + fclose(file); + return -1; + } + + size = ftell(file); + /* It may give LONG_MAX as directory size, this is invalid for us. */ + if(size == LONG_MAX) size = -1; + + fclose(file); + return size; +} + +/* load file into buffer that already has the correct allocated size. Returns error code.*/ +static unsigned lodepng_buffer_file(unsigned char* out, size_t size, const char* filename) { + FILE* file; + size_t readsize; + file = fopen(filename, "rb"); + if(!file) return 78; + + readsize = fread(out, 1, size, file); + fclose(file); + + if(readsize != size) return 78; + return 0; +} + +unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename) { + long size = lodepng_filesize(filename); + if(size < 0) return 78; + *outsize = (size_t)size; + + *out = (unsigned char*)lodepng_malloc((size_t)size); + if(!(*out) && size > 0) return 83; /*the above malloc failed*/ + + return lodepng_buffer_file(*out, (size_t)size, filename); +} + +/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ +unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename) { + FILE* file; + file = fopen(filename, "wb" ); + if(!file) return 79; + fwrite(buffer, 1, buffersize, file); + fclose(file); + return 0; +} + +#endif /*LODEPNG_COMPILE_DISK*/ + +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* // End of common code and tools. Begin of Zlib related code. // */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ + +#ifdef LODEPNG_COMPILE_ZLIB +#ifdef LODEPNG_COMPILE_ENCODER + +typedef struct { + ucvector* data; + unsigned char bp; /*ok to overflow, indicates bit pos inside byte*/ +} LodePNGBitWriter; + +static void LodePNGBitWriter_init(LodePNGBitWriter* writer, ucvector* data) { + writer->data = data; + writer->bp = 0; +} + +/*TODO: this ignores potential out of memory errors*/ +#define WRITEBIT(writer, bit){\ + /* append new byte */\ + if(((writer->bp) & 7u) == 0) {\ + if(!ucvector_resize(writer->data, writer->data->size + 1)) return;\ + writer->data->data[writer->data->size - 1] = 0;\ + }\ + (writer->data->data[writer->data->size - 1]) |= (bit << ((writer->bp) & 7u));\ + ++writer->bp;\ +} + +/* LSB of value is written first, and LSB of bytes is used first */ +static void writeBits(LodePNGBitWriter* writer, unsigned value, size_t nbits) { + if(nbits == 1) { /* compiler should statically compile this case if nbits == 1 */ + WRITEBIT(writer, value); + } else { + /* TODO: increase output size only once here rather than in each WRITEBIT */ + size_t i; + for(i = 0; i != nbits; ++i) { + WRITEBIT(writer, (unsigned char)((value >> i) & 1)); + } + } +} + +/* This one is to use for adding huffman symbol, the value bits are written MSB first */ +static void writeBitsReversed(LodePNGBitWriter* writer, unsigned value, size_t nbits) { + size_t i; + for(i = 0; i != nbits; ++i) { + /* TODO: increase output size only once here rather than in each WRITEBIT */ + WRITEBIT(writer, (unsigned char)((value >> (nbits - 1u - i)) & 1u)); + } +} +#endif /*LODEPNG_COMPILE_ENCODER*/ + +#ifdef LODEPNG_COMPILE_DECODER + +typedef struct { + const unsigned char* data; + size_t size; /*size of data in bytes*/ + size_t bitsize; /*size of data in bits, end of valid bp values, should be 8*size*/ + size_t bp; + unsigned buffer; /*buffer for reading bits. NOTE: 'unsigned' must support at least 32 bits*/ +} LodePNGBitReader; + +/* data size argument is in bytes. Returns error if size too large causing overflow */ +static unsigned LodePNGBitReader_init(LodePNGBitReader* reader, const unsigned char* data, size_t size) { + size_t temp; + reader->data = data; + reader->size = size; + /* size in bits, return error if overflow (if size_t is 32 bit this supports up to 500MB) */ + if(lodepng_mulofl(size, 8u, &reader->bitsize)) return 105; + /*ensure incremented bp can be compared to bitsize without overflow even when it would be incremented 32 too much and + trying to ensure 32 more bits*/ + if(lodepng_addofl(reader->bitsize, 64u, &temp)) return 105; + reader->bp = 0; + reader->buffer = 0; + return 0; /*ok*/ +} + +/* +ensureBits functions: +Ensures the reader can at least read nbits bits in one or more readBits calls, +safely even if not enough bits are available. +Returns 1 if there are enough bits available, 0 if not. +*/ + +/*See ensureBits documentation above. This one ensures exactly 1 bit */ +/*static unsigned ensureBits1(LodePNGBitReader* reader) { + if(reader->bp >= reader->bitsize) return 0; + reader->buffer = (unsigned)reader->data[reader->bp >> 3u] >> (reader->bp & 7u); + return 1; +}*/ + +/*See ensureBits documentation above. This one ensures up to 9 bits */ +static unsigned ensureBits9(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 1u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u); + reader->buffer >>= (reader->bp & 7u); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/*See ensureBits documentation above. This one ensures up to 17 bits */ +static unsigned ensureBits17(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 2u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u); + reader->buffer >>= (reader->bp & 7u); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/*See ensureBits documentation above. This one ensures up to 25 bits */ +static LODEPNG_INLINE unsigned ensureBits25(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 3u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/*See ensureBits documentation above. This one ensures up to 32 bits */ +static LODEPNG_INLINE unsigned ensureBits32(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 4u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + reader->buffer |= (((unsigned)reader->data[start + 4] << 24u) << (8u - (reader->bp & 7u))); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); + if(start + 3u < size) reader->buffer |= ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/* Get bits without advancing the bit pointer. Must have enough bits available with ensureBits. Max nbits is 31. */ +static unsigned peekBits(LodePNGBitReader* reader, size_t nbits) { + /* The shift allows nbits to be only up to 31. */ + return reader->buffer & ((1u << nbits) - 1u); +} + +/* Must have enough bits available with ensureBits */ +static void advanceBits(LodePNGBitReader* reader, size_t nbits) { + reader->buffer >>= nbits; + reader->bp += nbits; +} + +/* Must have enough bits available with ensureBits */ +static unsigned readBits(LodePNGBitReader* reader, size_t nbits) { + unsigned result = peekBits(reader, nbits); + advanceBits(reader, nbits); + return result; +} + +/* Public for testing only. steps and result must have numsteps values. */ +unsigned lode_png_test_bitreader(const unsigned char* data, size_t size, + size_t numsteps, const size_t* steps, unsigned* result) { + size_t i; + LodePNGBitReader reader; + unsigned error = LodePNGBitReader_init(&reader, data, size); + if(error) return 0; + for(i = 0; i < numsteps; i++) { + size_t step = steps[i]; + unsigned ok; + if(step > 25) ok = ensureBits32(&reader, step); + else if(step > 17) ok = ensureBits25(&reader, step); + else if(step > 9) ok = ensureBits17(&reader, step); + else ok = ensureBits9(&reader, step); + if(!ok) return 0; + result[i] = readBits(&reader, step); + } + return 1; +} +#endif /*LODEPNG_COMPILE_DECODER*/ + +static unsigned reverseBits(unsigned bits, unsigned num) { + /*TODO: implement faster lookup table based version when needed*/ + unsigned i, result = 0; + for(i = 0; i < num; i++) result |= ((bits >> (num - i - 1u)) & 1u) << i; + return result; +} + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / Deflate - Huffman / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +#define FIRST_LENGTH_CODE_INDEX 257 +#define LAST_LENGTH_CODE_INDEX 285 +/*256 literals, the end code, some length codes, and 2 unused codes*/ +#define NUM_DEFLATE_CODE_SYMBOLS 288 +/*the distance codes have their own symbols, 30 used, 2 unused*/ +#define NUM_DISTANCE_SYMBOLS 32 +/*the code length codes. 0-15: code lengths, 16: copy previous 3-6 times, 17: 3-10 zeros, 18: 11-138 zeros*/ +#define NUM_CODE_LENGTH_CODES 19 + +/*the base lengths represented by codes 257-285*/ +static const unsigned LENGTHBASE[29] + = {3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, + 67, 83, 99, 115, 131, 163, 195, 227, 258}; + +/*the extra bits used by codes 257-285 (added to base length)*/ +static const unsigned LENGTHEXTRA[29] + = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, + 4, 4, 4, 4, 5, 5, 5, 5, 0}; + +/*the base backwards distances (the bits of distance codes appear after length codes and use their own huffman tree)*/ +static const unsigned DISTANCEBASE[30] + = {1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, + 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; + +/*the extra bits of backwards distances (added to base)*/ +static const unsigned DISTANCEEXTRA[30] + = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, + 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; + +/*the order in which "code length alphabet code lengths" are stored as specified by deflate, out of this the huffman +tree of the dynamic huffman tree lengths is generated*/ +static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] + = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + +/* ////////////////////////////////////////////////////////////////////////// */ + +/* +Huffman tree struct, containing multiple representations of the tree +*/ +typedef struct HuffmanTree { + unsigned* codes; /*the huffman codes (bit patterns representing the symbols)*/ + unsigned* lengths; /*the lengths of the huffman codes*/ + unsigned maxbitlen; /*maximum number of bits a single code can get*/ + unsigned numcodes; /*number of symbols in the alphabet = number of codes*/ + /* for reading only */ + unsigned char* table_len; /*length of symbol from lookup table, or max length if secondary lookup needed*/ + unsigned short* table_value; /*value of symbol from lookup table, or pointer to secondary table if needed*/ +} HuffmanTree; + +static void HuffmanTree_init(HuffmanTree* tree) { + tree->codes = 0; + tree->lengths = 0; + tree->table_len = 0; + tree->table_value = 0; +} + +static void HuffmanTree_cleanup(HuffmanTree* tree) { + lodepng_free(tree->codes); + lodepng_free(tree->lengths); + lodepng_free(tree->table_len); + lodepng_free(tree->table_value); +} + +/* amount of bits for first huffman table lookup (aka root bits), see HuffmanTree_makeTable and huffmanDecodeSymbol.*/ +/* values 8u and 9u work the fastest */ +#define FIRSTBITS 9u + +/* a symbol value too big to represent any valid symbol, to indicate reading disallowed huffman bits combination, +which is possible in case of only 0 or 1 present symbols. */ +#define INVALIDSYMBOL 65535u + +/* make table for huffman decoding */ +static unsigned HuffmanTree_makeTable(HuffmanTree* tree) { + static const unsigned headsize = 1u << FIRSTBITS; /*size of the first table*/ + static const unsigned mask = (1u << FIRSTBITS) /*headsize*/ - 1u; + size_t i, numpresent, pointer, size; /*total table size*/ + unsigned* maxlens = (unsigned*)lodepng_malloc(headsize * sizeof(unsigned)); + if(!maxlens) return 83; /*alloc fail*/ + + /* compute maxlens: max total bit length of symbols sharing prefix in the first table*/ + lodepng_memset(maxlens, 0, headsize * sizeof(*maxlens)); + for(i = 0; i < tree->numcodes; i++) { + unsigned symbol = tree->codes[i]; + unsigned l = tree->lengths[i]; + unsigned index; + if(l <= FIRSTBITS) continue; /*symbols that fit in first table don't increase secondary table size*/ + /*get the FIRSTBITS MSBs, the MSBs of the symbol are encoded first. See later comment about the reversing*/ + index = reverseBits(symbol >> (l - FIRSTBITS), FIRSTBITS); + maxlens[index] = LODEPNG_MAX(maxlens[index], l); + } + /* compute total table size: size of first table plus all secondary tables for symbols longer than FIRSTBITS */ + size = headsize; + for(i = 0; i < headsize; ++i) { + unsigned l = maxlens[i]; + if(l > FIRSTBITS) size += (1u << (l - FIRSTBITS)); + } + tree->table_len = (unsigned char*)lodepng_malloc(size * sizeof(*tree->table_len)); + tree->table_value = (unsigned short*)lodepng_malloc(size * sizeof(*tree->table_value)); + if(!tree->table_len || !tree->table_value) { + lodepng_free(maxlens); + /* freeing tree->table values is done at a higher scope */ + return 83; /*alloc fail*/ + } + /*initialize with an invalid length to indicate unused entries*/ + for(i = 0; i < size; ++i) tree->table_len[i] = 16; + + /*fill in the first table for long symbols: max prefix size and pointer to secondary tables*/ + pointer = headsize; + for(i = 0; i < headsize; ++i) { + unsigned l = maxlens[i]; + if(l <= FIRSTBITS) continue; + tree->table_len[i] = l; + tree->table_value[i] = pointer; + pointer += (1u << (l - FIRSTBITS)); + } + lodepng_free(maxlens); + + /*fill in the first table for short symbols, or secondary table for long symbols*/ + numpresent = 0; + for(i = 0; i < tree->numcodes; ++i) { + unsigned l = tree->lengths[i]; + unsigned symbol = tree->codes[i]; /*the huffman bit pattern. i itself is the value.*/ + /*reverse bits, because the huffman bits are given in MSB first order but the bit reader reads LSB first*/ + unsigned reverse = reverseBits(symbol, l); + if(l == 0) continue; + numpresent++; + + if(l <= FIRSTBITS) { + /*short symbol, fully in first table, replicated num times if l < FIRSTBITS*/ + unsigned num = 1u << (FIRSTBITS - l); + unsigned j; + for(j = 0; j < num; ++j) { + /*bit reader will read the l bits of symbol first, the remaining FIRSTBITS - l bits go to the MSB's*/ + unsigned index = reverse | (j << l); + if(tree->table_len[index] != 16) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ + tree->table_len[index] = l; + tree->table_value[index] = i; + } + } else { + /*long symbol, shares prefix with other long symbols in first lookup table, needs second lookup*/ + /*the FIRSTBITS MSBs of the symbol are the first table index*/ + unsigned index = reverse & mask; + unsigned maxlen = tree->table_len[index]; + /*log2 of secondary table length, should be >= l - FIRSTBITS*/ + unsigned tablelen = maxlen - FIRSTBITS; + unsigned start = tree->table_value[index]; /*starting index in secondary table*/ + unsigned num = 1u << (tablelen - (l - FIRSTBITS)); /*amount of entries of this symbol in secondary table*/ + unsigned j; + if(maxlen < l) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ + for(j = 0; j < num; ++j) { + unsigned reverse2 = reverse >> FIRSTBITS; /* l - FIRSTBITS bits */ + unsigned index2 = start + (reverse2 | (j << (l - FIRSTBITS))); + tree->table_len[index2] = l; + tree->table_value[index2] = i; + } + } + } + + if(numpresent < 2) { + /* In case of exactly 1 symbol, in theory the huffman symbol needs 0 bits, + but deflate uses 1 bit instead. In case of 0 symbols, no symbols can + appear at all, but such huffman tree could still exist (e.g. if distance + codes are never used). In both cases, not all symbols of the table will be + filled in. Fill them in with an invalid symbol value so returning them from + huffmanDecodeSymbol will cause error. */ + for(i = 0; i < size; ++i) { + if(tree->table_len[i] == 16) { + /* As length, use a value smaller than FIRSTBITS for the head table, + and a value larger than FIRSTBITS for the secondary table, to ensure + valid behavior for advanceBits when reading this symbol. */ + tree->table_len[i] = (i < headsize) ? 1 : (FIRSTBITS + 1); + tree->table_value[i] = INVALIDSYMBOL; + } + } + } else { + /* A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. + If that is not the case (due to too long length codes), the table will not + have been fully used, and this is an error (not all bit combinations can be + decoded): an oversubscribed huffman tree, indicated by error 55. */ + for(i = 0; i < size; ++i) { + if(tree->table_len[i] == 16) return 55; + } + } + + return 0; +} + +/* +Second step for the ...makeFromLengths and ...makeFromFrequencies functions. +numcodes, lengths and maxbitlen must already be filled in correctly. return +value is error. +*/ +static unsigned HuffmanTree_makeFromLengths2(HuffmanTree* tree) { + unsigned* blcount; + unsigned* nextcode; + unsigned error = 0; + unsigned bits, n; + + tree->codes = (unsigned*)lodepng_malloc(tree->numcodes * sizeof(unsigned)); + blcount = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); + nextcode = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); + if(!tree->codes || !blcount || !nextcode) error = 83; /*alloc fail*/ + + if(!error) { + for(n = 0; n != tree->maxbitlen + 1; n++) blcount[n] = nextcode[n] = 0; + /*step 1: count number of instances of each code length*/ + for(bits = 0; bits != tree->numcodes; ++bits) ++blcount[tree->lengths[bits]]; + /*step 2: generate the nextcode values*/ + for(bits = 1; bits <= tree->maxbitlen; ++bits) { + nextcode[bits] = (nextcode[bits - 1] + blcount[bits - 1]) << 1u; + } + /*step 3: generate all the codes*/ + for(n = 0; n != tree->numcodes; ++n) { + if(tree->lengths[n] != 0) { + tree->codes[n] = nextcode[tree->lengths[n]]++; + /*remove superfluous bits from the code*/ + tree->codes[n] &= ((1u << tree->lengths[n]) - 1u); + } + } + } + + lodepng_free(blcount); + lodepng_free(nextcode); + + if(!error) error = HuffmanTree_makeTable(tree); + return error; +} + +/* +given the code lengths (as stored in the PNG file), generate the tree as defined +by Deflate. maxbitlen is the maximum bits that a code in the tree can have. +return value is error. +*/ +static unsigned HuffmanTree_makeFromLengths(HuffmanTree* tree, const unsigned* bitlen, + size_t numcodes, unsigned maxbitlen) { + unsigned i; + tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); + if(!tree->lengths) return 83; /*alloc fail*/ + for(i = 0; i != numcodes; ++i) tree->lengths[i] = bitlen[i]; + tree->numcodes = (unsigned)numcodes; /*number of symbols*/ + tree->maxbitlen = maxbitlen; + return HuffmanTree_makeFromLengths2(tree); +} + +#ifdef LODEPNG_COMPILE_ENCODER + +/*BPM: Boundary Package Merge, see "A Fast and Space-Economical Algorithm for Length-Limited Coding", +Jyrki Katajainen, Alistair Moffat, Andrew Turpin, 1995.*/ + +/*chain node for boundary package merge*/ +typedef struct BPMNode { + int weight; /*the sum of all weights in this chain*/ + unsigned index; /*index of this leaf node (called "count" in the paper)*/ + struct BPMNode* tail; /*the next nodes in this chain (null if last)*/ + int in_use; +} BPMNode; + +/*lists of chains*/ +typedef struct BPMLists { + /*memory pool*/ + unsigned memsize; + BPMNode* memory; + unsigned numfree; + unsigned nextfree; + BPMNode** freelist; + /*two heads of lookahead chains per list*/ + unsigned listsize; + BPMNode** chains0; + BPMNode** chains1; +} BPMLists; + +/*creates a new chain node with the given parameters, from the memory in the lists */ +static BPMNode* bpmnode_create(BPMLists* lists, int weight, unsigned index, BPMNode* tail) { + unsigned i; + BPMNode* result; + + /*memory full, so garbage collect*/ + if(lists->nextfree >= lists->numfree) { + /*mark only those that are in use*/ + for(i = 0; i != lists->memsize; ++i) lists->memory[i].in_use = 0; + for(i = 0; i != lists->listsize; ++i) { + BPMNode* node; + for(node = lists->chains0[i]; node != 0; node = node->tail) node->in_use = 1; + for(node = lists->chains1[i]; node != 0; node = node->tail) node->in_use = 1; + } + /*collect those that are free*/ + lists->numfree = 0; + for(i = 0; i != lists->memsize; ++i) { + if(!lists->memory[i].in_use) lists->freelist[lists->numfree++] = &lists->memory[i]; + } + lists->nextfree = 0; + } + + result = lists->freelist[lists->nextfree++]; + result->weight = weight; + result->index = index; + result->tail = tail; + return result; +} + +/*sort the leaves with stable mergesort*/ +static void bpmnode_sort(BPMNode* leaves, size_t num) { + BPMNode* mem = (BPMNode*)lodepng_malloc(sizeof(*leaves) * num); + size_t width, counter = 0; + for(width = 1; width < num; width *= 2) { + BPMNode* a = (counter & 1) ? mem : leaves; + BPMNode* b = (counter & 1) ? leaves : mem; + size_t p; + for(p = 0; p < num; p += 2 * width) { + size_t q = (p + width > num) ? num : (p + width); + size_t r = (p + 2 * width > num) ? num : (p + 2 * width); + size_t i = p, j = q, k; + for(k = p; k < r; k++) { + if(i < q && (j >= r || a[i].weight <= a[j].weight)) b[k] = a[i++]; + else b[k] = a[j++]; + } + } + counter++; + } + if(counter & 1) lodepng_memcpy(leaves, mem, sizeof(*leaves) * num); + lodepng_free(mem); +} + +/*Boundary Package Merge step, numpresent is the amount of leaves, and c is the current chain.*/ +static void boundaryPM(BPMLists* lists, BPMNode* leaves, size_t numpresent, int c, int num) { + unsigned lastindex = lists->chains1[c]->index; + + if(c == 0) { + if(lastindex >= numpresent) return; + lists->chains0[c] = lists->chains1[c]; + lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, 0); + } else { + /*sum of the weights of the head nodes of the previous lookahead chains.*/ + int sum = lists->chains0[c - 1]->weight + lists->chains1[c - 1]->weight; + lists->chains0[c] = lists->chains1[c]; + if(lastindex < numpresent && sum > leaves[lastindex].weight) { + lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, lists->chains1[c]->tail); + return; + } + lists->chains1[c] = bpmnode_create(lists, sum, lastindex, lists->chains1[c - 1]); + /*in the end we are only interested in the chain of the last list, so no + need to recurse if we're at the last one (this gives measurable speedup)*/ + if(num + 1 < (int)(2 * numpresent - 2)) { + boundaryPM(lists, leaves, numpresent, c - 1, num); + boundaryPM(lists, leaves, numpresent, c - 1, num); + } + } +} + +unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies, + size_t numcodes, unsigned maxbitlen) { + unsigned error = 0; + unsigned i; + size_t numpresent = 0; /*number of symbols with non-zero frequency*/ + BPMNode* leaves; /*the symbols, only those with > 0 frequency*/ + + if(numcodes == 0) return 80; /*error: a tree of 0 symbols is not supposed to be made*/ + if((1u << maxbitlen) < (unsigned)numcodes) return 80; /*error: represent all symbols*/ + + leaves = (BPMNode*)lodepng_malloc(numcodes * sizeof(*leaves)); + if(!leaves) return 83; /*alloc fail*/ + + for(i = 0; i != numcodes; ++i) { + if(frequencies[i] > 0) { + leaves[numpresent].weight = (int)frequencies[i]; + leaves[numpresent].index = i; + ++numpresent; + } + } + + lodepng_memset(lengths, 0, numcodes * sizeof(*lengths)); + + /*ensure at least two present symbols. There should be at least one symbol + according to RFC 1951 section 3.2.7. Some decoders incorrectly require two. To + make these work as well ensure there are at least two symbols. The + Package-Merge code below also doesn't work correctly if there's only one + symbol, it'd give it the theoretical 0 bits but in practice zlib wants 1 bit*/ + if(numpresent == 0) { + lengths[0] = lengths[1] = 1; /*note that for RFC 1951 section 3.2.7, only lengths[0] = 1 is needed*/ + } else if(numpresent == 1) { + lengths[leaves[0].index] = 1; + lengths[leaves[0].index == 0 ? 1 : 0] = 1; + } else { + BPMLists lists; + BPMNode* node; + + bpmnode_sort(leaves, numpresent); + + lists.listsize = maxbitlen; + lists.memsize = 2 * maxbitlen * (maxbitlen + 1); + lists.nextfree = 0; + lists.numfree = lists.memsize; + lists.memory = (BPMNode*)lodepng_malloc(lists.memsize * sizeof(*lists.memory)); + lists.freelist = (BPMNode**)lodepng_malloc(lists.memsize * sizeof(BPMNode*)); + lists.chains0 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*)); + lists.chains1 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*)); + if(!lists.memory || !lists.freelist || !lists.chains0 || !lists.chains1) error = 83; /*alloc fail*/ + + if(!error) { + for(i = 0; i != lists.memsize; ++i) lists.freelist[i] = &lists.memory[i]; + + bpmnode_create(&lists, leaves[0].weight, 1, 0); + bpmnode_create(&lists, leaves[1].weight, 2, 0); + + for(i = 0; i != lists.listsize; ++i) { + lists.chains0[i] = &lists.memory[0]; + lists.chains1[i] = &lists.memory[1]; + } + + /*each boundaryPM call adds one chain to the last list, and we need 2 * numpresent - 2 chains.*/ + for(i = 2; i != 2 * numpresent - 2; ++i) boundaryPM(&lists, leaves, numpresent, (int)maxbitlen - 1, (int)i); + + for(node = lists.chains1[maxbitlen - 1]; node; node = node->tail) { + for(i = 0; i != node->index; ++i) ++lengths[leaves[i].index]; + } + } + + lodepng_free(lists.memory); + lodepng_free(lists.freelist); + lodepng_free(lists.chains0); + lodepng_free(lists.chains1); + } + + lodepng_free(leaves); + return error; +} + +/*Create the Huffman tree given the symbol frequencies*/ +static unsigned HuffmanTree_makeFromFrequencies(HuffmanTree* tree, const unsigned* frequencies, + size_t mincodes, size_t numcodes, unsigned maxbitlen) { + unsigned error = 0; + while(!frequencies[numcodes - 1] && numcodes > mincodes) --numcodes; /*trim zeroes*/ + tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); + if(!tree->lengths) return 83; /*alloc fail*/ + tree->maxbitlen = maxbitlen; + tree->numcodes = (unsigned)numcodes; /*number of symbols*/ + + error = lodepng_huffman_code_lengths(tree->lengths, frequencies, numcodes, maxbitlen); + if(!error) error = HuffmanTree_makeFromLengths2(tree); + return error; +} +#endif /*LODEPNG_COMPILE_ENCODER*/ + +/*get the literal and length code tree of a deflated block with fixed tree, as per the deflate specification*/ +static unsigned generateFixedLitLenTree(HuffmanTree* tree) { + unsigned i, error = 0; + unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); + if(!bitlen) return 83; /*alloc fail*/ + + /*288 possible codes: 0-255=literals, 256=endcode, 257-285=lengthcodes, 286-287=unused*/ + for(i = 0; i <= 143; ++i) bitlen[i] = 8; + for(i = 144; i <= 255; ++i) bitlen[i] = 9; + for(i = 256; i <= 279; ++i) bitlen[i] = 7; + for(i = 280; i <= 287; ++i) bitlen[i] = 8; + + error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DEFLATE_CODE_SYMBOLS, 15); + + lodepng_free(bitlen); + return error; +} + +/*get the distance code tree of a deflated block with fixed tree, as specified in the deflate specification*/ +static unsigned generateFixedDistanceTree(HuffmanTree* tree) { + unsigned i, error = 0; + unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); + if(!bitlen) return 83; /*alloc fail*/ + + /*there are 32 distance codes, but 30-31 are unused*/ + for(i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) bitlen[i] = 5; + error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DISTANCE_SYMBOLS, 15); + + lodepng_free(bitlen); + return error; +} + +#ifdef LODEPNG_COMPILE_DECODER + +/* +returns the code. The bit reader must already have been ensured at least 15 bits +*/ +static unsigned huffmanDecodeSymbol(LodePNGBitReader* reader, const HuffmanTree* codetree) { + unsigned short code = peekBits(reader, FIRSTBITS); + unsigned short l = codetree->table_len[code]; + unsigned short value = codetree->table_value[code]; + if(l <= FIRSTBITS) { + advanceBits(reader, l); + return value; + } else { + unsigned index2; + advanceBits(reader, FIRSTBITS); + index2 = value + peekBits(reader, l - FIRSTBITS); + advanceBits(reader, codetree->table_len[index2] - FIRSTBITS); + return codetree->table_value[index2]; + } +} +#endif /*LODEPNG_COMPILE_DECODER*/ + +#ifdef LODEPNG_COMPILE_DECODER + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / Inflator (Decompressor) / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +/*get the tree of a deflated block with fixed tree, as specified in the deflate specification +Returns error code.*/ +static unsigned getTreeInflateFixed(HuffmanTree* tree_ll, HuffmanTree* tree_d) { + unsigned error = generateFixedLitLenTree(tree_ll); + if(error) return error; + return generateFixedDistanceTree(tree_d); +} + +/*get the tree of a deflated block with dynamic tree, the tree itself is also Huffman compressed with a known tree*/ +static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, + LodePNGBitReader* reader) { + /*make sure that length values that aren't filled in will be 0, or a wrong tree will be generated*/ + unsigned error = 0; + unsigned n, HLIT, HDIST, HCLEN, i; + + /*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/ + unsigned* bitlen_ll = 0; /*lit,len code lengths*/ + unsigned* bitlen_d = 0; /*dist code lengths*/ + /*code length code lengths ("clcl"), the bit lengths of the huffman tree used to compress bitlen_ll and bitlen_d*/ + unsigned* bitlen_cl = 0; + HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/ + + if(!ensureBits17(reader, 14)) return 49; /*error: the bit pointer is or will go past the memory*/ + + /*number of literal/length codes + 257. Unlike the spec, the value 257 is added to it here already*/ + HLIT = readBits(reader, 5) + 257; + /*number of distance codes. Unlike the spec, the value 1 is added to it here already*/ + HDIST = readBits(reader, 5) + 1; + /*number of code length codes. Unlike the spec, the value 4 is added to it here already*/ + HCLEN = readBits(reader, 4) + 4; + + bitlen_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); + if(!bitlen_cl) return 83 /*alloc fail*/; + + HuffmanTree_init(&tree_cl); + + while(!error) { + /*read the code length codes out of 3 * (amount of code length codes) bits*/ + if(lodepng_gtofl(reader->bp, HCLEN * 3, reader->bitsize)) { + ERROR_BREAK(50); /*error: the bit pointer is or will go past the memory*/ + } + for(i = 0; i != HCLEN; ++i) { + ensureBits9(reader, 3); /*out of bounds already checked above */ + bitlen_cl[CLCL_ORDER[i]] = readBits(reader, 3); + } + for(i = HCLEN; i != NUM_CODE_LENGTH_CODES; ++i) { + bitlen_cl[CLCL_ORDER[i]] = 0; + } + + error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7); + if(error) break; + + /*now we can use this tree to read the lengths for the tree that this function will return*/ + bitlen_ll = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); + bitlen_d = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); + if(!bitlen_ll || !bitlen_d) ERROR_BREAK(83 /*alloc fail*/); + lodepng_memset(bitlen_ll, 0, NUM_DEFLATE_CODE_SYMBOLS * sizeof(*bitlen_ll)); + lodepng_memset(bitlen_d, 0, NUM_DISTANCE_SYMBOLS * sizeof(*bitlen_d)); + + /*i is the current symbol we're reading in the part that contains the code lengths of lit/len and dist codes*/ + i = 0; + while(i < HLIT + HDIST) { + unsigned code; + ensureBits25(reader, 22); /* up to 15 bits for huffman code, up to 7 extra bits below*/ + code = huffmanDecodeSymbol(reader, &tree_cl); + if(code <= 15) /*a length code*/ { + if(i < HLIT) bitlen_ll[i] = code; + else bitlen_d[i - HLIT] = code; + ++i; + } else if(code == 16) /*repeat previous*/ { + unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/ + unsigned value; /*set value to the previous code*/ + + if(i == 0) ERROR_BREAK(54); /*can't repeat previous if i is 0*/ + + replength += readBits(reader, 2); + + if(i < HLIT + 1) value = bitlen_ll[i - 1]; + else value = bitlen_d[i - HLIT - 1]; + /*repeat this value in the next lengths*/ + for(n = 0; n < replength; ++n) { + if(i >= HLIT + HDIST) ERROR_BREAK(13); /*error: i is larger than the amount of codes*/ + if(i < HLIT) bitlen_ll[i] = value; + else bitlen_d[i - HLIT] = value; + ++i; + } + } else if(code == 17) /*repeat "0" 3-10 times*/ { + unsigned replength = 3; /*read in the bits that indicate repeat length*/ + replength += readBits(reader, 3); + + /*repeat this value in the next lengths*/ + for(n = 0; n < replength; ++n) { + if(i >= HLIT + HDIST) ERROR_BREAK(14); /*error: i is larger than the amount of codes*/ + + if(i < HLIT) bitlen_ll[i] = 0; + else bitlen_d[i - HLIT] = 0; + ++i; + } + } else if(code == 18) /*repeat "0" 11-138 times*/ { + unsigned replength = 11; /*read in the bits that indicate repeat length*/ + replength += readBits(reader, 7); + + /*repeat this value in the next lengths*/ + for(n = 0; n < replength; ++n) { + if(i >= HLIT + HDIST) ERROR_BREAK(15); /*error: i is larger than the amount of codes*/ + + if(i < HLIT) bitlen_ll[i] = 0; + else bitlen_d[i - HLIT] = 0; + ++i; + } + } else /*if(code == INVALIDSYMBOL)*/ { + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ + } + /*check if any of the ensureBits above went out of bounds*/ + if(reader->bp > reader->bitsize) { + /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol + (10=no endcode, 11=wrong jump outside of tree)*/ + /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ + ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ + } + } + if(error) break; + + if(bitlen_ll[256] == 0) ERROR_BREAK(64); /*the length of the end code 256 must be larger than 0*/ + + /*now we've finally got HLIT and HDIST, so generate the code trees, and the function is done*/ + error = HuffmanTree_makeFromLengths(tree_ll, bitlen_ll, NUM_DEFLATE_CODE_SYMBOLS, 15); + if(error) break; + error = HuffmanTree_makeFromLengths(tree_d, bitlen_d, NUM_DISTANCE_SYMBOLS, 15); + + break; /*end of error-while*/ + } + + lodepng_free(bitlen_cl); + lodepng_free(bitlen_ll); + lodepng_free(bitlen_d); + HuffmanTree_cleanup(&tree_cl); + + return error; +} + +/*inflate a block with dynamic of fixed Huffman tree. btype must be 1 or 2.*/ +static unsigned inflateHuffmanBlock(ucvector* out, LodePNGBitReader* reader, + unsigned btype, size_t max_output_size) { + unsigned error = 0; + HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/ + HuffmanTree tree_d; /*the huffman tree for distance codes*/ + + HuffmanTree_init(&tree_ll); + HuffmanTree_init(&tree_d); + + if(btype == 1) error = getTreeInflateFixed(&tree_ll, &tree_d); + else /*if(btype == 2)*/ error = getTreeInflateDynamic(&tree_ll, &tree_d, reader); + + while(!error) /*decode all symbols until end reached, breaks at end code*/ { + /*code_ll is literal, length or end code*/ + unsigned code_ll; + ensureBits25(reader, 20); /* up to 15 for the huffman symbol, up to 5 for the length extra bits */ + code_ll = huffmanDecodeSymbol(reader, &tree_ll); + if(code_ll <= 255) /*literal symbol*/ { + if(!ucvector_resize(out, out->size + 1)) ERROR_BREAK(83 /*alloc fail*/); + out->data[out->size - 1] = (unsigned char)code_ll; + } else if(code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ { + unsigned code_d, distance; + unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/ + size_t start, backward, length; + + /*part 1: get length base*/ + length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX]; + + /*part 2: get extra bits and add the value of that to length*/ + numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX]; + if(numextrabits_l != 0) { + /* bits already ensured above */ + length += readBits(reader, numextrabits_l); + } + + /*part 3: get distance code*/ + ensureBits32(reader, 28); /* up to 15 for the huffman symbol, up to 13 for the extra bits */ + code_d = huffmanDecodeSymbol(reader, &tree_d); + if(code_d > 29) { + if(code_d <= 31) { + ERROR_BREAK(18); /*error: invalid distance code (30-31 are never used)*/ + } else /* if(code_d == INVALIDSYMBOL) */{ + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ + } + } + distance = DISTANCEBASE[code_d]; + + /*part 4: get extra bits from distance*/ + numextrabits_d = DISTANCEEXTRA[code_d]; + if(numextrabits_d != 0) { + /* bits already ensured above */ + distance += readBits(reader, numextrabits_d); + } + + /*part 5: fill in all the out[n] values based on the length and dist*/ + start = out->size; + if(distance > start) ERROR_BREAK(52); /*too long backward distance*/ + backward = start - distance; + + if(!ucvector_resize(out, out->size + length)) ERROR_BREAK(83 /*alloc fail*/); + if(distance < length) { + size_t forward; + lodepng_memcpy(out->data + start, out->data + backward, distance); + start += distance; + for(forward = distance; forward < length; ++forward) { + out->data[start++] = out->data[backward++]; + } + } else { + lodepng_memcpy(out->data + start, out->data + backward, length); + } + } else if(code_ll == 256) { + break; /*end code, break the loop*/ + } else /*if(code_ll == INVALIDSYMBOL)*/ { + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ + } + /*check if any of the ensureBits above went out of bounds*/ + if(reader->bp > reader->bitsize) { + /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol + (10=no endcode, 11=wrong jump outside of tree)*/ + /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ + ERROR_BREAK(51); /*error, bit pointer jumps past memory*/ + } + if(max_output_size && out->size > max_output_size) { + ERROR_BREAK(109); /*error, larger than max size*/ + } + } + + HuffmanTree_cleanup(&tree_ll); + HuffmanTree_cleanup(&tree_d); + + return error; +} + +static unsigned inflateNoCompression(ucvector* out, LodePNGBitReader* reader, + const LodePNGDecompressSettings* settings) { + size_t bytepos; + size_t size = reader->size; + unsigned LEN, NLEN, error = 0; + + /*go to first boundary of byte*/ + bytepos = (reader->bp + 7u) >> 3u; + + /*read LEN (2 bytes) and NLEN (2 bytes)*/ + if(bytepos + 4 >= size) return 52; /*error, bit pointer will jump past memory*/ + LEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; + NLEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; + + /*check if 16-bit NLEN is really the one's complement of LEN*/ + if(!settings->ignore_nlen && LEN + NLEN != 65535) { + return 21; /*error: NLEN is not one's complement of LEN*/ + } + + if(!ucvector_resize(out, out->size + LEN)) return 83; /*alloc fail*/ + + /*read the literal data: LEN bytes are now stored in the out buffer*/ + if(bytepos + LEN > size) return 23; /*error: reading outside of in buffer*/ + + lodepng_memcpy(out->data + out->size - LEN, reader->data + bytepos, LEN); + bytepos += LEN; + + reader->bp = bytepos << 3u; + + return error; +} + +static unsigned lodepng_inflatev(ucvector* out, + const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings) { + unsigned BFINAL = 0; + LodePNGBitReader reader; + unsigned error = LodePNGBitReader_init(&reader, in, insize); + + if(error) return error; + + while(!BFINAL) { + unsigned BTYPE; + if(!ensureBits9(&reader, 3)) return 52; /*error, bit pointer will jump past memory*/ + BFINAL = readBits(&reader, 1); + BTYPE = readBits(&reader, 2); + + if(BTYPE == 3) return 20; /*error: invalid BTYPE*/ + else if(BTYPE == 0) error = inflateNoCompression(out, &reader, settings); /*no compression*/ + else error = inflateHuffmanBlock(out, &reader, BTYPE, settings->max_output_size); /*compression, BTYPE 01 or 10*/ + if(!error && settings->max_output_size && out->size > settings->max_output_size) error = 109; + if(error) break; + } + + return error; +} + +unsigned lodepng_inflate(unsigned char** out, size_t* outsize, + const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_inflatev(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; +} + +static unsigned inflatev(ucvector* out, const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings) { + if(settings->custom_inflate) { + unsigned error = settings->custom_inflate(&out->data, &out->size, in, insize, settings); + out->allocsize = out->size; + if(error) { + /*the custom inflate is allowed to have its own error codes, however, we translate it to code 110*/ + error = 110; + /*if there's a max output size, and the custom zlib returned error, then indicate that error instead*/ + if(settings->max_output_size && out->size > settings->max_output_size) error = 109; + } + return error; + } else { + return lodepng_inflatev(out, in, insize, settings); + } +} + +#endif /*LODEPNG_COMPILE_DECODER*/ + +#ifdef LODEPNG_COMPILE_ENCODER + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / Deflator (Compressor) / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +static const size_t MAX_SUPPORTED_DEFLATE_LENGTH = 258; + +/*search the index in the array, that has the largest value smaller than or equal to the given value, +given array must be sorted (if no value is smaller, it returns the size of the given array)*/ +static size_t searchCodeIndex(const unsigned* array, size_t array_size, size_t value) { + /*binary search (only small gain over linear). TODO: use CPU log2 instruction for getting symbols instead*/ + size_t left = 1; + size_t right = array_size - 1; + + while(left <= right) { + size_t mid = (left + right) >> 1; + if(array[mid] >= value) right = mid - 1; + else left = mid + 1; + } + if(left >= array_size || array[left] > value) left--; + return left; +} + +static void addLengthDistance(uivector* values, size_t length, size_t distance) { + /*values in encoded vector are those used by deflate: + 0-255: literal bytes + 256: end + 257-285: length/distance pair (length code, followed by extra length bits, distance code, extra distance bits) + 286-287: invalid*/ + + unsigned length_code = (unsigned)searchCodeIndex(LENGTHBASE, 29, length); + unsigned extra_length = (unsigned)(length - LENGTHBASE[length_code]); + unsigned dist_code = (unsigned)searchCodeIndex(DISTANCEBASE, 30, distance); + unsigned extra_distance = (unsigned)(distance - DISTANCEBASE[dist_code]); + + size_t pos = values->size; + /*TODO: return error when this fails (out of memory)*/ + unsigned ok = uivector_resize(values, values->size + 4); + if(ok) { + values->data[pos + 0] = length_code + FIRST_LENGTH_CODE_INDEX; + values->data[pos + 1] = extra_length; + values->data[pos + 2] = dist_code; + values->data[pos + 3] = extra_distance; + } +} + +/*3 bytes of data get encoded into two bytes. The hash cannot use more than 3 +bytes as input because 3 is the minimum match length for deflate*/ +static const unsigned HASH_NUM_VALUES = 65536; +static const unsigned HASH_BIT_MASK = 65535; /*HASH_NUM_VALUES - 1, but C90 does not like that as initializer*/ + +typedef struct Hash { + int* head; /*hash value to head circular pos - can be outdated if went around window*/ + /*circular pos to prev circular pos*/ + unsigned short* chain; + int* val; /*circular pos to hash value*/ + + /*TODO: do this not only for zeros but for any repeated byte. However for PNG + it's always going to be the zeros that dominate, so not important for PNG*/ + int* headz; /*similar to head, but for chainz*/ + unsigned short* chainz; /*those with same amount of zeros*/ + unsigned short* zeros; /*length of zeros streak, used as a second hash chain*/ +} Hash; + +static unsigned hash_init(Hash* hash, unsigned windowsize) { + unsigned i; + hash->head = (int*)lodepng_malloc(sizeof(int) * HASH_NUM_VALUES); + hash->val = (int*)lodepng_malloc(sizeof(int) * windowsize); + hash->chain = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); + + hash->zeros = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); + hash->headz = (int*)lodepng_malloc(sizeof(int) * (MAX_SUPPORTED_DEFLATE_LENGTH + 1)); + hash->chainz = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); + + if(!hash->head || !hash->chain || !hash->val || !hash->headz|| !hash->chainz || !hash->zeros) { + return 83; /*alloc fail*/ + } + + /*initialize hash table*/ + for(i = 0; i != HASH_NUM_VALUES; ++i) hash->head[i] = -1; + for(i = 0; i != windowsize; ++i) hash->val[i] = -1; + for(i = 0; i != windowsize; ++i) hash->chain[i] = i; /*same value as index indicates uninitialized*/ + + for(i = 0; i <= MAX_SUPPORTED_DEFLATE_LENGTH; ++i) hash->headz[i] = -1; + for(i = 0; i != windowsize; ++i) hash->chainz[i] = i; /*same value as index indicates uninitialized*/ + + return 0; +} + +static void hash_cleanup(Hash* hash) { + lodepng_free(hash->head); + lodepng_free(hash->val); + lodepng_free(hash->chain); + + lodepng_free(hash->zeros); + lodepng_free(hash->headz); + lodepng_free(hash->chainz); +} + + + +static unsigned getHash(const unsigned char* data, size_t size, size_t pos) { + unsigned result = 0; + if(pos + 2 < size) { + /*A simple shift and xor hash is used. Since the data of PNGs is dominated + by zeroes due to the filters, a better hash does not have a significant + effect on speed in traversing the chain, and causes more time spend on + calculating the hash.*/ + result ^= ((unsigned)data[pos + 0] << 0u); + result ^= ((unsigned)data[pos + 1] << 4u); + result ^= ((unsigned)data[pos + 2] << 8u); + } else { + size_t amount, i; + if(pos >= size) return 0; + amount = size - pos; + for(i = 0; i != amount; ++i) result ^= ((unsigned)data[pos + i] << (i * 8u)); + } + return result & HASH_BIT_MASK; +} + +static unsigned countZeros(const unsigned char* data, size_t size, size_t pos) { + const unsigned char* start = data + pos; + const unsigned char* end = start + MAX_SUPPORTED_DEFLATE_LENGTH; + if(end > data + size) end = data + size; + data = start; + while(data != end && *data == 0) ++data; + /*subtracting two addresses returned as 32-bit number (max value is MAX_SUPPORTED_DEFLATE_LENGTH)*/ + return (unsigned)(data - start); +} + +/*wpos = pos & (windowsize - 1)*/ +static void updateHashChain(Hash* hash, size_t wpos, unsigned hashval, unsigned short numzeros) { + hash->val[wpos] = (int)hashval; + if(hash->head[hashval] != -1) hash->chain[wpos] = hash->head[hashval]; + hash->head[hashval] = (int)wpos; + + hash->zeros[wpos] = numzeros; + if(hash->headz[numzeros] != -1) hash->chainz[wpos] = hash->headz[numzeros]; + hash->headz[numzeros] = (int)wpos; +} + +/* +LZ77-encode the data. Return value is error code. The input are raw bytes, the output +is in the form of unsigned integers with codes representing for example literal bytes, or +length/distance pairs. +It uses a hash table technique to let it encode faster. When doing LZ77 encoding, a +sliding window (of windowsize) is used, and all past bytes in that window can be used as +the "dictionary". A brute force search through all possible distances would be slow, and +this hash technique is one out of several ways to speed this up. +*/ +static unsigned encodeLZ77(uivector* out, Hash* hash, + const unsigned char* in, size_t inpos, size_t insize, unsigned windowsize, + unsigned minmatch, unsigned nicematch, unsigned lazymatching) { + size_t pos; + unsigned i, error = 0; + /*for large window lengths, assume the user wants no compression loss. Otherwise, max hash chain length speedup.*/ + unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8u; + unsigned maxlazymatch = windowsize >= 8192 ? MAX_SUPPORTED_DEFLATE_LENGTH : 64; + + unsigned usezeros = 1; /*not sure if setting it to false for windowsize < 8192 is better or worse*/ + unsigned numzeros = 0; + + unsigned offset; /*the offset represents the distance in LZ77 terminology*/ + unsigned length; + unsigned lazy = 0; + unsigned lazylength = 0, lazyoffset = 0; + unsigned hashval; + unsigned current_offset, current_length; + unsigned prev_offset; + const unsigned char *lastptr, *foreptr, *backptr; + unsigned hashpos; + + if(windowsize == 0 || windowsize > 32768) return 60; /*error: windowsize smaller/larger than allowed*/ + if((windowsize & (windowsize - 1)) != 0) return 90; /*error: must be power of two*/ + + if(nicematch > MAX_SUPPORTED_DEFLATE_LENGTH) nicematch = MAX_SUPPORTED_DEFLATE_LENGTH; + + for(pos = inpos; pos < insize; ++pos) { + size_t wpos = pos & (windowsize - 1); /*position for in 'circular' hash buffers*/ + unsigned chainlength = 0; + + hashval = getHash(in, insize, pos); + + if(usezeros && hashval == 0) { + if(numzeros == 0) numzeros = countZeros(in, insize, pos); + else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; + } else { + numzeros = 0; + } + + updateHashChain(hash, wpos, hashval, numzeros); + + /*the length and offset found for the current position*/ + length = 0; + offset = 0; + + hashpos = hash->chain[wpos]; + + lastptr = &in[insize < pos + MAX_SUPPORTED_DEFLATE_LENGTH ? insize : pos + MAX_SUPPORTED_DEFLATE_LENGTH]; + + /*search for the longest string*/ + prev_offset = 0; + for(;;) { + if(chainlength++ >= maxchainlength) break; + current_offset = (unsigned)(hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize); + + if(current_offset < prev_offset) break; /*stop when went completely around the circular buffer*/ + prev_offset = current_offset; + if(current_offset > 0) { + /*test the next characters*/ + foreptr = &in[pos]; + backptr = &in[pos - current_offset]; + + /*common case in PNGs is lots of zeros. Quickly skip over them as a speedup*/ + if(numzeros >= 3) { + unsigned skip = hash->zeros[hashpos]; + if(skip > numzeros) skip = numzeros; + backptr += skip; + foreptr += skip; + } + + while(foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by deflate is max length*/ { + ++backptr; + ++foreptr; + } + current_length = (unsigned)(foreptr - &in[pos]); + + if(current_length > length) { + length = current_length; /*the longest length*/ + offset = current_offset; /*the offset that is related to this longest length*/ + /*jump out once a length of max length is found (speed gain). This also jumps + out if length is MAX_SUPPORTED_DEFLATE_LENGTH*/ + if(current_length >= nicematch) break; + } + } + + if(hashpos == hash->chain[hashpos]) break; + + if(numzeros >= 3 && length > numzeros) { + hashpos = hash->chainz[hashpos]; + if(hash->zeros[hashpos] != numzeros) break; + } else { + hashpos = hash->chain[hashpos]; + /*outdated hash value, happens if particular value was not encountered in whole last window*/ + if(hash->val[hashpos] != (int)hashval) break; + } + } + + if(lazymatching) { + if(!lazy && length >= 3 && length <= maxlazymatch && length < MAX_SUPPORTED_DEFLATE_LENGTH) { + lazy = 1; + lazylength = length; + lazyoffset = offset; + continue; /*try the next byte*/ + } + if(lazy) { + lazy = 0; + if(pos == 0) ERROR_BREAK(81); + if(length > lazylength + 1) { + /*push the previous character as literal*/ + if(!uivector_push_back(out, in[pos - 1])) ERROR_BREAK(83 /*alloc fail*/); + } else { + length = lazylength; + offset = lazyoffset; + hash->head[hashval] = -1; /*the same hashchain update will be done, this ensures no wrong alteration*/ + hash->headz[numzeros] = -1; /*idem*/ + --pos; + } + } + } + if(length >= 3 && offset > windowsize) ERROR_BREAK(86 /*too big (or overflown negative) offset*/); + + /*encode it as length/distance pair or literal value*/ + if(length < 3) /*only lengths of 3 or higher are supported as length/distance pair*/ { + if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); + } else if(length < minmatch || (length == 3 && offset > 4096)) { + /*compensate for the fact that longer offsets have more extra bits, a + length of only 3 may be not worth it then*/ + if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); + } else { + addLengthDistance(out, length, offset); + for(i = 1; i < length; ++i) { + ++pos; + wpos = pos & (windowsize - 1); + hashval = getHash(in, insize, pos); + if(usezeros && hashval == 0) { + if(numzeros == 0) numzeros = countZeros(in, insize, pos); + else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; + } else { + numzeros = 0; + } + updateHashChain(hash, wpos, hashval, numzeros); + } + } + } /*end of the loop through each character of input*/ + + return error; +} + +/* /////////////////////////////////////////////////////////////////////////// */ + +static unsigned deflateNoCompression(ucvector* out, const unsigned char* data, size_t datasize) { + /*non compressed deflate block data: 1 bit BFINAL,2 bits BTYPE,(5 bits): it jumps to start of next byte, + 2 bytes LEN, 2 bytes NLEN, LEN bytes literal DATA*/ + + size_t i, numdeflateblocks = (datasize + 65534u) / 65535u; + unsigned datapos = 0; + for(i = 0; i != numdeflateblocks; ++i) { + unsigned BFINAL, BTYPE, LEN, NLEN; + unsigned char firstbyte; + size_t pos = out->size; + + BFINAL = (i == numdeflateblocks - 1); + BTYPE = 0; + + LEN = 65535; + if(datasize - datapos < 65535u) LEN = (unsigned)datasize - datapos; + NLEN = 65535 - LEN; + + if(!ucvector_resize(out, out->size + LEN + 5)) return 83; /*alloc fail*/ + + firstbyte = (unsigned char)(BFINAL + ((BTYPE & 1u) << 1u) + ((BTYPE & 2u) << 1u)); + out->data[pos + 0] = firstbyte; + out->data[pos + 1] = (unsigned char)(LEN & 255); + out->data[pos + 2] = (unsigned char)(LEN >> 8u); + out->data[pos + 3] = (unsigned char)(NLEN & 255); + out->data[pos + 4] = (unsigned char)(NLEN >> 8u); + lodepng_memcpy(out->data + pos + 5, data + datapos, LEN); + datapos += LEN; + } + + return 0; +} + +/* +write the lz77-encoded data, which has lit, len and dist codes, to compressed stream using huffman trees. +tree_ll: the tree for lit and len codes. +tree_d: the tree for distance codes. +*/ +static void writeLZ77data(LodePNGBitWriter* writer, const uivector* lz77_encoded, + const HuffmanTree* tree_ll, const HuffmanTree* tree_d) { + size_t i = 0; + for(i = 0; i != lz77_encoded->size; ++i) { + unsigned val = lz77_encoded->data[i]; + writeBitsReversed(writer, tree_ll->codes[val], tree_ll->lengths[val]); + if(val > 256) /*for a length code, 3 more things have to be added*/ { + unsigned length_index = val - FIRST_LENGTH_CODE_INDEX; + unsigned n_length_extra_bits = LENGTHEXTRA[length_index]; + unsigned length_extra_bits = lz77_encoded->data[++i]; + + unsigned distance_code = lz77_encoded->data[++i]; + + unsigned distance_index = distance_code; + unsigned n_distance_extra_bits = DISTANCEEXTRA[distance_index]; + unsigned distance_extra_bits = lz77_encoded->data[++i]; + + writeBits(writer, length_extra_bits, n_length_extra_bits); + writeBitsReversed(writer, tree_d->codes[distance_code], tree_d->lengths[distance_code]); + writeBits(writer, distance_extra_bits, n_distance_extra_bits); + } + } +} + +/*Deflate for a block of type "dynamic", that is, with freely, optimally, created huffman trees*/ +static unsigned deflateDynamic(LodePNGBitWriter* writer, Hash* hash, + const unsigned char* data, size_t datapos, size_t dataend, + const LodePNGCompressSettings* settings, unsigned final) { + unsigned error = 0; + + /* + A block is compressed as follows: The PNG data is lz77 encoded, resulting in + literal bytes and length/distance pairs. This is then huffman compressed with + two huffman trees. One huffman tree is used for the lit and len values ("ll"), + another huffman tree is used for the dist values ("d"). These two trees are + stored using their code lengths, and to compress even more these code lengths + are also run-length encoded and huffman compressed. This gives a huffman tree + of code lengths "cl". The code lengths used to describe this third tree are + the code length code lengths ("clcl"). + */ + + /*The lz77 encoded data, represented with integers since there will also be length and distance codes in it*/ + uivector lz77_encoded; + HuffmanTree tree_ll; /*tree for lit,len values*/ + HuffmanTree tree_d; /*tree for distance codes*/ + HuffmanTree tree_cl; /*tree for encoding the code lengths representing tree_ll and tree_d*/ + unsigned* frequencies_ll = 0; /*frequency of lit,len codes*/ + unsigned* frequencies_d = 0; /*frequency of dist codes*/ + unsigned* frequencies_cl = 0; /*frequency of code length codes*/ + unsigned* bitlen_lld = 0; /*lit,len,dist code lengths (int bits), literally (without repeat codes).*/ + unsigned* bitlen_lld_e = 0; /*bitlen_lld encoded with repeat codes (this is a rudimentary run length compression)*/ + size_t datasize = dataend - datapos; + + /* + If we could call "bitlen_cl" the the code length code lengths ("clcl"), that is the bit lengths of codes to represent + tree_cl in CLCL_ORDER, then due to the huffman compression of huffman tree representations ("two levels"), there are + some analogies: + bitlen_lld is to tree_cl what data is to tree_ll and tree_d. + bitlen_lld_e is to bitlen_lld what lz77_encoded is to data. + bitlen_cl is to bitlen_lld_e what bitlen_lld is to lz77_encoded. + */ + + unsigned BFINAL = final; + size_t i; + size_t numcodes_ll, numcodes_d, numcodes_lld, numcodes_lld_e, numcodes_cl; + unsigned HLIT, HDIST, HCLEN; + + uivector_init(&lz77_encoded); + HuffmanTree_init(&tree_ll); + HuffmanTree_init(&tree_d); + HuffmanTree_init(&tree_cl); + /* could fit on stack, but >1KB is on the larger side so allocate instead */ + frequencies_ll = (unsigned*)lodepng_malloc(286 * sizeof(*frequencies_ll)); + frequencies_d = (unsigned*)lodepng_malloc(30 * sizeof(*frequencies_d)); + frequencies_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); + + if(!frequencies_ll || !frequencies_d || !frequencies_cl) error = 83; /*alloc fail*/ + + /*This while loop never loops due to a break at the end, it is here to + allow breaking out of it to the cleanup phase on error conditions.*/ + while(!error) { + lodepng_memset(frequencies_ll, 0, 286 * sizeof(*frequencies_ll)); + lodepng_memset(frequencies_d, 0, 30 * sizeof(*frequencies_d)); + lodepng_memset(frequencies_cl, 0, NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); + + if(settings->use_lz77) { + error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, + settings->minmatch, settings->nicematch, settings->lazymatching); + if(error) break; + } else { + if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83 /*alloc fail*/); + for(i = datapos; i < dataend; ++i) lz77_encoded.data[i - datapos] = data[i]; /*no LZ77, but still will be Huffman compressed*/ + } + + /*Count the frequencies of lit, len and dist codes*/ + for(i = 0; i != lz77_encoded.size; ++i) { + unsigned symbol = lz77_encoded.data[i]; + ++frequencies_ll[symbol]; + if(symbol > 256) { + unsigned dist = lz77_encoded.data[i + 2]; + ++frequencies_d[dist]; + i += 3; + } + } + frequencies_ll[256] = 1; /*there will be exactly 1 end code, at the end of the block*/ + + /*Make both huffman trees, one for the lit and len codes, one for the dist codes*/ + error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll, 257, 286, 15); + if(error) break; + /*2, not 1, is chosen for mincodes: some buggy PNG decoders require at least 2 symbols in the dist tree*/ + error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d, 2, 30, 15); + if(error) break; + + numcodes_ll = LODEPNG_MIN(tree_ll.numcodes, 286); + numcodes_d = LODEPNG_MIN(tree_d.numcodes, 30); + /*store the code lengths of both generated trees in bitlen_lld*/ + numcodes_lld = numcodes_ll + numcodes_d; + bitlen_lld = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld)); + /*numcodes_lld_e never needs more size than bitlen_lld*/ + bitlen_lld_e = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld_e)); + if(!bitlen_lld || !bitlen_lld_e) ERROR_BREAK(83); /*alloc fail*/ + numcodes_lld_e = 0; + + for(i = 0; i != numcodes_ll; ++i) bitlen_lld[i] = tree_ll.lengths[i]; + for(i = 0; i != numcodes_d; ++i) bitlen_lld[numcodes_ll + i] = tree_d.lengths[i]; + + /*run-length compress bitlen_ldd into bitlen_lld_e by using repeat codes 16 (copy length 3-6 times), + 17 (3-10 zeroes), 18 (11-138 zeroes)*/ + for(i = 0; i != numcodes_lld; ++i) { + unsigned j = 0; /*amount of repetitions*/ + while(i + j + 1 < numcodes_lld && bitlen_lld[i + j + 1] == bitlen_lld[i]) ++j; + + if(bitlen_lld[i] == 0 && j >= 2) /*repeat code for zeroes*/ { + ++j; /*include the first zero*/ + if(j <= 10) /*repeat code 17 supports max 10 zeroes*/ { + bitlen_lld_e[numcodes_lld_e++] = 17; + bitlen_lld_e[numcodes_lld_e++] = j - 3; + } else /*repeat code 18 supports max 138 zeroes*/ { + if(j > 138) j = 138; + bitlen_lld_e[numcodes_lld_e++] = 18; + bitlen_lld_e[numcodes_lld_e++] = j - 11; + } + i += (j - 1); + } else if(j >= 3) /*repeat code for value other than zero*/ { + size_t k; + unsigned num = j / 6u, rest = j % 6u; + bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; + for(k = 0; k < num; ++k) { + bitlen_lld_e[numcodes_lld_e++] = 16; + bitlen_lld_e[numcodes_lld_e++] = 6 - 3; + } + if(rest >= 3) { + bitlen_lld_e[numcodes_lld_e++] = 16; + bitlen_lld_e[numcodes_lld_e++] = rest - 3; + } + else j -= rest; + i += j; + } else /*too short to benefit from repeat code*/ { + bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; + } + } + + /*generate tree_cl, the huffmantree of huffmantrees*/ + for(i = 0; i != numcodes_lld_e; ++i) { + ++frequencies_cl[bitlen_lld_e[i]]; + /*after a repeat code come the bits that specify the number of repetitions, + those don't need to be in the frequencies_cl calculation*/ + if(bitlen_lld_e[i] >= 16) ++i; + } + + error = HuffmanTree_makeFromFrequencies(&tree_cl, frequencies_cl, + NUM_CODE_LENGTH_CODES, NUM_CODE_LENGTH_CODES, 7); + if(error) break; + + /*compute amount of code-length-code-lengths to output*/ + numcodes_cl = NUM_CODE_LENGTH_CODES; + /*trim zeros at the end (using CLCL_ORDER), but minimum size must be 4 (see HCLEN below)*/ + while(numcodes_cl > 4u && tree_cl.lengths[CLCL_ORDER[numcodes_cl - 1u]] == 0) { + numcodes_cl--; + } + + /* + Write everything into the output + + After the BFINAL and BTYPE, the dynamic block consists out of the following: + - 5 bits HLIT, 5 bits HDIST, 4 bits HCLEN + - (HCLEN+4)*3 bits code lengths of code length alphabet + - HLIT + 257 code lengths of lit/length alphabet (encoded using the code length + alphabet, + possible repetition codes 16, 17, 18) + - HDIST + 1 code lengths of distance alphabet (encoded using the code length + alphabet, + possible repetition codes 16, 17, 18) + - compressed data + - 256 (end code) + */ + + /*Write block type*/ + writeBits(writer, BFINAL, 1); + writeBits(writer, 0, 1); /*first bit of BTYPE "dynamic"*/ + writeBits(writer, 1, 1); /*second bit of BTYPE "dynamic"*/ + + /*write the HLIT, HDIST and HCLEN values*/ + /*all three sizes take trimmed ending zeroes into account, done either by HuffmanTree_makeFromFrequencies + or in the loop for numcodes_cl above, which saves space. */ + HLIT = (unsigned)(numcodes_ll - 257); + HDIST = (unsigned)(numcodes_d - 1); + HCLEN = (unsigned)(numcodes_cl - 4); + writeBits(writer, HLIT, 5); + writeBits(writer, HDIST, 5); + writeBits(writer, HCLEN, 4); + + /*write the code lengths of the code length alphabet ("bitlen_cl")*/ + for(i = 0; i != numcodes_cl; ++i) writeBits(writer, tree_cl.lengths[CLCL_ORDER[i]], 3); + + /*write the lengths of the lit/len AND the dist alphabet*/ + for(i = 0; i != numcodes_lld_e; ++i) { + writeBitsReversed(writer, tree_cl.codes[bitlen_lld_e[i]], tree_cl.lengths[bitlen_lld_e[i]]); + /*extra bits of repeat codes*/ + if(bitlen_lld_e[i] == 16) writeBits(writer, bitlen_lld_e[++i], 2); + else if(bitlen_lld_e[i] == 17) writeBits(writer, bitlen_lld_e[++i], 3); + else if(bitlen_lld_e[i] == 18) writeBits(writer, bitlen_lld_e[++i], 7); + } + + /*write the compressed data symbols*/ + writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); + /*error: the length of the end code 256 must be larger than 0*/ + if(tree_ll.lengths[256] == 0) ERROR_BREAK(64); + + /*write the end code*/ + writeBitsReversed(writer, tree_ll.codes[256], tree_ll.lengths[256]); + + break; /*end of error-while*/ + } + + /*cleanup*/ + uivector_cleanup(&lz77_encoded); + HuffmanTree_cleanup(&tree_ll); + HuffmanTree_cleanup(&tree_d); + HuffmanTree_cleanup(&tree_cl); + lodepng_free(frequencies_ll); + lodepng_free(frequencies_d); + lodepng_free(frequencies_cl); + lodepng_free(bitlen_lld); + lodepng_free(bitlen_lld_e); + + return error; +} + +static unsigned deflateFixed(LodePNGBitWriter* writer, Hash* hash, + const unsigned char* data, + size_t datapos, size_t dataend, + const LodePNGCompressSettings* settings, unsigned final) { + HuffmanTree tree_ll; /*tree for literal values and length codes*/ + HuffmanTree tree_d; /*tree for distance codes*/ + + unsigned BFINAL = final; + unsigned error = 0; + size_t i; + + HuffmanTree_init(&tree_ll); + HuffmanTree_init(&tree_d); + + error = generateFixedLitLenTree(&tree_ll); + if(!error) error = generateFixedDistanceTree(&tree_d); + + if(!error) { + writeBits(writer, BFINAL, 1); + writeBits(writer, 1, 1); /*first bit of BTYPE*/ + writeBits(writer, 0, 1); /*second bit of BTYPE*/ + + if(settings->use_lz77) /*LZ77 encoded*/ { + uivector lz77_encoded; + uivector_init(&lz77_encoded); + error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, + settings->minmatch, settings->nicematch, settings->lazymatching); + if(!error) writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); + uivector_cleanup(&lz77_encoded); + } else /*no LZ77, but still will be Huffman compressed*/ { + for(i = datapos; i < dataend; ++i) { + writeBitsReversed(writer, tree_ll.codes[data[i]], tree_ll.lengths[data[i]]); + } + } + /*add END code*/ + if(!error) writeBitsReversed(writer,tree_ll.codes[256], tree_ll.lengths[256]); + } + + /*cleanup*/ + HuffmanTree_cleanup(&tree_ll); + HuffmanTree_cleanup(&tree_d); + + return error; +} + +static unsigned lodepng_deflatev(ucvector* out, const unsigned char* in, size_t insize, + const LodePNGCompressSettings* settings) { + unsigned error = 0; + size_t i, blocksize, numdeflateblocks; + Hash hash; + LodePNGBitWriter writer; + + LodePNGBitWriter_init(&writer, out); + + if(settings->btype > 2) return 61; + else if(settings->btype == 0) return deflateNoCompression(out, in, insize); + else if(settings->btype == 1) blocksize = insize; + else /*if(settings->btype == 2)*/ { + /*on PNGs, deflate blocks of 65-262k seem to give most dense encoding*/ + blocksize = insize / 8u + 8; + if(blocksize < 65536) blocksize = 65536; + if(blocksize > 262144) blocksize = 262144; + } + + numdeflateblocks = (insize + blocksize - 1) / blocksize; + if(numdeflateblocks == 0) numdeflateblocks = 1; + + error = hash_init(&hash, settings->windowsize); + + if(!error) { + for(i = 0; i != numdeflateblocks && !error; ++i) { + unsigned final = (i == numdeflateblocks - 1); + size_t start = i * blocksize; + size_t end = start + blocksize; + if(end > insize) end = insize; + + if(settings->btype == 1) error = deflateFixed(&writer, &hash, in, start, end, settings, final); + else if(settings->btype == 2) error = deflateDynamic(&writer, &hash, in, start, end, settings, final); + } + } + + hash_cleanup(&hash); + + return error; +} + +unsigned lodepng_deflate(unsigned char** out, size_t* outsize, + const unsigned char* in, size_t insize, + const LodePNGCompressSettings* settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_deflatev(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; +} + +static unsigned deflate(unsigned char** out, size_t* outsize, + const unsigned char* in, size_t insize, + const LodePNGCompressSettings* settings) { + if(settings->custom_deflate) { + unsigned error = settings->custom_deflate(out, outsize, in, insize, settings); + /*the custom deflate is allowed to have its own error codes, however, we translate it to code 111*/ + return error ? 111 : 0; + } else { + return lodepng_deflate(out, outsize, in, insize, settings); + } +} + +#endif /*LODEPNG_COMPILE_DECODER*/ + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / Adler32 / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +static unsigned update_adler32(unsigned adler, const unsigned char* data, unsigned len) { + unsigned s1 = adler & 0xffffu; + unsigned s2 = (adler >> 16u) & 0xffffu; + + while(len != 0u) { + unsigned i; + /*at least 5552 sums can be done before the sums overflow, saving a lot of module divisions*/ + unsigned amount = len > 5552u ? 5552u : len; + len -= amount; + for(i = 0; i != amount; ++i) { + s1 += (*data++); + s2 += s1; + } + s1 %= 65521u; + s2 %= 65521u; + } + + return (s2 << 16u) | s1; +} + +/*Return the adler32 of the bytes data[0..len-1]*/ +static unsigned adler32(const unsigned char* data, unsigned len) { + return update_adler32(1u, data, len); +} + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / Zlib / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +#ifdef LODEPNG_COMPILE_DECODER + +static unsigned lodepng_zlib_decompressv(ucvector* out, + const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings) { + unsigned error = 0; + unsigned CM, CINFO, FDICT; + + if(insize < 2) return 53; /*error, size of zlib data too small*/ + /*read information from zlib header*/ + if((in[0] * 256 + in[1]) % 31 != 0) { + /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value is supposed to be made that way*/ + return 24; + } + + CM = in[0] & 15; + CINFO = (in[0] >> 4) & 15; + /*FCHECK = in[1] & 31;*/ /*FCHECK is already tested above*/ + FDICT = (in[1] >> 5) & 1; + /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/ + + if(CM != 8 || CINFO > 7) { + /*error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec*/ + return 25; + } + if(FDICT != 0) { + /*error: the specification of PNG says about the zlib stream: + "The additional flags shall not specify a preset dictionary."*/ + return 26; + } + + error = inflatev(out, in + 2, insize - 2, settings); + if(error) return error; + + if(!settings->ignore_adler32) { + unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]); + unsigned checksum = adler32(out->data, (unsigned)(out->size)); + if(checksum != ADLER32) return 58; /*error, adler checksum not correct, data must be corrupted*/ + } + + return 0; /*no error*/ +} + + +unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, + size_t insize, const LodePNGDecompressSettings* settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_zlib_decompressv(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; +} + +/*expected_size is expected output size, to avoid intermediate allocations. Set to 0 if not known. */ +static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, + const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { + unsigned error; + if(settings->custom_zlib) { + error = settings->custom_zlib(out, outsize, in, insize, settings); + if(error) { + /*the custom zlib is allowed to have its own error codes, however, we translate it to code 110*/ + error = 110; + /*if there's a max output size, and the custom zlib returned error, then indicate that error instead*/ + if(settings->max_output_size && *outsize > settings->max_output_size) error = 109; + } + } else { + ucvector v = ucvector_init(*out, *outsize); + if(expected_size) { + /*reserve the memory to avoid intermediate reallocations*/ + ucvector_resize(&v, *outsize + expected_size); + v.size = *outsize; + } + error = lodepng_zlib_decompressv(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + } + return error; +} + +#endif /*LODEPNG_COMPILE_DECODER*/ + +#ifdef LODEPNG_COMPILE_ENCODER + +unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, + size_t insize, const LodePNGCompressSettings* settings) { + size_t i; + unsigned error; + unsigned char* deflatedata = 0; + size_t deflatesize = 0; + + error = deflate(&deflatedata, &deflatesize, in, insize, settings); + + *out = NULL; + *outsize = 0; + if(!error) { + *outsize = deflatesize + 6; + *out = (unsigned char*)lodepng_malloc(*outsize); + if(!*out) error = 83; /*alloc fail*/ + } + + if(!error) { + unsigned ADLER32 = adler32(in, (unsigned)insize); + /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte ADLER32 checksum of the Decompressed data*/ + unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any window size up to 32768 can be used.*/ + unsigned FLEVEL = 0; + unsigned FDICT = 0; + unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64; + unsigned FCHECK = 31 - CMFFLG % 31; + CMFFLG += FCHECK; + + (*out)[0] = (unsigned char)(CMFFLG >> 8); + (*out)[1] = (unsigned char)(CMFFLG & 255); + for(i = 0; i != deflatesize; ++i) (*out)[i + 2] = deflatedata[i]; + lodepng_set32bitInt(&(*out)[*outsize - 4], ADLER32); + } + + lodepng_free(deflatedata); + return error; +} + +/* compress using the default or custom zlib function */ +static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, + size_t insize, const LodePNGCompressSettings* settings) { + if(settings->custom_zlib) { + unsigned error = settings->custom_zlib(out, outsize, in, insize, settings); + /*the custom zlib is allowed to have its own error codes, however, we translate it to code 111*/ + return error ? 111 : 0; + } else { + return lodepng_zlib_compress(out, outsize, in, insize, settings); + } +} + +#endif /*LODEPNG_COMPILE_ENCODER*/ + +#else /*no LODEPNG_COMPILE_ZLIB*/ + +#ifdef LODEPNG_COMPILE_DECODER +static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, + const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { + if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ + (void)expected_size; + return settings->custom_zlib(out, outsize, in, insize, settings); +} +#endif /*LODEPNG_COMPILE_DECODER*/ +#ifdef LODEPNG_COMPILE_ENCODER +static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, + size_t insize, const LodePNGCompressSettings* settings) { + if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ + return settings->custom_zlib(out, outsize, in, insize, settings); +} +#endif /*LODEPNG_COMPILE_ENCODER*/ + +#endif /*LODEPNG_COMPILE_ZLIB*/ + +/* ////////////////////////////////////////////////////////////////////////// */ + +#ifdef LODEPNG_COMPILE_ENCODER + +/*this is a good tradeoff between speed and compression ratio*/ +#define DEFAULT_WINDOWSIZE 2048 + +void lodepng_compress_settings_init(LodePNGCompressSettings* settings) { + /*compress with dynamic huffman tree (not in the mathematical sense, just not the predefined one)*/ + settings->btype = 2; + settings->use_lz77 = 1; + settings->windowsize = DEFAULT_WINDOWSIZE; + settings->minmatch = 3; + settings->nicematch = 128; + settings->lazymatching = 1; + + settings->custom_zlib = 0; + settings->custom_deflate = 0; + settings->custom_context = 0; +} + +const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0}; + + +#endif /*LODEPNG_COMPILE_ENCODER*/ + +#ifdef LODEPNG_COMPILE_DECODER + +void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings) { + settings->ignore_adler32 = 0; + settings->ignore_nlen = 0; + settings->max_output_size = 0; + + settings->custom_zlib = 0; + settings->custom_inflate = 0; + settings->custom_context = 0; +} + +const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0, 0, 0}; + +#endif /*LODEPNG_COMPILE_DECODER*/ + +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* // End of Zlib related code. Begin of PNG related code. // */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ + +#ifdef LODEPNG_COMPILE_PNG + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / CRC32 / */ +/* ////////////////////////////////////////////////////////////////////////// */ + + +#ifndef LODEPNG_NO_COMPILE_CRC +/* CRC polynomial: 0xedb88320 */ +static unsigned lodepng_crc32_table[256] = { + 0u, 1996959894u, 3993919788u, 2567524794u, 124634137u, 1886057615u, 3915621685u, 2657392035u, + 249268274u, 2044508324u, 3772115230u, 2547177864u, 162941995u, 2125561021u, 3887607047u, 2428444049u, + 498536548u, 1789927666u, 4089016648u, 2227061214u, 450548861u, 1843258603u, 4107580753u, 2211677639u, + 325883990u, 1684777152u, 4251122042u, 2321926636u, 335633487u, 1661365465u, 4195302755u, 2366115317u, + 997073096u, 1281953886u, 3579855332u, 2724688242u, 1006888145u, 1258607687u, 3524101629u, 2768942443u, + 901097722u, 1119000684u, 3686517206u, 2898065728u, 853044451u, 1172266101u, 3705015759u, 2882616665u, + 651767980u, 1373503546u, 3369554304u, 3218104598u, 565507253u, 1454621731u, 3485111705u, 3099436303u, + 671266974u, 1594198024u, 3322730930u, 2970347812u, 795835527u, 1483230225u, 3244367275u, 3060149565u, + 1994146192u, 31158534u, 2563907772u, 4023717930u, 1907459465u, 112637215u, 2680153253u, 3904427059u, + 2013776290u, 251722036u, 2517215374u, 3775830040u, 2137656763u, 141376813u, 2439277719u, 3865271297u, + 1802195444u, 476864866u, 2238001368u, 4066508878u, 1812370925u, 453092731u, 2181625025u, 4111451223u, + 1706088902u, 314042704u, 2344532202u, 4240017532u, 1658658271u, 366619977u, 2362670323u, 4224994405u, + 1303535960u, 984961486u, 2747007092u, 3569037538u, 1256170817u, 1037604311u, 2765210733u, 3554079995u, + 1131014506u, 879679996u, 2909243462u, 3663771856u, 1141124467u, 855842277u, 2852801631u, 3708648649u, + 1342533948u, 654459306u, 3188396048u, 3373015174u, 1466479909u, 544179635u, 3110523913u, 3462522015u, + 1591671054u, 702138776u, 2966460450u, 3352799412u, 1504918807u, 783551873u, 3082640443u, 3233442989u, + 3988292384u, 2596254646u, 62317068u, 1957810842u, 3939845945u, 2647816111u, 81470997u, 1943803523u, + 3814918930u, 2489596804u, 225274430u, 2053790376u, 3826175755u, 2466906013u, 167816743u, 2097651377u, + 4027552580u, 2265490386u, 503444072u, 1762050814u, 4150417245u, 2154129355u, 426522225u, 1852507879u, + 4275313526u, 2312317920u, 282753626u, 1742555852u, 4189708143u, 2394877945u, 397917763u, 1622183637u, + 3604390888u, 2714866558u, 953729732u, 1340076626u, 3518719985u, 2797360999u, 1068828381u, 1219638859u, + 3624741850u, 2936675148u, 906185462u, 1090812512u, 3747672003u, 2825379669u, 829329135u, 1181335161u, + 3412177804u, 3160834842u, 628085408u, 1382605366u, 3423369109u, 3138078467u, 570562233u, 1426400815u, + 3317316542u, 2998733608u, 733239954u, 1555261956u, 3268935591u, 3050360625u, 752459403u, 1541320221u, + 2607071920u, 3965973030u, 1969922972u, 40735498u, 2617837225u, 3943577151u, 1913087877u, 83908371u, + 2512341634u, 3803740692u, 2075208622u, 213261112u, 2463272603u, 3855990285u, 2094854071u, 198958881u, + 2262029012u, 4057260610u, 1759359992u, 534414190u, 2176718541u, 4139329115u, 1873836001u, 414664567u, + 2282248934u, 4279200368u, 1711684554u, 285281116u, 2405801727u, 4167216745u, 1634467795u, 376229701u, + 2685067896u, 3608007406u, 1308918612u, 956543938u, 2808555105u, 3495958263u, 1231636301u, 1047427035u, + 2932959818u, 3654703836u, 1088359270u, 936918000u, 2847714899u, 3736837829u, 1202900863u, 817233897u, + 3183342108u, 3401237130u, 1404277552u, 615818150u, 3134207493u, 3453421203u, 1423857449u, 601450431u, + 3009837614u, 3294710456u, 1567103746u, 711928724u, 3020668471u, 3272380065u, 1510334235u, 755167117u +}; + +/*Return the CRC of the bytes buf[0..len-1].*/ +unsigned lodepng_crc32(const unsigned char* data, size_t length) { + unsigned r = 0xffffffffu; + size_t i; + for(i = 0; i < length; ++i) { + r = lodepng_crc32_table[(r ^ data[i]) & 0xffu] ^ (r >> 8u); + } + return r ^ 0xffffffffu; +} +#else /* !LODEPNG_NO_COMPILE_CRC */ +unsigned lodepng_crc32(const unsigned char* data, size_t length); +#endif /* !LODEPNG_NO_COMPILE_CRC */ + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / Reading and writing PNG color channel bits / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +/* The color channel bits of less-than-8-bit pixels are read with the MSB of bytes first, +so LodePNGBitWriter and LodePNGBitReader can't be used for those. */ + +static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream) { + unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1); + ++(*bitpointer); + return result; +} + +/* TODO: make this faster */ +static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) { + unsigned result = 0; + size_t i; + for(i = 0 ; i < nbits; ++i) { + result <<= 1u; + result |= (unsigned)readBitFromReversedStream(bitpointer, bitstream); + } + return result; +} + +static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) { + /*the current bit in bitstream may be 0 or 1 for this to work*/ + if(bit == 0) bitstream[(*bitpointer) >> 3u] &= (unsigned char)(~(1u << (7u - ((*bitpointer) & 7u)))); + else bitstream[(*bitpointer) >> 3u] |= (1u << (7u - ((*bitpointer) & 7u))); + ++(*bitpointer); +} + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / PNG chunks / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +unsigned lodepng_chunk_length(const unsigned char* chunk) { + return lodepng_read32bitInt(&chunk[0]); +} + +void lodepng_chunk_type(char type[5], const unsigned char* chunk) { + unsigned i; + for(i = 0; i != 4; ++i) type[i] = (char)chunk[4 + i]; + type[4] = 0; /*null termination char*/ +} + +unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type) { + if(lodepng_strlen(type) != 4) return 0; + return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]); +} + +unsigned char lodepng_chunk_ancillary(const unsigned char* chunk) { + return((chunk[4] & 32) != 0); +} + +unsigned char lodepng_chunk_private(const unsigned char* chunk) { + return((chunk[6] & 32) != 0); +} + +unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk) { + return((chunk[7] & 32) != 0); +} + +unsigned char* lodepng_chunk_data(unsigned char* chunk) { + return &chunk[8]; +} + +const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk) { + return &chunk[8]; +} + +unsigned lodepng_chunk_check_crc(const unsigned char* chunk) { + unsigned length = lodepng_chunk_length(chunk); + unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]); + /*the CRC is taken of the data and the 4 chunk type letters, not the length*/ + unsigned checksum = lodepng_crc32(&chunk[4], length + 4); + if(CRC != checksum) return 1; + else return 0; +} + +void lodepng_chunk_generate_crc(unsigned char* chunk) { + unsigned length = lodepng_chunk_length(chunk); + unsigned CRC = lodepng_crc32(&chunk[4], length + 4); + lodepng_set32bitInt(chunk + 8 + length, CRC); +} + +unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end) { + if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/ + if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 + && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { + /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ + return chunk + 8; + } else { + size_t total_chunk_length; + unsigned char* result; + if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; + result = chunk + total_chunk_length; + if(result < chunk) return end; /*pointer overflow*/ + return result; + } +} + +const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end) { + if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/ + if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 + && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { + /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ + return chunk + 8; + } else { + size_t total_chunk_length; + const unsigned char* result; + if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; + result = chunk + total_chunk_length; + if(result < chunk) return end; /*pointer overflow*/ + return result; + } +} + +unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]) { + for(;;) { + if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ + if(lodepng_chunk_type_equals(chunk, type)) return chunk; + chunk = lodepng_chunk_next(chunk, end); + } +} + +const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]) { + for(;;) { + if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ + if(lodepng_chunk_type_equals(chunk, type)) return chunk; + chunk = lodepng_chunk_next_const(chunk, end); + } +} + +unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk) { + unsigned i; + size_t total_chunk_length, new_length; + unsigned char *chunk_start, *new_buffer; + + if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return 77; + if(lodepng_addofl(*outsize, total_chunk_length, &new_length)) return 77; + + new_buffer = (unsigned char*)lodepng_realloc(*out, new_length); + if(!new_buffer) return 83; /*alloc fail*/ + (*out) = new_buffer; + (*outsize) = new_length; + chunk_start = &(*out)[new_length - total_chunk_length]; + + for(i = 0; i != total_chunk_length; ++i) chunk_start[i] = chunk[i]; + + return 0; +} + +/*Sets length and name and allocates the space for data and crc but does not +set data or crc yet. Returns the start of the chunk in chunk. The start of +the data is at chunk + 8. To finalize chunk, add the data, then use +lodepng_chunk_generate_crc */ +static unsigned lodepng_chunk_init(unsigned char** chunk, + ucvector* out, + unsigned length, const char* type) { + size_t new_length = out->size; + if(lodepng_addofl(new_length, length, &new_length)) return 77; + if(lodepng_addofl(new_length, 12, &new_length)) return 77; + if(!ucvector_resize(out, new_length)) return 83; /*alloc fail*/ + *chunk = out->data + new_length - length - 12u; + + /*1: length*/ + lodepng_set32bitInt(*chunk, length); + + /*2: chunk name (4 letters)*/ + lodepng_memcpy(*chunk + 4, type, 4); + + return 0; +} + +/* like lodepng_chunk_create but with custom allocsize */ +static unsigned lodepng_chunk_createv(ucvector* out, + unsigned length, const char* type, const unsigned char* data) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, length, type)); + + /*3: the data*/ + lodepng_memcpy(chunk + 8, data, length); + + /*4: CRC (of the chunkname characters and the data)*/ + lodepng_chunk_generate_crc(chunk); + + return 0; +} + +unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, + unsigned length, const char* type, const unsigned char* data) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_chunk_createv(&v, length, type, data); + *out = v.data; + *outsize = v.size; + return error; +} + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / Color types, channels, bits / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +/*checks if the colortype is valid and the bitdepth bd is allowed for this colortype. +Return value is a LodePNG error code.*/ +static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) { + switch(colortype) { + case LCT_GREY: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break; + case LCT_RGB: if(!( bd == 8 || bd == 16)) return 37; break; + case LCT_PALETTE: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break; + case LCT_GREY_ALPHA: if(!( bd == 8 || bd == 16)) return 37; break; + case LCT_RGBA: if(!( bd == 8 || bd == 16)) return 37; break; + case LCT_MAX_OCTET_VALUE: return 31; /* invalid color type */ + default: return 31; /* invalid color type */ + } + return 0; /*allowed color type / bits combination*/ +} + +static unsigned getNumColorChannels(LodePNGColorType colortype) { + switch(colortype) { + case LCT_GREY: return 1; + case LCT_RGB: return 3; + case LCT_PALETTE: return 1; + case LCT_GREY_ALPHA: return 2; + case LCT_RGBA: return 4; + case LCT_MAX_OCTET_VALUE: return 0; /* invalid color type */ + default: return 0; /*invalid color type*/ + } +} + +static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) { + /*bits per pixel is amount of channels * bits per channel*/ + return getNumColorChannels(colortype) * bitdepth; +} + +/* ////////////////////////////////////////////////////////////////////////// */ + +void lodepng_color_mode_init(LodePNGColorMode* info) { + info->key_defined = 0; + info->key_r = info->key_g = info->key_b = 0; + info->colortype = LCT_RGBA; + info->bitdepth = 8; + info->palette = 0; + info->palettesize = 0; +} + +/*allocates palette memory if needed, and initializes all colors to black*/ +static void lodepng_color_mode_alloc_palette(LodePNGColorMode* info) { + size_t i; + /*if the palette is already allocated, it will have size 1024 so no reallocation needed in that case*/ + /*the palette must have room for up to 256 colors with 4 bytes each.*/ + if(!info->palette) info->palette = (unsigned char*)lodepng_malloc(1024); + if(!info->palette) return; /*alloc fail*/ + for(i = 0; i != 256; ++i) { + /*Initialize all unused colors with black, the value used for invalid palette indices. + This is an error according to the PNG spec, but common PNG decoders make it black instead. + That makes color conversion slightly faster due to no error handling needed.*/ + info->palette[i * 4 + 0] = 0; + info->palette[i * 4 + 1] = 0; + info->palette[i * 4 + 2] = 0; + info->palette[i * 4 + 3] = 255; + } +} + +void lodepng_color_mode_cleanup(LodePNGColorMode* info) { + lodepng_palette_clear(info); +} + +unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source) { + lodepng_color_mode_cleanup(dest); + lodepng_memcpy(dest, source, sizeof(LodePNGColorMode)); + if(source->palette) { + dest->palette = (unsigned char*)lodepng_malloc(1024); + if(!dest->palette && source->palettesize) return 83; /*alloc fail*/ + lodepng_memcpy(dest->palette, source->palette, source->palettesize * 4); + } + return 0; +} + +LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth) { + LodePNGColorMode result; + lodepng_color_mode_init(&result); + result.colortype = colortype; + result.bitdepth = bitdepth; + return result; +} + +static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColorMode* b) { + size_t i; + if(a->colortype != b->colortype) return 0; + if(a->bitdepth != b->bitdepth) return 0; + if(a->key_defined != b->key_defined) return 0; + if(a->key_defined) { + if(a->key_r != b->key_r) return 0; + if(a->key_g != b->key_g) return 0; + if(a->key_b != b->key_b) return 0; + } + if(a->palettesize != b->palettesize) return 0; + for(i = 0; i != a->palettesize * 4; ++i) { + if(a->palette[i] != b->palette[i]) return 0; + } + return 1; +} + +void lodepng_palette_clear(LodePNGColorMode* info) { + if(info->palette) lodepng_free(info->palette); + info->palette = 0; + info->palettesize = 0; +} + +unsigned lodepng_palette_add(LodePNGColorMode* info, + unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + if(!info->palette) /*allocate palette if empty*/ { + lodepng_color_mode_alloc_palette(info); + if(!info->palette) return 83; /*alloc fail*/ + } + if(info->palettesize >= 256) { + return 108; /*too many palette values*/ + } + info->palette[4 * info->palettesize + 0] = r; + info->palette[4 * info->palettesize + 1] = g; + info->palette[4 * info->palettesize + 2] = b; + info->palette[4 * info->palettesize + 3] = a; + ++info->palettesize; + return 0; +} + +/*calculate bits per pixel out of colortype and bitdepth*/ +unsigned lodepng_get_bpp(const LodePNGColorMode* info) { + return lodepng_get_bpp_lct(info->colortype, info->bitdepth); +} + +unsigned lodepng_get_channels(const LodePNGColorMode* info) { + return getNumColorChannels(info->colortype); +} + +unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info) { + return info->colortype == LCT_GREY || info->colortype == LCT_GREY_ALPHA; +} + +unsigned lodepng_is_alpha_type(const LodePNGColorMode* info) { + return (info->colortype & 4) != 0; /*4 or 6*/ +} + +unsigned lodepng_is_palette_type(const LodePNGColorMode* info) { + return info->colortype == LCT_PALETTE; +} + +unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info) { + size_t i; + for(i = 0; i != info->palettesize; ++i) { + if(info->palette[i * 4 + 3] < 255) return 1; + } + return 0; +} + +unsigned lodepng_can_have_alpha(const LodePNGColorMode* info) { + return info->key_defined + || lodepng_is_alpha_type(info) + || lodepng_has_palette_alpha(info); +} + +static size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth); + size_t n = (size_t)w * (size_t)h; + return ((n / 8u) * bpp) + ((n & 7u) * bpp + 7u) / 8u; +} + +size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color) { + return lodepng_get_raw_size_lct(w, h, color->colortype, color->bitdepth); +} + + +#ifdef LODEPNG_COMPILE_PNG + +/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer, +and in addition has one extra byte per line: the filter byte. So this gives a larger +result than lodepng_get_raw_size. Set h to 1 to get the size of 1 row including filter byte. */ +static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, unsigned bpp) { + /* + 1 for the filter byte, and possibly plus padding bits per line. */ + /* Ignoring casts, the expression is equal to (w * bpp + 7) / 8 + 1, but avoids overflow of w * bpp */ + size_t line = ((size_t)(w / 8u) * bpp) + 1u + ((w & 7u) * bpp + 7u) / 8u; + return (size_t)h * line; +} + +#ifdef LODEPNG_COMPILE_DECODER +/*Safely checks whether size_t overflow can be caused due to amount of pixels. +This check is overcautious rather than precise. If this check indicates no overflow, +you can safely compute in a size_t (but not an unsigned): +-(size_t)w * (size_t)h * 8 +-amount of bytes in IDAT (including filter, padding and Adam7 bytes) +-amount of bytes in raw color model +Returns 1 if overflow possible, 0 if not. +*/ +static int lodepng_pixel_overflow(unsigned w, unsigned h, + const LodePNGColorMode* pngcolor, const LodePNGColorMode* rawcolor) { + size_t bpp = LODEPNG_MAX(lodepng_get_bpp(pngcolor), lodepng_get_bpp(rawcolor)); + size_t numpixels, total; + size_t line; /* bytes per line in worst case */ + + if(lodepng_mulofl((size_t)w, (size_t)h, &numpixels)) return 1; + if(lodepng_mulofl(numpixels, 8, &total)) return 1; /* bit pointer with 8-bit color, or 8 bytes per channel color */ + + /* Bytes per scanline with the expression "(w / 8u) * bpp) + ((w & 7u) * bpp + 7u) / 8u" */ + if(lodepng_mulofl((size_t)(w / 8u), bpp, &line)) return 1; + if(lodepng_addofl(line, ((w & 7u) * bpp + 7u) / 8u, &line)) return 1; + + if(lodepng_addofl(line, 5, &line)) return 1; /* 5 bytes overhead per line: 1 filterbyte, 4 for Adam7 worst case */ + if(lodepng_mulofl(line, h, &total)) return 1; /* Total bytes in worst case */ + + return 0; /* no overflow */ +} +#endif /*LODEPNG_COMPILE_DECODER*/ +#endif /*LODEPNG_COMPILE_PNG*/ + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + +static void LodePNGUnknownChunks_init(LodePNGInfo* info) { + unsigned i; + for(i = 0; i != 3; ++i) info->unknown_chunks_data[i] = 0; + for(i = 0; i != 3; ++i) info->unknown_chunks_size[i] = 0; +} + +static void LodePNGUnknownChunks_cleanup(LodePNGInfo* info) { + unsigned i; + for(i = 0; i != 3; ++i) lodepng_free(info->unknown_chunks_data[i]); +} + +static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo* src) { + unsigned i; + + LodePNGUnknownChunks_cleanup(dest); + + for(i = 0; i != 3; ++i) { + size_t j; + dest->unknown_chunks_size[i] = src->unknown_chunks_size[i]; + dest->unknown_chunks_data[i] = (unsigned char*)lodepng_malloc(src->unknown_chunks_size[i]); + if(!dest->unknown_chunks_data[i] && dest->unknown_chunks_size[i]) return 83; /*alloc fail*/ + for(j = 0; j < src->unknown_chunks_size[i]; ++j) { + dest->unknown_chunks_data[i][j] = src->unknown_chunks_data[i][j]; + } + } + + return 0; +} + +/******************************************************************************/ + +static void LodePNGText_init(LodePNGInfo* info) { + info->text_num = 0; + info->text_keys = NULL; + info->text_strings = NULL; +} + +static void LodePNGText_cleanup(LodePNGInfo* info) { + size_t i; + for(i = 0; i != info->text_num; ++i) { + string_cleanup(&info->text_keys[i]); + string_cleanup(&info->text_strings[i]); + } + lodepng_free(info->text_keys); + lodepng_free(info->text_strings); +} + +static unsigned LodePNGText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { + size_t i = 0; + dest->text_keys = NULL; + dest->text_strings = NULL; + dest->text_num = 0; + for(i = 0; i != source->text_num; ++i) { + CERROR_TRY_RETURN(lodepng_add_text(dest, source->text_keys[i], source->text_strings[i])); + } + return 0; +} + +static unsigned lodepng_add_text_sized(LodePNGInfo* info, const char* key, const char* str, size_t size) { + char** new_keys = (char**)(lodepng_realloc(info->text_keys, sizeof(char*) * (info->text_num + 1))); + char** new_strings = (char**)(lodepng_realloc(info->text_strings, sizeof(char*) * (info->text_num + 1))); + + if(new_keys) info->text_keys = new_keys; + if(new_strings) info->text_strings = new_strings; + + if(!new_keys || !new_strings) return 83; /*alloc fail*/ + + ++info->text_num; + info->text_keys[info->text_num - 1] = alloc_string(key); + info->text_strings[info->text_num - 1] = alloc_string_sized(str, size); + if(!info->text_keys[info->text_num - 1] || !info->text_strings[info->text_num - 1]) return 83; /*alloc fail*/ + + return 0; +} + +unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str) { + return lodepng_add_text_sized(info, key, str, lodepng_strlen(str)); +} + +void lodepng_clear_text(LodePNGInfo* info) { + LodePNGText_cleanup(info); +} + +/******************************************************************************/ + +static void LodePNGIText_init(LodePNGInfo* info) { + info->itext_num = 0; + info->itext_keys = NULL; + info->itext_langtags = NULL; + info->itext_transkeys = NULL; + info->itext_strings = NULL; +} + +static void LodePNGIText_cleanup(LodePNGInfo* info) { + size_t i; + for(i = 0; i != info->itext_num; ++i) { + string_cleanup(&info->itext_keys[i]); + string_cleanup(&info->itext_langtags[i]); + string_cleanup(&info->itext_transkeys[i]); + string_cleanup(&info->itext_strings[i]); + } + lodepng_free(info->itext_keys); + lodepng_free(info->itext_langtags); + lodepng_free(info->itext_transkeys); + lodepng_free(info->itext_strings); +} + +static unsigned LodePNGIText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { + size_t i = 0; + dest->itext_keys = NULL; + dest->itext_langtags = NULL; + dest->itext_transkeys = NULL; + dest->itext_strings = NULL; + dest->itext_num = 0; + for(i = 0; i != source->itext_num; ++i) { + CERROR_TRY_RETURN(lodepng_add_itext(dest, source->itext_keys[i], source->itext_langtags[i], + source->itext_transkeys[i], source->itext_strings[i])); + } + return 0; +} + +void lodepng_clear_itext(LodePNGInfo* info) { + LodePNGIText_cleanup(info); +} + +static unsigned lodepng_add_itext_sized(LodePNGInfo* info, const char* key, const char* langtag, + const char* transkey, const char* str, size_t size) { + char** new_keys = (char**)(lodepng_realloc(info->itext_keys, sizeof(char*) * (info->itext_num + 1))); + char** new_langtags = (char**)(lodepng_realloc(info->itext_langtags, sizeof(char*) * (info->itext_num + 1))); + char** new_transkeys = (char**)(lodepng_realloc(info->itext_transkeys, sizeof(char*) * (info->itext_num + 1))); + char** new_strings = (char**)(lodepng_realloc(info->itext_strings, sizeof(char*) * (info->itext_num + 1))); + + if(new_keys) info->itext_keys = new_keys; + if(new_langtags) info->itext_langtags = new_langtags; + if(new_transkeys) info->itext_transkeys = new_transkeys; + if(new_strings) info->itext_strings = new_strings; + + if(!new_keys || !new_langtags || !new_transkeys || !new_strings) return 83; /*alloc fail*/ + + ++info->itext_num; + + info->itext_keys[info->itext_num - 1] = alloc_string(key); + info->itext_langtags[info->itext_num - 1] = alloc_string(langtag); + info->itext_transkeys[info->itext_num - 1] = alloc_string(transkey); + info->itext_strings[info->itext_num - 1] = alloc_string_sized(str, size); + + return 0; +} + +unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, + const char* transkey, const char* str) { + return lodepng_add_itext_sized(info, key, langtag, transkey, str, lodepng_strlen(str)); +} + +/* same as set but does not delete */ +static unsigned lodepng_assign_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { + if(profile_size == 0) return 100; /*invalid ICC profile size*/ + + info->iccp_name = alloc_string(name); + info->iccp_profile = (unsigned char*)lodepng_malloc(profile_size); + + if(!info->iccp_name || !info->iccp_profile) return 83; /*alloc fail*/ + + lodepng_memcpy(info->iccp_profile, profile, profile_size); + info->iccp_profile_size = profile_size; + + return 0; /*ok*/ +} + +unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { + if(info->iccp_name) lodepng_clear_icc(info); + info->iccp_defined = 1; + + return lodepng_assign_icc(info, name, profile, profile_size); +} + +void lodepng_clear_icc(LodePNGInfo* info) { + string_cleanup(&info->iccp_name); + lodepng_free(info->iccp_profile); + info->iccp_profile = NULL; + info->iccp_profile_size = 0; + info->iccp_defined = 0; +} +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +void lodepng_info_init(LodePNGInfo* info) { + lodepng_color_mode_init(&info->color); + info->interlace_method = 0; + info->compression_method = 0; + info->filter_method = 0; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + info->background_defined = 0; + info->background_r = info->background_g = info->background_b = 0; + + LodePNGText_init(info); + LodePNGIText_init(info); + + info->time_defined = 0; + info->phys_defined = 0; + + info->gama_defined = 0; + info->chrm_defined = 0; + info->srgb_defined = 0; + info->iccp_defined = 0; + info->iccp_name = NULL; + info->iccp_profile = NULL; + + LodePNGUnknownChunks_init(info); +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +} + +void lodepng_info_cleanup(LodePNGInfo* info) { + lodepng_color_mode_cleanup(&info->color); +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + LodePNGText_cleanup(info); + LodePNGIText_cleanup(info); + + lodepng_clear_icc(info); + + LodePNGUnknownChunks_cleanup(info); +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +} + +unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source) { + lodepng_info_cleanup(dest); + lodepng_memcpy(dest, source, sizeof(LodePNGInfo)); + lodepng_color_mode_init(&dest->color); + CERROR_TRY_RETURN(lodepng_color_mode_copy(&dest->color, &source->color)); + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + CERROR_TRY_RETURN(LodePNGText_copy(dest, source)); + CERROR_TRY_RETURN(LodePNGIText_copy(dest, source)); + if(source->iccp_defined) { + CERROR_TRY_RETURN(lodepng_assign_icc(dest, source->iccp_name, source->iccp_profile, source->iccp_profile_size)); + } + + LodePNGUnknownChunks_init(dest); + CERROR_TRY_RETURN(LodePNGUnknownChunks_copy(dest, source)); +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + return 0; +} + +/* ////////////////////////////////////////////////////////////////////////// */ + +/*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, out: octet array to add bits to*/ +static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsigned in) { + unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/ + /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for first half or 1 for second half*/ + unsigned p = index & m; + in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/ + in = in << (bits * (m - p)); + if(p == 0) out[index * bits / 8u] = in; + else out[index * bits / 8u] |= in; +} + +typedef struct ColorTree ColorTree; + +/* +One node of a color tree +This is the data structure used to count the number of unique colors and to get a palette +index for a color. It's like an octree, but because the alpha channel is used too, each +node has 16 instead of 8 children. +*/ +struct ColorTree { + ColorTree* children[16]; /*up to 16 pointers to ColorTree of next level*/ + int index; /*the payload. Only has a meaningful value if this is in the last level*/ +}; + +static void color_tree_init(ColorTree* tree) { + lodepng_memset(tree->children, 0, 16 * sizeof(*tree->children)); + tree->index = -1; +} + +static void color_tree_cleanup(ColorTree* tree) { + int i; + for(i = 0; i != 16; ++i) { + if(tree->children[i]) { + color_tree_cleanup(tree->children[i]); + lodepng_free(tree->children[i]); + } + } +} + +/*returns -1 if color not present, its index otherwise*/ +static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + int bit = 0; + for(bit = 0; bit < 8; ++bit) { + int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); + if(!tree->children[i]) return -1; + else tree = tree->children[i]; + } + return tree ? tree->index : -1; +} + +#ifdef LODEPNG_COMPILE_ENCODER +static int color_tree_has(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + return color_tree_get(tree, r, g, b, a) >= 0; +} +#endif /*LODEPNG_COMPILE_ENCODER*/ + +/*color is not allowed to already exist. +Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist") +Returns error code, or 0 if ok*/ +static unsigned color_tree_add(ColorTree* tree, + unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned index) { + int bit; + for(bit = 0; bit < 8; ++bit) { + int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); + if(!tree->children[i]) { + tree->children[i] = (ColorTree*)lodepng_malloc(sizeof(ColorTree)); + if(!tree->children[i]) return 83; /*alloc fail*/ + color_tree_init(tree->children[i]); + } + tree = tree->children[i]; + } + tree->index = (int)index; + return 0; +} + +/*put a pixel, given its RGBA color, into image of any color type*/ +static unsigned rgba8ToPixel(unsigned char* out, size_t i, + const LodePNGColorMode* mode, ColorTree* tree /*for palette*/, + unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + if(mode->colortype == LCT_GREY) { + unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ + if(mode->bitdepth == 8) out[i] = gray; + else if(mode->bitdepth == 16) out[i * 2 + 0] = out[i * 2 + 1] = gray; + else { + /*take the most significant bits of gray*/ + gray = ((unsigned)gray >> (8u - mode->bitdepth)) & ((1u << mode->bitdepth) - 1u); + addColorBits(out, i, mode->bitdepth, gray); + } + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { + out[i * 3 + 0] = r; + out[i * 3 + 1] = g; + out[i * 3 + 2] = b; + } else { + out[i * 6 + 0] = out[i * 6 + 1] = r; + out[i * 6 + 2] = out[i * 6 + 3] = g; + out[i * 6 + 4] = out[i * 6 + 5] = b; + } + } else if(mode->colortype == LCT_PALETTE) { + int index = color_tree_get(tree, r, g, b, a); + if(index < 0) return 82; /*color not in palette*/ + if(mode->bitdepth == 8) out[i] = index; + else addColorBits(out, i, mode->bitdepth, (unsigned)index); + } else if(mode->colortype == LCT_GREY_ALPHA) { + unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ + if(mode->bitdepth == 8) { + out[i * 2 + 0] = gray; + out[i * 2 + 1] = a; + } else if(mode->bitdepth == 16) { + out[i * 4 + 0] = out[i * 4 + 1] = gray; + out[i * 4 + 2] = out[i * 4 + 3] = a; + } + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { + out[i * 4 + 0] = r; + out[i * 4 + 1] = g; + out[i * 4 + 2] = b; + out[i * 4 + 3] = a; + } else { + out[i * 8 + 0] = out[i * 8 + 1] = r; + out[i * 8 + 2] = out[i * 8 + 3] = g; + out[i * 8 + 4] = out[i * 8 + 5] = b; + out[i * 8 + 6] = out[i * 8 + 7] = a; + } + } + + return 0; /*no error*/ +} + +/*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth type*/ +static void rgba16ToPixel(unsigned char* out, size_t i, + const LodePNGColorMode* mode, + unsigned short r, unsigned short g, unsigned short b, unsigned short a) { + if(mode->colortype == LCT_GREY) { + unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ + out[i * 2 + 0] = (gray >> 8) & 255; + out[i * 2 + 1] = gray & 255; + } else if(mode->colortype == LCT_RGB) { + out[i * 6 + 0] = (r >> 8) & 255; + out[i * 6 + 1] = r & 255; + out[i * 6 + 2] = (g >> 8) & 255; + out[i * 6 + 3] = g & 255; + out[i * 6 + 4] = (b >> 8) & 255; + out[i * 6 + 5] = b & 255; + } else if(mode->colortype == LCT_GREY_ALPHA) { + unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ + out[i * 4 + 0] = (gray >> 8) & 255; + out[i * 4 + 1] = gray & 255; + out[i * 4 + 2] = (a >> 8) & 255; + out[i * 4 + 3] = a & 255; + } else if(mode->colortype == LCT_RGBA) { + out[i * 8 + 0] = (r >> 8) & 255; + out[i * 8 + 1] = r & 255; + out[i * 8 + 2] = (g >> 8) & 255; + out[i * 8 + 3] = g & 255; + out[i * 8 + 4] = (b >> 8) & 255; + out[i * 8 + 5] = b & 255; + out[i * 8 + 6] = (a >> 8) & 255; + out[i * 8 + 7] = a & 255; + } +} + +/*Get RGBA8 color of pixel with index i (y * width + x) from the raw image with given color type.*/ +static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, + unsigned char* b, unsigned char* a, + const unsigned char* in, size_t i, + const LodePNGColorMode* mode) { + if(mode->colortype == LCT_GREY) { + if(mode->bitdepth == 8) { + *r = *g = *b = in[i]; + if(mode->key_defined && *r == mode->key_r) *a = 0; + else *a = 255; + } else if(mode->bitdepth == 16) { + *r = *g = *b = in[i * 2 + 0]; + if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; + else *a = 255; + } else { + unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ + size_t j = i * mode->bitdepth; + unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); + *r = *g = *b = (value * 255) / highest; + if(mode->key_defined && value == mode->key_r) *a = 0; + else *a = 255; + } + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { + *r = in[i * 3 + 0]; *g = in[i * 3 + 1]; *b = in[i * 3 + 2]; + if(mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) *a = 0; + else *a = 255; + } else { + *r = in[i * 6 + 0]; + *g = in[i * 6 + 2]; + *b = in[i * 6 + 4]; + if(mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r + && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g + && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; + else *a = 255; + } + } else if(mode->colortype == LCT_PALETTE) { + unsigned index; + if(mode->bitdepth == 8) index = in[i]; + else { + size_t j = i * mode->bitdepth; + index = readBitsFromReversedStream(&j, in, mode->bitdepth); + } + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + *r = mode->palette[index * 4 + 0]; + *g = mode->palette[index * 4 + 1]; + *b = mode->palette[index * 4 + 2]; + *a = mode->palette[index * 4 + 3]; + } else if(mode->colortype == LCT_GREY_ALPHA) { + if(mode->bitdepth == 8) { + *r = *g = *b = in[i * 2 + 0]; + *a = in[i * 2 + 1]; + } else { + *r = *g = *b = in[i * 4 + 0]; + *a = in[i * 4 + 2]; + } + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { + *r = in[i * 4 + 0]; + *g = in[i * 4 + 1]; + *b = in[i * 4 + 2]; + *a = in[i * 4 + 3]; + } else { + *r = in[i * 8 + 0]; + *g = in[i * 8 + 2]; + *b = in[i * 8 + 4]; + *a = in[i * 8 + 6]; + } + } +} + +/*Similar to getPixelColorRGBA8, but with all the for loops inside of the color +mode test cases, optimized to convert the colors much faster, when converting +to the common case of RGBA with 8 bit per channel. buffer must be RGBA with +enough memory.*/ +static void getPixelColorsRGBA8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, + const unsigned char* LODEPNG_RESTRICT in, + const LodePNGColorMode* mode) { + unsigned num_channels = 4; + size_t i; + if(mode->colortype == LCT_GREY) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i]; + buffer[3] = 255; + } + if(mode->key_defined) { + buffer -= numpixels * num_channels; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + if(buffer[0] == mode->key_r) buffer[3] = 0; + } + } + } else if(mode->bitdepth == 16) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2]; + buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255; + } + } else { + unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ + size_t j = 0; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); + buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; + buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; + } + } + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + lodepng_memcpy(buffer, &in[i * 3], 3); + buffer[3] = 255; + } + if(mode->key_defined) { + buffer -= numpixels * num_channels; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + if(buffer[0] == mode->key_r && buffer[1]== mode->key_g && buffer[2] == mode->key_b) buffer[3] = 0; + } + } + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 6 + 0]; + buffer[1] = in[i * 6 + 2]; + buffer[2] = in[i * 6 + 4]; + buffer[3] = mode->key_defined + && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r + && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g + && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b ? 0 : 255; + } + } + } else if(mode->colortype == LCT_PALETTE) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = in[i]; + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 4); + } + } else { + size_t j = 0; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 4); + } + } + } else if(mode->colortype == LCT_GREY_ALPHA) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; + buffer[3] = in[i * 2 + 1]; + } + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; + buffer[3] = in[i * 4 + 2]; + } + } + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { + lodepng_memcpy(buffer, in, numpixels * 4); + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 8 + 0]; + buffer[1] = in[i * 8 + 2]; + buffer[2] = in[i * 8 + 4]; + buffer[3] = in[i * 8 + 6]; + } + } + } +} + +/*Similar to getPixelColorsRGBA8, but with 3-channel RGB output.*/ +static void getPixelColorsRGB8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, + const unsigned char* LODEPNG_RESTRICT in, + const LodePNGColorMode* mode) { + const unsigned num_channels = 3; + size_t i; + if(mode->colortype == LCT_GREY) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i]; + } + } else if(mode->bitdepth == 16) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2]; + } + } else { + unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ + size_t j = 0; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); + buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; + } + } + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { + lodepng_memcpy(buffer, in, numpixels * 3); + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 6 + 0]; + buffer[1] = in[i * 6 + 2]; + buffer[2] = in[i * 6 + 4]; + } + } + } else if(mode->colortype == LCT_PALETTE) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = in[i]; + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 3); + } + } else { + size_t j = 0; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 3); + } + } + } else if(mode->colortype == LCT_GREY_ALPHA) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; + } + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; + } + } + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + lodepng_memcpy(buffer, &in[i * 4], 3); + } + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 8 + 0]; + buffer[1] = in[i * 8 + 2]; + buffer[2] = in[i * 8 + 4]; + } + } + } +} + +/*Get RGBA16 color of pixel with index i (y * width + x) from the raw image with +given color type, but the given color type must be 16-bit itself.*/ +static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned short* b, unsigned short* a, + const unsigned char* in, size_t i, const LodePNGColorMode* mode) { + if(mode->colortype == LCT_GREY) { + *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1]; + if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; + else *a = 65535; + } else if(mode->colortype == LCT_RGB) { + *r = 256u * in[i * 6 + 0] + in[i * 6 + 1]; + *g = 256u * in[i * 6 + 2] + in[i * 6 + 3]; + *b = 256u * in[i * 6 + 4] + in[i * 6 + 5]; + if(mode->key_defined + && 256u * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r + && 256u * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g + && 256u * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; + else *a = 65535; + } else if(mode->colortype == LCT_GREY_ALPHA) { + *r = *g = *b = 256u * in[i * 4 + 0] + in[i * 4 + 1]; + *a = 256u * in[i * 4 + 2] + in[i * 4 + 3]; + } else if(mode->colortype == LCT_RGBA) { + *r = 256u * in[i * 8 + 0] + in[i * 8 + 1]; + *g = 256u * in[i * 8 + 2] + in[i * 8 + 3]; + *b = 256u * in[i * 8 + 4] + in[i * 8 + 5]; + *a = 256u * in[i * 8 + 6] + in[i * 8 + 7]; + } +} + +unsigned lodepng_convert(unsigned char* out, const unsigned char* in, + const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, + unsigned w, unsigned h) { + size_t i; + ColorTree tree; + size_t numpixels = (size_t)w * (size_t)h; + unsigned error = 0; + + if(mode_in->colortype == LCT_PALETTE && !mode_in->palette) { + return 107; /* error: must provide palette if input mode is palette */ + } + + if(lodepng_color_mode_equal(mode_out, mode_in)) { + size_t numbytes = lodepng_get_raw_size(w, h, mode_in); + lodepng_memcpy(out, in, numbytes); + return 0; + } + + if(mode_out->colortype == LCT_PALETTE) { + size_t palettesize = mode_out->palettesize; + const unsigned char* palette = mode_out->palette; + size_t palsize = (size_t)1u << mode_out->bitdepth; + /*if the user specified output palette but did not give the values, assume + they want the values of the input color type (assuming that one is palette). + Note that we never create a new palette ourselves.*/ + if(palettesize == 0) { + palettesize = mode_in->palettesize; + palette = mode_in->palette; + /*if the input was also palette with same bitdepth, then the color types are also + equal, so copy literally. This to preserve the exact indices that were in the PNG + even in case there are duplicate colors in the palette.*/ + if(mode_in->colortype == LCT_PALETTE && mode_in->bitdepth == mode_out->bitdepth) { + size_t numbytes = lodepng_get_raw_size(w, h, mode_in); + lodepng_memcpy(out, in, numbytes); + return 0; + } + } + if(palettesize < palsize) palsize = palettesize; + color_tree_init(&tree); + for(i = 0; i != palsize; ++i) { + const unsigned char* p = &palette[i * 4]; + error = color_tree_add(&tree, p[0], p[1], p[2], p[3], (unsigned)i); + if(error) break; + } + } + + if(!error) { + if(mode_in->bitdepth == 16 && mode_out->bitdepth == 16) { + for(i = 0; i != numpixels; ++i) { + unsigned short r = 0, g = 0, b = 0, a = 0; + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + rgba16ToPixel(out, i, mode_out, r, g, b, a); + } + } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) { + getPixelColorsRGBA8(out, numpixels, in, mode_in); + } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) { + getPixelColorsRGB8(out, numpixels, in, mode_in); + } else { + unsigned char r = 0, g = 0, b = 0, a = 0; + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + error = rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a); + if(error) break; + } + } + } + + if(mode_out->colortype == LCT_PALETTE) { + color_tree_cleanup(&tree); + } + + return error; +} + + +/* Converts a single rgb color without alpha from one type to another, color bits truncated to +their bitdepth. In case of single channel (gray or palette), only the r channel is used. Slow +function, do not use to process all pixels of an image. Alpha channel not supported on purpose: +this is for bKGD, supporting alpha may prevent it from finding a color in the palette, from the +specification it looks like bKGD should ignore the alpha values of the palette since it can use +any palette index but doesn't have an alpha channel. Idem with ignoring color key. */ +unsigned lodepng_convert_rgb( + unsigned* r_out, unsigned* g_out, unsigned* b_out, + unsigned r_in, unsigned g_in, unsigned b_in, + const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in) { + unsigned r = 0, g = 0, b = 0; + unsigned mul = 65535 / ((1u << mode_in->bitdepth) - 1u); /*65535, 21845, 4369, 257, 1*/ + unsigned shift = 16 - mode_out->bitdepth; + + if(mode_in->colortype == LCT_GREY || mode_in->colortype == LCT_GREY_ALPHA) { + r = g = b = r_in * mul; + } else if(mode_in->colortype == LCT_RGB || mode_in->colortype == LCT_RGBA) { + r = r_in * mul; + g = g_in * mul; + b = b_in * mul; + } else if(mode_in->colortype == LCT_PALETTE) { + if(r_in >= mode_in->palettesize) return 82; + r = mode_in->palette[r_in * 4 + 0] * 257u; + g = mode_in->palette[r_in * 4 + 1] * 257u; + b = mode_in->palette[r_in * 4 + 2] * 257u; + } else { + return 31; + } + + /* now convert to output format */ + if(mode_out->colortype == LCT_GREY || mode_out->colortype == LCT_GREY_ALPHA) { + *r_out = r >> shift ; + } else if(mode_out->colortype == LCT_RGB || mode_out->colortype == LCT_RGBA) { + *r_out = r >> shift ; + *g_out = g >> shift ; + *b_out = b >> shift ; + } else if(mode_out->colortype == LCT_PALETTE) { + unsigned i; + /* a 16-bit color cannot be in the palette */ + if((r >> 8) != (r & 255) || (g >> 8) != (g & 255) || (b >> 8) != (b & 255)) return 82; + for(i = 0; i < mode_out->palettesize; i++) { + unsigned j = i * 4; + if((r >> 8) == mode_out->palette[j + 0] && (g >> 8) == mode_out->palette[j + 1] && + (b >> 8) == mode_out->palette[j + 2]) { + *r_out = i; + return 0; + } + } + return 82; + } else { + return 31; + } + + return 0; +} + +#ifdef LODEPNG_COMPILE_ENCODER + +void lodepng_color_stats_init(LodePNGColorStats* stats) { + /*stats*/ + stats->colored = 0; + stats->key = 0; + stats->key_r = stats->key_g = stats->key_b = 0; + stats->alpha = 0; + stats->numcolors = 0; + stats->bits = 1; + stats->numpixels = 0; + /*settings*/ + stats->allow_palette = 1; + stats->allow_greyscale = 1; +} + +/*function used for debug purposes with C++*/ +/*void printColorStats(LodePNGColorStats* p) { + std::cout << "colored: " << (int)p->colored << ", "; + std::cout << "key: " << (int)p->key << ", "; + std::cout << "key_r: " << (int)p->key_r << ", "; + std::cout << "key_g: " << (int)p->key_g << ", "; + std::cout << "key_b: " << (int)p->key_b << ", "; + std::cout << "alpha: " << (int)p->alpha << ", "; + std::cout << "numcolors: " << (int)p->numcolors << ", "; + std::cout << "bits: " << (int)p->bits << std::endl; +}*/ + +/*Returns how many bits needed to represent given value (max 8 bit)*/ +static unsigned getValueRequiredBits(unsigned char value) { + if(value == 0 || value == 255) return 1; + /*The scaling of 2-bit and 4-bit values uses multiples of 85 and 17*/ + if(value % 17 == 0) return value % 85 == 0 ? 2 : 4; + return 8; +} + +/*stats must already have been inited. */ +unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, + const unsigned char* in, unsigned w, unsigned h, + const LodePNGColorMode* mode_in) { + size_t i; + ColorTree tree; + size_t numpixels = (size_t)w * (size_t)h; + unsigned error = 0; + + /* mark things as done already if it would be impossible to have a more expensive case */ + unsigned colored_done = lodepng_is_greyscale_type(mode_in) ? 1 : 0; + unsigned alpha_done = lodepng_can_have_alpha(mode_in) ? 0 : 1; + unsigned numcolors_done = 0; + unsigned bpp = lodepng_get_bpp(mode_in); + unsigned bits_done = (stats->bits == 1 && bpp == 1) ? 1 : 0; + unsigned sixteen = 0; /* whether the input image is 16 bit */ + unsigned maxnumcolors = 257; + if(bpp <= 8) maxnumcolors = LODEPNG_MIN(257, stats->numcolors + (1u << bpp)); + + stats->numpixels += numpixels; + + /*if palette not allowed, no need to compute numcolors*/ + if(!stats->allow_palette) numcolors_done = 1; + + color_tree_init(&tree); + + /*If the stats was already filled in from previous data, fill its palette in tree + and mark things as done already if we know they are the most expensive case already*/ + if(stats->alpha) alpha_done = 1; + if(stats->colored) colored_done = 1; + if(stats->bits == 16) numcolors_done = 1; + if(stats->bits >= bpp) bits_done = 1; + if(stats->numcolors >= maxnumcolors) numcolors_done = 1; + + if(!numcolors_done) { + for(i = 0; i < stats->numcolors; i++) { + const unsigned char* color = &stats->palette[i * 4]; + error = color_tree_add(&tree, color[0], color[1], color[2], color[3], i); + if(error) goto cleanup; + } + } + + /*Check if the 16-bit input is truly 16-bit*/ + if(mode_in->bitdepth == 16 && !sixteen) { + unsigned short r = 0, g = 0, b = 0, a = 0; + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + if((r & 255) != ((r >> 8) & 255) || (g & 255) != ((g >> 8) & 255) || + (b & 255) != ((b >> 8) & 255) || (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ { + stats->bits = 16; + sixteen = 1; + bits_done = 1; + numcolors_done = 1; /*counting colors no longer useful, palette doesn't support 16-bit*/ + break; + } + } + } + + if(sixteen) { + unsigned short r = 0, g = 0, b = 0, a = 0; + + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + + if(!colored_done && (r != g || r != b)) { + stats->colored = 1; + colored_done = 1; + } + + if(!alpha_done) { + unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); + if(a != 65535 && (a != 0 || (stats->key && !matchkey))) { + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + } else if(a == 0 && !stats->alpha && !stats->key) { + stats->key = 1; + stats->key_r = r; + stats->key_g = g; + stats->key_b = b; + } else if(a == 65535 && stats->key && matchkey) { + /* Color key cannot be used if an opaque pixel also has that RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + } + } + if(alpha_done && numcolors_done && colored_done && bits_done) break; + } + + if(stats->key && !stats->alpha) { + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { + /* Color key cannot be used if an opaque pixel also has that RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + } + } + } + } else /* < 16-bit */ { + unsigned char r = 0, g = 0, b = 0, a = 0; + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + + if(!bits_done && stats->bits < 8) { + /*only r is checked, < 8 bits is only relevant for grayscale*/ + unsigned bits = getValueRequiredBits(r); + if(bits > stats->bits) stats->bits = bits; + } + bits_done = (stats->bits >= bpp); + + if(!colored_done && (r != g || r != b)) { + stats->colored = 1; + colored_done = 1; + if(stats->bits < 8) stats->bits = 8; /*PNG has no colored modes with less than 8-bit per channel*/ + } + + if(!alpha_done) { + unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); + if(a != 255 && (a != 0 || (stats->key && !matchkey))) { + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + } else if(a == 0 && !stats->alpha && !stats->key) { + stats->key = 1; + stats->key_r = r; + stats->key_g = g; + stats->key_b = b; + } else if(a == 255 && stats->key && matchkey) { + /* Color key cannot be used if an opaque pixel also has that RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + } + } + + if(!numcolors_done) { + if(!color_tree_has(&tree, r, g, b, a)) { + error = color_tree_add(&tree, r, g, b, a, stats->numcolors); + if(error) goto cleanup; + if(stats->numcolors < 256) { + unsigned char* p = stats->palette; + unsigned n = stats->numcolors; + p[n * 4 + 0] = r; + p[n * 4 + 1] = g; + p[n * 4 + 2] = b; + p[n * 4 + 3] = a; + } + ++stats->numcolors; + numcolors_done = stats->numcolors >= maxnumcolors; + } + } + + if(alpha_done && numcolors_done && colored_done && bits_done) break; + } + + if(stats->key && !stats->alpha) { + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { + /* Color key cannot be used if an opaque pixel also has that RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + } + } + } + + /*make the stats's key always 16-bit for consistency - repeat each byte twice*/ + stats->key_r += (stats->key_r << 8); + stats->key_g += (stats->key_g << 8); + stats->key_b += (stats->key_b << 8); + } + +cleanup: + color_tree_cleanup(&tree); + return error; +} + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS +/*Adds a single color to the color stats. The stats must already have been inited. The color must be given as 16-bit +(with 2 bytes repeating for 8-bit and 65535 for opaque alpha channel). This function is expensive, do not call it for +all pixels of an image but only for a few additional values. */ +static unsigned lodepng_color_stats_add(LodePNGColorStats* stats, + unsigned r, unsigned g, unsigned b, unsigned a) { + unsigned error = 0; + unsigned char image[8]; + LodePNGColorMode mode; + lodepng_color_mode_init(&mode); + image[0] = r >> 8; image[1] = r; image[2] = g >> 8; image[3] = g; + image[4] = b >> 8; image[5] = b; image[6] = a >> 8; image[7] = a; + mode.bitdepth = 16; + mode.colortype = LCT_RGBA; + error = lodepng_compute_color_stats(stats, image, 1, 1, &mode); + lodepng_color_mode_cleanup(&mode); + return error; +} +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +/*Computes a minimal PNG color model that can contain all colors as indicated by the stats. +The stats should be computed with lodepng_compute_color_stats. +mode_in is raw color profile of the image the stats were computed on, to copy palette order from when relevant. +Minimal PNG color model means the color type and bit depth that gives smallest amount of bits in the output image, +e.g. gray if only grayscale pixels, palette if less than 256 colors, color key if only single transparent color, ... +This is used if auto_convert is enabled (it is by default). +*/ +static unsigned auto_choose_color(LodePNGColorMode* mode_out, + const LodePNGColorMode* mode_in, + const LodePNGColorStats* stats) { + unsigned error = 0; + unsigned palettebits; + size_t i, n; + size_t numpixels = stats->numpixels; + unsigned palette_ok, gray_ok; + + unsigned alpha = stats->alpha; + unsigned key = stats->key; + unsigned bits = stats->bits; + + mode_out->key_defined = 0; + + if(key && numpixels <= 16) { + alpha = 1; /*too few pixels to justify tRNS chunk overhead*/ + key = 0; + if(bits < 8) bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + } + + gray_ok = !stats->colored; + if(!stats->allow_greyscale) gray_ok = 0; + if(!gray_ok && bits < 8) bits = 8; + + n = stats->numcolors; + palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8)); + palette_ok = n <= 256 && bits <= 8 && n != 0; /*n==0 means likely numcolors wasn't computed*/ + if(numpixels < n * 2) palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/ + if(gray_ok && !alpha && bits <= palettebits) palette_ok = 0; /*gray is less overhead*/ + if(!stats->allow_palette) palette_ok = 0; + + if(palette_ok) { + const unsigned char* p = stats->palette; + lodepng_palette_clear(mode_out); /*remove potential earlier palette*/ + for(i = 0; i != stats->numcolors; ++i) { + error = lodepng_palette_add(mode_out, p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3]); + if(error) break; + } + + mode_out->colortype = LCT_PALETTE; + mode_out->bitdepth = palettebits; + + if(mode_in->colortype == LCT_PALETTE && mode_in->palettesize >= mode_out->palettesize + && mode_in->bitdepth == mode_out->bitdepth) { + /*If input should have same palette colors, keep original to preserve its order and prevent conversion*/ + lodepng_color_mode_cleanup(mode_out); + lodepng_color_mode_copy(mode_out, mode_in); + } + } else /*8-bit or 16-bit per channel*/ { + mode_out->bitdepth = bits; + mode_out->colortype = alpha ? (gray_ok ? LCT_GREY_ALPHA : LCT_RGBA) + : (gray_ok ? LCT_GREY : LCT_RGB); + if(key) { + unsigned mask = (1u << mode_out->bitdepth) - 1u; /*stats always uses 16-bit, mask converts it*/ + mode_out->key_r = stats->key_r & mask; + mode_out->key_g = stats->key_g & mask; + mode_out->key_b = stats->key_b & mask; + mode_out->key_defined = 1; + } + } + + return error; +} + +#endif /* #ifdef LODEPNG_COMPILE_ENCODER */ + +/* +Paeth predictor, used by PNG filter type 4 +The parameters are of type short, but should come from unsigned chars, the shorts +are only needed to make the paeth calculation correct. +*/ +static unsigned char paethPredictor(short a, short b, short c) { + short pa = LODEPNG_ABS(b - c); + short pb = LODEPNG_ABS(a - c); + short pc = LODEPNG_ABS(a + b - c - c); + /* return input value associated with smallest of pa, pb, pc (with certain priority if equal) */ + if(pb < pa) { a = b; pa = pb; } + return (pc < pa) ? c : a; +} + +/*shared values used by multiple Adam7 related functions*/ + +static const unsigned ADAM7_IX[7] = { 0, 4, 0, 2, 0, 1, 0 }; /*x start values*/ +static const unsigned ADAM7_IY[7] = { 0, 0, 4, 0, 2, 0, 1 }; /*y start values*/ +static const unsigned ADAM7_DX[7] = { 8, 8, 4, 4, 2, 2, 1 }; /*x delta values*/ +static const unsigned ADAM7_DY[7] = { 8, 8, 8, 4, 4, 2, 2 }; /*y delta values*/ + +/* +Outputs various dimensions and positions in the image related to the Adam7 reduced images. +passw: output containing the width of the 7 passes +passh: output containing the height of the 7 passes +filter_passstart: output containing the index of the start and end of each + reduced image with filter bytes +padded_passstart output containing the index of the start and end of each + reduced image when without filter bytes but with padded scanlines +passstart: output containing the index of the start and end of each reduced + image without padding between scanlines, but still padding between the images +w, h: width and height of non-interlaced image +bpp: bits per pixel +"padded" is only relevant if bpp is less than 8 and a scanline or image does not + end at a full byte +*/ +static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t filter_passstart[8], + size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) { + /*the passstart values have 8 values: the 8th one indicates the byte after the end of the 7th (= last) pass*/ + unsigned i; + + /*calculate width and height in pixels of each pass*/ + for(i = 0; i != 7; ++i) { + passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i]; + passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i]; + if(passw[i] == 0) passh[i] = 0; + if(passh[i] == 0) passw[i] = 0; + } + + filter_passstart[0] = padded_passstart[0] = passstart[0] = 0; + for(i = 0; i != 7; ++i) { + /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/ + filter_passstart[i + 1] = filter_passstart[i] + + ((passw[i] && passh[i]) ? passh[i] * (1u + (passw[i] * bpp + 7u) / 8u) : 0); + /*bits padded if needed to fill full byte at end of each scanline*/ + padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7u) / 8u); + /*only padded at end of reduced image*/ + passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7u) / 8u; + } +} + +#ifdef LODEPNG_COMPILE_DECODER + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / PNG Decoder / */ +/* ////////////////////////////////////////////////////////////////////////// */ + +/*read the information from the header and store it in the LodePNGInfo. return value is error*/ +unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state, + const unsigned char* in, size_t insize) { + unsigned width, height; + LodePNGInfo* info = &state->info_png; + if(insize == 0 || in == 0) { + CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/ + } + if(insize < 33) { + CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller than the length of a PNG header*/ + } + + /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/ + /* TODO: remove this. One should use a new LodePNGState for new sessions */ + lodepng_info_cleanup(info); + lodepng_info_init(info); + + if(in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 + || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) { + CERROR_RETURN_ERROR(state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/ + } + if(lodepng_chunk_length(in + 8) != 13) { + CERROR_RETURN_ERROR(state->error, 94); /*error: header size must be 13 bytes*/ + } + if(!lodepng_chunk_type_equals(in + 8, "IHDR")) { + CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/ + } + + /*read the values given in the header*/ + width = lodepng_read32bitInt(&in[16]); + height = lodepng_read32bitInt(&in[20]); + /*TODO: remove the undocumented feature that allows to give null pointers to width or height*/ + if(w) *w = width; + if(h) *h = height; + info->color.bitdepth = in[24]; + info->color.colortype = (LodePNGColorType)in[25]; + info->compression_method = in[26]; + info->filter_method = in[27]; + info->interlace_method = in[28]; + + /*errors returned only after the parsing so other values are still output*/ + + /*error: invalid image size*/ + if(width == 0 || height == 0) CERROR_RETURN_ERROR(state->error, 93); + /*error: invalid colortype or bitdepth combination*/ + state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); + if(state->error) return state->error; + /*error: only compression method 0 is allowed in the specification*/ + if(info->compression_method != 0) CERROR_RETURN_ERROR(state->error, 32); + /*error: only filter method 0 is allowed in the specification*/ + if(info->filter_method != 0) CERROR_RETURN_ERROR(state->error, 33); + /*error: only interlace methods 0 and 1 exist in the specification*/ + if(info->interlace_method > 1) CERROR_RETURN_ERROR(state->error, 34); + + if(!state->decoder.ignore_crc) { + unsigned CRC = lodepng_read32bitInt(&in[29]); + unsigned checksum = lodepng_crc32(&in[12], 17); + if(CRC != checksum) { + CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ + } + } + + return state->error; +} + +static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scanline, const unsigned char* precon, + size_t bytewidth, unsigned char filterType, size_t length) { + /* + For PNG filter method 0 + unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte, + the filter works byte per byte (bytewidth = 1) + precon is the previous unfiltered scanline, recon the result, scanline the current one + the incoming scanlines do NOT include the filtertype byte, that one is given in the parameter filterType instead + recon and scanline MAY be the same memory address! precon must be disjoint. + */ + + size_t i; + switch(filterType) { + case 0: + for(i = 0; i != length; ++i) recon[i] = scanline[i]; + break; + case 1: + for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; + for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + recon[i - bytewidth]; + break; + case 2: + if(precon) { + for(i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i]; + } else { + for(i = 0; i != length; ++i) recon[i] = scanline[i]; + } + break; + case 3: + if(precon) { + for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1u); + for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) >> 1u); + } else { + for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; + for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + (recon[i - bytewidth] >> 1u); + } + break; + case 4: + if(precon) { + for(i = 0; i != bytewidth; ++i) { + recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/ + } + + /* Unroll independent paths of the paeth predictor. A 6x and 8x version would also be possible but that + adds too much code. Whether this actually speeds anything up at all depends on compiler and settings. */ + if(bytewidth >= 4) { + for(; i + 3 < length; i += 4) { + size_t j = i - bytewidth; + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2], s3 = scanline[i + 3]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2], r3 = recon[j + 3]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2], p3 = precon[i + 3]; + unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2], q3 = precon[j + 3]; + recon[i + 0] = s0 + paethPredictor(r0, p0, q0); + recon[i + 1] = s1 + paethPredictor(r1, p1, q1); + recon[i + 2] = s2 + paethPredictor(r2, p2, q2); + recon[i + 3] = s3 + paethPredictor(r3, p3, q3); + } + } else if(bytewidth >= 3) { + for(; i + 2 < length; i += 3) { + size_t j = i - bytewidth; + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2]; + unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2]; + recon[i + 0] = s0 + paethPredictor(r0, p0, q0); + recon[i + 1] = s1 + paethPredictor(r1, p1, q1); + recon[i + 2] = s2 + paethPredictor(r2, p2, q2); + } + } else if(bytewidth >= 2) { + for(; i + 1 < length; i += 2) { + size_t j = i - bytewidth; + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1]; + unsigned char q0 = precon[j + 0], q1 = precon[j + 1]; + recon[i + 0] = s0 + paethPredictor(r0, p0, q0); + recon[i + 1] = s1 + paethPredictor(r1, p1, q1); + } + } + + for(; i != length; ++i) { + recon[i] = (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth])); + } + } else { + for(i = 0; i != bytewidth; ++i) { + recon[i] = scanline[i]; + } + for(i = bytewidth; i < length; ++i) { + /*paethPredictor(recon[i - bytewidth], 0, 0) is always recon[i - bytewidth]*/ + recon[i] = (scanline[i] + recon[i - bytewidth]); + } + } + break; + default: return 36; /*error: invalid filter type given*/ + } + return 0; +} + +static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { + /* + For PNG filter method 0 + this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 seven times) + out must have enough bytes allocated already, in must have the scanlines + 1 filtertype byte per scanline + w and h are image dimensions or dimensions of reduced image, bpp is bits per pixel + in and out are allowed to be the same memory address (but aren't the same size since in has the extra filter bytes) + */ + + unsigned y; + unsigned char* prevline = 0; + + /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ + size_t bytewidth = (bpp + 7u) / 8u; + /*the width of a scanline in bytes, not including the filter type*/ + size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; + + for(y = 0; y < h; ++y) { + size_t outindex = linebytes * y; + size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ + unsigned char filterType = in[inindex]; + + CERROR_TRY_RETURN(unfilterScanline(&out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes)); + + prevline = &out[outindex]; + } + + return 0; +} + +/* +in: Adam7 interlaced image, with no padding bits between scanlines, but between + reduced images so that each reduced image starts at a byte. +out: the same pixels, but re-ordered so that they're now a non-interlaced image with size w*h +bpp: bits per pixel +out has the following size in bits: w * h * bpp. +in is possibly bigger due to padding bits between reduced images. +out must be big enough AND must be 0 everywhere if bpp < 8 in the current implementation +(because that's likely a little bit faster) +NOTE: comments about padding bits are only relevant if bpp < 8 +*/ +static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { + unsigned passw[7], passh[7]; + size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned i; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + if(bpp >= 8) { + for(i = 0; i != 7; ++i) { + unsigned x, y, b; + size_t bytewidth = bpp / 8u; + for(y = 0; y < passh[i]; ++y) + for(x = 0; x < passw[i]; ++x) { + size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth; + size_t pixeloutstart = ((ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * (size_t)w + + ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bytewidth; + for(b = 0; b < bytewidth; ++b) { + out[pixeloutstart + b] = in[pixelinstart + b]; + } + } + } + } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { + for(i = 0; i != 7; ++i) { + unsigned x, y, b; + unsigned ilinebits = bpp * passw[i]; + unsigned olinebits = bpp * w; + size_t obp, ibp; /*bit pointers (for out and in buffer)*/ + for(y = 0; y < passh[i]; ++y) + for(x = 0; x < passw[i]; ++x) { + ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp); + obp = (ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bpp; + for(b = 0; b < bpp; ++b) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + } + } + } +} + +static void removePaddingBits(unsigned char* out, const unsigned char* in, + size_t olinebits, size_t ilinebits, unsigned h) { + /* + After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need + to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers + for the Adam7 code, the color convert code and the output to the user. + in and out are allowed to be the same buffer, in may also be higher but still overlapping; in must + have >= ilinebits*h bits, out must have >= olinebits*h bits, olinebits must be <= ilinebits + also used to move bits after earlier such operations happened, e.g. in a sequence of reduced images from Adam7 + only useful if (ilinebits - olinebits) is a value in the range 1..7 + */ + unsigned y; + size_t diff = ilinebits - olinebits; + size_t ibp = 0, obp = 0; /*input and output bit pointers*/ + for(y = 0; y < h; ++y) { + size_t x; + for(x = 0; x < olinebits; ++x) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + ibp += diff; + } +} + +/*out must be buffer big enough to contain full image, and in must contain the full decompressed data from +the IDAT chunks (with filter index bytes and possible padding bits) +return value is error*/ +static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, + unsigned w, unsigned h, const LodePNGInfo* info_png) { + /* + This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. + Steps: + *) if no Adam7: 1) unfilter 2) remove padding bits (= possible extra bits per scanline if bpp < 8) + *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace + NOTE: the in buffer will be overwritten with intermediate data! + */ + unsigned bpp = lodepng_get_bpp(&info_png->color); + if(bpp == 0) return 31; /*error: invalid colortype*/ + + if(info_png->interlace_method == 0) { + if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { + CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp)); + removePaddingBits(out, in, w * bpp, ((w * bpp + 7u) / 8u) * 8u, h); + } + /*we can immediately filter into the out buffer, no other steps needed*/ + else CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp)); + } else /*interlace_method is 1 (Adam7)*/ { + unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned i; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + for(i = 0; i != 7; ++i) { + CERROR_TRY_RETURN(unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp)); + /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline, + move bytes instead of bits or move not at all*/ + if(bpp < 8) { + /*remove padding bits in scanlines; after this there still may be padding + bits between the different reduced images: each reduced image still starts nicely at a byte*/ + removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp, + ((passw[i] * bpp + 7u) / 8u) * 8u, passh[i]); + } + } + + Adam7_deinterlace(out, in, w, h, bpp); + } + + return 0; +} + +static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { + unsigned pos = 0, i; + color->palettesize = chunkLength / 3u; + if(color->palettesize == 0 || color->palettesize > 256) return 38; /*error: palette too small or big*/ + lodepng_color_mode_alloc_palette(color); + if(!color->palette && color->palettesize) { + color->palettesize = 0; + return 83; /*alloc fail*/ + } + + for(i = 0; i != color->palettesize; ++i) { + color->palette[4 * i + 0] = data[pos++]; /*R*/ + color->palette[4 * i + 1] = data[pos++]; /*G*/ + color->palette[4 * i + 2] = data[pos++]; /*B*/ + color->palette[4 * i + 3] = 255; /*alpha*/ + } + + return 0; /* OK */ +} + +static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { + unsigned i; + if(color->colortype == LCT_PALETTE) { + /*error: more alpha values given than there are palette entries*/ + if(chunkLength > color->palettesize) return 39; + + for(i = 0; i != chunkLength; ++i) color->palette[4 * i + 3] = data[i]; + } else if(color->colortype == LCT_GREY) { + /*error: this chunk must be 2 bytes for grayscale image*/ + if(chunkLength != 2) return 30; + + color->key_defined = 1; + color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1]; + } else if(color->colortype == LCT_RGB) { + /*error: this chunk must be 6 bytes for RGB image*/ + if(chunkLength != 6) return 41; + + color->key_defined = 1; + color->key_r = 256u * data[0] + data[1]; + color->key_g = 256u * data[2] + data[3]; + color->key_b = 256u * data[4] + data[5]; + } + else return 42; /*error: tRNS chunk not allowed for other color models*/ + + return 0; /* OK */ +} + + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS +/*background color chunk (bKGD)*/ +static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(info->color.colortype == LCT_PALETTE) { + /*error: this chunk must be 1 byte for indexed color image*/ + if(chunkLength != 1) return 43; + + /*error: invalid palette index, or maybe this chunk appeared before PLTE*/ + if(data[0] >= info->color.palettesize) return 103; + + info->background_defined = 1; + info->background_r = info->background_g = info->background_b = data[0]; + } else if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { + /*error: this chunk must be 2 bytes for grayscale image*/ + if(chunkLength != 2) return 44; + + /*the values are truncated to bitdepth in the PNG file*/ + info->background_defined = 1; + info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1]; + } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { + /*error: this chunk must be 6 bytes for grayscale image*/ + if(chunkLength != 6) return 45; + + /*the values are truncated to bitdepth in the PNG file*/ + info->background_defined = 1; + info->background_r = 256u * data[0] + data[1]; + info->background_g = 256u * data[2] + data[3]; + info->background_b = 256u * data[4] + data[5]; + } + + return 0; /* OK */ +} + +/*text chunk (tEXt)*/ +static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + unsigned error = 0; + char *key = 0, *str = 0; + + while(!error) /*not really a while loop, only used to break on error*/ { + unsigned length, string2_begin; + + length = 0; + while(length < chunkLength && data[length] != 0) ++length; + /*even though it's not allowed by the standard, no error is thrown if + there's no null termination char, if the text is empty*/ + if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ + + key = (char*)lodepng_malloc(length + 1); + if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(key, data, length); + key[length] = 0; + + string2_begin = length + 1; /*skip keyword null terminator*/ + + length = (unsigned)(chunkLength < string2_begin ? 0 : chunkLength - string2_begin); + str = (char*)lodepng_malloc(length + 1); + if(!str) CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(str, data + string2_begin, length); + str[length] = 0; + + error = lodepng_add_text(info, key, str); + + break; + } + + lodepng_free(key); + lodepng_free(str); + + return error; +} + +/*compressed text chunk (zTXt)*/ +static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, + const unsigned char* data, size_t chunkLength) { + unsigned error = 0; + + /*copy the object to change parameters in it*/ + LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; + + unsigned length, string2_begin; + char *key = 0; + unsigned char* str = 0; + size_t size = 0; + + while(!error) /*not really a while loop, only used to break on error*/ { + for(length = 0; length < chunkLength && data[length] != 0; ++length) ; + if(length + 2 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ + if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ + + key = (char*)lodepng_malloc(length + 1); + if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(key, data, length); + key[length] = 0; + + if(data[length + 1] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ + + string2_begin = length + 2; + if(string2_begin > chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ + + length = (unsigned)chunkLength - string2_begin; + zlibsettings.max_output_size = decoder->max_text_size; + /*will fail if zlib error, e.g. if length is too small*/ + error = zlib_decompress(&str, &size, 0, &data[string2_begin], + length, &zlibsettings); + /*error: compressed text larger than decoder->max_text_size*/ + if(error && size > zlibsettings.max_output_size) error = 112; + if(error) break; + error = lodepng_add_text_sized(info, key, (char*)str, size); + break; + } + + lodepng_free(key); + lodepng_free(str); + + return error; +} + +/*international text chunk (iTXt)*/ +static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, + const unsigned char* data, size_t chunkLength) { + unsigned error = 0; + unsigned i; + + /*copy the object to change parameters in it*/ + LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; + + unsigned length, begin, compressed; + char *key = 0, *langtag = 0, *transkey = 0; + + while(!error) /*not really a while loop, only used to break on error*/ { + /*Quick check if the chunk length isn't too small. Even without check + it'd still fail with other error checks below if it's too short. This just gives a different error code.*/ + if(chunkLength < 5) CERROR_BREAK(error, 30); /*iTXt chunk too short*/ + + /*read the key*/ + for(length = 0; length < chunkLength && data[length] != 0; ++length) ; + if(length + 3 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination char, corrupt?*/ + if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ + + key = (char*)lodepng_malloc(length + 1); + if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(key, data, length); + key[length] = 0; + + /*read the compression method*/ + compressed = data[length + 1]; + if(data[length + 2] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ + + /*even though it's not allowed by the standard, no error is thrown if + there's no null termination char, if the text is empty for the next 3 texts*/ + + /*read the langtag*/ + begin = length + 3; + length = 0; + for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length; + + langtag = (char*)lodepng_malloc(length + 1); + if(!langtag) CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(langtag, data + begin, length); + langtag[length] = 0; + + /*read the transkey*/ + begin += length + 1; + length = 0; + for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length; + + transkey = (char*)lodepng_malloc(length + 1); + if(!transkey) CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(transkey, data + begin, length); + transkey[length] = 0; + + /*read the actual text*/ + begin += length + 1; + + length = (unsigned)chunkLength < begin ? 0 : (unsigned)chunkLength - begin; + + if(compressed) { + unsigned char* str = 0; + size_t size = 0; + zlibsettings.max_output_size = decoder->max_text_size; + /*will fail if zlib error, e.g. if length is too small*/ + error = zlib_decompress(&str, &size, 0, &data[begin], + length, &zlibsettings); + /*error: compressed text larger than decoder->max_text_size*/ + if(error && size > zlibsettings.max_output_size) error = 112; + if(!error) error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)str, size); + lodepng_free(str); + } else { + error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)(data + begin), length); + } + + break; + } + + lodepng_free(key); + lodepng_free(langtag); + lodepng_free(transkey); + + return error; +} + +static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 7) return 73; /*invalid tIME chunk size*/ + + info->time_defined = 1; + info->time.year = 256u * data[0] + data[1]; + info->time.month = data[2]; + info->time.day = data[3]; + info->time.hour = data[4]; + info->time.minute = data[5]; + info->time.second = data[6]; + + return 0; /* OK */ +} + +static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 9) return 74; /*invalid pHYs chunk size*/ + + info->phys_defined = 1; + info->phys_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; + info->phys_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7]; + info->phys_unit = data[8]; + + return 0; /* OK */ +} + +static unsigned readChunk_gAMA(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 4) return 96; /*invalid gAMA chunk size*/ + + info->gama_defined = 1; + info->gama_gamma = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; + + return 0; /* OK */ +} + +static unsigned readChunk_cHRM(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 32) return 97; /*invalid cHRM chunk size*/ + + info->chrm_defined = 1; + info->chrm_white_x = 16777216u * data[ 0] + 65536u * data[ 1] + 256u * data[ 2] + data[ 3]; + info->chrm_white_y = 16777216u * data[ 4] + 65536u * data[ 5] + 256u * data[ 6] + data[ 7]; + info->chrm_red_x = 16777216u * data[ 8] + 65536u * data[ 9] + 256u * data[10] + data[11]; + info->chrm_red_y = 16777216u * data[12] + 65536u * data[13] + 256u * data[14] + data[15]; + info->chrm_green_x = 16777216u * data[16] + 65536u * data[17] + 256u * data[18] + data[19]; + info->chrm_green_y = 16777216u * data[20] + 65536u * data[21] + 256u * data[22] + data[23]; + info->chrm_blue_x = 16777216u * data[24] + 65536u * data[25] + 256u * data[26] + data[27]; + info->chrm_blue_y = 16777216u * data[28] + 65536u * data[29] + 256u * data[30] + data[31]; + + return 0; /* OK */ +} + +static unsigned readChunk_sRGB(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 1) return 98; /*invalid sRGB chunk size (this one is never ignored)*/ + + info->srgb_defined = 1; + info->srgb_intent = data[0]; + + return 0; /* OK */ +} + +static unsigned readChunk_iCCP(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, + const unsigned char* data, size_t chunkLength) { + unsigned error = 0; + unsigned i; + size_t size = 0; + /*copy the object to change parameters in it*/ + LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; + + unsigned length, string2_begin; + + info->iccp_defined = 1; + if(info->iccp_name) lodepng_clear_icc(info); + + for(length = 0; length < chunkLength && data[length] != 0; ++length) ; + if(length + 2 >= chunkLength) return 75; /*no null termination, corrupt?*/ + if(length < 1 || length > 79) return 89; /*keyword too short or long*/ + + info->iccp_name = (char*)lodepng_malloc(length + 1); + if(!info->iccp_name) return 83; /*alloc fail*/ + + info->iccp_name[length] = 0; + for(i = 0; i != length; ++i) info->iccp_name[i] = (char)data[i]; + + if(data[length + 1] != 0) return 72; /*the 0 byte indicating compression must be 0*/ + + string2_begin = length + 2; + if(string2_begin > chunkLength) return 75; /*no null termination, corrupt?*/ + + length = (unsigned)chunkLength - string2_begin; + zlibsettings.max_output_size = decoder->max_icc_size; + error = zlib_decompress(&info->iccp_profile, &size, 0, + &data[string2_begin], + length, &zlibsettings); + /*error: ICC profile larger than decoder->max_icc_size*/ + if(error && size > zlibsettings.max_output_size) error = 113; + info->iccp_profile_size = size; + if(!error && !info->iccp_profile_size) error = 100; /*invalid ICC profile size*/ + return error; +} +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, + const unsigned char* in, size_t insize) { + const unsigned char* chunk = in + pos; + unsigned chunkLength; + const unsigned char* data; + unsigned unhandled = 0; + unsigned error = 0; + + if(pos + 4 > insize) return 30; + chunkLength = lodepng_chunk_length(chunk); + if(chunkLength > 2147483647) return 63; + data = lodepng_chunk_data_const(chunk); + if(data + chunkLength + 4 > in + insize) return 30; + + if(lodepng_chunk_type_equals(chunk, "PLTE")) { + error = readChunk_PLTE(&state->info_png.color, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { + error = readChunk_tRNS(&state->info_png.color, data, chunkLength); +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { + error = readChunk_bKGD(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { + error = readChunk_tEXt(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { + error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { + error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "tIME")) { + error = readChunk_tIME(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { + error = readChunk_pHYs(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { + error = readChunk_gAMA(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { + error = readChunk_cHRM(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { + error = readChunk_sRGB(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { + error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + } else { + /* unhandled chunk is ok (is not an error) */ + unhandled = 1; + } + + if(!error && !unhandled && !state->decoder.ignore_crc) { + if(lodepng_chunk_check_crc(chunk)) return 57; /*invalid CRC*/ + } + + return error; +} + +/*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/ +static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h, + LodePNGState* state, + const unsigned char* in, size_t insize) { + unsigned char IEND = 0; + const unsigned char* chunk; + unsigned char* idat; /*the data from idat chunks, zlib compressed*/ + size_t idatsize = 0; + unsigned char* scanlines = 0; + size_t scanlines_size = 0, expected_size = 0; + size_t outsize = 0; + + /*for unknown chunk order*/ + unsigned unknown = 0; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + + + /* safe output values in case error happens */ + *out = 0; + *w = *h = 0; + + state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/ + if(state->error) return; + + if(lodepng_pixel_overflow(*w, *h, &state->info_png.color, &state->info_raw)) { + CERROR_RETURN(state->error, 92); /*overflow possible due to amount of pixels*/ + } + + /*the input filesize is a safe upper bound for the sum of idat chunks size*/ + idat = (unsigned char*)lodepng_malloc(insize); + if(!idat) CERROR_RETURN(state->error, 83); /*alloc fail*/ + + chunk = &in[33]; /*first byte of the first chunk after the header*/ + + /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk. + IDAT data is put at the start of the in buffer*/ + while(!IEND && !state->error) { + unsigned chunkLength; + const unsigned char* data; /*the data in the chunk*/ + + /*error: size of the in buffer too small to contain next chunk*/ + if((size_t)((chunk - in) + 12) > insize || chunk < in) { + if(state->decoder.ignore_end) break; /*other errors may still happen though*/ + CERROR_BREAK(state->error, 30); + } + + /*length of the data of the chunk, excluding the length bytes, chunk type and CRC bytes*/ + chunkLength = lodepng_chunk_length(chunk); + /*error: chunk length larger than the max PNG chunk size*/ + if(chunkLength > 2147483647) { + if(state->decoder.ignore_end) break; /*other errors may still happen though*/ + CERROR_BREAK(state->error, 63); + } + + if((size_t)((chunk - in) + chunkLength + 12) > insize || (chunk + chunkLength + 12) < in) { + CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to contain next chunk*/ + } + + data = lodepng_chunk_data_const(chunk); + + unknown = 0; + + /*IDAT chunk, containing compressed image data*/ + if(lodepng_chunk_type_equals(chunk, "IDAT")) { + size_t newsize; + if(lodepng_addofl(idatsize, chunkLength, &newsize)) CERROR_BREAK(state->error, 95); + if(newsize > insize) CERROR_BREAK(state->error, 95); + lodepng_memcpy(idat + idatsize, data, chunkLength); + idatsize += chunkLength; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + critical_pos = 3; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + } else if(lodepng_chunk_type_equals(chunk, "IEND")) { + /*IEND chunk*/ + IEND = 1; + } else if(lodepng_chunk_type_equals(chunk, "PLTE")) { + /*palette chunk (PLTE)*/ + state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength); + if(state->error) break; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + critical_pos = 2; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { + /*palette transparency chunk (tRNS). Even though this one is an ancillary chunk , it is still compiled + in without 'LODEPNG_COMPILE_ANCILLARY_CHUNKS' because it contains essential color information that + affects the alpha channel of pixels. */ + state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength); + if(state->error) break; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*background color chunk (bKGD)*/ + } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { + state->error = readChunk_bKGD(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { + /*text chunk (tEXt)*/ + if(state->decoder.read_text_chunks) { + state->error = readChunk_tEXt(&state->info_png, data, chunkLength); + if(state->error) break; + } + } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { + /*compressed text chunk (zTXt)*/ + if(state->decoder.read_text_chunks) { + state->error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); + if(state->error) break; + } + } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { + /*international text chunk (iTXt)*/ + if(state->decoder.read_text_chunks) { + state->error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); + if(state->error) break; + } + } else if(lodepng_chunk_type_equals(chunk, "tIME")) { + state->error = readChunk_tIME(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { + state->error = readChunk_pHYs(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { + state->error = readChunk_gAMA(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { + state->error = readChunk_cHRM(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { + state->error = readChunk_sRGB(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { + state->error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); + if(state->error) break; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + } else /*it's not an implemented chunk type, so ignore it: skip over the data*/ { + /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/ + if(!state->decoder.ignore_critical && !lodepng_chunk_ancillary(chunk)) { + CERROR_BREAK(state->error, 69); + } + + unknown = 1; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + if(state->decoder.remember_unknown_chunks) { + state->error = lodepng_chunk_append(&state->info_png.unknown_chunks_data[critical_pos - 1], + &state->info_png.unknown_chunks_size[critical_pos - 1], chunk); + if(state->error) break; + } +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + } + + if(!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ { + if(lodepng_chunk_check_crc(chunk)) CERROR_BREAK(state->error, 57); /*invalid CRC*/ + } + + if(!IEND) chunk = lodepng_chunk_next_const(chunk, in + insize); + } + + if(!state->error && state->info_png.color.colortype == LCT_PALETTE && !state->info_png.color.palette) { + state->error = 106; /* error: PNG file must have PLTE chunk if color type is palette */ + } + + if(!state->error) { + /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation. + If the decompressed size does not match the prediction, the image must be corrupt.*/ + if(state->info_png.interlace_method == 0) { + size_t bpp = lodepng_get_bpp(&state->info_png.color); + expected_size = lodepng_get_raw_size_idat(*w, *h, bpp); + } else { + size_t bpp = lodepng_get_bpp(&state->info_png.color); + /*Adam-7 interlaced: expected size is the sum of the 7 sub-images sizes*/ + expected_size = 0; + expected_size += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, bpp); + if(*w > 4) expected_size += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, bpp); + if(*w > 2) expected_size += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, bpp); + if(*w > 1) expected_size += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, bpp); + } + + state->error = zlib_decompress(&scanlines, &scanlines_size, expected_size, idat, idatsize, &state->decoder.zlibsettings); + } + if(!state->error && scanlines_size != expected_size) state->error = 91; /*decompressed size doesn't match prediction*/ + lodepng_free(idat); + + if(!state->error) { + outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color); + *out = (unsigned char*)lodepng_malloc(outsize); + if(!*out) state->error = 83; /*alloc fail*/ + } + if(!state->error) { + lodepng_memset(*out, 0, outsize); + state->error = postProcessScanlines(*out, scanlines, *w, *h, &state->info_png); + } + lodepng_free(scanlines); +} + +unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, + LodePNGState* state, + const unsigned char* in, size_t insize) { + *out = 0; + decodeGeneric(out, w, h, state, in, insize); + if(state->error) return state->error; + if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) { + /*same color type, no copying or converting of data needed*/ + /*store the info_png color settings on the info_raw so that the info_raw still reflects what colortype + the raw image has to the end user*/ + if(!state->decoder.color_convert) { + state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color); + if(state->error) return state->error; + } + } else { /*color conversion needed*/ + unsigned char* data = *out; + size_t outsize; + + /*TODO: check if this works according to the statement in the documentation: "The converter can convert + from grayscale input color type, to 8-bit grayscale or grayscale with alpha"*/ + if(!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA) + && !(state->info_raw.bitdepth == 8)) { + return 56; /*unsupported color mode conversion*/ + } + + outsize = lodepng_get_raw_size(*w, *h, &state->info_raw); + *out = (unsigned char*)lodepng_malloc(outsize); + if(!(*out)) { + state->error = 83; /*alloc fail*/ + } + else state->error = lodepng_convert(*out, data, &state->info_raw, + &state->info_png.color, *w, *h); + lodepng_free(data); + } + return state->error; +} + +unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, + size_t insize, LodePNGColorType colortype, unsigned bitdepth) { + unsigned error; + LodePNGState state; + lodepng_state_init(&state); + state.info_raw.colortype = colortype; + state.info_raw.bitdepth = bitdepth; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*disable reading things that this function doesn't output*/ + state.decoder.read_text_chunks = 0; + state.decoder.remember_unknown_chunks = 0; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + error = lodepng_decode(out, w, h, &state, in, insize); + lodepng_state_cleanup(&state); + return error; +} + +unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { + return lodepng_decode_memory(out, w, h, in, insize, LCT_RGBA, 8); +} + +unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { + return lodepng_decode_memory(out, w, h, in, insize, LCT_RGB, 8); +} + +#ifdef LODEPNG_COMPILE_DISK +unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename, + LodePNGColorType colortype, unsigned bitdepth) { + unsigned char* buffer = 0; + size_t buffersize; + unsigned error; + /* safe output values in case error happens */ + *out = 0; + *w = *h = 0; + error = lodepng_load_file(&buffer, &buffersize, filename); + if(!error) error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth); + lodepng_free(buffer); + return error; +} + +unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { + return lodepng_decode_file(out, w, h, filename, LCT_RGBA, 8); +} + +unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { + return lodepng_decode_file(out, w, h, filename, LCT_RGB, 8); +} +#endif /*LODEPNG_COMPILE_DISK*/ + +void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) { + settings->color_convert = 1; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + settings->read_text_chunks = 1; + settings->remember_unknown_chunks = 0; + settings->max_text_size = 16777216; + settings->max_icc_size = 16777216; /* 16MB is much more than enough for any reasonable ICC profile */ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + settings->ignore_crc = 0; + settings->ignore_critical = 0; + settings->ignore_end = 0; + lodepng_decompress_settings_init(&settings->zlibsettings); +} + +#endif /*LODEPNG_COMPILE_DECODER*/ + +#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) + +void lodepng_state_init(LodePNGState* state) { +#ifdef LODEPNG_COMPILE_DECODER + lodepng_decoder_settings_init(&state->decoder); +#endif /*LODEPNG_COMPILE_DECODER*/ +#ifdef LODEPNG_COMPILE_ENCODER + lodepng_encoder_settings_init(&state->encoder); +#endif /*LODEPNG_COMPILE_ENCODER*/ + lodepng_color_mode_init(&state->info_raw); + lodepng_info_init(&state->info_png); + state->error = 1; +} + +void lodepng_state_cleanup(LodePNGState* state) { + lodepng_color_mode_cleanup(&state->info_raw); + lodepng_info_cleanup(&state->info_png); +} + +void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) { + lodepng_state_cleanup(dest); + *dest = *source; + lodepng_color_mode_init(&dest->info_raw); + lodepng_info_init(&dest->info_png); + dest->error = lodepng_color_mode_copy(&dest->info_raw, &source->info_raw); if(dest->error) return; + dest->error = lodepng_info_copy(&dest->info_png, &source->info_png); if(dest->error) return; +} + +#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ + +#ifdef LODEPNG_COMPILE_ENCODER + +/* ////////////////////////////////////////////////////////////////////////// */ +/* / PNG Encoder / */ +/* ////////////////////////////////////////////////////////////////////////// */ + + +static unsigned writeSignature(ucvector* out) { + size_t pos = out->size; + const unsigned char signature[] = {137, 80, 78, 71, 13, 10, 26, 10}; + /*8 bytes PNG signature, aka the magic bytes*/ + if(!ucvector_resize(out, out->size + 8)) return 83; /*alloc fail*/ + lodepng_memcpy(out->data + pos, signature, 8); + return 0; +} + +static unsigned addChunk_IHDR(ucvector* out, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth, unsigned interlace_method) { + unsigned char *chunk, *data; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 13, "IHDR")); + data = chunk + 8; + + lodepng_set32bitInt(data + 0, w); /*width*/ + lodepng_set32bitInt(data + 4, h); /*height*/ + data[8] = (unsigned char)bitdepth; /*bit depth*/ + data[9] = (unsigned char)colortype; /*color type*/ + data[10] = 0; /*compression method*/ + data[11] = 0; /*filter method*/ + data[12] = interlace_method; /*interlace method*/ + + lodepng_chunk_generate_crc(chunk); + return 0; +} + +/* only adds the chunk if needed (there is a key or palette with alpha) */ +static unsigned addChunk_PLTE(ucvector* out, const LodePNGColorMode* info) { + unsigned char* chunk; + size_t i, j = 8; + + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, info->palettesize * 3, "PLTE")); + + for(i = 0; i != info->palettesize; ++i) { + /*add all channels except alpha channel*/ + chunk[j++] = info->palette[i * 4 + 0]; + chunk[j++] = info->palette[i * 4 + 1]; + chunk[j++] = info->palette[i * 4 + 2]; + } + + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_tRNS(ucvector* out, const LodePNGColorMode* info) { + unsigned char* chunk = 0; + + if(info->colortype == LCT_PALETTE) { + size_t i, amount = info->palettesize; + /*the tail of palette values that all have 255 as alpha, does not have to be encoded*/ + for(i = info->palettesize; i != 0; --i) { + if(info->palette[4 * (i - 1) + 3] != 255) break; + --amount; + } + if(amount) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, amount, "tRNS")); + /*add the alpha channel values from the palette*/ + for(i = 0; i != amount; ++i) chunk[8 + i] = info->palette[4 * i + 3]; + } + } else if(info->colortype == LCT_GREY) { + if(info->key_defined) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "tRNS")); + chunk[8] = (unsigned char)(info->key_r >> 8); + chunk[9] = (unsigned char)(info->key_r & 255); + } + } else if(info->colortype == LCT_RGB) { + if(info->key_defined) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "tRNS")); + chunk[8] = (unsigned char)(info->key_r >> 8); + chunk[9] = (unsigned char)(info->key_r & 255); + chunk[10] = (unsigned char)(info->key_g >> 8); + chunk[11] = (unsigned char)(info->key_g & 255); + chunk[12] = (unsigned char)(info->key_b >> 8); + chunk[13] = (unsigned char)(info->key_b & 255); + } + } + + if(chunk) lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_IDAT(ucvector* out, const unsigned char* data, size_t datasize, + LodePNGCompressSettings* zlibsettings) { + unsigned error = 0; + unsigned char* zlib = 0; + size_t zlibsize = 0; + + error = zlib_compress(&zlib, &zlibsize, data, datasize, zlibsettings); + if(!error) { + error = lodepng_chunk_createv(out, zlibsize, "IDAT", zlib); + } + lodepng_free(zlib); + return error; +} + +static unsigned addChunk_IEND(ucvector* out) { + return lodepng_chunk_createv(out, 0, "IEND", 0); +} + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + +static unsigned addChunk_tEXt(ucvector* out, const char* keyword, const char* textstring) { + unsigned char* chunk = 0; + size_t keysize = lodepng_strlen(keyword), textsize = lodepng_strlen(textstring); + size_t size = keysize + 1 + textsize; + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, size, "tEXt")); + lodepng_memcpy(chunk + 8, keyword, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + lodepng_memcpy(chunk + 9 + keysize, textstring, textsize); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_zTXt(ucvector* out, const char* keyword, const char* textstring, + LodePNGCompressSettings* zlibsettings) { + unsigned error = 0; + unsigned char* chunk = 0; + unsigned char* compressed = 0; + size_t compressedsize = 0; + size_t textsize = lodepng_strlen(textstring); + size_t keysize = lodepng_strlen(keyword); + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ + + error = zlib_compress(&compressed, &compressedsize, + (const unsigned char*)textstring, textsize, zlibsettings); + if(!error) { + size_t size = keysize + 2 + compressedsize; + error = lodepng_chunk_init(&chunk, out, size, "zTXt"); + } + if(!error) { + lodepng_memcpy(chunk + 8, keyword, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + chunk[9 + keysize] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); + lodepng_chunk_generate_crc(chunk); + } + + lodepng_free(compressed); + return error; +} + +static unsigned addChunk_iTXt(ucvector* out, unsigned compress, const char* keyword, const char* langtag, + const char* transkey, const char* textstring, LodePNGCompressSettings* zlibsettings) { + unsigned error = 0; + unsigned char* chunk = 0; + unsigned char* compressed = 0; + size_t compressedsize = 0; + size_t textsize = lodepng_strlen(textstring); + size_t keysize = lodepng_strlen(keyword), langsize = lodepng_strlen(langtag), transsize = lodepng_strlen(transkey); + + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ + + if(compress) { + error = zlib_compress(&compressed, &compressedsize, + (const unsigned char*)textstring, textsize, zlibsettings); + } + if(!error) { + size_t size = keysize + 3 + langsize + 1 + transsize + 1 + (compress ? compressedsize : textsize); + error = lodepng_chunk_init(&chunk, out, size, "iTXt"); + } + if(!error) { + size_t pos = 8; + lodepng_memcpy(chunk + pos, keyword, keysize); + pos += keysize; + chunk[pos++] = 0; /*null termination char*/ + chunk[pos++] = (compress ? 1 : 0); /*compression flag*/ + chunk[pos++] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + pos, langtag, langsize); + pos += langsize; + chunk[pos++] = 0; /*null termination char*/ + lodepng_memcpy(chunk + pos, transkey, transsize); + pos += transsize; + chunk[pos++] = 0; /*null termination char*/ + if(compress) { + lodepng_memcpy(chunk + pos, compressed, compressedsize); + } else { + lodepng_memcpy(chunk + pos, textstring, textsize); + } + lodepng_chunk_generate_crc(chunk); + } + + lodepng_free(compressed); + return error; +} + +static unsigned addChunk_bKGD(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk = 0; + if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "bKGD")); + chunk[8] = (unsigned char)(info->background_r >> 8); + chunk[9] = (unsigned char)(info->background_r & 255); + } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "bKGD")); + chunk[8] = (unsigned char)(info->background_r >> 8); + chunk[9] = (unsigned char)(info->background_r & 255); + chunk[10] = (unsigned char)(info->background_g >> 8); + chunk[11] = (unsigned char)(info->background_g & 255); + chunk[12] = (unsigned char)(info->background_b >> 8); + chunk[13] = (unsigned char)(info->background_b & 255); + } else if(info->color.colortype == LCT_PALETTE) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "bKGD")); + chunk[8] = (unsigned char)(info->background_r & 255); /*palette index*/ + } + if(chunk) lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_tIME(ucvector* out, const LodePNGTime* time) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 7, "tIME")); + chunk[8] = (unsigned char)(time->year >> 8); + chunk[9] = (unsigned char)(time->year & 255); + chunk[10] = (unsigned char)time->month; + chunk[11] = (unsigned char)time->day; + chunk[12] = (unsigned char)time->hour; + chunk[13] = (unsigned char)time->minute; + chunk[14] = (unsigned char)time->second; + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_pHYs(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 9, "pHYs")); + lodepng_set32bitInt(chunk + 8, info->phys_x); + lodepng_set32bitInt(chunk + 12, info->phys_y); + chunk[16] = info->phys_unit; + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_gAMA(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "gAMA")); + lodepng_set32bitInt(chunk + 8, info->gama_gamma); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_cHRM(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 32, "cHRM")); + lodepng_set32bitInt(chunk + 8, info->chrm_white_x); + lodepng_set32bitInt(chunk + 12, info->chrm_white_y); + lodepng_set32bitInt(chunk + 16, info->chrm_red_x); + lodepng_set32bitInt(chunk + 20, info->chrm_red_y); + lodepng_set32bitInt(chunk + 24, info->chrm_green_x); + lodepng_set32bitInt(chunk + 28, info->chrm_green_y); + lodepng_set32bitInt(chunk + 32, info->chrm_blue_x); + lodepng_set32bitInt(chunk + 36, info->chrm_blue_y); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_sRGB(ucvector* out, const LodePNGInfo* info) { + unsigned char data = info->srgb_intent; + return lodepng_chunk_createv(out, 1, "sRGB", &data); +} + +static unsigned addChunk_iCCP(ucvector* out, const LodePNGInfo* info, LodePNGCompressSettings* zlibsettings) { + unsigned error = 0; + unsigned char* chunk = 0; + unsigned char* compressed = 0; + size_t compressedsize = 0; + size_t keysize = lodepng_strlen(info->iccp_name); + + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ + error = zlib_compress(&compressed, &compressedsize, + info->iccp_profile, info->iccp_profile_size, zlibsettings); + if(!error) { + size_t size = keysize + 2 + compressedsize; + error = lodepng_chunk_init(&chunk, out, size, "iCCP"); + } + if(!error) { + lodepng_memcpy(chunk + 8, info->iccp_name, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + chunk[9 + keysize] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); + lodepng_chunk_generate_crc(chunk); + } + + lodepng_free(compressed); + return error; +} + +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +static void filterScanline(unsigned char* out, const unsigned char* scanline, const unsigned char* prevline, + size_t length, size_t bytewidth, unsigned char filterType) { + size_t i; + switch(filterType) { + case 0: /*None*/ + for(i = 0; i != length; ++i) out[i] = scanline[i]; + break; + case 1: /*Sub*/ + for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; + for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - scanline[i - bytewidth]; + break; + case 2: /*Up*/ + if(prevline) { + for(i = 0; i != length; ++i) out[i] = scanline[i] - prevline[i]; + } else { + for(i = 0; i != length; ++i) out[i] = scanline[i]; + } + break; + case 3: /*Average*/ + if(prevline) { + for(i = 0; i != bytewidth; ++i) out[i] = scanline[i] - (prevline[i] >> 1); + for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - ((scanline[i - bytewidth] + prevline[i]) >> 1); + } else { + for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; + for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - (scanline[i - bytewidth] >> 1); + } + break; + case 4: /*Paeth*/ + if(prevline) { + /*paethPredictor(0, prevline[i], 0) is always prevline[i]*/ + for(i = 0; i != bytewidth; ++i) out[i] = (scanline[i] - prevline[i]); + for(i = bytewidth; i < length; ++i) { + out[i] = (scanline[i] - paethPredictor(scanline[i - bytewidth], prevline[i], prevline[i - bytewidth])); + } + } else { + for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; + /*paethPredictor(scanline[i - bytewidth], 0, 0) is always scanline[i - bytewidth]*/ + for(i = bytewidth; i < length; ++i) out[i] = (scanline[i] - scanline[i - bytewidth]); + } + break; + default: return; /*invalid filter type given*/ + } +} + +/* integer binary logarithm, max return value is 31 */ +static size_t ilog2(size_t i) { + size_t result = 0; + if(i >= 65536) { result += 16; i >>= 16; } + if(i >= 256) { result += 8; i >>= 8; } + if(i >= 16) { result += 4; i >>= 4; } + if(i >= 4) { result += 2; i >>= 2; } + if(i >= 2) { result += 1; /*i >>= 1;*/ } + return result; +} + +/* integer approximation for i * log2(i), helper function for LFS_ENTROPY */ +static size_t ilog2i(size_t i) { + size_t l; + if(i == 0) return 0; + l = ilog2(i); + /* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u) + linearly approximates the missing fractional part multiplied by i */ + return i * l + ((i - (1u << l)) << 1u); +} + +static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, + const LodePNGColorMode* color, const LodePNGEncoderSettings* settings) { + /* + For PNG filter method 0 + out must be a buffer with as size: h + (w * h * bpp + 7u) / 8u, because there are + the scanlines with 1 extra byte per scanline + */ + + unsigned bpp = lodepng_get_bpp(color); + /*the width of a scanline in bytes, not including the filter type*/ + size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; + + /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ + size_t bytewidth = (bpp + 7u) / 8u; + const unsigned char* prevline = 0; + unsigned x, y; + unsigned error = 0; + LodePNGFilterStrategy strategy = settings->filter_strategy; + + /* + There is a heuristic called the minimum sum of absolute differences heuristic, suggested by the PNG standard: + * If the image type is Palette, or the bit depth is smaller than 8, then do not filter the image (i.e. + use fixed filtering, with the filter None). + * (The other case) If the image type is Grayscale or RGB (with or without Alpha), and the bit depth is + not smaller than 8, then use adaptive filtering heuristic as follows: independently for each row, apply + all five filters and select the filter that produces the smallest sum of absolute values per row. + This heuristic is used if filter strategy is LFS_MINSUM and filter_palette_zero is true. + + If filter_palette_zero is true and filter_strategy is not LFS_MINSUM, the above heuristic is followed, + but for "the other case", whatever strategy filter_strategy is set to instead of the minimum sum + heuristic is used. + */ + if(settings->filter_palette_zero && + (color->colortype == LCT_PALETTE || color->bitdepth < 8)) strategy = LFS_ZERO; + + if(bpp == 0) return 31; /*error: invalid color type*/ + + if(strategy >= LFS_ZERO && strategy <= LFS_FOUR) { + unsigned char type = (unsigned char)strategy; + for(y = 0; y != h; ++y) { + size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ + size_t inindex = linebytes * y; + out[outindex] = type; /*filter type byte*/ + filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); + prevline = &in[inindex]; + } + } else if(strategy == LFS_MINSUM) { + /*adaptive filtering*/ + unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ + size_t smallest = 0; + unsigned char type, bestType = 0; + + for(type = 0; type != 5; ++type) { + attempt[type] = (unsigned char*)lodepng_malloc(linebytes); + if(!attempt[type]) error = 83; /*alloc fail*/ + } + + if(!error) { + for(y = 0; y != h; ++y) { + /*try the 5 filter types*/ + for(type = 0; type != 5; ++type) { + size_t sum = 0; + filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + + /*calculate the sum of the result*/ + if(type == 0) { + for(x = 0; x != linebytes; ++x) sum += (unsigned char)(attempt[type][x]); + } else { + for(x = 0; x != linebytes; ++x) { + /*For differences, each byte should be treated as signed, values above 127 are negative + (converted to signed char). Filtertype 0 isn't a difference though, so use unsigned there. + This means filtertype 0 is almost never chosen, but that is justified.*/ + unsigned char s = attempt[type][x]; + sum += s < 128 ? s : (255U - s); + } + } + + /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ + if(type == 0 || sum < smallest) { + bestType = type; + smallest = sum; + } + } + + prevline = &in[y * linebytes]; + + /*now fill the out values*/ + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ + for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; + } + } + + for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); + } else if(strategy == LFS_ENTROPY) { + unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ + size_t bestSum = 0; + unsigned type, bestType = 0; + unsigned count[256]; + + for(type = 0; type != 5; ++type) { + attempt[type] = (unsigned char*)lodepng_malloc(linebytes); + if(!attempt[type]) error = 83; /*alloc fail*/ + } + + if(!error) { + for(y = 0; y != h; ++y) { + /*try the 5 filter types*/ + for(type = 0; type != 5; ++type) { + size_t sum = 0; + filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + lodepng_memset(count, 0, 256 * sizeof(*count)); + for(x = 0; x != linebytes; ++x) ++count[attempt[type][x]]; + ++count[type]; /*the filter type itself is part of the scanline*/ + for(x = 0; x != 256; ++x) { + sum += ilog2i(count[x]); + } + /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ + if(type == 0 || sum > bestSum) { + bestType = type; + bestSum = sum; + } + } + + prevline = &in[y * linebytes]; + + /*now fill the out values*/ + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ + for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; + } + } + + for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); + } else if(strategy == LFS_PREDEFINED) { + for(y = 0; y != h; ++y) { + size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ + size_t inindex = linebytes * y; + unsigned char type = settings->predefined_filters[y]; + out[outindex] = type; /*filter type byte*/ + filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); + prevline = &in[inindex]; + } + } else if(strategy == LFS_BRUTE_FORCE) { + /*brute force filter chooser. + deflate the scanline after every filter attempt to see which one deflates best. + This is very slow and gives only slightly smaller, sometimes even larger, result*/ + size_t size[5]; + unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ + size_t smallest = 0; + unsigned type = 0, bestType = 0; + unsigned char* dummy; + LodePNGCompressSettings zlibsettings; + lodepng_memcpy(&zlibsettings, &settings->zlibsettings, sizeof(LodePNGCompressSettings)); + /*use fixed tree on the attempts so that the tree is not adapted to the filtertype on purpose, + to simulate the true case where the tree is the same for the whole image. Sometimes it gives + better result with dynamic tree anyway. Using the fixed tree sometimes gives worse, but in rare + cases better compression. It does make this a bit less slow, so it's worth doing this.*/ + zlibsettings.btype = 1; + /*a custom encoder likely doesn't read the btype setting and is optimized for complete PNG + images only, so disable it*/ + zlibsettings.custom_zlib = 0; + zlibsettings.custom_deflate = 0; + for(type = 0; type != 5; ++type) { + attempt[type] = (unsigned char*)lodepng_malloc(linebytes); + if(!attempt[type]) error = 83; /*alloc fail*/ + } + if(!error) { + for(y = 0; y != h; ++y) /*try the 5 filter types*/ { + for(type = 0; type != 5; ++type) { + unsigned testsize = (unsigned)linebytes; + /*if(testsize > 8) testsize /= 8;*/ /*it already works good enough by testing a part of the row*/ + + filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + size[type] = 0; + dummy = 0; + zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings); + lodepng_free(dummy); + /*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/ + if(type == 0 || size[type] < smallest) { + bestType = type; + smallest = size[type]; + } + } + prevline = &in[y * linebytes]; + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ + for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; + } + } + for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); + } + else return 88; /* unknown filter strategy */ + + return error; +} + +static void addPaddingBits(unsigned char* out, const unsigned char* in, + size_t olinebits, size_t ilinebits, unsigned h) { + /*The opposite of the removePaddingBits function + olinebits must be >= ilinebits*/ + unsigned y; + size_t diff = olinebits - ilinebits; + size_t obp = 0, ibp = 0; /*bit pointers*/ + for(y = 0; y != h; ++y) { + size_t x; + for(x = 0; x < ilinebits; ++x) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + /*obp += diff; --> no, fill in some value in the padding bits too, to avoid + "Use of uninitialised value of size ###" warning from valgrind*/ + for(x = 0; x != diff; ++x) setBitOfReversedStream(&obp, out, 0); + } +} + +/* +in: non-interlaced image with size w*h +out: the same pixels, but re-ordered according to PNG's Adam7 interlacing, with + no padding bits between scanlines, but between reduced images so that each + reduced image starts at a byte. +bpp: bits per pixel +there are no padding bits, not between scanlines, not between reduced images +in has the following size in bits: w * h * bpp. +out is possibly bigger due to padding bits between reduced images +NOTE: comments about padding bits are only relevant if bpp < 8 +*/ +static void Adam7_interlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { + unsigned passw[7], passh[7]; + size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned i; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + if(bpp >= 8) { + for(i = 0; i != 7; ++i) { + unsigned x, y, b; + size_t bytewidth = bpp / 8u; + for(y = 0; y < passh[i]; ++y) + for(x = 0; x < passw[i]; ++x) { + size_t pixelinstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; + size_t pixeloutstart = passstart[i] + (y * passw[i] + x) * bytewidth; + for(b = 0; b < bytewidth; ++b) { + out[pixeloutstart + b] = in[pixelinstart + b]; + } + } + } + } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { + for(i = 0; i != 7; ++i) { + unsigned x, y, b; + unsigned ilinebits = bpp * passw[i]; + unsigned olinebits = bpp * w; + size_t obp, ibp; /*bit pointers (for out and in buffer)*/ + for(y = 0; y < passh[i]; ++y) + for(x = 0; x < passw[i]; ++x) { + ibp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; + obp = (8 * passstart[i]) + (y * ilinebits + x * bpp); + for(b = 0; b < bpp; ++b) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + } + } + } +} + +/*out must be buffer big enough to contain uncompressed IDAT chunk data, and in must contain the full image. +return value is error**/ +static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const unsigned char* in, + unsigned w, unsigned h, + const LodePNGInfo* info_png, const LodePNGEncoderSettings* settings) { + /* + This function converts the pure 2D image with the PNG's colortype, into filtered-padded-interlaced data. Steps: + *) if no Adam7: 1) add padding bits (= possible extra bits per scanline if bpp < 8) 2) filter + *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter + */ + unsigned bpp = lodepng_get_bpp(&info_png->color); + unsigned error = 0; + + if(info_png->interlace_method == 0) { + *outsize = h + (h * ((w * bpp + 7u) / 8u)); /*image size plus an extra byte per scanline + possible padding bits*/ + *out = (unsigned char*)lodepng_malloc(*outsize); + if(!(*out) && (*outsize)) error = 83; /*alloc fail*/ + + if(!error) { + /*non multiple of 8 bits per scanline, padding bits needed per scanline*/ + if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { + unsigned char* padded = (unsigned char*)lodepng_malloc(h * ((w * bpp + 7u) / 8u)); + if(!padded) error = 83; /*alloc fail*/ + if(!error) { + addPaddingBits(padded, in, ((w * bpp + 7u) / 8u) * 8u, w * bpp, h); + error = filter(*out, padded, w, h, &info_png->color, settings); + } + lodepng_free(padded); + } else { + /*we can immediately filter into the out buffer, no other steps needed*/ + error = filter(*out, in, w, h, &info_png->color, settings); + } + } + } else /*interlace_method is 1 (Adam7)*/ { + unsigned passw[7], passh[7]; + size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned char* adam7; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + *outsize = filter_passstart[7]; /*image size plus an extra byte per scanline + possible padding bits*/ + *out = (unsigned char*)lodepng_malloc(*outsize); + if(!(*out)) error = 83; /*alloc fail*/ + + adam7 = (unsigned char*)lodepng_malloc(passstart[7]); + if(!adam7 && passstart[7]) error = 83; /*alloc fail*/ + + if(!error) { + unsigned i; + + Adam7_interlace(adam7, in, w, h, bpp); + for(i = 0; i != 7; ++i) { + if(bpp < 8) { + unsigned char* padded = (unsigned char*)lodepng_malloc(padded_passstart[i + 1] - padded_passstart[i]); + if(!padded) ERROR_BREAK(83); /*alloc fail*/ + addPaddingBits(padded, &adam7[passstart[i]], + ((passw[i] * bpp + 7u) / 8u) * 8u, passw[i] * bpp, passh[i]); + error = filter(&(*out)[filter_passstart[i]], padded, + passw[i], passh[i], &info_png->color, settings); + lodepng_free(padded); + } else { + error = filter(&(*out)[filter_passstart[i]], &adam7[padded_passstart[i]], + passw[i], passh[i], &info_png->color, settings); + } + + if(error) break; + } + } + + lodepng_free(adam7); + } + + return error; +} + +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS +static unsigned addUnknownChunks(ucvector* out, unsigned char* data, size_t datasize) { + unsigned char* inchunk = data; + while((size_t)(inchunk - data) < datasize) { + CERROR_TRY_RETURN(lodepng_chunk_append(&out->data, &out->size, inchunk)); + out->allocsize = out->size; /*fix the allocsize again*/ + inchunk = lodepng_chunk_next(inchunk, data + datasize); + } + return 0; +} + +static unsigned isGrayICCProfile(const unsigned char* profile, unsigned size) { + /* + It is a gray profile if bytes 16-19 are "GRAY", rgb profile if bytes 16-19 + are "RGB ". We do not perform any full parsing of the ICC profile here, other + than check those 4 bytes to grayscale profile. Other than that, validity of + the profile is not checked. This is needed only because the PNG specification + requires using a non-gray color model if there is an ICC profile with "RGB " + (sadly limiting compression opportunities if the input data is grayscale RGB + data), and requires using a gray color model if it is "GRAY". + */ + if(size < 20) return 0; + return profile[16] == 'G' && profile[17] == 'R' && profile[18] == 'A' && profile[19] == 'Y'; +} + +static unsigned isRGBICCProfile(const unsigned char* profile, unsigned size) { + /* See comment in isGrayICCProfile*/ + if(size < 20) return 0; + return profile[16] == 'R' && profile[17] == 'G' && profile[18] == 'B' && profile[19] == ' '; +} +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +unsigned lodepng_encode(unsigned char** out, size_t* outsize, + const unsigned char* image, unsigned w, unsigned h, + LodePNGState* state) { + unsigned char* data = 0; /*uncompressed version of the IDAT chunk data*/ + size_t datasize = 0; + ucvector outv = ucvector_init(NULL, 0); + LodePNGInfo info; + const LodePNGInfo* info_png = &state->info_png; + + lodepng_info_init(&info); + + /*provide some proper output values if error will happen*/ + *out = 0; + *outsize = 0; + state->error = 0; + + /*check input values validity*/ + if((info_png->color.colortype == LCT_PALETTE || state->encoder.force_palette) + && (info_png->color.palettesize == 0 || info_png->color.palettesize > 256)) { + state->error = 68; /*invalid palette size, it is only allowed to be 1-256*/ + goto cleanup; + } + if(state->encoder.zlibsettings.btype > 2) { + state->error = 61; /*error: invalid btype*/ + goto cleanup; + } + if(info_png->interlace_method > 1) { + state->error = 71; /*error: invalid interlace mode*/ + goto cleanup; + } + state->error = checkColorValidity(info_png->color.colortype, info_png->color.bitdepth); + if(state->error) goto cleanup; /*error: invalid color type given*/ + state->error = checkColorValidity(state->info_raw.colortype, state->info_raw.bitdepth); + if(state->error) goto cleanup; /*error: invalid color type given*/ + + /* color convert and compute scanline filter types */ + lodepng_info_copy(&info, &state->info_png); + if(state->encoder.auto_convert) { + LodePNGColorStats stats; + lodepng_color_stats_init(&stats); +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + if(info_png->iccp_defined && + isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { + /*the PNG specification does not allow to use palette with a GRAY ICC profile, even + if the palette has only gray colors, so disallow it.*/ + stats.allow_palette = 0; + } + if(info_png->iccp_defined && + isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { + /*the PNG specification does not allow to use grayscale color with RGB ICC profile, so disallow gray.*/ + stats.allow_greyscale = 0; + } +#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ + state->error = lodepng_compute_color_stats(&stats, image, w, h, &state->info_raw); + if(state->error) goto cleanup; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + if(info_png->background_defined) { + /*the background chunk's color must be taken into account as well*/ + unsigned r = 0, g = 0, b = 0; + LodePNGColorMode mode16 = lodepng_color_mode_make(LCT_RGB, 16); + lodepng_convert_rgb(&r, &g, &b, info_png->background_r, info_png->background_g, info_png->background_b, &mode16, &info_png->color); + state->error = lodepng_color_stats_add(&stats, r, g, b, 65535); + if(state->error) goto cleanup; + } +#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ + state->error = auto_choose_color(&info.color, &state->info_raw, &stats); + if(state->error) goto cleanup; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*also convert the background chunk*/ + if(info_png->background_defined) { + if(lodepng_convert_rgb(&info.background_r, &info.background_g, &info.background_b, + info_png->background_r, info_png->background_g, info_png->background_b, &info.color, &info_png->color)) { + state->error = 104; + goto cleanup; + } + } +#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ + } +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + if(info_png->iccp_defined) { + unsigned gray_icc = isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); + unsigned rgb_icc = isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); + unsigned gray_png = info.color.colortype == LCT_GREY || info.color.colortype == LCT_GREY_ALPHA; + if(!gray_icc && !rgb_icc) { + state->error = 100; /* Disallowed profile color type for PNG */ + goto cleanup; + } + if(gray_icc != gray_png) { + /*Not allowed to use RGB/RGBA/palette with GRAY ICC profile or vice versa, + or in case of auto_convert, it wasn't possible to find appropriate model*/ + state->error = state->encoder.auto_convert ? 102 : 101; + goto cleanup; + } + } +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + if(!lodepng_color_mode_equal(&state->info_raw, &info.color)) { + unsigned char* converted; + size_t size = ((size_t)w * (size_t)h * (size_t)lodepng_get_bpp(&info.color) + 7u) / 8u; + + converted = (unsigned char*)lodepng_malloc(size); + if(!converted && size) state->error = 83; /*alloc fail*/ + if(!state->error) { + state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h); + } + if(!state->error) { + state->error = preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder); + } + lodepng_free(converted); + if(state->error) goto cleanup; + } else { + state->error = preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder); + if(state->error) goto cleanup; + } + + /* output all PNG chunks */ { +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + size_t i; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + /*write signature and chunks*/ + state->error = writeSignature(&outv); + if(state->error) goto cleanup; + /*IHDR*/ + state->error = addChunk_IHDR(&outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method); + if(state->error) goto cleanup; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*unknown chunks between IHDR and PLTE*/ + if(info.unknown_chunks_data[0]) { + state->error = addUnknownChunks(&outv, info.unknown_chunks_data[0], info.unknown_chunks_size[0]); + if(state->error) goto cleanup; + } + /*color profile chunks must come before PLTE */ + if(info.iccp_defined) { + state->error = addChunk_iCCP(&outv, &info, &state->encoder.zlibsettings); + if(state->error) goto cleanup; + } + if(info.srgb_defined) { + state->error = addChunk_sRGB(&outv, &info); + if(state->error) goto cleanup; + } + if(info.gama_defined) { + state->error = addChunk_gAMA(&outv, &info); + if(state->error) goto cleanup; + } + if(info.chrm_defined) { + state->error = addChunk_cHRM(&outv, &info); + if(state->error) goto cleanup; + } +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + /*PLTE*/ + if(info.color.colortype == LCT_PALETTE) { + state->error = addChunk_PLTE(&outv, &info.color); + if(state->error) goto cleanup; + } + if(state->encoder.force_palette && (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) { + /*force_palette means: write suggested palette for truecolor in PLTE chunk*/ + state->error = addChunk_PLTE(&outv, &info.color); + if(state->error) goto cleanup; + } + /*tRNS (this will only add if when necessary) */ + state->error = addChunk_tRNS(&outv, &info.color); + if(state->error) goto cleanup; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*bKGD (must come between PLTE and the IDAt chunks*/ + if(info.background_defined) { + state->error = addChunk_bKGD(&outv, &info); + if(state->error) goto cleanup; + } + /*pHYs (must come before the IDAT chunks)*/ + if(info.phys_defined) { + state->error = addChunk_pHYs(&outv, &info); + if(state->error) goto cleanup; + } + + /*unknown chunks between PLTE and IDAT*/ + if(info.unknown_chunks_data[1]) { + state->error = addUnknownChunks(&outv, info.unknown_chunks_data[1], info.unknown_chunks_size[1]); + if(state->error) goto cleanup; + } +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + /*IDAT (multiple IDAT chunks must be consecutive)*/ + state->error = addChunk_IDAT(&outv, data, datasize, &state->encoder.zlibsettings); + if(state->error) goto cleanup; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*tIME*/ + if(info.time_defined) { + state->error = addChunk_tIME(&outv, &info.time); + if(state->error) goto cleanup; + } + /*tEXt and/or zTXt*/ + for(i = 0; i != info.text_num; ++i) { + if(lodepng_strlen(info.text_keys[i]) > 79) { + state->error = 66; /*text chunk too large*/ + goto cleanup; + } + if(lodepng_strlen(info.text_keys[i]) < 1) { + state->error = 67; /*text chunk too small*/ + goto cleanup; + } + if(state->encoder.text_compression) { + state->error = addChunk_zTXt(&outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings); + if(state->error) goto cleanup; + } else { + state->error = addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]); + if(state->error) goto cleanup; + } + } + /*LodePNG version id in text chunk*/ + if(state->encoder.add_id) { + unsigned already_added_id_text = 0; + for(i = 0; i != info.text_num; ++i) { + const char* k = info.text_keys[i]; + /* Could use strcmp, but we're not calling or reimplementing this C library function for this use only */ + if(k[0] == 'L' && k[1] == 'o' && k[2] == 'd' && k[3] == 'e' && + k[4] == 'P' && k[5] == 'N' && k[6] == 'G' && k[7] == '\0') { + already_added_id_text = 1; + break; + } + } + if(already_added_id_text == 0) { + state->error = addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt than as zTXt chunk*/ + if(state->error) goto cleanup; + } + } + /*iTXt*/ + for(i = 0; i != info.itext_num; ++i) { + if(lodepng_strlen(info.itext_keys[i]) > 79) { + state->error = 66; /*text chunk too large*/ + goto cleanup; + } + if(lodepng_strlen(info.itext_keys[i]) < 1) { + state->error = 67; /*text chunk too small*/ + goto cleanup; + } + state->error = addChunk_iTXt( + &outv, state->encoder.text_compression, + info.itext_keys[i], info.itext_langtags[i], info.itext_transkeys[i], info.itext_strings[i], + &state->encoder.zlibsettings); + if(state->error) goto cleanup; + } + + /*unknown chunks between IDAT and IEND*/ + if(info.unknown_chunks_data[2]) { + state->error = addUnknownChunks(&outv, info.unknown_chunks_data[2], info.unknown_chunks_size[2]); + if(state->error) goto cleanup; + } +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + state->error = addChunk_IEND(&outv); + if(state->error) goto cleanup; + } + +cleanup: + lodepng_info_cleanup(&info); + lodepng_free(data); + + /*instead of cleaning the vector up, give it to the output*/ + *out = outv.data; + *outsize = outv.size; + + return state->error; +} + +unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, const unsigned char* image, + unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + unsigned error; + LodePNGState state; + lodepng_state_init(&state); + state.info_raw.colortype = colortype; + state.info_raw.bitdepth = bitdepth; + state.info_png.color.colortype = colortype; + state.info_png.color.bitdepth = bitdepth; + lodepng_encode(out, outsize, image, w, h, &state); + error = state.error; + lodepng_state_cleanup(&state); + return error; +} + +unsigned lodepng_encode32(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { + return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGBA, 8); +} + +unsigned lodepng_encode24(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { + return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGB, 8); +} + +#ifdef LODEPNG_COMPILE_DISK +unsigned lodepng_encode_file(const char* filename, const unsigned char* image, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth) { + unsigned char* buffer; + size_t buffersize; + unsigned error = lodepng_encode_memory(&buffer, &buffersize, image, w, h, colortype, bitdepth); + if(!error) error = lodepng_save_file(buffer, buffersize, filename); + lodepng_free(buffer); + return error; +} + +unsigned lodepng_encode32_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { + return lodepng_encode_file(filename, image, w, h, LCT_RGBA, 8); +} + +unsigned lodepng_encode24_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { + return lodepng_encode_file(filename, image, w, h, LCT_RGB, 8); +} +#endif /*LODEPNG_COMPILE_DISK*/ + +void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) { + lodepng_compress_settings_init(&settings->zlibsettings); + settings->filter_palette_zero = 1; + settings->filter_strategy = LFS_MINSUM; + settings->auto_convert = 1; + settings->force_palette = 0; + settings->predefined_filters = 0; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + settings->add_id = 0; + settings->text_compression = 1; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +} + +#endif /*LODEPNG_COMPILE_ENCODER*/ +#endif /*LODEPNG_COMPILE_PNG*/ + +#ifdef LODEPNG_COMPILE_ERROR_TEXT +/* +This returns the description of a numerical error code in English. This is also +the documentation of all the error codes. +*/ +const char* lodepng_error_text(unsigned code) { + switch(code) { + case 0: return "no error, everything went ok"; + case 1: return "nothing done yet"; /*the Encoder/Decoder has done nothing yet, error checking makes no sense yet*/ + case 10: return "end of input memory reached without huffman end code"; /*while huffman decoding*/ + case 11: return "error in code tree made it jump outside of huffman tree"; /*while huffman decoding*/ + case 13: return "problem while processing dynamic deflate block"; + case 14: return "problem while processing dynamic deflate block"; + case 15: return "problem while processing dynamic deflate block"; + /*this error could happen if there are only 0 or 1 symbols present in the huffman code:*/ + case 16: return "invalid code while processing dynamic deflate block"; + case 17: return "end of out buffer memory reached while inflating"; + case 18: return "invalid distance code while inflating"; + case 19: return "end of out buffer memory reached while inflating"; + case 20: return "invalid deflate block BTYPE encountered while decoding"; + case 21: return "NLEN is not ones complement of LEN in a deflate block"; + + /*end of out buffer memory reached while inflating: + This can happen if the inflated deflate data is longer than the amount of bytes required to fill up + all the pixels of the image, given the color depth and image dimensions. Something that doesn't + happen in a normal, well encoded, PNG image.*/ + case 22: return "end of out buffer memory reached while inflating"; + case 23: return "end of in buffer memory reached while inflating"; + case 24: return "invalid FCHECK in zlib header"; + case 25: return "invalid compression method in zlib header"; + case 26: return "FDICT encountered in zlib header while it's not used for PNG"; + case 27: return "PNG file is smaller than a PNG header"; + /*Checks the magic file header, the first 8 bytes of the PNG file*/ + case 28: return "incorrect PNG signature, it's no PNG or corrupted"; + case 29: return "first chunk is not the header chunk"; + case 30: return "chunk length too large, chunk broken off at end of file"; + case 31: return "illegal PNG color type or bpp"; + case 32: return "illegal PNG compression method"; + case 33: return "illegal PNG filter method"; + case 34: return "illegal PNG interlace method"; + case 35: return "chunk length of a chunk is too large or the chunk too small"; + case 36: return "illegal PNG filter type encountered"; + case 37: return "illegal bit depth for this color type given"; + case 38: return "the palette is too small or too big"; /*0, or more than 256 colors*/ + case 39: return "tRNS chunk before PLTE or has more entries than palette size"; + case 40: return "tRNS chunk has wrong size for grayscale image"; + case 41: return "tRNS chunk has wrong size for RGB image"; + case 42: return "tRNS chunk appeared while it was not allowed for this color type"; + case 43: return "bKGD chunk has wrong size for palette image"; + case 44: return "bKGD chunk has wrong size for grayscale image"; + case 45: return "bKGD chunk has wrong size for RGB image"; + case 48: return "empty input buffer given to decoder. Maybe caused by non-existing file?"; + case 49: return "jumped past memory while generating dynamic huffman tree"; + case 50: return "jumped past memory while generating dynamic huffman tree"; + case 51: return "jumped past memory while inflating huffman block"; + case 52: return "jumped past memory while inflating"; + case 53: return "size of zlib data too small"; + case 54: return "repeat symbol in tree while there was no value symbol yet"; + /*jumped past tree while generating huffman tree, this could be when the + tree will have more leaves than symbols after generating it out of the + given lengths. They call this an oversubscribed dynamic bit lengths tree in zlib.*/ + case 55: return "jumped past tree while generating huffman tree"; + case 56: return "given output image colortype or bitdepth not supported for color conversion"; + case 57: return "invalid CRC encountered (checking CRC can be disabled)"; + case 58: return "invalid ADLER32 encountered (checking ADLER32 can be disabled)"; + case 59: return "requested color conversion not supported"; + case 60: return "invalid window size given in the settings of the encoder (must be 0-32768)"; + case 61: return "invalid BTYPE given in the settings of the encoder (only 0, 1 and 2 are allowed)"; + /*LodePNG leaves the choice of RGB to grayscale conversion formula to the user.*/ + case 62: return "conversion from color to grayscale not supported"; + /*(2^31-1)*/ + case 63: return "length of a chunk too long, max allowed for PNG is 2147483647 bytes per chunk"; + /*this would result in the inability of a deflated block to ever contain an end code. It must be at least 1.*/ + case 64: return "the length of the END symbol 256 in the Huffman tree is 0"; + case 66: return "the length of a text chunk keyword given to the encoder is longer than the maximum of 79 bytes"; + case 67: return "the length of a text chunk keyword given to the encoder is smaller than the minimum of 1 byte"; + case 68: return "tried to encode a PLTE chunk with a palette that has less than 1 or more than 256 colors"; + case 69: return "unknown chunk type with 'critical' flag encountered by the decoder"; + case 71: return "invalid interlace mode given to encoder (must be 0 or 1)"; + case 72: return "while decoding, invalid compression method encountering in zTXt or iTXt chunk (it must be 0)"; + case 73: return "invalid tIME chunk size"; + case 74: return "invalid pHYs chunk size"; + /*length could be wrong, or data chopped off*/ + case 75: return "no null termination char found while decoding text chunk"; + case 76: return "iTXt chunk too short to contain required bytes"; + case 77: return "integer overflow in buffer size"; + case 78: return "failed to open file for reading"; /*file doesn't exist or couldn't be opened for reading*/ + case 79: return "failed to open file for writing"; + case 80: return "tried creating a tree of 0 symbols"; + case 81: return "lazy matching at pos 0 is impossible"; + case 82: return "color conversion to palette requested while a color isn't in palette, or index out of bounds"; + case 83: return "memory allocation failed"; + case 84: return "given image too small to contain all pixels to be encoded"; + case 86: return "impossible offset in lz77 encoding (internal bug)"; + case 87: return "must provide custom zlib function pointer if LODEPNG_COMPILE_ZLIB is not defined"; + case 88: return "invalid filter strategy given for LodePNGEncoderSettings.filter_strategy"; + case 89: return "text chunk keyword too short or long: must have size 1-79"; + /*the windowsize in the LodePNGCompressSettings. Requiring POT(==> & instead of %) makes encoding 12% faster.*/ + case 90: return "windowsize must be a power of two"; + case 91: return "invalid decompressed idat size"; + case 92: return "integer overflow due to too many pixels"; + case 93: return "zero width or height is invalid"; + case 94: return "header chunk must have a size of 13 bytes"; + case 95: return "integer overflow with combined idat chunk size"; + case 96: return "invalid gAMA chunk size"; + case 97: return "invalid cHRM chunk size"; + case 98: return "invalid sRGB chunk size"; + case 99: return "invalid sRGB rendering intent"; + case 100: return "invalid ICC profile color type, the PNG specification only allows RGB or GRAY"; + case 101: return "PNG specification does not allow RGB ICC profile on gray color types and vice versa"; + case 102: return "not allowed to set grayscale ICC profile with colored pixels by PNG specification"; + case 103: return "invalid palette index in bKGD chunk. Maybe it came before PLTE chunk?"; + case 104: return "invalid bKGD color while encoding (e.g. palette index out of range)"; + case 105: return "integer overflow of bitsize"; + case 106: return "PNG file must have PLTE chunk if color type is palette"; + case 107: return "color convert from palette mode requested without setting the palette data in it"; + case 108: return "tried to add more than 256 values to a palette"; + /*this limit can be configured in LodePNGDecompressSettings*/ + case 109: return "tried to decompress zlib or deflate data larger than desired max_output_size"; + case 110: return "custom zlib or inflate decompression failed"; + case 111: return "custom zlib or deflate compression failed"; + /*max text size limit can be configured in LodePNGDecoderSettings. This error prevents + unreasonable memory consumption when decoding due to impossibly large text sizes.*/ + case 112: return "compressed text unreasonably large"; + /*max ICC size limit can be configured in LodePNGDecoderSettings. This error prevents + unreasonable memory consumption when decoding due to impossibly large ICC profile*/ + case 113: return "ICC profile unreasonably large"; + } + return "unknown error code"; +} +#endif /*LODEPNG_COMPILE_ERROR_TEXT*/ + +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* // C++ Wrapper // */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ + +#ifdef LODEPNG_COMPILE_CPP +namespace lodepng { + +#ifdef LODEPNG_COMPILE_DISK +unsigned load_file(std::vector& buffer, const std::string& filename) { + long size = lodepng_filesize(filename.c_str()); + if(size < 0) return 78; + buffer.resize((size_t)size); + return size == 0 ? 0 : lodepng_buffer_file(&buffer[0], (size_t)size, filename.c_str()); +} + +/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ +unsigned save_file(const std::vector& buffer, const std::string& filename) { + return lodepng_save_file(buffer.empty() ? 0 : &buffer[0], buffer.size(), filename.c_str()); +} +#endif /* LODEPNG_COMPILE_DISK */ + +#ifdef LODEPNG_COMPILE_ZLIB +#ifdef LODEPNG_COMPILE_DECODER +unsigned decompress(std::vector& out, const unsigned char* in, size_t insize, + const LodePNGDecompressSettings& settings) { + unsigned char* buffer = 0; + size_t buffersize = 0; + unsigned error = zlib_decompress(&buffer, &buffersize, 0, in, insize, &settings); + if(buffer) { + out.insert(out.end(), &buffer[0], &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned decompress(std::vector& out, const std::vector& in, + const LodePNGDecompressSettings& settings) { + return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings); +} +#endif /* LODEPNG_COMPILE_DECODER */ + +#ifdef LODEPNG_COMPILE_ENCODER +unsigned compress(std::vector& out, const unsigned char* in, size_t insize, + const LodePNGCompressSettings& settings) { + unsigned char* buffer = 0; + size_t buffersize = 0; + unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings); + if(buffer) { + out.insert(out.end(), &buffer[0], &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned compress(std::vector& out, const std::vector& in, + const LodePNGCompressSettings& settings) { + return compress(out, in.empty() ? 0 : &in[0], in.size(), settings); +} +#endif /* LODEPNG_COMPILE_ENCODER */ +#endif /* LODEPNG_COMPILE_ZLIB */ + + +#ifdef LODEPNG_COMPILE_PNG + +State::State() { + lodepng_state_init(this); +} + +State::State(const State& other) { + lodepng_state_init(this); + lodepng_state_copy(this, &other); +} + +State::~State() { + lodepng_state_cleanup(this); +} + +State& State::operator=(const State& other) { + lodepng_state_copy(this, &other); + return *this; +} + +#ifdef LODEPNG_COMPILE_DECODER + +unsigned decode(std::vector& out, unsigned& w, unsigned& h, const unsigned char* in, + size_t insize, LodePNGColorType colortype, unsigned bitdepth) { + unsigned char* buffer = 0; + unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth); + if(buffer && !error) { + State state; + state.info_raw.colortype = colortype; + state.info_raw.bitdepth = bitdepth; + size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); + out.insert(out.end(), &buffer[0], &buffer[buffersize]); + } + lodepng_free(buffer); + return error; +} + +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + const std::vector& in, LodePNGColorType colortype, unsigned bitdepth) { + return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth); +} + +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + State& state, + const unsigned char* in, size_t insize) { + unsigned char* buffer = NULL; + unsigned error = lodepng_decode(&buffer, &w, &h, &state, in, insize); + if(buffer && !error) { + size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); + out.insert(out.end(), &buffer[0], &buffer[buffersize]); + } + lodepng_free(buffer); + return error; +} + +unsigned decode(std::vector& out, unsigned& w, unsigned& h, + State& state, + const std::vector& in) { + return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size()); +} + +#ifdef LODEPNG_COMPILE_DISK +unsigned decode(std::vector& out, unsigned& w, unsigned& h, const std::string& filename, + LodePNGColorType colortype, unsigned bitdepth) { + std::vector buffer; + /* safe output values in case error happens */ + w = h = 0; + unsigned error = load_file(buffer, filename); + if(error) return error; + return decode(out, w, h, buffer, colortype, bitdepth); +} +#endif /* LODEPNG_COMPILE_DECODER */ +#endif /* LODEPNG_COMPILE_DISK */ + +#ifdef LODEPNG_COMPILE_ENCODER +unsigned encode(std::vector& out, const unsigned char* in, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth) { + unsigned char* buffer; + size_t buffersize; + unsigned error = lodepng_encode_memory(&buffer, &buffersize, in, w, h, colortype, bitdepth); + if(buffer) { + out.insert(out.end(), &buffer[0], &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned encode(std::vector& out, + const std::vector& in, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth) { + if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; + return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); +} + +unsigned encode(std::vector& out, + const unsigned char* in, unsigned w, unsigned h, + State& state) { + unsigned char* buffer; + size_t buffersize; + unsigned error = lodepng_encode(&buffer, &buffersize, in, w, h, &state); + if(buffer) { + out.insert(out.end(), &buffer[0], &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned encode(std::vector& out, + const std::vector& in, unsigned w, unsigned h, + State& state) { + if(lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) return 84; + return encode(out, in.empty() ? 0 : &in[0], w, h, state); +} + +#ifdef LODEPNG_COMPILE_DISK +unsigned encode(const std::string& filename, + const unsigned char* in, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth) { + std::vector buffer; + unsigned error = encode(buffer, in, w, h, colortype, bitdepth); + if(!error) error = save_file(buffer, filename); + return error; +} + +unsigned encode(const std::string& filename, + const std::vector& in, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth) { + if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; + return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); +} +#endif /* LODEPNG_COMPILE_DISK */ +#endif /* LODEPNG_COMPILE_ENCODER */ +#endif /* LODEPNG_COMPILE_PNG */ +} /* namespace lodepng */ +#endif /*LODEPNG_COMPILE_CPP*/ diff --git a/source/utils/queueSystem.cpp b/source/utils/queueSystem.cpp new file mode 100644 index 0000000..1578032 --- /dev/null +++ b/source/utils/queueSystem.cpp @@ -0,0 +1,400 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "files.hpp" +#include "gui.hpp" +#include "queueSystem.hpp" +#include "scriptUtils.hpp" +#include "storeUtils.hpp" +#include + +std::deque> queueEntries; +int QueueSystem::RequestNeeded = -1, QueueSystem::RequestAnswer = -1; +bool QueueSystem::Wait = false, QueueSystem::Popup = false, QueueSystem::CancelCallback = false; +std::string QueueSystem::RequestMsg = "", QueueSystem::EndMsg = ""; +int QueueSystem::LastElement = 0; + +bool QueueRuns = false; +static Thread queueThread = nullptr; + +/* + Adds an entry to the queue. + + nlohmann::json obj: The object. + C2D_Image icn: The icon. +*/ +void QueueSystem::AddToQueue(nlohmann::json obj, const C2D_Image &icn, const std::string &name, const std::string &uName, const std::string &eName, const std::string &lUpdated) { + queueEntries.push_back( std::make_unique(obj, icn, name, uName, eName, lUpdated) ); + + /* If not already running, let it run!! */ + if (!QueueRuns && !QueueSystem::Wait) { + QueueRuns = true; // We enable the queue run state here. + + if (queueThread) { + threadJoin(queueThread, U64_MAX); + threadFree(queueThread); + queueThread = nullptr; + } + + s32 prio = 0; + + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); + queueThread = threadCreate((ThreadFunc)QueueSystem::QueueHandle, NULL, 64 * 1024, prio - 1, -2, false); + aptSetHomeAllowed(false); + } +} + +/* + Clears the queue. +*/ +void QueueSystem::ClearQueue() { + QueueRuns = false; + queueEntries.clear(); + + if (queueThread) { + threadJoin(queueThread, U64_MAX); + threadFree(queueThread); + queueThread = nullptr; + } +} + +/* + Use this, to go back to the queue after the Request. +*/ +void QueueSystem::Resume() { + aptSetHomeAllowed(false); + QueueSystem::Wait = false; + QueueRuns = true; + + if (queueThread) { + threadJoin(queueThread, U64_MAX); + threadFree(queueThread); + queueThread = nullptr; + } + + s32 prio = 0; + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); + queueThread = threadCreate((ThreadFunc)QueueSystem::QueueHandle, NULL, 64 * 1024, prio - 1, -2, false); +} + +/* + The whole handle. +*/ +void QueueSystem::QueueHandle() { + while(QueueRuns) { + Result ret = NONE; // No Error as of yet. + + for(int i = QueueSystem::LastElement; ret == NONE && i < queueEntries[0]->total && !QueueSystem::CancelCallback; i++) { + queueEntries[0]->current++; + + std::string type = ""; + + if (queueEntries[0]->obj[i].contains("type") && queueEntries[0]->obj[i]["type"].is_string()) { + type = queueEntries[0]->obj[i]["type"]; + + } else { + ret = SYNTAX_ERROR; + } + + /* Deleting a file. */ + if (type == "deleteFile") { + bool missing = false; + std::string file = ""; + queueEntries[0]->status = QueueStatus::Deleting; + + if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) { + file = queueEntries[0]->obj[i]["file"]; + } else missing = true; + + if (!missing) ret = ScriptUtils::removeFile(file, ""); + else ret = SYNTAX_ERROR; + + /* Downloading from a URL. */ + } else if (type == "downloadFile") { + bool missing = false; + std::string file = "", output = ""; + + queueEntries[0]->status = QueueStatus::Downloading; + + if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) { + file = queueEntries[0]->obj[i]["file"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) { + output = queueEntries[0]->obj[i]["output"]; + } else missing = true; + + if (!missing) ret = ScriptUtils::downloadFile(file, output, "", false); + else ret = SYNTAX_ERROR; + + /* Download from a GitHub Release. */ + } else if (type == "downloadRelease") { + bool missing = false, includePrereleases = false; + std::string repo = "", file = "", output = ""; + + queueEntries[0]->status = QueueStatus::Downloading; + + if (queueEntries[0]->obj[i].contains("repo") && queueEntries[0]->obj[i]["repo"].is_string()) { + repo = queueEntries[0]->obj[i]["repo"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) { + file = queueEntries[0]->obj[i]["file"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) { + output = queueEntries[0]->obj[i]["output"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("includePrereleases") && queueEntries[0]->obj[i]["includePrereleases"].is_boolean()) + includePrereleases = queueEntries[0]->obj[i]["includePrereleases"]; + + if (!missing) ret = ScriptUtils::downloadRelease(repo, file, output, includePrereleases, "", false); + else ret = SYNTAX_ERROR; + + /* Extracting files. */ + } else if (type == "extractFile") { + bool missing = false; + std::string file = "", input = "", output = ""; + queueEntries[0]->status = QueueStatus::Extracting; + + if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) { + file = queueEntries[0]->obj[i]["file"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("input") && queueEntries[0]->obj[i]["input"].is_string()) { + input = queueEntries[0]->obj[i]["input"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) { + output = queueEntries[0]->obj[i]["output"]; + } else missing = true; + + if (!missing) ret = ScriptUtils::extractFile(file, input, output, "", false); + else ret = SYNTAX_ERROR; + + /* Installing CIAs. */ + } else if (type == "installCia") { + bool missing = false, updateSelf = false; + std::string file = ""; + queueEntries[0]->status = QueueStatus::Installing; + + if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) { + file = queueEntries[0]->obj[i]["file"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("updateSelf") && queueEntries[0]->obj[i]["updateSelf"].is_boolean()) { + updateSelf = queueEntries[0]->obj[i]["updateSelf"]; + } + + if (!missing) ScriptUtils::installFile(file, updateSelf, ""); + else ret = SYNTAX_ERROR; + + } else if (type == "mkdir") { + bool missing = false; + std::string directory = ""; + + if (queueEntries[0]->obj[i].contains("directory") && queueEntries[0]->obj[i]["directory"].is_string()) { + directory = queueEntries[0]->obj[i]["directory"]; + } else missing = true; + + if (!missing) makeDirs(directory.c_str()); + else ret = SYNTAX_ERROR; + + /* Request Type 1. */ + } else if (type == "rmdir") { + bool missing = false; + std::string directory = "", message = "", promptmsg = ""; + bool required = false; + queueEntries[0]->status = QueueStatus::Request; + + if (queueEntries[0]->obj[i].contains("directory") && queueEntries[0]->obj[i]["directory"].is_string()) { + directory = queueEntries[0]->obj[i]["directory"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("required") && queueEntries[0]->obj[i]["required"].is_boolean()) { + required = queueEntries[0]->obj[i]["required"]; + } + + promptmsg = Lang::get("DELETE_PROMPT") + "\n" + directory; + + if (!missing && directory != "") { + if (access(directory.c_str(), F_OK) != 0 && required) ret = DELETE_ERROR; + else { + if (QueueSystem::RequestNeeded == RMDIR_REQUEST) { + /* There we already did it. :) */ + queueEntries[0]->status = QueueStatus::Deleting; + if (QueueSystem::RequestAnswer == 1) removeDirRecursive(directory.c_str()); + /* Reset. */ + QueueSystem::RequestNeeded = NO_REQUEST; + QueueSystem::RequestAnswer = NO_REQUEST; + QueueSystem::RequestMsg = ""; + + } else { + /* We are in the process of the need of an answer. */ + QueueSystem::RequestNeeded = RMDIR_REQUEST; // Type 1. + QueueSystem::RequestMsg = promptmsg; + QueueSystem::LastElement = i; // So we know, where we go again after the Request. + ret = PROMPT_RET; + } + } + } + + else ret = SYNTAX_ERROR; + + /* Request Type 2. */ + } else if (type == "promptMessage" || type == "promptMsg") { + std::string Message = ""; + int skipCount = -1; + queueEntries[0]->status = QueueStatus::Request; + + if (queueEntries[0]->obj[i].contains("message") && queueEntries[0]->obj[i]["message"].is_string()) { + Message = queueEntries[0]->obj[i]["message"]; + } + + if (queueEntries[0]->obj[i].contains("count") && queueEntries[0]->obj[i]["count"].is_number()) { + skipCount = queueEntries[0]->obj[i]["count"]; + } + + if (QueueSystem::RequestNeeded == PROMPT_REQUEST) { + if ((skipCount > -1) && (QueueSystem::RequestAnswer == SCRIPT_CANCELED)) { + i += skipCount; // Skip. + queueEntries[0]->current += skipCount; + } + + /* Reset. */ + QueueSystem::RequestAnswer = NO_REQUEST; + QueueSystem::RequestNeeded = NO_REQUEST; + QueueSystem::RequestMsg = ""; + + } else { + QueueSystem::RequestNeeded = PROMPT_REQUEST; // Type 2. + QueueSystem::RequestMsg = Message; + QueueSystem::LastElement = i; // So we know, where we go again after the Request. + ret = PROMPT_RET; + } + + } else if (type == "exit") { + ret = SCRIPT_CANCELED; + + } else if (type == "copy") { + std::string source = "", destination = ""; + bool missing = false; + queueEntries[0]->status = QueueStatus::Copying; + + if (queueEntries[0]->obj[i].contains("source") && queueEntries[0]->obj[i]["source"].is_string()) { + source = queueEntries[0]->obj[i]["source"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("destination") && queueEntries[0]->obj[i]["destination"].is_string()) { + destination = queueEntries[0]->obj[i]["destination"]; + } else missing = true; + + if (!missing) ret = ScriptUtils::copyFile(source, destination, ""); + else ret = SYNTAX_ERROR; + + } else if (type == "move") { + std::string oldFile = "", newFile = ""; + bool missing = false; + queueEntries[0]->status = QueueStatus::Moving; + + if (queueEntries[0]->obj[i].contains("old") && queueEntries[0]->obj[i]["old"].is_string()) { + oldFile = queueEntries[0]->obj[i]["old"]; + } else missing = true; + + if (queueEntries[0]->obj[i].contains("new") && queueEntries[0]->obj[i]["new"].is_string()) { + newFile = queueEntries[0]->obj[i]["new"]; + } else missing = true; + + if (!missing) ret = ScriptUtils::renameFile(oldFile, newFile, ""); + else ret = SYNTAX_ERROR; + + } else if (type == "skip") { + int skipCount = -1; + + if (queueEntries[0]->obj[i].contains("count") && queueEntries[0]->obj[i]["count"].is_number()) { + skipCount = queueEntries[0]->obj[i]["count"]; + } + + if (skipCount > 0) i += skipCount; // Skip. + } + } + + /* If we expect a prompt, we go to this. */ + if (ret == PROMPT_RET) { + queueEntries[0]->current = QueueSystem::LastElement + 1; // Cause no Zero. + QueueSystem::Wait = true; + QueueRuns = false; + } + + if (!QueueSystem::Wait) { + /* Canceled or None is for me -> Done. */ + if (ret == NONE || ret == SCRIPT_CANCELED) { + queueEntries[0]->status = QueueStatus::Done; + + } else { // Else it failed.. + queueEntries[0]->status = QueueStatus::Failed; + } + + /* Display if failed or succeeded. */ + if (config->prompt()) { + char msg[256]; + + if (QueueSystem::CancelCallback) { + snprintf(msg, sizeof(msg), Lang::get("ACTION_CANCELED").c_str(), queueEntries[0]->name.c_str()); + + } else { + if (queueEntries[0]->status == QueueStatus::Failed) { + snprintf(msg, sizeof(msg), Lang::get("ACTION_FAILED").c_str(), queueEntries[0]->name.c_str()); + + } else { + snprintf(msg, sizeof(msg), Lang::get("ACTION_SUCCEEDED").c_str(), queueEntries[0]->name.c_str()); + } + } + + QueueSystem::EndMsg = msg; + QueueSystem::Popup = true; + } + + if (queueEntries[0]->status == QueueStatus::Done) { // ONLY update, if successful. + if (StoreUtils::meta) { + StoreUtils::meta->SetUpdated(queueEntries[0]->unistoreName, queueEntries[0]->entryName, queueEntries[0]->lastUpdated); + StoreUtils::meta->SetInstalled(queueEntries[0]->unistoreName, queueEntries[0]->entryName, queueEntries[0]->name); + StoreUtils::RefreshUpdateAVL(); + } + } + + if (QueueSystem::CancelCallback) QueueSystem::CancelCallback = false; // Reset. + + queueEntries.pop_front(); + if (QueueSystem::LastElement != 0) QueueSystem::LastElement = 0; + if (queueEntries.empty()) QueueRuns = false; // The queue ended. + ret = NONE; // Reset. + } + } + + aptSetHomeAllowed(true); +} \ No newline at end of file diff --git a/source/utils/screenshot.cpp b/source/utils/screenshot.cpp new file mode 100644 index 0000000..5a48776 --- /dev/null +++ b/source/utils/screenshot.cpp @@ -0,0 +1,91 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "lodepng.h" +#include "msg.hpp" +#include "screenshot.hpp" + +C2D_Image Screenshot::Convert(const std::string &filename) { + std::vector ImageBuffer; + unsigned width, height; + C2D_Image img; + lodepng::decode(ImageBuffer, width, height, filename); + + img.tex = new C3D_Tex; + img.subtex = new Tex3DS_SubTexture({(u16)width, (u16)height, 0.0f, 1.0f, width / 512.0f, 1.0f - (height / 512.0f)}); + + C3D_TexInit(img.tex, 512, 512, GPU_RGBA8); + C3D_TexSetFilter(img.tex, GPU_LINEAR, GPU_LINEAR); + img.tex->border = 0xFFFFFFFF; + C3D_TexSetWrap(img.tex, GPU_CLAMP_TO_BORDER, GPU_CLAMP_TO_BORDER); + + for (u32 x = 0; x < width && x < 512; x++) { + for (u32 y = 0; y < height && y < 512; y++) { + const u32 dstPos = ((((y >> 3) * (512 >> 3) + (x >> 3)) << 6) + + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | + ((x & 4) << 2) | ((y & 4) << 3))) * 4; + + const u32 srcPos = (y * width + x) * 4; + ((uint8_t *)img.tex->data)[dstPos + 0] = ImageBuffer.data()[srcPos + 3]; + ((uint8_t *)img.tex->data)[dstPos + 1] = ImageBuffer.data()[srcPos + 2]; + ((uint8_t *)img.tex->data)[dstPos + 2] = ImageBuffer.data()[srcPos + 1]; + ((uint8_t *)img.tex->data)[dstPos + 3] = ImageBuffer.data()[srcPos + 0]; + } + } + + return img; +} + +C2D_Image Screenshot::ConvertFromBuffer(const std::vector &buffer) { + std::vector ImageBuffer; + unsigned width, height; + C2D_Image img; + lodepng::decode(ImageBuffer, width, height, buffer); + + img.tex = new C3D_Tex; + img.subtex = new Tex3DS_SubTexture({(u16)width, (u16)height, 0.0f, 1.0f, width / 512.0f, 1.0f - (height / 512.0f)}); + + C3D_TexInit(img.tex, 512, 512, GPU_RGBA8); + C3D_TexSetFilter(img.tex, GPU_LINEAR, GPU_LINEAR); + img.tex->border = 0xFFFFFFFF; + C3D_TexSetWrap(img.tex, GPU_CLAMP_TO_BORDER, GPU_CLAMP_TO_BORDER); + + for (u32 x = 0; x < width && x < 512; x++) { + for (u32 y = 0; y < height && y < 512; y++) { + const u32 dstPos = ((((y >> 3) * (512 >> 3) + (x >> 3)) << 6) + + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | + ((x & 4) << 2) | ((y & 4) << 3))) * 4; + + const u32 srcPos = (y * width + x) * 4; + ((uint8_t *)img.tex->data)[dstPos + 0] = ImageBuffer.data()[srcPos + 3]; + ((uint8_t *)img.tex->data)[dstPos + 1] = ImageBuffer.data()[srcPos + 2]; + ((uint8_t *)img.tex->data)[dstPos + 2] = ImageBuffer.data()[srcPos + 1]; + ((uint8_t *)img.tex->data)[dstPos + 3] = ImageBuffer.data()[srcPos + 0]; + } + } + + return img; +} \ No newline at end of file diff --git a/source/utils/scriptUtils.cpp b/source/utils/scriptUtils.cpp index 23f21c6..c074bea 100644 --- a/source/utils/scriptUtils.cpp +++ b/source/utils/scriptUtils.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ extern bool showProgressBar; extern ProgressBar progressbarType; extern char progressBarMsg[128]; -extern int filesExtracted; +extern int filesExtracted, extractFilesCount; extern void downloadFailed(); static Thread thread; @@ -47,41 +47,40 @@ bool ScriptUtils::matchPattern(const std::string &pattern, const std::string &te return regex_match(tested, patternRegex); } -/* - Remove a File. -*/ -Result ScriptUtils::removeFile(const std::string &file, const std::string &message) { +/* Remove a File. */ +Result ScriptUtils::removeFile(const std::string &file, bool isARG) { std::string out; out = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); Result ret = NONE; if (access(out.c_str(), F_OK) != 0) return DELETE_ERROR; - Msg::DisplayMsg(message); deleteFile(out.c_str()); return ret; } -/* - Boot a title. -*/ -void ScriptUtils::bootTitle(const std::string &TitleID, const bool &isNAND, const std::string &message) { +/* Boot a title. */ +void ScriptUtils::bootTitle(const std::string &TitleID, bool isNAND, bool isARG) { std::string MSG = Lang::get("BOOT_TITLE") + "\n\n"; if (isNAND) MSG += Lang::get("MEDIATYPE_NAND") + "\n" + TitleID; else MSG += Lang::get("MEDIATYPE_SD") + "\n" + TitleID; const u64 ID = std::stoull(TitleID, 0, 16); - if (Msg::promptMsg(MSG)) { - Msg::DisplayMsg(message); - CIA_LaunchTitle(ID, isNAND ? MEDIATYPE_NAND : MEDIATYPE_SD); + if (isARG) { + if (Msg::promptMsg(MSG)) { + Title::Launch(ID, isNAND ? MEDIATYPE_NAND : MEDIATYPE_SD); + } + + } else { + Title::Launch(ID, isNAND ? MEDIATYPE_NAND : MEDIATYPE_SD); } } -/* - Prompt message. -*/ +/* Prompt message. */ Result ScriptUtils::prompt(const std::string &message) { Result ret = NONE; if (!Msg::promptMsg(message)) ret = SCRIPT_CANCELED; @@ -89,28 +88,33 @@ Result ScriptUtils::prompt(const std::string &message) { return ret; } -/* - Copy. -*/ -Result ScriptUtils::copyFile(const std::string &source, const std::string &destination, const std::string &message) { +/* Copy. */ +Result ScriptUtils::copyFile(const std::string &source, const std::string &destination, const std::string &message, bool isARG) { Result ret = NONE; if (access(source.c_str(), F_OK) != 0) return COPY_ERROR; std::string _source, _dest; _source = std::regex_replace(source, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + _source = std::regex_replace(_source, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); _source = std::regex_replace(_source, std::regex("%3DSX%"), config->_3dsxPath()); _source = std::regex_replace(_source, std::regex("%NDS%"), config->ndsPath()); + _source = std::regex_replace(_source, std::regex("%FIRM%"), config->firmPath()); + _dest = std::regex_replace(destination, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + _dest = std::regex_replace(_dest, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); _dest = std::regex_replace(_dest, std::regex("%3DSX%"), config->_3dsxPath()); _dest = std::regex_replace(_dest, std::regex("%NDS%"), config->ndsPath()); + _dest = std::regex_replace(_dest, std::regex("%FIRM%"), config->firmPath()); - snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); - showProgressBar = true; - progressbarType = ProgressBar::Copying; + if (isARG) { + snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); + showProgressBar = true; + progressbarType = ProgressBar::Copying; - s32 prio = 0; - svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); - thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); + s32 prio = 0; + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); + thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); + } /* If destination does not exist, create dirs. */ if (access(_dest.c_str(), F_OK) != 0) makeDirs(_dest.c_str()); @@ -118,29 +122,33 @@ Result ScriptUtils::copyFile(const std::string &source, const std::string &desti if (ret == -1) ret = COPY_ERROR; else if (ret == 1) ret = NONE; - showProgressBar = false; - threadJoin(thread, U64_MAX); - threadFree(thread); + + if (isARG) { + showProgressBar = false; + threadJoin(thread, U64_MAX); + threadFree(thread); + } + return ret; } -/* - Rename / Move a file. -*/ -Result ScriptUtils::renameFile(const std::string &oldName, const std::string &newName, const std::string &message) { - +/* Rename / Move a file. */ +Result ScriptUtils::renameFile(const std::string &oldName, const std::string &newName, bool isARG) { Result ret = NONE; if (access(oldName.c_str(), F_OK) != 0) return MOVE_ERROR; std::string old, _new; old = std::regex_replace(oldName, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + old = std::regex_replace(old, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); old = std::regex_replace(old, std::regex("%3DSX%"), config->_3dsxPath()); old = std::regex_replace(old, std::regex("%NDS%"), config->ndsPath()); + old = std::regex_replace(old, std::regex("%FIRM%"), config->firmPath()); + _new = std::regex_replace(newName, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + _new = std::regex_replace(_new, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); _new = std::regex_replace(_new, std::regex("%3DSX%"), config->_3dsxPath()); _new = std::regex_replace(_new, std::regex("%NDS%"), config->ndsPath()); - - Msg::DisplayMsg(message); + _new = std::regex_replace(_new, std::regex("%FIRM%"), config->firmPath()); /* TODO: Kinda avoid that? */ makeDirs(_new.c_str()); @@ -148,140 +156,200 @@ Result ScriptUtils::renameFile(const std::string &oldName, const std::string &ne return ret; } -/* - Download from GitHub Release. -*/ -Result ScriptUtils::downloadRelease(const std::string &repo, const std::string &file, const std::string &output, const bool &includePrereleases, const std::string &message) { +/* Download from GitHub Release. */ +Result ScriptUtils::downloadRelease(const std::string &repo, const std::string &file, const std::string &output, bool includePrereleases, const std::string &message, bool isARG) { std::string out; - out = std::regex_replace(output, std::regex("%3DSX%"), config->_3dsxPath()); - out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); - out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); - - Result ret = NONE; - - snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); - showProgressBar = true; - progressbarType = ProgressBar::Downloading; - - s32 prio = 0; - svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); - thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); - - if (downloadFromRelease("https://github.com/" + repo, file, out, includePrereleases) != 0) { - showProgressBar = false; - downloadFailed(); - ret = FAILED_DOWNLOAD; - threadJoin(thread, U64_MAX); - threadFree(thread); - return ret; - } - - showProgressBar = false; - threadJoin(thread, U64_MAX); - threadFree(thread); - return ret; -} - -/* - Download a file. -*/ -Result ScriptUtils::downloadFile(const std::string &file, const std::string &output, const std::string &message) { - std::string out; - out = std::regex_replace(output, std::regex("%3DSX%"), config->_3dsxPath()); - out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); - out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); - - Result ret = NONE; - snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); - showProgressBar = true; - progressbarType = ProgressBar::Downloading; - - s32 prio = 0; - svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); - thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); - - if (downloadToFile(file, out) != 0) { - showProgressBar = false; - downloadFailed(); - ret = FAILED_DOWNLOAD; - threadJoin(thread, U64_MAX); - threadFree(thread); - return ret; - } - - showProgressBar = false; - threadJoin(thread, U64_MAX); - threadFree(thread); - return ret; -} - -/* - Install CIA files. -*/ -void ScriptUtils::installFile(const std::string &file, const bool &updatingSelf, const std::string &message) { - std::string in; - in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); - in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath()); - in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath()); - - snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); - showProgressBar = true; - progressbarType = ProgressBar::Installing; - - s32 prio = 0; - svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); - thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); - - installCia(in.c_str(), updatingSelf); - showProgressBar = false; - threadJoin(thread, U64_MAX); - threadFree(thread); -} - -/* - Extract files. -*/ -void ScriptUtils::extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message) { - std::string out, in; - in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); - in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath()); - in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath()); - out = std::regex_replace(output, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + out = std::regex_replace(output, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); + + Result ret = NONE; + + if (isARG) { + snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); + showProgressBar = true; + progressbarType = ProgressBar::Downloading; + + s32 prio = 0; + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); + thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); + } + + if (downloadFromRelease("https://github.com/" + repo, file, out, includePrereleases) != 0) { + ret = FAILED_DOWNLOAD; + + if (isARG) { + showProgressBar = false; + + downloadFailed(); + + threadJoin(thread, U64_MAX); + threadFree(thread); + } + return ret; + } + + if (isARG) { + showProgressBar = false; + threadJoin(thread, U64_MAX); + threadFree(thread); + } + + return ret; +} + +/* Download a file. */ +Result ScriptUtils::downloadFile(const std::string &file, const std::string &output, const std::string &message, bool isARG) { + std::string out; + out = std::regex_replace(output, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); + out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); + out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); + + Result ret = NONE; + + if (isARG) { + snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); + showProgressBar = true; + progressbarType = ProgressBar::Downloading; + + s32 prio = 0; + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); + thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); + } + + if (downloadToFile(file, out) != 0) { + ret = FAILED_DOWNLOAD; + + if (isARG) { + showProgressBar = false; + + downloadFailed(); + + threadJoin(thread, U64_MAX); + threadFree(thread); + } + + return ret; + } + + if (isARG) { + showProgressBar = false; + threadJoin(thread, U64_MAX); + threadFree(thread); + } + + return ret; +} + +/* Install CIA files. */ +void ScriptUtils::installFile(const std::string &file, bool updatingSelf, const std::string &message, bool isARG) { + std::string in; + in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + in = std::regex_replace(in, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); + in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath()); + in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath()); + in = std::regex_replace(in, std::regex("%FIRM%"), config->firmPath()); + + if (isARG) { + snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); + showProgressBar = true; + progressbarType = ProgressBar::Installing; + + s32 prio = 0; + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); + thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); + } + + Title::Install(in.c_str(), updatingSelf); + + if (isARG) { + showProgressBar = false; + threadJoin(thread, U64_MAX); + threadFree(thread); + } +} + +/* Extract files. */ +Result ScriptUtils::extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message, bool isARG) { + extractFilesCount = 0; + Result ret = NONE; + + std::string out, in; + in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + in = std::regex_replace(in, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); + in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath()); + in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath()); + in = std::regex_replace(in, std::regex("%FIRM%"), config->firmPath()); + + out = std::regex_replace(output, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); + out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); + out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); + out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); + + if (isARG) { + snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); + showProgressBar = true; + progressbarType = ProgressBar::Extracting; + + s32 prio = 0; + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); + thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); + } - snprintf(progressBarMsg, sizeof(progressBarMsg), message.c_str()); - showProgressBar = true; filesExtracted = 0; - progressbarType = ProgressBar::Extracting; - - s32 prio = 0; - svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); - thread = threadCreate((ThreadFunc)Animation::displayProgressBar, NULL, 64 * 1024, prio - 1, -2, false); getExtractedSize(in, input); - extractArchive(in, input, out); - showProgressBar = false; - threadJoin(thread, U64_MAX); - threadFree(thread); + if(extractArchive(in, input, out) != EXTRACT_ERROR_NONE) { + ret = EXTRACT_ERROR; + } + + if (isARG) { + showProgressBar = false; + threadJoin(thread, U64_MAX); + threadFree(thread); + } + + return ret; } /* - Execute | run the script. + NOTE: This is for the argument system for now. This might get replaced completely with the Queue System in the future. */ -Result ScriptUtils::runFunctions(const nlohmann::json &storeJson, const int &selection, const std::string &entry) { +Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const std::string &entry) { Result ret = NONE; // No Error as of yet. if (!storeJson.contains("storeContent")) { Msg::waitMsg(Lang::get("SYNTAX_ERROR")); return SYNTAX_ERROR; }; if ((int)storeJson["storeContent"].size() < selection) { Msg::waitMsg(Lang::get("SYNTAX_ERROR")); return SYNTAX_ERROR; }; if (!storeJson["storeContent"][selection].contains(entry)) { Msg::waitMsg(Lang::get("SYNTAX_ERROR")); return SYNTAX_ERROR; }; - for(int i = 0; i < (int)storeJson["storeContent"][selection][entry].size(); i++) { + nlohmann::json Script = nullptr; + + /* Detect if array or new object thing. Else return Syntax error. :P */ + if (storeJson["storeContent"][selection][entry].type() == nlohmann::json::value_t::array) { + Script = storeJson["storeContent"][selection][entry]; + + } else if (storeJson["storeContent"][selection][entry].type() == nlohmann::json::value_t::object) { + if (storeJson["storeContent"][selection][entry].contains("script") && storeJson["storeContent"][selection][entry]["script"].is_array()) { + Script = storeJson["storeContent"][selection][entry]["script"]; + + } else { + Msg::waitMsg(Lang::get("SYNTAX_ERROR")); + return SYNTAX_ERROR; + } + } + + + for(int i = 0; i < (int)Script.size(); i++) { if (ret == NONE) { std::string type = ""; - if (storeJson["storeContent"][selection][entry][i].contains("type") && storeJson["storeContent"][selection][entry][i]["type"].is_string()) { - type = storeJson["storeContent"][selection][entry][i]["type"]; + if (Script[i].contains("type") && Script[i]["type"].is_string()) { + type = Script[i]["type"]; } else { ret = SYNTAX_ERROR; @@ -289,123 +357,115 @@ Result ScriptUtils::runFunctions(const nlohmann::json &storeJson, const int &sel if (type == "deleteFile") { bool missing = false; - std::string file = "", message = ""; + std::string file = ""; - if (storeJson["storeContent"][selection][entry][i].contains("file") && storeJson["storeContent"][selection][entry][i]["file"].is_string()) { - file = storeJson["storeContent"][selection][entry][i]["file"]; + if (Script[i].contains("file") && Script[i]["file"].is_string()) { + file = Script[i]["file"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - message = storeJson["storeContent"][selection][entry][i]["message"]; - } - - if (!missing) ret = ScriptUtils::removeFile(file, message); + if (!missing) ret = ScriptUtils::removeFile(file, true); else ret = SYNTAX_ERROR; } else if (type == "downloadFile") { bool missing = false; - std::string file = "", output = "", message = ""; + std::string file = "", output = ""; - if (storeJson["storeContent"][selection][entry][i].contains("file") && storeJson["storeContent"][selection][entry][i]["file"].is_string()) { - file = storeJson["storeContent"][selection][entry][i]["file"]; + if (Script[i].contains("file") && Script[i]["file"].is_string()) { + file = Script[i]["file"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("output") && storeJson["storeContent"][selection][entry][i]["output"].is_string()) { - output = storeJson["storeContent"][selection][entry][i]["output"]; + if (Script[i].contains("output") && Script[i]["output"].is_string()) { + output = Script[i]["output"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - message = storeJson["storeContent"][selection][entry][i]["message"]; - } + char message[256]; + snprintf(message, sizeof(message), Lang::get("SHORTCUT_DOWNLOADING").c_str(), output.substr(output.find_first_of("/") + 1).c_str()); - if (!missing) ret = ScriptUtils::downloadFile(file, output, message); + if (!missing) ret = ScriptUtils::downloadFile(file, output, message, true); else ret = SYNTAX_ERROR; } else if (type == "downloadRelease") { bool missing = false, includePrereleases = false; - std::string repo = "", file = "", output = "", message = ""; + std::string repo = "", file = "", output = ""; - if (storeJson["storeContent"][selection][entry][i].contains("repo") && storeJson["storeContent"][selection][entry][i]["repo"].is_string()) { - repo = storeJson["storeContent"][selection][entry][i]["repo"]; + if (Script[i].contains("repo") && Script[i]["repo"].is_string()) { + repo = Script[i]["repo"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("file") && storeJson["storeContent"][selection][entry][i]["file"].is_string()) { - file = storeJson["storeContent"][selection][entry][i]["file"]; + if (Script[i].contains("file") && Script[i]["file"].is_string()) { + file = Script[i]["file"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("output") && storeJson["storeContent"][selection][entry][i]["output"].is_string()) { - output = storeJson["storeContent"][selection][entry][i]["output"]; + if (Script[i].contains("output") && Script[i]["output"].is_string()) { + output = Script[i]["output"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("includePrereleases") && storeJson["storeContent"][selection][entry][i]["includePrereleases"].is_boolean()) - includePrereleases = storeJson["storeContent"][selection][entry][i]["includePrereleases"]; + if (Script[i].contains("includePrereleases") && Script[i]["includePrereleases"].is_boolean()) + includePrereleases = Script[i]["includePrereleases"]; - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - message = storeJson["storeContent"][selection][entry][i]["message"]; - } + char message[256]; + snprintf(message, sizeof(message), Lang::get("SHORTCUT_DOWNLOADING").c_str(), output.substr(output.find_first_of("/") + 1).c_str()); - if (!missing) ret = ScriptUtils::downloadRelease(repo, file, output, includePrereleases, message); + if (!missing) ret = ScriptUtils::downloadRelease(repo, file, output, includePrereleases, message, true); else ret = SYNTAX_ERROR; } else if (type == "extractFile") { bool missing = false; - std::string file = "", input = "", output = "", message = ""; + std::string file = "", input = "", output = ""; - if (storeJson["storeContent"][selection][entry][i].contains("file") && storeJson["storeContent"][selection][entry][i]["file"].is_string()) { - file = storeJson["storeContent"][selection][entry][i]["file"]; + if (Script[i].contains("file") && Script[i]["file"].is_string()) { + file = Script[i]["file"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("input") && storeJson["storeContent"][selection][entry][i]["input"].is_string()) { - input = storeJson["storeContent"][selection][entry][i]["input"]; + if (Script[i].contains("input") && Script[i]["input"].is_string()) { + input = Script[i]["input"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("output") && storeJson["storeContent"][selection][entry][i]["output"].is_string()) { - output = storeJson["storeContent"][selection][entry][i]["output"]; + if (Script[i].contains("output") && Script[i]["output"].is_string()) { + output = Script[i]["output"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - message = storeJson["storeContent"][selection][entry][i]["message"]; - } + char message[256]; + snprintf(message, sizeof(message), Lang::get("SHORTCUT_EXTRACTING").c_str(), file.substr(file.find_first_of("/") + 1).c_str()); - if (!missing) ScriptUtils::extractFile(file, input, output, message); + if (!missing) ret = ScriptUtils::extractFile(file, input, output, message, true); else ret = SYNTAX_ERROR; } else if (type == "installCia") { bool missing = false, updateSelf = false; - std::string file = "", message = ""; + std::string file = ""; - if (storeJson["storeContent"][selection][entry][i].contains("file") && storeJson["storeContent"][selection][entry][i]["file"].is_string()) { - file = storeJson["storeContent"][selection][entry][i]["file"]; + if (Script[i].contains("file") && Script[i]["file"].is_string()) { + file = Script[i]["file"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("updateSelf") && storeJson["storeContent"][selection][entry][i]["updateSelf"].is_boolean()) { - updateSelf = storeJson["storeContent"][selection][entry][i]["updateSelf"]; + if (Script[i].contains("updateSelf") && Script[i]["updateSelf"].is_boolean()) { + updateSelf = Script[i]["updateSelf"]; } - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - message = storeJson["storeContent"][selection][entry][i]["message"]; - } + char message[256]; + snprintf(message, sizeof(message), Lang::get("SHORTCUT_INSTALLING").c_str(), file.substr(file.find_first_of("/") + 1).c_str()); - if (!missing) ScriptUtils::installFile(file, updateSelf, message); + if (!missing) ScriptUtils::installFile(file, updateSelf, message, true); else ret = SYNTAX_ERROR; } else if (type == "mkdir") { bool missing = false; - std::string directory = "", message = ""; + std::string directory = ""; - if (storeJson["storeContent"][selection][entry][i].contains("directory") && storeJson["storeContent"][selection][entry][i]["directory"].is_string()) { - directory = storeJson["storeContent"][selection][entry][i]["directory"]; + if (Script[i].contains("directory") && Script[i]["directory"].is_string()) { + directory = Script[i]["directory"]; } else missing = true; @@ -414,16 +474,21 @@ Result ScriptUtils::runFunctions(const nlohmann::json &storeJson, const int &sel } else if (type == "rmdir") { bool missing = false; - std::string directory = "", message = "", promptmsg = ""; + std::string directory = "", promptmsg = ""; + bool required = false; - if (storeJson["storeContent"][selection][entry][i].contains("directory") && storeJson["storeContent"][selection][entry][i]["directory"].is_string()) { - directory = storeJson["storeContent"][selection][entry][i]["directory"]; + if (Script[i].contains("directory") && Script[i]["directory"].is_string()) { + directory = Script[i]["directory"]; } else missing = true; + if (Script[i].contains("required") && Script[i]["required"].is_boolean()) { + required = Script[i]["required"]; + } + promptmsg = Lang::get("DELETE_PROMPT") + "\n" + directory; if (!missing && directory != "") { - if (access(directory.c_str(), F_OK) != 0) ret = DELETE_ERROR; + if (access(directory.c_str(), F_OK) != 0 && required) ret = DELETE_ERROR; else { if (Msg::promptMsg(promptmsg)) removeDirRecursive(directory.c_str()); } @@ -435,12 +500,12 @@ Result ScriptUtils::runFunctions(const nlohmann::json &storeJson, const int &sel std::string Message = ""; int skipCount = -1; - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - Message = storeJson["storeContent"][selection][entry][i]["message"]; + if (Script[i].contains("message") && Script[i]["message"].is_string()) { + Message = Script[i]["message"]; } - if (storeJson["storeContent"][selection][entry][i].contains("count") && storeJson["storeContent"][selection][entry][i]["count"].is_number()) { - skipCount = storeJson["storeContent"][selection][entry][i]["count"]; + if (Script[i].contains("count") && Script[i]["count"].is_number()) { + skipCount = Script[i]["count"]; } ret = ScriptUtils::prompt(Message); @@ -454,52 +519,47 @@ Result ScriptUtils::runFunctions(const nlohmann::json &storeJson, const int &sel break; } else if (type == "copy") { - std::string Message = "", source = "", destination = ""; + std::string source = "", destination = ""; bool missing = false; - if (storeJson["storeContent"][selection][entry][i].contains("source") && storeJson["storeContent"][selection][entry][i]["source"].is_string()) { - source = storeJson["storeContent"][selection][entry][i]["source"]; + if (Script[i].contains("source") && Script[i]["source"].is_string()) { + source = Script[i]["source"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("destination") && storeJson["storeContent"][selection][entry][i]["destination"].is_string()) { - destination = storeJson["storeContent"][selection][entry][i]["destination"]; + if (Script[i].contains("destination") && Script[i]["destination"].is_string()) { + destination = Script[i]["destination"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - Message = storeJson["storeContent"][selection][entry][i]["message"]; - } + char message[256]; + snprintf(message, sizeof(message), Lang::get("SHORTCUT_COPYING").c_str(), source.substr(source.find_first_of("/") + 1).c_str()); - if (!missing) ret = ScriptUtils::copyFile(source, destination, Message); + if (!missing) ret = ScriptUtils::copyFile(source, destination, message, true); else ret = SYNTAX_ERROR; } else if (type == "move") { - std::string Message = "", oldFile = "", newFile = ""; + std::string oldFile = "", newFile = ""; bool missing = false; - if (storeJson["storeContent"][selection][entry][i].contains("old") && storeJson["storeContent"][selection][entry][i]["old"].is_string()) { - oldFile = storeJson["storeContent"][selection][entry][i]["old"]; + if (Script[i].contains("old") && Script[i]["old"].is_string()) { + oldFile = Script[i]["old"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("new") && storeJson["storeContent"][selection][entry][i]["new"].is_string()) { - newFile = storeJson["storeContent"][selection][entry][i]["new"]; + if (Script[i].contains("new") && Script[i]["new"].is_string()) { + newFile = Script[i]["new"]; } else missing = true; - if (storeJson["storeContent"][selection][entry][i].contains("message") && storeJson["storeContent"][selection][entry][i]["message"].is_string()) { - Message = storeJson["storeContent"][selection][entry][i]["message"]; - } - - if (!missing) ret = ScriptUtils::renameFile(oldFile, newFile, Message); + if (!missing) ret = ScriptUtils::renameFile(oldFile, newFile, true); else ret = SYNTAX_ERROR; } else if (type == "skip") { int skipCount = -1; - if (storeJson["storeContent"][selection][entry][i].contains("count") && storeJson["storeContent"][selection][entry][i]["count"].is_number()) { - skipCount = storeJson["storeContent"][selection][entry][i]["count"]; + if (Script[i].contains("count") && Script[i]["count"].is_number()) { + skipCount = Script[i]["count"]; } if (skipCount > 0) { @@ -515,5 +575,6 @@ Result ScriptUtils::runFunctions(const nlohmann::json &storeJson, const int &sel else if (ret == COPY_ERROR) Msg::waitMsg(Lang::get("COPY_ERROR")); else if (ret == MOVE_ERROR) Msg::waitMsg(Lang::get("MOVE_ERROR")); else if (ret == DELETE_ERROR) Msg::waitMsg(Lang::get("DELETE_ERROR")); + else if (ret == EXTRACT_ERROR) Msg::waitMsg(Lang::get("EXTRACT_ERROR")); return ret; } \ No newline at end of file diff --git a/source/utils/sound.cpp b/source/utils/sound.cpp new file mode 100644 index 0000000..162499c --- /dev/null +++ b/source/utils/sound.cpp @@ -0,0 +1,166 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "sound.hpp" +#include +#include +#include +#include + +/* + Reference: http://yannesposito.com/Scratch/en/blog/2010-10-14-Fun-with-wav/ +*/ +typedef struct _WavHeader { + char magic[4]; // "RIFF" + u32 totallength; // Total file length, minus 8. + char wavefmt[8]; // Should be "WAVEfmt ". + u32 format; // 16 for PCM format. + u16 pcm; // 1 for PCM format. + u16 channels; // Channels. + u32 frequency; // Sampling frequency. + u32 bytes_per_second; + u16 bytes_by_capture; + u16 bits_per_sample; + char data[4]; // "data". + u32 bytes_in_data; +} WavHeader; +static_assert(sizeof(WavHeader) == 44, "WavHeader size is not 44 bytes."); + +#define _MAX_SIZE 10485760 // 10 MiB. + +/* + Initialize the sound. + + const std::string &path: Path to the file to play. + const int channel: The channel to use. 1 by default. + const bool toloop: If should loop or not. True by default. +*/ +Sound::Sound(const std::string &path, const int channel, const bool toloop) { + ndspSetOutputMode(NDSP_OUTPUT_MONO); + ndspSetOutputCount(2); // Amount of buffers. + + /* Reading wav file. */ + FILE *file = fopen(path.c_str(), "rb"); + + if (!file) { + printf("Could not open the WAV file: %s.\n", path.c_str()); + this->good = false; + return; + } + + WavHeader wavHeader; + size_t read = fread(&wavHeader, 1, sizeof(wavHeader), file); + if (read != sizeof(wavHeader)) { + /* Short read. */ + printf("WAV file header is too short: %s.\n", path.c_str()); + fclose(file); + this->good = false; + return; + } + + /* Verify the header. */ + static const char RIFF_magic[4] = { 'R','I','F','F' }; + if (memcmp(wavHeader.magic, RIFF_magic, sizeof(wavHeader.magic)) != 0) { + /* Incorrect magic number. */ + printf("Wrong file format.\n"); + fclose(file); + this->good = false; + return; + } + + if (wavHeader.totallength == 0 || + (wavHeader.channels != 1 && wavHeader.channels != 2) || + (wavHeader.bits_per_sample != 8 && wavHeader.bits_per_sample != 16)) { + /* Unsupported WAV file. */ + printf("Corrupted wav file.\n"); + fclose(file); + this->good = false; + return; + } + + /* Get the file size. */ + fseek(file, 0, SEEK_END); + this->dataSize = ftell(file) - sizeof(wavHeader); + + if (this->dataSize > _MAX_SIZE) { + fclose(file); + this->good = false; + return; + } + + /* Allocating and reading samples. */ + this->data = reinterpret_cast(linearAlloc(this->dataSize)); + fseek(file, 44, SEEK_SET); + fread(this->data, 1, this->dataSize, file); + fclose(file); + + //if (wavHeader.bits_per_sample == 16) this->dataSize /= 2; // Not sure.. if that is actually needed at all. + + this->chnl = channel; + ndspChnReset(this->chnl); + ndspChnSetInterp(this->chnl, NDSP_INTERP_NONE); + ndspChnSetRate(this->chnl, float(wavHeader.frequency)); + ndspChnSetFormat(this->chnl, ((wavHeader.bits_per_sample == 8) ? NDSP_FORMAT_MONO_PCM8 : NDSP_FORMAT_MONO_PCM16)); + + /* Create and play a wav buffer. */ + memset(&this->waveBuf, 0, sizeof(this->waveBuf)); + + this->waveBuf.data_vaddr = reinterpret_cast(this->data); + this->waveBuf.nsamples = this->dataSize / (wavHeader.bits_per_sample >> 3); + this->waveBuf.looping = toloop; + this->waveBuf.status = NDSP_WBUF_FREE; +} + +Sound::~Sound() { + if (this->good) { + this->waveBuf.data_vaddr = 0; + this->waveBuf.nsamples = 0; + this->waveBuf.looping = false; + this->waveBuf.status = 0; + ndspChnWaveBufClear(this->chnl); + + if (this->data) linearFree(this->data); + } +} + +/* + Plays the sound. +*/ +void Sound::play() { + if (!this->data || !this->good) return; + + DSP_FlushDataCache(this->data, this->dataSize); + ndspChnWaveBufAdd(this->chnl, &this->waveBuf); +} + +/* + Stops the sound. +*/ +void Sound::stop() { + if (!this->data || !this->good) return; + + ndspChnWaveBufClear(this->chnl); +} \ No newline at end of file diff --git a/source/utils/stringutils.cpp b/source/utils/stringutils.cpp index 588fe59..bd55f10 100644 --- a/source/utils/stringutils.cpp +++ b/source/utils/stringutils.cpp @@ -1,6 +1,6 @@ /* * This file is part of Universal-Updater -* Copyright (C) 2019-2020 Universal-Team +* Copyright (C) 2019-2021 Universal-Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "common.hpp" #include "stringutils.hpp" +#include /* To lowercase conversion. @@ -64,14 +65,15 @@ std::string StringUtils::FetchStringsFromVector(const std::vector & /* adapted from GM9i's byte parsing. */ -std::string StringUtils::formatBytes(const int bytes) { +std::string StringUtils::formatBytes(u64 bytes) { char out[32]; - if (bytes == 1) snprintf(out, sizeof(out), "%d Byte", bytes); - else if (bytes < 1024) snprintf(out, sizeof(out), "%d Bytes", bytes); - else if (bytes < 1024 * 1024) snprintf(out, sizeof(out), "%.1f KB", (float)bytes / 1024); - else if (bytes < 1024 * 1024 * 1024) snprintf(out, sizeof(out), "%.1f MB", (float)bytes / 1024 / 1024); - else snprintf(out, sizeof(out), "%.1f GB", (float)bytes / 1024 / 1024 / 1024); + if (bytes == 1) snprintf(out, sizeof(out), "%lld Byte", bytes); + else if (bytes < 1ull << 10) snprintf(out, sizeof(out), "%lld Bytes", bytes); + else if (bytes < 1ull << 20) snprintf(out, sizeof(out), "%.1f KiB", (float)bytes / 1024); + else if (bytes < 1ull << 30) snprintf(out, sizeof(out), "%.1f MiB", (float)bytes / 1024 / 1024); + else if (bytes < 1ull << 40) snprintf(out, sizeof(out), "%.1f GiB", (float)bytes / 1024 / 1024 / 1024); + else snprintf(out, sizeof(out), "%.1f TiB", (float)bytes / 1024 / 1024 / 1024 / 1024); return out; } @@ -104,4 +106,15 @@ std::string StringUtils::GetMarkString(int marks) { if (marks & favoriteMarks::SPADE) out += "♠"; return out; +} + +std::string StringUtils::format(const char *fmt_str, ...) { + va_list ap; + char *fp = nullptr; + va_start(ap, fmt_str); + vasprintf(&fp, fmt_str, ap); + va_end(ap); + + std::unique_ptr formatted(fp, free); + return std::string(formatted.get()); } \ No newline at end of file diff --git a/source/utils/theme.cpp b/source/utils/theme.cpp new file mode 100644 index 0000000..e506c75 --- /dev/null +++ b/source/utils/theme.cpp @@ -0,0 +1,142 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019-2021 Universal-Team +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "theme.hpp" +#include +#include + +/** + * @brief Creates a 8 byte RGBA color + * @param r red component of the color + * @param g green component of the color + * @param b blue component of the color + * @param a alpha component of the color + */ +#define RGBA8(r, g, b, a) ((((r) & 0xFF) << 0) | (((g) & 0xFF) << 8) | (((b) & 0xFF) << 16) | (((a) & 0xFF) << 24)) + + +Theme::Theme(const std::string &ThemeJSON) { + FILE *file = fopen(ThemeJSON.c_str(), "rt"); + if (file) { + this->json = nlohmann::json::parse(file, nullptr, false); + fclose(file); + } + + if (!file || this->json.is_discarded()) this->json = this->InitWithDefaultColors(); + this->Loaded = true; +} + +nlohmann::json Theme::InitWithDefaultColors(const std::string &ThemePath) { + nlohmann::json JS = { + { "Default", { + { "BarColor", "#1A1A1A" }, + { "BGColor", "#0F0F0F" }, + { "BarOutline", "#2A2A2A" }, + { "TextColor", "#FFFFFF" }, + { "EntryBar", "#9B59B6" }, + { "EntryOutline", "#8E44AD" }, + { "BoxInside", "#16A085" }, + { "BoxSelected", "#2980B9" }, + { "BoxUnselected", "#000000" }, + { "ProgressbarOut", "#27AE60" }, + { "ProgressbarIn", "#2ECC71" }, + { "SearchBar", "#F1C40F" }, + { "SearchBarOutline", "#34495E" }, + { "SideBarSelected", "#E67E22" }, + { "SideBarUnselected", "#1A1A1A" }, + { "MarkSelected", "#E74C3C" }, + { "MarkUnselected", "#C0392B" }, + { "DownListPrev", "#9B59B6" }, + { "SideBarIconColor", "#FFFFFF" }, + { "Description", "A Deluxe Theme\n\nBy : MattTheTekie" } + }} + }; + + FILE *out = fopen(ThemePath.c_str(), "w"); + const std::string dump = JS.dump(1, '\t'); + fwrite(dump.c_str(), 1, JS.dump(1, '\t').size(), out); + fclose(out); + + return JS; +} + + +void Theme::LoadTheme(const std::string &ThemeName) { + this->vBarColor = this->GetThemeColor(ThemeName, "BarColor", C2D_Color32(50, 73, 98, 255)); + this->vBGColor = this->GetThemeColor(ThemeName, "BGColor", C2D_Color32(38, 44, 77, 255)); + this->vBarOutline = this->GetThemeColor(ThemeName, "BarOutline", C2D_Color32(25, 30, 53, 255)); + this->vTextColor = this->GetThemeColor(ThemeName, "TextColor", C2D_Color32(255, 255, 255, 255)); + this->vEntryBar = this->GetThemeColor(ThemeName, "EntryBar", C2D_Color32(50, 73, 98, 255)); + this->vEntryOutline = this->GetThemeColor(ThemeName, "EntryOutline", C2D_Color32(25, 30, 53, 255)); + this->vBoxInside = this->GetThemeColor(ThemeName, "BoxInside", C2D_Color32(28, 33, 58, 255)); + this->vBoxSelected = this->GetThemeColor(ThemeName, "BoxSelected", C2D_Color32(108, 130, 155, 255)); + this->vBoxUnselected = this->GetThemeColor(ThemeName, "BoxUnselected", C2D_Color32(0, 0, 0, 255)); + this->vProgressbarOut = this->GetThemeColor(ThemeName, "ProgressbarOut", C2D_Color32(28, 33, 58, 255)); + this->vProgressbarIn = this->GetThemeColor(ThemeName, "ProgressbarIn", C2D_Color32(77, 101, 128, 255)); + this->vSearchBar = this->GetThemeColor(ThemeName, "SearchBar", C2D_Color32(51, 75, 102, 255)); + this->vSearchBarOutline = this->GetThemeColor(ThemeName, "SearchBarOutline", C2D_Color32(25, 30, 53, 255)); + this->vSideBarSelected = this->GetThemeColor(ThemeName, "SideBarSelected", C2D_Color32(108, 130, 155, 255)); + this->vSideBarUnselected = this->GetThemeColor(ThemeName, "SideBarUnselected", C2D_Color32(77, 101, 128, 255)); + this->vMarkSelected = this->GetThemeColor(ThemeName, "MarkSelected", C2D_Color32(77, 101, 128, 255)); + this->vMarkUnselected = this->GetThemeColor(ThemeName, "MarkUnselected", C2D_Color32(28, 33, 58, 255)); + this->vDownListPrev = this->GetThemeColor(ThemeName, "DownListPrev", C2D_Color32(28, 33, 58, 255)); + this->vSideBarIconColor = this->GetThemeColor(ThemeName, "SideBarIconColor", C2D_Color32(173, 204, 239, 255)); +} + +std::vector> Theme::ThemeNames() { + std::vector> Temp = { }; + + if (this->Loaded) { + for(auto it = this->json.begin(); it != this->json.end(); ++it) { + if (this->json[it.key()].contains("Description") && this->json[it.key()]["Description"].is_string()) { + Temp.push_back(std::make_pair(it.key(), this->json[it.key()]["Description"])); + + } else { + Temp.push_back(std::make_pair(it.key(), it.key())); + } + } + } + + return Temp; +} + + +uint32_t Theme::GetThemeColor(const std::string &ThemeName, const std::string &Key, const uint32_t DefaultColor) { + if(this->json.contains(ThemeName) && this->json[ThemeName].is_object() && this->json[ThemeName].contains(Key) && this->json[ThemeName][Key].is_string()) { + const std::string &colorString = this->json[ThemeName][Key].get_ref(); + if (colorString.length() < 7 || std::regex_search(colorString.substr(1), std::regex("[^0-9A-Fa-f]"))) { // invalid color. + return DefaultColor; + } + + int r = std::stoi(colorString.substr(1, 2), nullptr, 16); + int g = std::stoi(colorString.substr(3, 2), nullptr, 16); + int b = std::stoi(colorString.substr(5, 2), nullptr, 16); + return RGBA8(r, g, b, 0xFF); + + } + + return DefaultColor; +}