Release v1.4.0 and fix several massive bugs.

Sachesi.pro

@@ -3,7 +3,7 @@ win32: QT += sql xmlpatterns
 
 TARGET="Sachesi"
 ICON=sachesi-114.png
-VERSION=1.3.2
+VERSION=1.4.0
 
 # Global specific
 win32:CONFIG(release, debug|release): CONFIG_DIR = $$join(OUT_PWD,,,/release)

qml/generic/installer.qml

@@ -45,6 +45,11 @@ PageTab {
                 font.pixelSize: config.defaultSubtextSize
             }
         }
+        Text {
+            anchors {bottom: parent.bottom; bottomMargin: 4; horizontalCenter: parent.horizontalCenter }
+            text: "Look at your device for total install percent."
+            font.pixelSize: config.defaultSubtextSize
+        }
         MouseArea {
             anchors.fill: parent
         }

qml/generic/usbconnect.qml

@@ -13,7 +13,7 @@ PageTab {
         Text {
             visible: !i.wrongPassBlock
             anchors.horizontalCenter: parent.horizontalCenter
-            text: "Searching for USB device"
+            text: "Searching for USB device" + (i.possibleDevices ? ("\nTalking to " + i.possibleDevices + " possible devices.") : "")
             font.pixelSize: config.defaultFontSize
         }
         Circle {

src/install.cpp

@@ -488,6 +488,8 @@ void InstallNet::login()
         }
     }
     ips.removeDuplicates();
+    // Keep the user updated with how many potential devices we are dealing with here.
+    setPossibleDevices(ips.count());
     if (ips.isEmpty())
         return;
     // Note: Removing fallback IP. Device will have to respond.

src/install.h

@@ -58,6 +58,7 @@ class InstallNet : public QObject {
     Q_PROPERTY(QString password READ password WRITE setPassword NOTIFY passwordChanged)
     Q_PROPERTY(bool wrongPass READ wrongPass WRITE setWrongPass NOTIFY wrongPassChanged)
     Q_PROPERTY(bool wrongPassBlock READ wrongPassBlock WRITE setWrongPassBlock NOTIFY wrongPassBlockChanged)
+    Q_PROPERTY(int possibleDevices READ possibleDevices WRITE setPossibleDevices NOTIFY possibleDevicesChanged)
     Q_PROPERTY(QString ip       READ ip       WRITE setIp       NOTIFY ipChanged)
     Q_PROPERTY(QString newLine  READ newLine  WRITE setNewLine  NOTIFY newLineChanged)
     Q_PROPERTY(int     state    READ state    NOTIFY stateChanged)
@@ -124,6 +125,7 @@ class InstallNet : public QObject {
     QString password() const;
     bool wrongPass() const;
     bool wrongPassBlock() const;
+    int possibleDevices() const;
     QString ip() const;
     QString newLine() const;
     int state() const;
@@ -158,6 +160,7 @@ class InstallNet : public QObject {
     void setPassword(const QString &password);
     void setWrongPass(const bool &wrong);
     void setWrongPassBlock(const bool &wrong);
+    void setPossibleDevices(const int &devices);
     void setNewLine(const QString &newLine);
     void setState(const int &state);
     void setDGProgress(const int &progress);
@@ -178,6 +181,7 @@ class InstallNet : public QObject {
     void newPassword(QString newPass);
     void wrongPassChanged();
     void wrongPassBlockChanged();
+    void possibleDevicesChanged();
     void ipChanged();
     void newLineChanged();
     void stateChanged();
@@ -258,6 +262,7 @@ private slots:
     QString _password;
     bool _wrongPass;
     bool _wrongPassBlock;
+    int _possibleDevices;
     QString _newLine;
     QFile _firmware;
     int _state;

src/install_qml.cpp

@@ -15,6 +15,8 @@
 // Official GIT repository and contact information can be found at
 // http://github.com/xsacha/Sachesi
 
+// This file is just Qt hooks that don't need to be seen. It should really do this for you anyway.
+
 #include "install.h"
 
 #define SET_QML(type, name) \
@@ -38,6 +40,7 @@
 SET_QML(QString, ip)
 SET_QML(bool, wrongPass)
 SET_QML2(bool, wrongPassBlock, setWrongPassBlock)
+SET_QML2(int, possibleDevices, setPossibleDevices)
 SET_QML(QString, newLine)
 SET_QML(QStringList, firmwareNames)
 SET_QML(QStringList, firmwarePaths)

src/main.cpp

@@ -57,7 +57,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     QString curPath = QDir::currentPath();
     // Use .app path instead of binary path. Should really use a different method.
 #ifdef __APPLE__
-    if (curPath.endsWith("Contents/MacOS")
+    if (curPath.endsWith("Contents/MacOS"))
         QDir::setCurrent(QApplication::applicationDirPath()+"/../../../");
 #endif
     if (curPath.endsWith(".tmp") || curPath.endsWith(".zip") || curPath.endsWith("/system32")) {

src/mainnet.cpp

@@ -256,8 +256,7 @@ void MainNet::cancelSplit()
 
 void MainNet::abortSplit()
 {
-    if (splitThread)
-        splitThread->quit();
+    killSplit();
     cancelSplit();
 }
 

src/splitter.cpp

@@ -74,6 +74,7 @@ void Splitter::extractDir(int nodenum, QString basedir, qint64 startPos, int tie
     QDir mainDir;
     if (!extractApps)
         mainDir.mkdir(basedir);
+
     QNXStream stream(signedFile);
     int count;
     qinode ind = createNode(nodenum, startPos);
@@ -109,7 +110,7 @@ void Splitter::extractDir(int nodenum, QString basedir, qint64 startPos, int tie
             if (ind2.perms & QCFM_IS_DIRECTORY)
             {
                 if (extractApps) {
-                    if (dir == "apps") {
+                    if (dir == "apps" && tier == 0) {
                         mainDir.mkdir(basedir);
                         extractDir(inodenum, basedir, startPos, 1);
                         continue;

src/splitter.h

@@ -98,7 +98,6 @@ public slots:
         currentZip = nullptr;
     }
 
-    // This should be used from the QML interface but isn't yet
     void killSplit() {
         kill = true;
         die();