tsiry-sandratraina.com
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita
audio
rust
zig
deno
mpris
rockbox
mpd
ZipInstaller: rename some member variables to be in line with the rest.
Also change the double inclusion protection to match the filename.
Change-Id: I5bb64afdb62c87057867f9f9d683f0df239d2efc
+24
-26
+20
-20
rbutil/rbutilqt/base/zipinstaller.cpp
+20
-20
rbutil/rbutilqt/base/zipinstaller.cpp
···
25
25
{
26
26
m_unzip = true;
27
27
m_usecache = false;
28
-
getter = 0;
28
+
m_getter = 0;
29
29
}
30
30
31
31
···
83
83
// make sure to get a fresh one on each run.
84
84
// making this a parent of the temporary file ensures the file gets deleted
85
85
// after the class object gets destroyed.
86
-
downloadFile = new QTemporaryFile(this);
87
-
downloadFile->open();
88
-
m_file = downloadFile->fileName();
89
-
downloadFile->close();
86
+
m_downloadFile = new QTemporaryFile(this);
87
+
m_downloadFile->open();
88
+
m_file = m_downloadFile->fileName();
89
+
m_downloadFile->close();
90
90
// get the real file.
91
-
if(getter != 0) getter->deleteLater();
92
-
getter = new HttpGet(this);
91
+
if(m_getter != 0) m_getter->deleteLater();
92
+
m_getter = new HttpGet(this);
93
93
if(m_usecache) {
94
-
getter->setCache(true);
94
+
m_getter->setCache(true);
95
95
}
96
-
getter->setFile(downloadFile);
96
+
m_getter->setFile(m_downloadFile);
97
97
98
-
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
99
-
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int)));
100
-
connect(this, SIGNAL(internalAborted()), getter, SLOT(abort()));
98
+
connect(m_getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
99
+
connect(m_getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int)));
100
+
connect(this, SIGNAL(internalAborted()), m_getter, SLOT(abort()));
101
101
102
-
getter->getFile(QUrl(m_url));
102
+
m_getter->getFile(QUrl(m_url));
103
103
}
104
104
105
105
···
110
110
// update progress bar
111
111
112
112
emit logProgress(1, 1);
113
-
if(getter->httpResponse() != 200 && !getter->isCached()) {
113
+
if(m_getter->httpResponse() != 200 && !m_getter->isCached()) {
114
114
emit logItem(tr("Download error: received HTTP error %1.")
115
-
.arg(getter->httpResponse()),LOGERROR);
115
+
.arg(m_getter->httpResponse()),LOGERROR);
116
116
emit done(true);
117
117
return;
118
118
}
119
-
if(getter->isCached())
119
+
if(m_getter->isCached())
120
120
emit logItem(tr("Cached file used."), LOGINFO);
121
121
if(error) {
122
-
emit logItem(tr("Download error: %1").arg(getter->errorString()), LOGERROR);
122
+
emit logItem(tr("Download error: %1").arg(m_getter->errorString()), LOGERROR);
123
123
emit done(true);
124
124
return;
125
125
}
···
161
161
emit logItem(tr("Installing file."), LOGINFO);
162
162
qDebug() << "[ZipInstall] saving downloaded file (no extraction)";
163
163
164
-
downloadFile->open(); // copy fails if file is not opened (filename issue?)
164
+
m_downloadFile->open(); // copy fails if file is not opened (filename issue?)
165
165
// make sure the required path is existing
166
166
QString path = QFileInfo(m_mountpoint + m_target).absolutePath();
167
167
QDir p;
168
168
p.mkpath(path);
169
169
// QFile::copy() doesn't overwrite files, so remove old one first
170
170
QFile(m_mountpoint + m_target).remove();
171
-
if(!downloadFile->copy(m_mountpoint + m_target)) {
171
+
if(!m_downloadFile->copy(m_mountpoint + m_target)) {
172
172
emit logItem(tr("Installing file failed."), LOGERROR);
173
173
emit done(true);
174
174
return;
···
179
179
}
180
180
if(m_logver.isEmpty()) {
181
181
// if no version info is set use the timestamp of the server file.
182
-
m_logver = getter->timestamp().toString(Qt::ISODate);
182
+
m_logver = m_getter->timestamp().toString(Qt::ISODate);
183
183
}
184
184
185
185
emit logItem(tr("Creating installation log"),LOGINFO);
+4
-6
rbutil/rbutilqt/base/zipinstaller.h
+4
-6
rbutil/rbutilqt/base/zipinstaller.h
···
19
19
****************************************************************************/
20
20
21
21
22
-
#ifndef INSTALLZIP_H
23
-
#define INSTALLZIP_H
24
-
25
-
22
+
#ifndef ZIPINSTALLER_H
23
+
#define ZIPINSTALLER_H
26
24
27
25
#include <QtCore>
28
26
···
75
73
QDir m_cache;
76
74
bool m_usecache;
77
75
78
-
HttpGet *getter;
79
-
QTemporaryFile *downloadFile;
76
+
HttpGet *m_getter;
77
+
QTemporaryFile *m_downloadFile;
80
78
};
81
79
82
80