Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
rbutil: more path suffix support
This commit adds suffix support for some missing components:
- Info widget
- Voice/talk files generation
- Backup
- Uninstall
Also fixes a crash in the uninstall window when there's no bootloader to select.
Change-Id: Ie97505a8cbd12dddf160bdebae2c04e738c373e5
authored by
Hairo R. Carela
and committed by
Solomon Peachy
f13f80c5
8aec8ee6
+55
-7
+10
-1
utils/rbutilqt/base/talkfile.cpp
+10
-1
utils/rbutilqt/base/talkfile.cpp
···
238
238
int m_progress = 0;
239
239
emit logProgress(m_progress,progressMax);
240
240
241
-
QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, nullptr);
241
+
QString suffix = RbSettings::value(RbSettings::Suffix).toString();
242
+
243
+
QString logpath;
244
+
if (!suffix.isEmpty()) {
245
+
logpath = m_mountpoint + suffix + "/.rockbox/rbutil.log";
246
+
} else {
247
+
logpath = m_mountpoint + "/.rockbox/rbutil.log";
248
+
}
249
+
250
+
QSettings installlog(logpath, QSettings::IniFormat, nullptr);
242
251
installlog.beginGroup("talkfiles");
243
252
244
253
for(int i=0; i < m_talkList.size(); i++)
+4
-1
utils/rbutilqt/base/uninstall.cpp
+4
-1
utils/rbutilqt/base/uninstall.cpp
···
120
120
{
121
121
QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, nullptr);
122
122
QStringList allSections = installlog.childGroups();
123
-
allSections.removeAt(allSections.lastIndexOf("Bootloader"));
123
+
124
+
int bl_index = allSections.lastIndexOf("Bootloader");
125
+
if (bl_index > -1) allSections.removeAt(bl_index);
126
+
124
127
return allSections;
125
128
}
126
129
+10
-1
utils/rbutilqt/createvoicewindow.cpp
+10
-1
utils/rbutilqt/createvoicewindow.cpp
···
53
53
saveSettings();
54
54
55
55
//configure voicecreator
56
-
voicecreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString());
56
+
QString suffix = RbSettings::value(RbSettings::Suffix).toString();
57
+
QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString();
58
+
59
+
if (!suffix.isEmpty()) {
60
+
QString fullpath = mountpoint + suffix;
61
+
voicecreator->setMountPoint(fullpath);
62
+
} else {
63
+
voicecreator->setMountPoint(mountpoint);
64
+
}
65
+
57
66
voicecreator->setLang(ui.comboLanguage->itemData(ui.comboLanguage->currentIndex()).toString());
58
67
voicecreator->setWavtrimThreshold(ui.wavtrimthreshold->value());
59
68
+9
-1
utils/rbutilqt/gui/backupdialog.cpp
+9
-1
utils/rbutilqt/gui/backupdialog.cpp
···
67
67
connect(ui.buttonBackup, &QAbstractButton::clicked, this, &BackupDialog::backup);
68
68
69
69
ui.backupSize->setText(tr("Installation size: calculating ..."));
70
-
m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString();
70
+
71
+
QString mp = RbSettings::value(RbSettings::Mountpoint).toString();
72
+
QString suffix = RbSettings::value(RbSettings::Suffix).toString();
73
+
74
+
if (!suffix.isEmpty()) {
75
+
m_mountpoint = mp + suffix;
76
+
} else {
77
+
m_mountpoint = mp;
78
+
}
71
79
72
80
m_backupName = RbSettings::value(RbSettings::BackupPath).toString();
73
81
if(m_backupName.isEmpty()) {
+10
-1
utils/rbutilqt/gui/infowidget.cpp
+10
-1
utils/rbutilqt/gui/infowidget.cpp
···
39
39
LOG_INFO() << "updating install info";
40
40
41
41
QString mp = RbSettings::value(RbSettings::Mountpoint).toString();
42
-
QSettings log(mp + "/.rockbox/rbutil.log", QSettings::IniFormat, this);
42
+
QString suff = RbSettings::value(RbSettings::Suffix).toString();
43
+
44
+
QString logpath;
45
+
if (!suff.isEmpty()) {
46
+
logpath = mp + suff + "/.rockbox/rbutil.log";
47
+
} else {
48
+
logpath = mp + "/.rockbox/rbutil.log";
49
+
}
50
+
51
+
QSettings log(logpath, QSettings::IniFormat, this);
43
52
QStringList groups = log.childGroups();
44
53
QTreeWidgetItem *w, *w2;
45
54
QString min, max;
+1
-1
utils/rbutilqt/gui/selectiveinstallwidget.cpp
+1
-1
utils/rbutilqt/gui/selectiveinstallwidget.cpp
···
51
51
52
52
m_logger = nullptr;
53
53
m_zipinstaller = nullptr;
54
-
m_suffix = RbSettings::value(RbSettings::Suffix).toString();
55
54
m_themesinstaller = new ThemesInstallWindow(this);
56
55
connect(m_themesinstaller, &ThemesInstallWindow::selected,
57
56
[this](int count) {ui.themesCheckbox->setChecked(count > 0);});
···
114
113
{
115
114
// get some configuration values globally
116
115
m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString();
116
+
m_suffix = RbSettings::value(RbSettings::Suffix).toString();
117
117
m_target = RbSettings::value(RbSettings::CurrentPlatform).toString();
118
118
m_blmethod = PlayerBuildInfo::instance()->value(
119
119
PlayerBuildInfo::BootloaderMethod, m_target).toString();
+11
-1
utils/rbutilqt/uninstallwindow.cpp
+11
-1
utils/rbutilqt/uninstallwindow.cpp
···
16
16
*
17
17
****************************************************************************/
18
18
19
+
#include <QtCore>
20
+
#include "Logger.h"
19
21
#include "uninstallwindow.h"
20
22
#include "ui_uninstallfrm.h"
21
23
#include "rbsettings.h"
···
28
30
connect(ui.CompleteRadioBtn,&QAbstractButton::toggled,this,&UninstallWindow::UninstallMethodChanged);
29
31
30
32
QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString();
33
+
QString suffix = RbSettings::value(RbSettings::Suffix).toString();
31
34
32
-
uninstaller = new Uninstaller(this,mountpoint);
35
+
QString path;
36
+
if (!suffix.isEmpty()) {
37
+
path = mountpoint + suffix;
38
+
} else {
39
+
path = mountpoint;
40
+
}
41
+
42
+
uninstaller = new Uninstaller(this, path);
33
43
logger = new ProgressLoggerGui(this);
34
44
connect(uninstaller, &Uninstaller::logItem, logger, &ProgressLoggerGui::addItem);
35
45
connect(uninstaller, &Uninstaller::logProgress, logger, &ProgressLoggerGui::setProgress);