tempo-plotter Changeset - 5c9db4e54bbd · protofusion repositories

Changeset - 5c9db4e54bbd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 7 years ago 2019-05-03 16:08:12
hy@ozderya.net

fix crash during update check #16

1 file changed with 1 insertions and 1 deletions:

src/updatechecker.cpp

0 comments (0 inline, 0 general)

src/updatechecker.cpp

➞

Show inline comments

@@ @@ -73,97 +73,97 @@ void UpdateChecker::onReqFinished(QNetwo @@
             emit checkFailed(QString("JSon parsing error: ") + error.errorString());
+        }
         else
+        {
             QList<FileInfo> files;
             if (!parseData(data, files))
+            {
                 // TODO: emit detailed data contents for logging
                 emit checkFailed("Data parsing error.");
+            }
             else
+            {
                 FileInfo updateFile;
                 if (findUpdate(files, updateFile))
+                {
                     emit checkFinished(
                         true, updateFile.version.toString(), updateFile.link);
+                }
                 else
+                {
                     emit checkFinished(false, "", "");
+                }
+            }
+        }
+    }
     reply->deleteLater();
     activeReply = NULL;
+}
 bool UpdateChecker::parseData(const QJsonDocument& data, QList<FileInfo>& files) const
+{
     /* Data is expected to be in this form:
+    {
        "values": [
+       {
          "name": "serialplot-0.9.1-x86_64.AppImage",
          "links": {
            "self": {
              "href": "https://api.bitbucket.org/2.0/repositories/hyOzd/serialplot/downloads/serialplot-0.9.1-x86_64.AppImage"
+            }
+          }
        }, ... ]
+    }
     */
     if (!data.isObject()) return false;
-    auto values = data.object()["values"];
+    auto values = data.object().value("values");
     if (values == QJsonValue::Undefined || !values.isArray()) return false;
     for (auto value : values.toArray())
+    {
         if (!value.isObject()) return false;
         auto name = value.toObject().value("name");
         if (name.isUndefined() || !name.isString())
              return false;
         auto links = value.toObject().value("links");
         if (links.isUndefined() || !links.isObject())
             return false;
         auto self = links.toObject().value("self");
         if (self.isUndefined() || !self.isObject())
             return false;
         auto href = self.toObject().value("href");
         if (href.isUndefined() || !href.isString())
             return false;
         FileInfo finfo;
         finfo.name = name.toString();
         finfo.link = href.toString();
         finfo.hasVersion = VersionNumber::extract(name.toString(), finfo.version);
         if (finfo.name.contains("amd64") ||
             finfo.name.contains("x86_64") ||
             finfo.name.contains("win64"))
+        {
             finfo.arch = FileArch::amd64;
+        }
         else if (finfo.name.contains("win32") ||
                  finfo.name.contains("i386"))
+        {
             finfo.arch = FileArch::_i386;
+        }
         else
+        {
             finfo.arch = FileArch::unknown;
+        }
         files += finfo;
+    }
     return true;
+}

0 comments (0 inline, 0 general)