Code tidy

companion/src/updates/repomodels.cpp

@@ -444,6 +444,24 @@ bool ReleasesMetaData::refreshRequired()
   return true;
 }
 
+int ReleasesMetaData::getSetId()
+{
+  m_id = filteredItemModel->channelLatestId();
+  return m_id;
+}
+
+int ReleasesMetaData::getSetId(int row)
+{
+  m_id = filteredItemModel->id(row);
+  return m_id;
+}
+
+int ReleasesMetaData::getSetId(QVariant value, Qt::MatchFlags flags, int role)
+{
+  m_id = filteredItemModel->id(value, flags, role);
+  return m_id;
+}
+
 /*
     AssetsMetaData
 */
@@ -454,3 +472,15 @@ AssetsMetaData::AssetsMetaData(QWidget * parent) :
   itemModel = new AssetsItemModel();
   filteredItemModel = new AssetsFilteredItemModel(itemModel);
 }
+
+int AssetsMetaData::getSetId(int row)
+{
+  m_id = filteredItemModel->id(row);
+  return m_id;
+}
+
+int AssetsMetaData::getSetId(QVariant value, Qt::MatchFlags flags, int role)
+{
+  m_id = filteredItemModel->id(value, flags, role);
+  return m_id;
+}

companion/src/updates/repomodels.h

@@ -215,15 +215,11 @@ class ReleasesMetaData : public QWidget
     void setId(int id) { m_id = id; }
     int id() { return m_id; }
 
-    int getSetId() { m_id = filteredItemModel->channelLatestId(); return m_id; }
+    int getSetId();
+    int getSetId(int row);
+    int getSetId(QVariant value, Qt::MatchFlags flags = Qt::MatchExactly, int role = Qt::DisplayRole);
 
-    int getSetId(int row) { m_id = filteredItemModel->id(row); return m_id; }
-
-    int getSetId(QVariant value, Qt::MatchFlags flags = Qt::MatchExactly, int role = Qt::DisplayRole)
-            { m_id = filteredItemModel->id(value, flags, role); return m_id; }
-
-    void parseMetaData(int mdt, QJsonDocument * jsonDoc)
-                        { itemModel->parseMetaData(mdt, jsonDoc); }
+    void parseMetaData(int mdt, QJsonDocument * jsonDoc) { itemModel->parseMetaData(mdt, jsonDoc); }
 
     int count() { return filteredItemModel->rows(); }
     QStringList list() { return filteredItemModel->list(); }
@@ -234,9 +230,9 @@ class ReleasesMetaData : public QWidget
     bool prerelease() { return filteredItemModel->prerelease(m_id); }
     QString version() { return filteredItemModel->version(m_id); }
 
-    QString urlReleases() { return m_repo % "/releases"; }
-    QString urlReleaseLatest() { return urlReleases() % "/latest"; }
-    QString urlRelease() { return urlReleases() % QString("/%1").arg(m_id); }
+    QString urlReleases() { return QString("%1/releases").arg(m_repo); }
+    QString urlReleaseLatest() { return QString("%1/latest").arg(urlReleases()); }
+    QString urlRelease() { return QString("%1/%2").arg(urlReleases()).arg(m_id); }
 
   private:
     ReleasesItemModel *itemModel;
@@ -257,10 +253,8 @@ class AssetsMetaData : public QWidget
     void setId(int id) { m_id = id; }
     int id() { return m_id; }
 
-    int getSetId(int row) { m_id = filteredItemModel->id(row); return m_id; }
-
-    int getSetId(QVariant value, Qt::MatchFlags flags = Qt::MatchExactly, int role = Qt::DisplayRole)
-            { m_id = filteredItemModel->id(value, flags, role); return m_id; }
+    int getSetId(int row);
+    int getSetId(QVariant value, Qt::MatchFlags flags = Qt::MatchExactly, int role = Qt::DisplayRole);
 
     void parseMetaData(int mdt, QJsonDocument * jsonDoc) { itemModel->parseMetaData(mdt, jsonDoc); }
 
@@ -285,10 +279,10 @@ class AssetsMetaData : public QWidget
     int flags() { return filteredItemModel->metaDataValue(m_id, UpdatesItemModel::IMDR_Flags).toInt(); }
 
     QString urlReleaseAssets(int releaseId, int max)
-                            { return urlReleases() % QString("/%1/assets").arg(releaseId) % (max > -1 ? QString("\?per_page=%1").arg(max) : ""); }
-    QString urlAsset() { return urlReleases() % QString("/assets/%1").arg(m_id); }
+                            { return QString("%1/%2/assets").arg(urlReleases()).arg(releaseId) % (max > -1 ? QString("\?per_page=%1").arg(max) : ""); }
+    QString urlAsset() { return QString("%1/assets/%2").arg(urlReleases()).arg(m_id); }
 
-    QString urlContent(QString path) { return m_repo % QString("/contents/%1").arg(path); }
+    QString urlContent(QString path) { return QString("%1/contents/%2").arg(m_repo).arg(path); }
 
   private:
     AssetsItemModel *itemModel;

companion/src/updates/updateinterface.cpp

@@ -335,6 +335,12 @@ void UpdateInterface::setName(QString name)
   currentRelease();
 }
 
+void UpdateInterface::setRepo(QString repo)
+{
+  releases->setRepo(repo);
+  assets->setRepo(repo);
+}
+
 void UpdateInterface::initParamFolders(UpdateParameters * params)
 {
   if (g.downloadDir().trimmed().isEmpty())
@@ -369,7 +375,6 @@ void UpdateInterface::resetRunEnvironment()
 {
   progress = nullptr;
   logLevel = g.updLogLevel();
-  qDebug() << tr("Log level: %1").arg(logLevel);
 
   *runParams = *dfltParams;
   runParams->data.flags &= ~UPDFLG_Update;

companion/src/updates/updateinterface.h

@@ -136,6 +136,9 @@ class UpdateInterface : public QWidget
     QString language;
     int logLevel;
 
+    virtual bool autoUpdate(ProgressWidget * progress = nullptr);
+    virtual bool manualUpdate(ProgressWidget * progress = nullptr);
+
     virtual bool update();
     virtual bool preparation();
     virtual bool flagAssets();
@@ -146,8 +149,18 @@ class UpdateInterface : public QWidget
     virtual bool housekeeping();
     virtual bool asyncInstall();
 
+    virtual const bool isUpdateAvailable();
+    virtual const QString currentVersion();
+    virtual const QString currentRelease();
+    virtual const QString updateRelease();
+    virtual const bool isLatestRelease();
+    virtual const bool isLatestVersion(const QString & current, const QString & latest);
+    virtual const QString latestRelease();
+    void clearRelease();
+    const QStringList getReleases();
+
     void setName(QString name);
-    void setRepo(QString repo) { releases->setRepo(repo); assets->setRepo(repo); }
+    void setRepo(QString repo);
     void setResultsPerPage(int cnt) { resultsPerPage = cnt; }
     void setReleasesNightlyName(QString name) { releases->setNightlyName(name); }
 
@@ -157,25 +170,6 @@ class UpdateInterface : public QWidget
     void resetRunEnvironment();
     void setRunUpdate() { runParams->data.flags |= UPDFLG_Update; }
 
-    const QStringList getReleases();
-
-    virtual const bool isUpdateAvailable();
-
-    virtual bool autoUpdate(ProgressWidget * progress = nullptr);
-    virtual bool manualUpdate(ProgressWidget * progress = nullptr);
-
-    virtual const QString currentVersion();
-
-    void clearRelease();
-
-    virtual const QString currentRelease();
-    virtual const QString updateRelease();
-    virtual const bool isLatestRelease();
-    virtual const bool isLatestVersion(const QString & current, const QString & latest);
-    virtual const QString latestRelease();
-
-    void getRadioProfileSettings();
-
     bool repoReleasesMetaData();
     bool repoReleaseAssetsMetaData();
 
@@ -195,20 +189,20 @@ class UpdateInterface : public QWidget
     bool copyFlaggedAssets();
     bool copyStructure();
     bool copyFiles();
+    bool saveReleaseSettings();
 
     bool downloadTextFileToBuffer(const QString & path);
     void downloadFileToBuffer(const QString & url);
+    bool convertDownloadToJson(QJsonDocument * json);
+    bool decompressArchive(const QString & archivePath, const QString & destPath);
     QByteArray * getDownloadBuffer() { return buffer; }
 
-    bool convertDownloadToJson(QJsonDocument * json);
-
-    bool decompressArchive(const QString & archivePath, const QString & destPath);
-    bool saveReleaseSettings();
     void reportProgress(const QString & text, const int type = QtInfoMsg);
     void progressMessage(const QString & text);
     void criticalMsg(const QString & msg);
     static QString downloadDataTypeToString(DownloadDataType val);
     static QString updateFlagsToString(UpdateFlags val);
+    void getRadioProfileSettings();
 
   private slots:
     void onDownloadFinished(QNetworkReply * reply, DownloadDataType ddt, int subtype);