Force old cache update + remove wideTitles

Author: J-D-K

inc/data.h

@@ -28,7 +28,6 @@ namespace data
             std::string getProdCode() { return prodCode; }
             std::u16string getTitle() { return title; }
             std::u16string getTitleSafe() { return titleSafe; }
-            std::u32string getTitleWide() { return wideTitle; }
 
             void drawInfo(unsigned x, unsigned y);
 
@@ -37,7 +36,6 @@ namespace data
             uint32_t high, low, unique, extdata;
             std::string prodCode;
             std::u16string title, titleSafe;
-            std::u32string wideTitle;
             FS_MediaType m;
     };
 

inc/gfx.h

@@ -16,7 +16,6 @@ namespace gfx
 
     void drawText(const std::string& str, const int& x, const int& y, const uint32_t& clr);
     void drawU16Text(const std::u16string& str, const int& x, const int& y, const uint32_t& clr);
-    void drawU32Text(const std::u32string& str, const int& x, const int& y, const uint32_t& clr);
     size_t getTextWidth(const std::string& str);
 }
 

inc/util.h

@@ -16,9 +16,7 @@ namespace util
     };
 
     std::string toUtf8(const std::u16string& conv);
-    std::string toUtf8(const std::u32string& conv);
     std::u16string toUtf16(const std::string& conv);
-    std::u32string toUtf32(const std::u16string& conv);
     std::u16string createPath(data::titleData& dat, const uint32_t& mode);
     std::string getString(const std::string& hint, bool def);
     int getInt(const std::string& hint, const int& init, const int& max);

src/data.cpp

@@ -93,9 +93,8 @@ namespace data
         if(smdh == NULL)
             return false;
 
-        title = (char16_t *)smdh->applicationTitles[1].shortDescription;
+        title.assign((char16_t *)(smdh->applicationTitles[1].shortDescription));
         titleSafe.assign(safeTitle(title));
-        wideTitle = util::toUtf32(title);
 
         char tmp[16];
         AM_GetTitleProductCode(m, id, tmp);
@@ -118,7 +117,6 @@ namespace data
 
         title.assign(_title);
         titleSafe.assign(safeTitle(title));
-        wideTitle.assign(util::toUtf32(title));
         prodCode.assign(code);
 
         return true;
@@ -252,6 +250,19 @@ namespace data
         std::fstream cache("/JKSV/titles", std::ios::in | std::ios::binary);
         if(cache.is_open())
         {
+            uint8_t cacheRev = 0;
+            cache.seekg(2, cache.beg);
+            cacheRev = cache.get();
+            cache.seekg(0, cache.beg);
+
+            if(cacheRev < 2)
+            {
+                cache.close();
+                std::remove("/JKSV/titles");
+                loadTitles();
+                return;
+            }
+
             uint16_t count = 0;
             cache.read((char *)&count, sizeof(uint16_t));
 
@@ -301,6 +312,7 @@ namespace data
                         titles.push_back(newTitle);
                     }
                 }
+                else
 
                 prog.update(i);
 
@@ -320,7 +332,7 @@ namespace data
             {
                 uint16_t countOut = titles.size();
                 cache.write((char *)&countOut, sizeof(uint16_t));
-                cache.put(0x00);
+                cache.put(0x02);
 
                 for(unsigned i = 0; i < titles.size(); i++)
                 {
@@ -354,6 +366,18 @@ namespace data
         std::fstream cache("/JKSV/nand", std::ios::in | std::ios::binary);
         if(cache.is_open())
         {
+            uint8_t cacheRev = 0;
+            cache.seekg(2, cache.beg);
+            cacheRev = cache.get();
+            cache.seekg(0, cache.beg);
+            if(cacheRev < 2)
+            {
+                cache.close();
+                std::remove("/JKSV/nand");
+                loadNand();
+                return;
+            }
+
             uint16_t count;
             cache.read((char *)&count, sizeof(uint16_t));
 
@@ -411,7 +435,7 @@ namespace data
             uint16_t countOut = nand.size();
             cache.open("/JKSV/nand", std::ios::out | std::ios::binary);
             cache.write((char *)&countOut, sizeof(uint16_t));
-            cache.put(0x00);
+            cache.put(0x02);
             for(unsigned i = 0; i < nand.size(); i++)
             {
                 char16_t titleOut[0x40];

src/gfx.cpp

@@ -79,19 +79,6 @@ namespace gfx
         C2D_TextBufDelete(tmpBuf);
     }
 
-    void drawU32Text(const std::u32string& str, const int& x, const int& y, const uint32_t& clr)
-    {
-        C2D_Text tmpTxt;
-        C2D_TextBuf tmpBuf = C2D_TextBufNew(1024);
-
-        std::string tmp = util::toUtf8(str);
-
-        C2D_TextParse(&tmpTxt, tmpBuf, tmp.c_str());
-        C2D_TextOptimize(&tmpTxt);
-        C2D_DrawText(&tmpTxt, C2D_WithColor, (float)x, (float) y, 0.5f, 0.5f, 0.5f, clr);
-        C2D_TextBufDelete(tmpBuf);
-    }
-
     size_t getTextWidth(const std::string& str)
     {
         float ret = 0;

src/ui.cpp

@@ -260,7 +260,7 @@ namespace ui
 
         gfx::frameBegin();
         gfx::frameStartTop();
-        drawTopBar(util::toUtf8(data::curData.getTitleWide()));
+        drawTopBar(util::toUtf8(data::curData.getTitle()));
         backupMenu.draw(40, 82, C2D_Color32(0xFF, 0xFF, 0xFF, 0xFF), 320);
         gfx::frameStartBot();
         gfx::frameEnd();
@@ -335,7 +335,7 @@ namespace ui
 
         gfx::frameBegin();
         gfx::frameStartTop();
-        drawTopBar(util::toUtf8(data::curData.getTitleWide()));
+        drawTopBar(util::toUtf8(data::curData.getTitle()));
         nandBackupMenu.draw(40, 88, C2D_Color32(0xFF, 0xFF, 0xFF, 0xFF), 320);
         gfx::frameStartBot();
         gfx::frameEnd();

src/util.cpp

@@ -19,14 +19,6 @@ namespace util
         return std::string((char *)tmp);
     }
 
-    std::string toUtf8(const std::u32string& conv)
-    {
-        uint8_t tmp[1024];
-        std::memset(tmp, 0, 1024);
-        utf32_to_utf8(tmp, (uint32_t *)conv.data(), 1024);
-        return std::string((char *)tmp);
-    }
-
     std::u16string toUtf16(const std::string& conv)
     {
         char16_t tmp[1024];
@@ -35,14 +27,6 @@ namespace util
         return std::u16string(tmp);
     }
 
-    std::u32string toUtf32(const std::u16string& conv)
-    {
-        uint32_t tmp[1024];
-        std::memset(tmp, 0, 1024 * 4);
-        utf16_to_utf32(tmp, (uint16_t *)conv.data(), 1024);
-        return std::u32string((char32_t *)tmp);
-    }
-
     std::u16string createPath(data::titleData& dat, const uint32_t& mode)
     {
         std::u16string ret;