Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-03-21 17:24:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: PR-related cleanup

Browse Source 
- updated build instructions
- added user-agent header to webdav calls
- Generalized popDriveNotActive to popRemoteNotActive
- Updated version identifier presented in app
- Removed some commented code
This commit is contained in:
Martin Riedel 2023-07-10 15:01:44 -04:00
parent 938c52b603
commit f342bf15af
22 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -38,7 +38,7 @@ INCLUDES := inc inc/ui inc/fs inc/gfx
EXEFS_SRC := exefs_src
APP_TITLE := JKSV
APP_AUTHOR := JK
APP_VERSION := 02.23.2023
APP_VERSION := 07.10.2023
ROMFS := romfs
ICON := icon.jpg

2
README.MD
View File

@ -98,7 +98,7 @@ This started as a simple, straight port of my 3DS save manager I publicly releas
## Building:
1. Requires [devkitPro](https://devkitpro.org/) and [libnx](https://github.com/switchbrew/libnx)
2. `dkp-pacman -S switch-curl switch-freetype switch-libjpeg-turbo switch-libjson-c switch-libpng switch-libwebp switch-sdl2 switch-sdl2_gfx switch-sdl2_image switch-zlib`
2. `dkp-pacman -S switch-curl switch-freetype switch-libjpeg-turbo switch-tinyxml2 switch-libjson-c switch-libpng switch-libwebp switch-sdl2 switch-sdl2_gfx switch-sdl2_image switch-zlib`
## Credits and Thanks:
* [shared-font](https://github.com/switchbrew/switch-portlibs-examples) example by yellows8 for loading system font with Freetype. All other font handling code (converting to SDL2, resizing on the fly, checking for glyphs, cache, etc) is my own.

4
inc/data.h
View File

@ -7,8 +7,8 @@
#include "gfx.h"
#define BLD_MON 02
#define BLD_DAY 23
#define BLD_MON 07
#define BLD_DAY 10
#define BLD_YEAR 2023
namespace data

2
romfs/lang/de.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/en-GB.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/en-US.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/es-419.txt
View File

@ -84,7 +84,7 @@ popChangeOutputFolder = 0, "Se cambia #%s# por #%s#"
#CHANGED=============================================>
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/es.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/fr-CA.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/fr.txt
View File

@ -66,7 +66,7 @@ popCPUBoostEnabled = 0, "CPU Boost activé pour les ZIP."
popChangeOutputError = 0, "#%s# contient des caractères incorrects ou non-ASCII."
popChangeOutputFolder = 0, "#%s# modifié en #%s#"
popDriveFailed = 0, "Echec du démarrage de Google Drive."
popDriveNotActive = 0, "Google Drive n'est pas utilisable"
popRemoteNotActive = 0, "Remote n'est pas utilisable"
popDriveStarted = 0, "Google Drive lancé avec succès."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/it.txt
View File

@ -66,7 +66,7 @@ popCPUBoostEnabled = 0, "CPU Boost Abilitato per ZIP."
popChangeOutputError = 0, "#%s# contiene caratteri illeciti o non-ASCII."
popChangeOutputFolder = 0, "#%s# cambiato in #%s#"
popDriveFailed = 0, "Impossibile avviare Google Drive."
popDriveNotActive = 0, "Google Drive non è Disponibile"
popRemoteNotActive = 0, "Remote non è Disponibile"
popDriveStarted = 0, "Google Drive avviato con successo."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/ja.txt
View File

@ -84,7 +84,7 @@ popChangeOutputFolder = 0, "#%s# から #%s#　に変更"
#CHANGED=============================================>
popDriveFailed = 0, "Google Driveの起動に失敗しました。"
popDriveNotActive = 0, "Googleドライブは使用できません"
popRemoteNotActive = 0, "Remoteドライブは使用できません"
popDriveStarted = 0, "Google Driveが正常に起動しました。"
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/ko.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "ZIP를 위한 CPU 부스트가 활성화되었습니다
popChangeOutputError = 0, "#%s#에 잘못된 또는 ASCII가 아닌 문자가 포함되어 있습니다."
popChangeOutputFolder = 0, "#%s#이(가) #%s#로 변경되었습니다."
popDriveFailed = 0, "구글 드라이브 시작에 실패했습니다."
popDriveNotActive = 0, "구글 드라이브를 사용할 수 없습니다."
popRemoteNotActive = 0, "구글 드라이브를 사용할 수 없습니다."
popDriveStarted = 0, "구글 드라이브가 성공적으로 시작되었습니다."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/nl.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/pt.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/ru.txt
View File

@ -67,7 +67,7 @@ popCPUBoostEnabled = 0, "CPU Boost Enabled for ZIP."
popChangeOutputError = 0, "#%s# contains illegal or non-ASCII characters."
popChangeOutputFolder = 0, "#%s# changed to #%s#"
popDriveFailed = 0, "Failed to start Google Drive."
popDriveNotActive = 0, "Google Drive is not available"
popRemoteNotActive = 0, "Remote is not available"
popDriveStarted = 0, "Google Drive started successfully."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/zh-CN.txt
View File

@ -66,7 +66,7 @@ popCPUBoostEnabled = 0, "为ZIP压缩启用CPU超频。"
popChangeOutputError = 0, "#%s#包含非法或者非ASCII的字符。"
popChangeOutputFolder = 0, "#%s#更改到#%s#"
popDriveFailed = 0, "Google Drive启动失败。"
popDriveNotActive = 0, "Google Drive不可用。"
popRemoteNotActive = 0, "Remote不可用。"
popDriveStarted = 0, "Google Drive启动成功。"
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
romfs/lang/zh-TW.txt
View File

@ -66,7 +66,7 @@ popCPUBoostEnabled = 0, "壓縮ZIP時將啟用CPU超頻."
popChangeOutputError = 0, "#%s# 包含非法或者非ASCII字元."
popChangeOutputFolder = 0, "#%s# 更改到 #%s#"
popDriveFailed = 0, "無法啟用Google雲端硬碟."
popDriveNotActive = 0, "沒有可用的Google雲端硬碟."
popRemoteNotActive = 0, "沒有可用的Remote雲端硬碟."
popDriveStarted = 0, "Google雲端硬碟已正確啟用."
popWebdavStarted = 0, "Webdav started successfully."
popWebdavFailed =, 0, "Failed to start Webdav."

2
src/fs/remote.cpp
View File

@ -129,8 +129,6 @@ void fs::webDavInit() {
}
}
// webdav->listInit(rfsRootID);
rfs = webdav;
ui::showPopMessage(POP_FRAME_DEFAULT, ui::getUICString("popWebdavStarted", 0));
}

2
src/ui/fld.cpp
View File

@ -155,7 +155,7 @@ static void fldFuncUpload(void *a)
if(fs::rfs)
ui::newThread(fldFuncUpload_t, a, NULL);
else
ui::showPopMessage(POP_FRAME_DEFAULT, ui::getUICString("popDriveNotActive", 0));
ui::showPopMessage(POP_FRAME_DEFAULT, ui::getUICString("popRemoteNotActive", 0));
}
static void fldFuncDownload_t(void *a)

2
src/ui/uistr.cpp
View File

@ -287,7 +287,7 @@ void ui::initStrings()
addUIString("popSVIExported", 0, "SVI Exported.");
addUIString("popDriveStarted", 0, "Google Drive started successfully.");
addUIString("popDriveFailed", 0, "Failed to start Google Drive.");
addUIString("popDriveNotActive", 0, "Google Drive is not available");
addUIString("popRemoteNotActive", 0, "Remote is not available");
addUIString("popWebdavStarted", 0, "Webdav started successfully.");
addUIString("popWebdavFailed", 0, "Failed to start Webdav.");

8
src/webdav.cpp
View File

@ -7,6 +7,7 @@ rfs::WebDav::WebDav(const std::string& origin, const std::string& username, cons
{
curl = curl_easy_init();
if (curl) {
curl_easy_setopt(curl, CURLOPT_USERAGENT, USER_AGENT);
if (!username.empty())
curl_easy_setopt(curl, CURLOPT_USERNAME, username.c_str());
@ -300,13 +301,6 @@ std::vector<rfs::RfsItem> rfs::WebDav::parseXMLResponse(const std::string& xml)
continue; // do not push parent to list (we are only interested in the children)
}
// fs::logWrite("WebDav: Adding %s with\n", item.name.c_str());
// fs::logWrite("WebDav: ID: %s\n", item.id.c_str());
// fs::logWrite("WebDav: ParentID: %s\n", item.parent.c_str());
// fs::logWrite("WebDav: Directory?: %s\n", item.isDir ? "yes" : "no");
// fs::logWrite("WebDav: Size: %u\n", item.size);
items.push_back(item);
}