mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: make uploadDiveLogsDE slots workable for desktop

Browse source 
Secure that the slots/signals in uploadDiveLogsDE, which are without
UI, can be used in DivelogsDeWebServices (to add the UI part).

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-09 12:18:33 +01:00 • committed by Dirk Hohndel
parent 2f680c1f76
commit 10ab833d7d
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/uploadDiveLogsDE.cpp
View file

@ -261,13 +261,14 @@ void uploadDiveLogsDE::updateProgressSlot(qint64 current, qint64 total)
{ {
if (!reply) if (!reply)
return; return;
if (total <= 0 || current <= 0) if (total <= 0 || current <= 0)
return; return;
// Calculate percentage // Calculate percentage as 0.x (values between 0.0 and 1.0)
// And signal whoever wants to know // And signal whoever wants to know
qreal percentage = (float)current / (float)total; qreal percentage = (float)current / (float)total;
emit uploadProgress(percentage); emit uploadProgress(percentage, 1.0);
// reset the timer: 30 seconds after we last got any data // reset the timer: 30 seconds after we last got any data
timeout.start(); timeout.start();
@ -295,38 +296,46 @@ void uploadDiveLogsDE::uploadFinishedSlot()
report_error(tr("Upload failed").toUtf8()); report_error(tr("Upload failed").toUtf8());
return; return;
} }
timeout.stop();
err = tr("Upload successful"); err = tr("Upload successful");
emit uploadFinish(true, err); emit uploadFinish(true, err);
timeout.stop();
return; return;
} }
timeout.stop();
err = tr("Login failed"); err = tr("Login failed");
report_error(err.toUtf8()); report_error(err.toUtf8());
emit uploadFinish(false, err); emit uploadFinish(false, err);
timeout.stop();
return; return;
} }
timeout.stop();
err = tr("Cannot parse response"); err = tr("Cannot parse response");
report_error(tr("Cannot parse response").toUtf8()); report_error(tr("Cannot parse response").toUtf8());
emit uploadFinish(false, err); emit uploadFinish(false, err);
timeout.stop();
} }
} }
void uploadDiveLogsDE::uploadTimeoutSlot() void uploadDiveLogsDE::uploadTimeoutSlot()
{ {
timeout.stop();
if (reply) {
reply->deleteLater();
reply = NULL;
}
QString err(tr("divelogs.de not responding")); QString err(tr("divelogs.de not responding"));
report_error(err.toUtf8()); report_error(err.toUtf8());
emit uploadFinish(false, err); emit uploadFinish(false, err);
timeout.stop();
} }
void uploadDiveLogsDE::uploadErrorSlot(QNetworkReply::NetworkError error) void uploadDiveLogsDE::uploadErrorSlot(QNetworkReply::NetworkError error)
{ {
timeout.stop();
if (reply) {
reply->deleteLater();
reply = NULL;
}
QString err(tr("network error %1").arg(error)); QString err(tr("network error %1").arg(error));
report_error(err.toUtf8()); report_error(err.toUtf8());
emit uploadFinish(false, err); emit uploadFinish(false, err);
timeout.stop();
} }

2
core/uploadDiveLogsDE.h
View file

@ -24,7 +24,7 @@ private slots:
signals: signals:
void uploadFinish(bool success, const QString &text); void uploadFinish(bool success, const QString &text);
void uploadProgress(qreal percentage); void uploadProgress(qreal percentage, qreal total);
private: private:
uploadDiveLogsDE(); uploadDiveLogsDE();