From 2a57d5b592a2cced5c4f9d2f66266cfed8516aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Wed, 3 Jan 2024 15:41:11 +0100 Subject: [PATCH] wasm: update manual test to handle dropped files Verify that the file is saved correctly to the local file system by loading it and printing the sha1 of its contents. Also add indents in order to improve legibility. The output lines should now be correctly nested. Change-Id: I698c016253656aef29f04129da5f01a9dc35191e Reviewed-by: Lorn Potter (cherry picked from commit a2294287ad3edd729f165280a71b8dd7a5345b1d) Reviewed-by: Qt Cherry-pick Bot --- tests/manual/wasm/clipboard/mainwindow.cpp | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/manual/wasm/clipboard/mainwindow.cpp b/tests/manual/wasm/clipboard/mainwindow.cpp index 96fb494cb34..e3b8dfdd8be 100644 --- a/tests/manual/wasm/clipboard/mainwindow.cpp +++ b/tests/manual/wasm/clipboard/mainwindow.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #ifdef Q_OS_WASM #include @@ -264,20 +265,19 @@ void MainWindow::dropEvent(QDropEvent* e) QString urlStr = url.toDisplayString(); int size = urlStr.length(); sizeStr.setNum(size); - ui->textEdit_2->insertPlainText(" Drop has url data length: " + sizeStr + "\n"); - ui->textEdit_2->insertPlainText(urlStr + "\n"); - QString fname = url.toLocalFile(); - QFileInfo info(fname); - if (info.exists()) { // this is a file - QMimeDatabase db; - QMimeType mt = db.mimeTypeForFile(info); - if (mt.name().contains("image")) { - QImage image = QImage(fname); - setImage(image); - } + QString fileName = url.toLocalFile(); + QString sha1; + QFile file(fileName); + if (file.exists()) { + file.open(QFile::ReadOnly); + sha1 = QCryptographicHash::hash(file.readAll(), QCryptographicHash::Sha1).toHex(); } + + ui->textEdit_2->insertPlainText(" Drop has url data length: " + sizeStr + "\n"); + ui->textEdit_2->insertPlainText(" " + urlStr + " sha1 " + sha1.left(8) + "\n"); } + ui->textEdit_2->insertPlainText("\n"); if (e->mimeData()->hasImage()) { qsizetype imageSize = qvariant_cast(e->mimeData()->imageData()).sizeInBytes(); @@ -294,14 +294,15 @@ void MainWindow::dropEvent(QDropEvent* e) int size = e->mimeData()->html().length(); sizeStr.setNum(size); ui->textEdit_2->insertPlainText(" Drop has html data length: " + sizeStr + "\n"); - ui->textEdit_2->insertPlainText(e->mimeData()->html()+"\n"); - ui->textEdit->insertHtml(e->mimeData()->html()+"
"); + for (const auto &line : e->mimeData()->html().split('\n', Qt::SkipEmptyParts)) + ui->textEdit_2->insertPlainText(" " + line + "\n"); } if (e->mimeData()->hasText()) { int size = e->mimeData()->text().length(); sizeStr.setNum(size); ui->textEdit_2->insertPlainText(" Drop has text data length: " + sizeStr + "\n"); - ui->textEdit_2->insertPlainText(e->mimeData()->text()); + for (const auto &line : e->mimeData()->text().split('\n', Qt::SkipEmptyParts)) + ui->textEdit_2->insertPlainText(" " + line + "\n"); } const QString message = tr(" Drop accepted, %1 ")