diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-15 18:52:10 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-15 18:52:10 +0100 |
commit | 2b2a7b9ae340e2f7273c79ebb8d6140b8fd7aa35 (patch) | |
tree | 8f254861a3f31ebc6e19a876ac1b52930c14933c /rbutil/rbutilqt/gui/manualwidget.cpp | |
parent | 687edc1866bc605d793ad57f8a6aaaeb63fa4fae (diff) | |
download | rockbox-2b2a7b9ae3.tar.gz rockbox-2b2a7b9ae3.zip |
rbutil: Simplify manual download URL handling.
- Don't construct the URL directly. The ServerInfo already has it, use
that instead.
- Don't manually construct the output filename. ZipInstaller will use
the server filename automatically.
Change-Id: Ib44616daf5efc95b238418b6e699ccd56c40b011
Diffstat (limited to 'rbutil/rbutilqt/gui/manualwidget.cpp')
-rw-r--r-- | rbutil/rbutilqt/gui/manualwidget.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp index 063facf3a1..ba8f6f6064 100644 --- a/rbutil/rbutilqt/gui/manualwidget.cpp +++ b/rbutil/rbutilqt/gui/manualwidget.cpp @@ -65,10 +65,7 @@ void ManualWidget::downloadManual(void) QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { return; } - QString manual = SystemInfo::platformValue(SystemInfo::Manual).toString(); - if(manual.isEmpty()) { - manual = "rockbox-" + SystemInfo::platformValue(SystemInfo::BuildserverModel).toString(); - } + QString manual = ServerInfo::platformValue(ServerInfo::ManualPdfUrl).toString(); ProgressLoggerGui* logger = new ProgressLoggerGui(this); logger->show(); @@ -81,13 +78,11 @@ void ManualWidget::downloadManual(void) installer->setUrl(ServerInfo::platformValue( ServerInfo::ManualPdfUrl, m_platform).toString()); installer->setLogSection("Manual (PDF)"); - installer->setTarget("/" + manual + ".pdf"); } else { installer->setUrl(ServerInfo::platformValue( ServerInfo::ManualZipUrl, m_platform).toString()); installer->setLogSection("Manual (HTML)"); - installer->setTarget("/" + manual + "-" + "-html.zip"); } installer->setLogVersion(); installer->setUnzip(false); |