joel16/VITA-Homebrew-Sorter
1
0
Fork 0
mirror of https://github.com/joel16/VITA-Homebrew-Sorter.git synced 2024-11-26 21:00:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

applist: Fix titles with single quotes not being parsed correctly

Browse Source
This commit is contained in:
Joel16 2022-01-10 00:12:33 -05:00
parent 29110f5bc7
commit d6ce91ec24
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/applist.cpp
View File

@ -20,14 +20,13 @@ namespace AppList {
entries.folders.clear();
entries.child_apps.clear();
sqlite3 *db;
sqlite3 *db = nullptr;
int ret = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE, nullptr);
if (ret)
return -1;
std::string query =
std::string("SELECT info_icon.pageId, info_page.pageNo, info_icon.pos, info_icon.title, info_icon.titleId, info_icon.reserved01, ")
std::string query = std::string("SELECT info_icon.pageId, info_page.pageNo, info_icon.pos, info_icon.title, info_icon.titleId, info_icon.reserved01, ")
+ "info_icon.icon0Type "
+ "FROM tbl_appinfo_icon info_icon "
+ "INNER JOIN tbl_appinfo_page info_page "
@ -66,8 +65,7 @@ namespace AppList {
sqlite3_finalize(stmt);
query =
std::string("SELECT DISTINCT info_page.pageId, info_page.pageNo ")
query = std::string("SELECT DISTINCT info_page.pageId, info_page.pageNo ")
+ "FROM tbl_appinfo_page info_page "
+ "INNER JOIN tbl_appinfo_icon info_icon "
+ "ON info_page.pageId = info_icon.pageId "
@ -112,7 +110,7 @@ namespace AppList {
int Save(std::vector<AppInfoIcon> &entries) {
int ret = 0;
sqlite3 *db;
sqlite3 *db = nullptr;
char *error = nullptr;
if (R_FAILED(ret = FS::CopyFile(path, path_edit)))
@ -147,8 +145,7 @@ namespace AppList {
std::string title = entries[i].title;
std::string titleId = entries[i].titleId;
std::string reserved01 = entries[i].reserved01;
std::string query =
std::string("UPDATE tbl_appinfo_icon_sort ")
std::string query = std::string("UPDATE tbl_appinfo_icon_sort ")
+ "SET pageId = " + std::to_string(entries[i].pageId) + ", pos = " + std::to_string(entries[i].pos) + " "
+ "WHERE ";
@ -160,7 +157,7 @@ namespace AppList {
query.append("reserved01 = " + reserved01 + ";");
}
else {
query.append((titleId == "(null)"? "title = '" + title + "'" : "titleId = '" + titleId + "'")
query.append((titleId == "(null)"? "title = \"" + title + "\"" : "titleId = \"" + titleId + "\"")
+ (entries[i].icon0Type == 7? " AND reserved01 = " + reserved01 + ";" : ";"));
}
@ -253,6 +250,7 @@ namespace AppList {
void Sort(AppEntries &entries) {
int pos = 0, pageCounter = 0;
for (unsigned int i = 0; i < entries.icons.size(); i ++) {
// Reset position
if (pos > 9) {
@ -312,7 +310,7 @@ namespace AppList {
std::vector<std::string> loadout_entries;
std::vector<std::string> diff_entries;
sqlite3 *db;
sqlite3 *db = nullptr;
int ret = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE, nullptr);
if (ret)

2
source/gui.cpp
View File

@ -27,7 +27,7 @@ namespace Renderer {
ImGui::Render();
ImGui_ImplVitaGL_RenderDrawData(ImGui::GetDrawData());
vglSwapBuffers(GL_FALSE);
vglSwapBuffers(GL_TRUE);
}
}

4
source/utils.cpp
View File

@ -7,8 +7,8 @@
#include "log.h"
#include "utils.h"
int SCE_CTRL_ENTER, SCE_CTRL_CANCEL;
unsigned int pressed;
int SCE_CTRL_ENTER = 0, SCE_CTRL_CANCEL = 0;
unsigned int pressed = 0;
namespace Utils {
static SceCtrlData pad, old_pad;