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

desktop-widgets: divelogsDE: delay handling until user select upload

Browse source 
Do not prepare zip file, just because user selected the divelogs.de
radiobutton

Move prepareDives to startUpload (slot handling user clicking on
upload button).

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-09 13:24:08 +01:00 • committed by Dirk Hohndel
parent 8becc29ca8
commit 9fd95c18bd
2 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
desktop-widgets/subsurfacewebservices.cpp
View file

@ -238,9 +238,8 @@ void DivelogsDeWebServices::prepareDivesForUpload(bool selected)
{ {
// this is called when the user selects the divelogs.de radiobutton // this is called when the user selects the divelogs.de radiobutton
// Prepare zip file // Remember if all dives or selected dives are to be uploaded
if (!uploadDives(selected)) useSelectedDives = selected;
return;
// Adjust UI // Adjust UI
hideDownload(); hideDownload();
@ -290,6 +289,32 @@ bool DivelogsDeWebServices::uploadDives(bool selected)
} }
f.close(); f.close();
f.remove(); f.remove();
{
QNetworkRequest request;
request.setUrl(QUrl("https://divelogs.de/DivelogsDirectImport.php"));
request.setRawHeader("Accept", "text/xml, application/xml");
request.setRawHeader("User-Agent", userAgent.toUtf8());
QHttpPart part;
part.setRawHeader("Content-Disposition", "form-data; name=\"user\"");
part.setBody(ui.userID->text().toUtf8());
multipart->append(part);
part.setRawHeader("Content-Disposition", "form-data; name=\"pass\"");
part.setBody(ui.password->text().toUtf8());
multipart->append(part);
reply = manager()->post(request, multipart);
connect(reply, SIGNAL(finished()), this, SLOT(uploadFinished()));
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
SLOT(uploadError(QNetworkReply::NetworkError)));
connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this,
SLOT(updateProgress(qint64, qint64)));
timeout.start(30000); // 30s
}
return true; return true;
} }
@ -319,28 +344,14 @@ void DivelogsDeWebServices::startUpload()
ui.userID->setEnabled(false); ui.userID->setEnabled(false);
ui.password->setEnabled(false); ui.password->setEnabled(false);
QNetworkRequest request; // Prepare zip file
request.setUrl(QUrl("https://divelogs.de/DivelogsDirectImport.php")); if (!uploadDives(useSelectedDives))
request.setRawHeader("Accept", "text/xml, application/xml"); return;
request.setRawHeader("User-Agent", userAgent.toUtf8());
QHttpPart part; // Remember for later
part.setRawHeader("Content-Disposition", "form-data; name=\"user\""); // connect(reply, SIGNAL(finished()), this, SLOT(listDownloadFinished()));
part.setBody(ui.userID->text().toUtf8()); // connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
multipart->append(part); // this, SLOT(downloadError(QNetworkReply::NetworkError)));
part.setRawHeader("Content-Disposition", "form-data; name=\"pass\"");
part.setBody(ui.password->text().toUtf8());
multipart->append(part);
reply = manager()->post(request, multipart);
connect(reply, SIGNAL(finished()), this, SLOT(uploadFinished()));
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
SLOT(uploadError(QNetworkReply::NetworkError)));
connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this,
SLOT(updateProgress(qint64, qint64)));
timeout.start(30000); // 30s
} }
void DivelogsDeWebServices::startDownload() void DivelogsDeWebServices::startDownload()

1
desktop-widgets/subsurfacewebservices.h
View file

@ -74,6 +74,7 @@ private:
QHttpMultiPart *multipart; QHttpMultiPart *multipart;
QTemporaryFile zipFile; QTemporaryFile zipFile;
bool uploadMode; bool uploadMode;
bool useSelectedDives;
}; };
class UserSurveyServices : public QDialog { class UserSurveyServices : public QDialog {