1.8 release, implemented #37 and #44, with minor fixes

soarqin · Mar 13, 2019 · 49daaa8 · 49daaa8
1 parent b1e3d7a
commit 49daaa8
Show file tree

Hide file tree

Showing 18 changed files with 562 additions and 424 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+v1.8
+1. Support for memcore(h-encore 2.0 for VITA 3.60 support with PSN access), compiled from [my fork](https://github.com/soarqin/h-encore), thanks to [CelesteBlue-dev](https://github.com/CelesteBlue-dev) for his port
+2. Can trim h-encore app to only 6.5MB now, thanks to [KuromeSan](https://github.com/KuromeSan)
+3. Fixed a bug that button is reset to be clickable when another info sync from PSVITA is received
+4. Fixed French language
+
 v1.71
 1. Updated official fix for h-encore 2.0
 

diff --git a/src/finalhe.ui b/src/finalhe.ui
@@ -119,7 +119,7 @@
              </font>
             </property>
             <property name="text">
-             <string>Trim h-encore to ~13MB</string>
+             <string>Trim h-encore to ~6.5MB</string>
             </property>
            </widget>
           </item>

diff --git a/src/package.cc b/src/package.cc
@@ -31,8 +31,9 @@
 #include <QSettings>
 
 const char *HENCORE_FULL_FILE = "h-encore-full.zip";
-const char *HENCORE_FULL_SHA256 = "3ea59bdf6e7d8f5aa96cabd4f0577fcf78822970f463680b0758a5aaa332452d";
+const char *HENCORE_FULL_SHA256 = "f4dc2160e79475237932180956b2fc14ac73eebe6b4e09a14dfa02ad94e0c99e";
 const char *MEMCORE_FULL_FILE = "memcore-full.zip";
+const char *MEMCORE_FULL_SHA256 = "e6945976de13d2e4257b917d2e18a1eb5e44c1adf9ab197804cdd4637ad974fa";
 
 const char *BSPKG_URL = "http://ares.dl.playstation.net/cdn/JP0741/PCSG90096_00/xGMrXOkORxWRyqzLMihZPqsXAbAXLzvAdJFqtPJLAZTgOcqJobxQAhLNbgiFydVlcmVOrpZKklOYxizQCRpiLfjeROuWivGXfwgkq.pkg";
 const char *BSPKG_FILE = "BitterSmile.pkg";
@@ -159,8 +160,16 @@ void Package::startUnpackDemo(const char *filename) {
         } else {
             curr.cd("h-encore");
             curr.cd("app");
-            curr.rename("PCSG90096", "ux0_temp_game_PCSG90096_app_PCSG90096");
-            *(bool*)arg = true;
+            int count = 10;
+            while (count > 0) {
+                if (curr.rename("PCSG90096", "ux0_temp_game_PCSG90096_app_PCSG90096")) break;
+                QThread::msleep(500);
+                --count;
+            }
+            if (count == 0) {
+                qWarning("Failed to unpack %s!", filename);
+                emit setStatusText(tr("Failed to unpack %1").arg(filename));
+            } else *(bool*)arg = true;
         }
         QDir::setCurrent(oldDir);
     }, [this](void *arg) {
@@ -277,7 +286,7 @@ void Package::startUnpackZipsFull() {
     for (auto &p : selectedExtraApps) {
         unzipQueue.push_back(*p);
     }
-    unzipQueue.push_back(AppInfo{ QDir(pkgBasePath).filePath(HENCORE_FULL_FILE), "PCSG90096", "h-encore" });
+    unzipQueue.push_back(AppInfo{ QDir(pkgBasePath).filePath(useMemcore ? MEMCORE_FULL_FILE : HENCORE_FULL_FILE), "PCSG90096", "h-encore" });
     emit unpackNext();
 }
 
@@ -424,8 +433,8 @@ void Package::checkHencoreFull() {
     static bool succ = false;
     Worker::start(this, [this](void *arg) {
         QDir dir(pkgBasePath);
-        QString filename = dir.filePath(HENCORE_FULL_FILE);
-        *(bool*)arg = verify(filename, HENCORE_FULL_SHA256);
+        QString filename = useMemcore ? dir.filePath(MEMCORE_FULL_FILE) : dir.filePath(HENCORE_FULL_FILE);
+        *(bool*)arg = verify(filename, useMemcore ? MEMCORE_FULL_SHA256 : HENCORE_FULL_SHA256);
     }, [this](void *arg) {
         if (*(bool*)arg) {
             startUnpackZipsFull();
@@ -452,13 +461,33 @@ void Package::createPsvImgs(QString titleID) {
                 emit setStatusText(tr("Trimming package"));
                 if (curr.cd("app") && curr.cd("ux0_temp_game_PCSG90096_app_PCSG90096")) {
                     QDir cdir = curr;
+                    if (cdir.cd("sce_module")) {
+                        cdir.remove("libface.suprx");
+                        cdir.remove("libsmart.suprx");
+                        cdir.remove("libult.suprx");
+                    }
+                    cdir = curr;
+                    if (cdir.cd("sce_sys")) {
+                        cdir.remove("icon0.png");
+                        cdir.remove("pic0.png");
+                    }
+                    cdir = curr;
+                    if (cdir.cd("sce_sys") && cdir.cd("about"))
+                        cdir.removeRecursively();
+                    cdir = curr;
+                    if (cdir.cd("sce_sys") && cdir.cd("livearea"))
+                        cdir.removeRecursively();
+                    cdir = curr;
+                    if (cdir.cd("sce_sys") && cdir.cd("manual"))
+                        cdir.removeRecursively();
+                    cdir = curr;
                     if (cdir.cd("resource") && cdir.cd("movie"))
                         cdir.removeRecursively();
                     cdir = curr;
                     if (cdir.cd("resource") && cdir.cd("sound"))
                         cdir.removeRecursively();
                     cdir = curr;
-                    if (cdir.cd("resource") && cdir.cd("text") && cdir.cd("01"))
+                    if (cdir.cd("resource") && cdir.cd("text"))
                         cdir.removeRecursively();
                     cdir = curr;
                     if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("bg"))
@@ -473,6 +502,32 @@ void Package::createPsvImgs(QString titleID) {
                     if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("stitle"))
                         cdir.removeRecursively();
                     cdir = curr;
+                    if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("sys"))
+                        cdir.removeRecursively();
+                    cdir = curr;
+                    if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("sysc")) {
+                        cdir.remove("kuro_waku.png");
+                        cdir.remove("shiro_waku.png");
+                        cdir.remove("sysc_bgm_mode_base.jpg");
+                        cdir.remove("sysc_black.jpg");
+                        cdir.remove("sysc_button_number.png");
+                        cdir.remove("sysc_cg_mode_base.jpg");
+                        cdir.remove("sysc_how_to_base.jpg");
+                        cdir.remove("sysc_info_base.jpg");
+                        cdir.remove("sysc_log_base.jpg");
+                        cdir.remove("sysc_mabuta_1.png");
+                        cdir.remove("sysc_mabuta_2.png");
+                        cdir.remove("sysc_rain.png");
+                        cdir.remove("sysc_save_base.jpg");
+                        cdir.remove("sysc_sepia.jpg");
+                        cdir.remove("sysc_shuuchuu.png");
+                        cdir.remove("sysc_small_black.jpg");
+                        cdir.remove("sysc_snow.png");
+                        cdir.remove("sysc_tobira_l.png");
+                        cdir.remove("sysc_tobira_r.png");
+                        cdir.remove("sysc_white.jpg");
+                    }
+                    cdir = curr;
                     if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("tachie"))
                         cdir.removeRecursively();
                 }

diff --git a/src/translations/cs_CZ.ts b/src/translations/cs_CZ.ts
@@ -28,60 +28,64 @@
         <translation type="vanished">K zapisování do této složky nemáte práva! Ukončuji.</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="147"/>
+        <location filename="../finalhe.cc" line="156"/>
         <source>Firmware %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="150"/>
+        <location filename="../finalhe.cc" line="159"/>
         <source>-- Firmware update --</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="166"/>
+        <location filename="../finalhe.cc" line="175"/>
         <source>-- Additional applications --</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="195"/>
-        <location filename="../finalhe.cc" line="220"/>
+        <location filename="../finalhe.cc" line="204"/>
+        <location filename="../finalhe.cc" line="229"/>
+        <location filename="../finalhe.cc" line="254"/>
         <source>Fimrware version is not supported by h-encore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="196"/>
-        <location filename="../finalhe.cc" line="221"/>
+        <location filename="../finalhe.cc" line="205"/>
+        <location filename="../finalhe.cc" line="230"/>
+        <location filename="../finalhe.cc" line="255"/>
         <source>Update to %1 first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="199"/>
-        <location filename="../finalhe.cc" line="224"/>
+        <location filename="../finalhe.cc" line="208"/>
+        <location filename="../finalhe.cc" line="233"/>
+        <location filename="../finalhe.cc" line="258"/>
         <source>To update through USB:
 Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="198"/>
-        <location filename="../finalhe.cc" line="223"/>
+        <location filename="../finalhe.cc" line="207"/>
+        <location filename="../finalhe.cc" line="232"/>
+        <location filename="../finalhe.cc" line="257"/>
         <source>On PS Vita:
 Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="232"/>
+        <location filename="../finalhe.cc" line="267"/>
         <source>Click button to START!</source>
         <translation>Stiskněte tlačítko pro START!</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="250"/>
+        <location filename="../finalhe.cc" line="285"/>
         <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
         <translation>Registruji zařízení: %1
 Zadejte na Vaší Vitě následující PIN: %2</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="254"/>
+        <location filename="../finalhe.cc" line="289"/>
         <source>Registered device.</source>
         <translation>Zařízení zaregistrované.</translation>
     </message>
@@ -95,49 +99,50 @@ Zadejte na Vaší Vitě následující PIN: %2</translation>
     </message>
     <message>
         <location filename="../finalhe.ui" line="122"/>
-        <source>Trim h-encore to ~13MB</source>
-        <translation>Zmenšit velikost h-encore na ~13MB</translation>
+        <source>Trim h-encore to ~6.5MB</source>
+        <translation>Zmenšit velikost h-encore na ~6.5MB</translation>
     </message>
 </context>
 <context>
     <name>Package</name>
     <message>
-        <location filename="../package.cc" line="122"/>
+        <location filename="../package.cc" line="124"/>
         <source>Downloading %1</source>
         <translation>Stahuji %1</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="143"/>
+        <location filename="../package.cc" line="145"/>
         <source>Unpacking %1</source>
         <translation>Rozbaluji %1</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="157"/>
+        <location filename="../package.cc" line="159"/>
+        <location filename="../package.cc" line="171"/>
         <source>Failed to unpack %1</source>
         <translation>Rozbalování selhalo %1</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="186"/>
+        <location filename="../package.cc" line="196"/>
         <source>Decompressing %1</source>
         <translation>Dekomprimuji %1</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="206"/>
+        <location filename="../package.cc" line="216"/>
         <source>Failed to decompress %1</source>
         <translation>Dekomprimace selhala %1</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="296"/>
+        <location filename="../package.cc" line="306"/>
         <source>Verifying %1</source>
         <translation>Ověřuji %1</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="325"/>
+        <location filename="../package.cc" line="335"/>
         <source>sha256sum mismatch! Please check your network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package.cc" line="415"/>
+        <location filename="../package.cc" line="425"/>
         <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -160,17 +165,17 @@ Click button to START!</source>
 Stiskněte tlačítko pro START!</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="451"/>
+        <location filename="../package.cc" line="461"/>
         <source>Trimming package</source>
         <translation>Zmenšuji balíček</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="58"/>
+        <location filename="../package.cc" line="60"/>
         <source>Launch Content Manager on PS Vita and connect to computer.</source>
         <translation>Spusťte na Vaší Vitě &quot;Content Manager&quot; a připojte Vitu k počítači.</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="486"/>
+        <location filename="../package.cc" line="542"/>
         <source>Createing psvimg&apos;s</source>
         <translation>Vytvářím psvimg</translation>
     </message>
@@ -184,18 +189,18 @@ Prosím, zkontrolujte připojení k síťi!</translation>
 <context>
     <name>VitaConn</name>
     <message>
-        <location filename="../vita.cc" line="438"/>
+        <location filename="../vita.cc" line="445"/>
         <source>Waiting for connection to PS Vita...</source>
         <translation>Čekám na spojení s PS Vitou...</translation>
     </message>
     <message>
-        <location filename="../vita.cc" line="441"/>
-        <location filename="../vita.cc" line="443"/>
+        <location filename="../vita.cc" line="448"/>
+        <location filename="../vita.cc" line="450"/>
         <source>Connected to PS Vita</source>
         <translation>Připojeno k PS Vitě</translation>
     </message>
     <message>
-        <location filename="../vita.cc" line="441"/>
+        <location filename="../vita.cc" line="448"/>
         <source>Waiting for account ID</source>
         <translation>čekám na ID účtu</translation>
     </message>
@@ -204,7 +209,7 @@ Prosím, zkontrolujte připojení k síťi!</translation>
     <name>base</name>
     <message>
         <location filename="../finalhe.cc" line="63"/>
-        <location filename="../finalhe.cc" line="316"/>
+        <location filename="../finalhe.cc" line="351"/>
         <source>English</source>
         <translation>Anglicky</translation>
     </message>