devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Move download link pattern description to rbutil.ini.

Browse source 
Don't hard code the creation of the download links anymore but use pattern replacement and define the basic structure in rbutil.ini.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22200 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-08-08 00:02:33 +00:00
parent 059255705b
commit 89e5333bc1
4 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rbutil/rbutilqt/install.cpp
View file

@ -103,27 +103,17 @@ void Install::accept()
QString myversion; QString myversion;
QString buildname = RbSettings::value(RbSettings::CurBuildserverModel).toString(); QString buildname = RbSettings::value(RbSettings::CurBuildserverModel).toString();
if(ui.radioStable->isChecked()) { if(ui.radioStable->isChecked()) {
file = QString("%1/%2/rockbox-%3-%4.zip") file = RbSettings::value(RbSettings::ReleaseUrl).toString();
.arg(RbSettings::value(RbSettings::ReleaseUrl).toString(), version.value("rel_rev"),
buildname, version.value("rel_rev"));
fileName = QString("rockbox-%1-%2.zip")
.arg(version.value("rel_rev"), buildname);
RbSettings::setValue(RbSettings::Build, "stable"); RbSettings::setValue(RbSettings::Build, "stable");
myversion = version.value("rel_rev"); myversion = version.value("rel_rev");
} }
else if(ui.radioArchived->isChecked()) { else if(ui.radioArchived->isChecked()) {
file = QString("%1%2/rockbox-%3-%4.zip") file = RbSettings::value(RbSettings::DailyUrl).toString();
.arg(RbSettings::value(RbSettings::DailyUrl).toString(),
buildname, buildname, version.value("arch_date"));
fileName = QString("rockbox-%1-%2.zip")
.arg(buildname, version.value("arch_date"));
RbSettings::setValue(RbSettings::Build, "archived"); RbSettings::setValue(RbSettings::Build, "archived");
myversion = "r" + version.value("arch_rev") + "-" + version.value("arch_date"); myversion = "r" + version.value("arch_rev") + "-" + version.value("arch_date");
} }
else if(ui.radioCurrent->isChecked()) { else if(ui.radioCurrent->isChecked()) {
file = QString("%1%2/rockbox.zip") file = RbSettings::value(RbSettings::BleedingUrl).toString();
.arg(RbSettings::value(RbSettings::BleedingUrl).toString(), buildname);
fileName = QString("rockbox.zip");
RbSettings::setValue(RbSettings::Build, "current"); RbSettings::setValue(RbSettings::Build, "current");
myversion = "r" + version.value("bleed_rev"); myversion = "r" + version.value("bleed_rev");
} }
@ -131,6 +121,11 @@ void Install::accept()
qDebug() << "[Install] no build selected -- this shouldn't happen"; qDebug() << "[Install] no build selected -- this shouldn't happen";
return; return;
} }
file.replace("%MODEL%", buildname);
file.replace("%RELVERSION%", version.value("rel_rev"));
file.replace("%REVISION%", version.value("arch_rev"));
file.replace("%DATE%", version.value("arch_date"));
RbSettings::sync(); RbSettings::sync();
QString warning = Detect::check(false); QString warning = Detect::check(false);

1
rbutil/rbutilqt/install.h
View file

@ -44,7 +44,6 @@ class Install : public QDialog
QHttp *download; QHttp *download;
QFile *target; QFile *target;
QString file; QString file;
QString fileName;
ZipInstaller* installer; ZipInstaller* installer;
QMap<QString, QString> version; QMap<QString, QString> version;
QString m_backupName; QString m_backupName;

6
rbutil/rbutilqt/rbutil.ini
View file

@ -1,7 +1,7 @@
[general] [general]
release_url=http://download.rockbox.org/release/ release_url=http://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
daily_url=http://download.rockbox.org/daily/ daily_url=http://download.rockbox.org/daily/%MODEL%/rockbox-%MODEL%.zip
bleeding_url=http://build.rockbox.org/dist/build- bleeding_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip
server_conf_url=http://www.rockbox.org/daily/build-info server_conf_url=http://www.rockbox.org/daily/build-info
bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info
bleeding_info=http://build.rockbox.org/cvsmod/build-info bleeding_info=http://build.rockbox.org/cvsmod/build-info

8
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -518,11 +518,9 @@ void RbUtilQt::installBtn()
bool RbUtilQt::installAuto() bool RbUtilQt::installAuto()
{ {
QString file = QString("%1/%2/rockbox-%3-%4.zip") QString file = RbSettings::value(RbSettings::ReleaseUrl).toString();
.arg(RbSettings::value(RbSettings::ReleaseUrl).toString(), file.replace("%MODEL%", RbSettings::value(RbSettings::CurBuildserverModel).toString());
versmap.value("rel_rev"), file.replace("%RELVERSION%", versmap.value("rel_rev"));
RbSettings::value(RbSettings::CurBuildserverModel).toString(),
versmap.value("rel_rev"));
buildInfo.open(); buildInfo.open();
QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); QSettings info(buildInfo.fileName(), QSettings::IniFormat, this);
buildInfo.close(); buildInfo.close();