From 20dec5dd37677eeac21e13534770f0e563f8db98 Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Tue, 15 Oct 2024 10:35:23 +0200
Subject: [PATCH] chore: remove zip support
---
src/designviewer.cpp | 66 ++++++++++++++------------------------------
src/designviewer.h | 2 +-
www/index.html | 4 +--
3 files changed, 24 insertions(+), 48 deletions(-)
diff --git a/src/designviewer.cpp b/src/designviewer.cpp
index 7d74b53..4c1a9e8 100644
--- a/src/designviewer.cpp
+++ b/src/designviewer.cpp
@@ -33,7 +33,6 @@
#include <QRandomGenerator>
#include <QRegularExpression>
#include <QResource>
-#include <QtCore/private/qzipreader_p.h>
DesignViewer::DesignViewer()
{
@@ -62,58 +61,35 @@ void DesignViewer::fetchProject(QByteArray *data, QString *fileName)
*fileName = QString::fromStdString(jsFileName.as<std::string>());
}
-QString DesignViewer::unpackProject(const QByteArray &project, bool extractZip)
+QString DesignViewer::unpackProject(const QByteArray &project)
{
- QString projectLocation = "/home/web_user/";
-
- if (extractZip) {
- QDir().mkpath(projectLocation);
- QBuffer buffer;
- buffer.setData(project);
- buffer.open(QIODevice::ReadOnly);
- QZipReader reader(&buffer);
- reader.extractAll(projectLocation);
- }
-
- qDebug() << "Initial project location: " + projectLocation;
-
- QDir projectLocationDir(projectLocation);
-
- // maybe it was not a zip file so try it as resource binary
- if (projectLocationDir.isEmpty()) {
- if (extractZip)
- qDebug() << "File could not be extracted. Trying to open it as a resource file.";
-
- const uchar *data;
- if (m_projectData.size()) {
- qDebug() << "Unregistering the previous data from QRC system. Path: " + m_projectPath
- + " Size: " + QString::number(m_projectData.size()) + " bytes.";
- data = reinterpret_cast<const uchar *>(m_projectData.data());
- if (!QResource::unregisterResource(data, m_projectPath)) {
- qCritical() << "Cannot unregister the previous resource data.";
- }
- }
-
- m_projectData = project;
+ const uchar *data;
+ if (m_projectData.size()) {
+ qDebug() << "Unregistering the previous data from QRC system. Path: " + m_projectPath
+ + " Size: " + QString::number(m_projectData.size()) + " bytes.";
data = reinterpret_cast<const uchar *>(m_projectData.data());
- qDebug() << "Registering resource data. Size: " + QString::number(m_projectData.size());
+ if (!QResource::unregisterResource(data, m_projectPath)) {
+ qCritical() << "Cannot unregister the previous resource data.";
+ }
+ }
- const QString resourcePath{"/" + QString::number(QRandomGenerator::global()->generate())};
- m_projectPath = resourcePath;
+ m_projectData = project;
+ data = reinterpret_cast<const uchar *>(m_projectData.data());
+ qDebug() << "Registering resource data. Size: " + QString::number(m_projectData.size());
- if (!QDir(resourcePath).removeRecursively()) {
- qDebug() << "Could not remove resource path: " + resourcePath;
- }
+ const QString resourcePath{"/" + QString::number(QRandomGenerator::global()->generate())};
+ m_projectPath = resourcePath;
- if (!QResource::registerResource(data, resourcePath)) {
- qCritical() << "Can not load the resource data.";
- return "";
- }
+ if (!QDir(resourcePath).removeRecursively()) {
+ qDebug() << "Could not remove resource path: " + resourcePath;
+ }
- projectLocation = ":" + resourcePath;
+ if (!QResource::registerResource(data, resourcePath)) {
+ qCritical() << "Can not load the resource data.";
+ return "";
}
- return projectLocation;
+ return QString(resourcePath).prepend(":");
}
QString DesignViewer::findFile(const QString &dir, const QString &filter)
diff --git a/src/designviewer.h b/src/designviewer.h
index 2dea2c2..abab211 100644
--- a/src/designviewer.h
+++ b/src/designviewer.h
@@ -52,7 +52,7 @@ private:
void showAppWindow();
void fetchProject(QByteArray *data, QString *fileName);
- QString unpackProject(const QByteArray &project, bool extractZip = false);
+ QString unpackProject(const QByteArray &project);
QString findFile(const QString &dir, const QString &filter);
void parseQmlprojectFile(const QString &fileName, QString *mainFile, QStringList *importPaths);
bool runProject(const QByteArray &projectData, const QString &projectName);
diff --git a/www/index.html b/www/index.html
index a800882..de13039 100644
--- a/www/index.html
+++ b/www/index.html
@@ -76,7 +76,7 @@
</figure>
<div id="qtcontainer"></div>
<div id="dropzone">
- <div id="instruction">Drop your qmlrc file or zip file here</div>
+ <div id="instruction">Drop your qmlrc file here</div>
<p>
(Package with a pure Qml project, containing either a .qmlproject file
or a main.qml)
@@ -86,7 +86,7 @@
><input
id="fileinput"
type="file"
- accept=".qmlrc,.zip"
+ accept=".qmlrc"
style="display: none"
/><img
src="resources/images/uploadIcon.svg"
--
GitLab