Display tweaks and small fix regarding title id not being properly ex…

…tracted when displaying the updated cheats

.gitignore

@@ -8,3 +8,4 @@ test/
 *.nacp
 *.nro
 *.zip
+*.ai

Makefile

@@ -45,7 +45,7 @@ INCLUDES	:=	include libs/minizip/include
 #ROMFS		:=	romfs
 APP_TITLE   :=  Cheats Updater
 APP_AUTHOR  :=  HamletDuFromage & Acta
-APP_VERSION :=  1.1.8
+APP_VERSION :=  1.2.0
 
 #---------------------------------------------------------------------------------
 # options for code generation

README.md

@@ -16,9 +16,12 @@ By default, this homebrew will overwrite the existing cheats. If you have your o
 Copy the `switch-cheats-updater/` directory to `/switch/` in your sdcard
 
 ## Screenshots
-![done](https://user-images.githubusercontent.com/61667930/79614220-643e2980-8100-11ea-83ec-0a6002f1f6b5.jpg)
+![Home](https://user-images.githubusercontent.com/61667930/81458764-74e03d80-919c-11ea-87da-0073dad8aebe.jpg)
+![Done](https://user-images.githubusercontent.com/61667930/81458769-81649600-919c-11ea-813d-6c34bc4266c7.jpg)
 
 ## Thanks
-[ITotalJustice](https://github.com/ITotalJustice) for his download functions
+- [wilsam239 (Acta)](https://github.com/wilsam239) for his [significant QOL contribtions](https://github.com/HamletDuFromage/switch-cheats-updater/pull/3)
 
-The AtlasNX discord for helping me various with libnx questions in the past few weeks
+- [ITotalJustice](https://github.com/ITotalJustice) for his download functions
+
+- The AtlasNX discord for helping me various with libnx questions in the past few weeks

include/titles.hpp

@@ -7,6 +7,7 @@
 #include <fstream>
 #include <string>
 #include <vector>
+#include <switch.h>
 
 #include "title.h"
 

source/extract.cpp

@@ -243,7 +243,7 @@ int extractCheats(std::string zipPath, std::vector<Title> titles, bool sxos, boo
                     std::cout << std::setfill(' ') << std::setw(80) << '\r';
 
                     name = "No name retrieved.";
-                    id = e.substr(7, 16);
+                    id = e.substr(offset, 16);
                     std::transform(id.begin(), id.end(), id.begin(), ::toupper);
 
                     for(int i = 0; i < (int)titles.size(); i++) {

source/main.cpp

@@ -11,7 +11,7 @@
 #include "download.hpp"
 #include "titles.hpp"
 
-#define VERSION "1.1.8"
+#define VERSION "1.2.0"
 #define RELEASE_URL "https://github.com/HamletDuFromage/switch-cheats-db/releases/tag/v1.0"
 #define ARCHIVE_URL "https://github.com/HamletDuFromage/switch-cheats-db/releases/download/v1.0/"
 
@@ -151,9 +151,9 @@ void viewTitles() {
 
     int total = titles.size();
 
-    std::cout << "\033[0;32m" << "Found " << total << " installed titles" << "\033[0m" << std::endl << std::endl;
-
     printTitles(titles);
+
+    std::cout << std::endl << "\033[0;32m" << "Found " << total << " installed titles" << "\033[0m" << std::endl;
 
     std::cout << std::endl;
 
@@ -164,11 +164,12 @@ void viewHeader() {
     std::cout << "\033[1;31m" << "Cheats Updater v" << VERSION << " by HamletDuFromage & Acta" << "\033[0m" <<std::endl;
     std::cout << "\033[31m" << "================================================================================" << "\033[0m" << std::endl;
     std::cout << std::endl;
+    consoleUpdate(NULL);
 }
 void viewMain() {
     viewHeader();
 
-    std::cout << "\033[36m" << "Title ids listed in \"/config/cheats-updater/exclude.txt\" won't get cheat updates" << "\033[0m" << std::endl;
+    std::cout << "\033[36m" << "Title IDs listed in \"/config/cheats-updater/exclude.txt\" won't get cheat updates" << "\033[0m" << std::endl;
 
     std::cout << "Press [A] to download and update cheat files" << std::endl;
     std::cout << "Press [B] to view installed titles" << std::endl;

source/titles.cpp

@@ -1,5 +1,6 @@
 #include "titles.hpp"
 
+
 /**
  * writeTitlesToFile
  * Writes the input vector to the updated.dat file in config
@@ -48,7 +49,9 @@ std::vector<Title> readTitlesFromFile() {
 **/
 void outputUpdatedTitles() {
     std::vector<Title> titles = readTitlesFromFile();
-    std::cout << "Updated Titles:" << std::endl << std::endl;
+
+    std::cout << "Updated Titles:" << std::endl;
+
     printTitles(titles);
 
     std::cout << "\033[7;37m"<< "\nPress [-] to return to main menu" << "\033[0m" <<std::endl;
@@ -67,5 +70,6 @@ void printTitles(std::vector<Title> titles) {
             titles.at(i).name.append("...");
         }
         std::cout << "\033[1;37m" << "Title ID: " << "\033[0m" << titles.at(i).id << "\033[1;37m" << " Title Name: " << "\033[0m" << titles.at(i).name << std::endl;
+        consoleUpdate(NULL);
     }
 }