Move download URL construction to ServerInfo.

Centralize creating the URLs so it's not duplicated in two places. This also
allows to change the representation on the server more easily, since it only
requires changes in one place.

Currently only changes URLs for Rockbox builds.

Change-Id: I87277cd61f8b164bdbcd914c9873d674661a786c

1 files changed, 3 insertions, 7 deletions

diff --git a/rbutil/rbutilqt/installwindow.cpp b/rbutil/rbutilqt/installwindow.cpp
index 7a78154561..1306043027 100644
--- a/rbutil/rbutilqt/installwindow.cpp
+++ b/rbutil/rbutilqt/installwindow.cpp
@@ -118,7 +118,7 @@ void InstallWindow::accept()
     logger = new ProgressLoggerGui(this);
     logger->show();
     QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString();
-    qDebug() << "[Install] mountpoint:" << RbSettings::value(RbSettings::Mountpoint).toString();
+    qDebug() << "[Install] mountpoint:" << mountPoint;
     // show dialog with error if mount point is wrong
     if(!QFileInfo(mountPoint).isDir()) {
         logger->addItem(tr("Mount point is wrong!"),LOGERROR);
@@ -127,14 +127,13 @@ void InstallWindow::accept()
     }
 
     QString myversion;
-    QString buildname = SystemInfo::value(SystemInfo::CurBuildserverModel).toString();
     if(ui.radioStable->isChecked()) {
-        file = SystemInfo::value(SystemInfo::ReleaseUrl).toString();
+        file = ServerInfo::value(ServerInfo::CurReleaseUrl).toString();
         RbSettings::setValue(RbSettings::Build, "stable");
         myversion = ServerInfo::value(ServerInfo::CurReleaseVersion).toString();
     }
     else if(ui.radioCurrent->isChecked()) {
-        file = SystemInfo::value(SystemInfo::BleedingUrl).toString();
+        file = ServerInfo::value(ServerInfo::CurDevelUrl).toString();
         RbSettings::setValue(RbSettings::Build, "current");
         myversion = "r" + ServerInfo::value(ServerInfo::BleedingRevision).toString();
     }
@@ -142,9 +141,6 @@ void InstallWindow::accept()
         qDebug() << "[Install] no build selected -- this shouldn't happen";
         return;
     }
-    file.replace("%MODEL%", buildname);
-    file.replace("%RELVERSION%", ServerInfo::value(ServerInfo::CurReleaseVersion).toString());
-
     RbSettings::sync();
 
     QString warning = Utils::checkEnvironment(false);