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

Get more descriptive error messages when uploading to divelogs.de

Browse source 
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2013-12-19 17:03:23 -08:00 • committed by Dirk Hohndel
parent d36e4555da
commit de47937dd1
2 changed files with 16 additions and 13 deletions

27
qt-ui/subsurfacewebservices.cpp
View file

@ -98,11 +98,11 @@ static void clear_table(struct dive_table *table)
table->nr = 0; table->nr = 0;
} }
bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile, const bool selected) bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile, const bool selected, QString *errorMsg)
{ {
static const char errPrefix[] = "divelog.de-upload:"; static const char errPrefix[] = "divelog.de-upload:";
if (!amount_selected) { if (!amount_selected) {
qDebug() << errPrefix << "no dives selected"; *errorMsg = tr("no dives were selected");
return false; return false;
} }
@ -123,10 +123,14 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
return false; return false;
} }
zip = zip_open(QFile::encodeName(tempfile), ZIP_CREATE, NULL);
int error_code;
zip = zip_open(QFile::encodeName(tempfile), ZIP_CREATE, &error_code);
if (!zip) { if (!zip) {
qDebug() << errPrefix << "cannot open file as zip"; char buffer[1024];
zip_error_to_str(buffer, sizeof buffer, error_code, errno);
*errorMsg = tr("failed to create zip file for upload: %1")
.arg(QString::fromLocal8Bit(buffer));
return false; return false;
} }
@ -139,7 +143,7 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
continue; continue;
f = tmpfile(); f = tmpfile();
if (!f) { if (!f) {
qDebug() << errPrefix << "cannot create temp file"; *errorMsg = tr("cannot create temporary file: %1").arg(qt_error_string());
goto error_close_zip; goto error_close_zip;
} }
save_dive(f, dive); save_dive(f, dive);
@ -148,7 +152,7 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
rewind(f); rewind(f);
membuf = (char *)malloc(streamsize + 1); membuf = (char *)malloc(streamsize + 1);
if (!membuf || !fread(membuf, streamsize, 1, f)) { if (!membuf || !fread(membuf, streamsize, 1, f)) {
qDebug() << errPrefix << "memory error"; *errorMsg = tr("internal error: %1").arg(qt_error_string());
fclose(f); fclose(f);
free((void *)membuf); free((void *)membuf);
goto error_close_zip; goto error_close_zip;
@ -162,7 +166,8 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
*/ */
xmlDoc *doc = xmlReadMemory(membuf, streamsize, "divelog", NULL, 0); xmlDoc *doc = xmlReadMemory(membuf, streamsize, "divelog", NULL, 0);
if (!doc) { if (!doc) {
qDebug() << errPrefix << "xml error"; qWarning() << errPrefix << "could not parse back into memory the XML file we've just created!";
*errorMsg = tr("internal error");
free((void *)membuf); free((void *)membuf);
goto error_close_zip; goto error_close_zip;
} }
@ -549,11 +554,11 @@ void DivelogsDeWebServices::downloadDives()
void DivelogsDeWebServices::prepareDivesForUpload() void DivelogsDeWebServices::prepareDivesForUpload()
{ {
QString errorText(tr("Cannot create DLD file")); QString errorText;
/* generate a random filename and create/open that file with zip_open */ /* generate a random filename and create/open that file with zip_open */
QString filename = QDir::tempPath() + "/import-" + QString::number(qrand() % 99999999) + ".dld"; QString filename = QDir::tempPath() + "/import-" + QString::number(qrand() % 99999999) + ".dld";
if (prepare_dives_for_divelogs(filename, true)) { if (prepare_dives_for_divelogs(filename, true, &errorText)) {
QFile f(filename); QFile f(filename);
if (f.open(QIODevice::ReadOnly)) { if (f.open(QIODevice::ReadOnly)) {
uploadDives((QIODevice *)&f); uploadDives((QIODevice *)&f);
@ -561,10 +566,8 @@ void DivelogsDeWebServices::prepareDivesForUpload()
f.remove(); f.remove();
return; return;
} }
mainWindow()->showError(errorText.append(": ").append(filename));
return;
} }
mainWindow()->showError(errorText.append("!")); mainWindow()->showError(errorText);
} }
void DivelogsDeWebServices::uploadDives(QIODevice *dldContent) void DivelogsDeWebServices::uploadDives(QIODevice *dldContent)

2
qt-ui/subsurfacewebservices.h
View file

@ -83,7 +83,7 @@ private:
void uploadDives(QIODevice *dldContent); void uploadDives(QIODevice *dldContent);
explicit DivelogsDeWebServices (QWidget* parent = 0, Qt::WindowFlags f = 0); explicit DivelogsDeWebServices (QWidget* parent = 0, Qt::WindowFlags f = 0);
void setStatusText(int status); void setStatusText(int status);
bool prepare_dives_for_divelogs(const QString &filename, bool selected); bool prepare_dives_for_divelogs(const QString &filename, bool selected, QString *errorMsg);
void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status); void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status);
unsigned int download_dialog_parse_response(const QByteArray& length); unsigned int download_dialog_parse_response(const QByteArray& length);