Showing the changes to libraries/script-engine/src/FileScriptingInterface.cpp (1 of 5 files). Show all
Unified · Split
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | // |
| 2 | 2 | // FileScriptingInterface.cpp |
| 3 | −// interface/src/scripting | |
| 3 | +// libraries/script-engine/src | |
| 4 | 4 | // |
| 5 | 5 | // Created by Elisa Lupin-Jimenez on 6/28/16. |
| 6 | 6 | // Copyright 2016 High Fidelity, Inc. |
| @@ -10,15 +10,18 @@ · 3 unmodified lines | ||
| 10 | 10 | // |
| 11 | 11 | |
| 12 | 12 | #include <QTemporaryDir> |
| 13 | +#include <QDir> | |
| 13 | 14 | #include <QFile> |
| 14 | 15 | #include <QDebug> |
| 15 | 16 | #include <QBuffer> |
| 17 | +#include <QTextCodec> | |
| 18 | +#include <QIODevice> | |
| 16 | 19 | #include <QUrl> |
| 17 | 20 | #include <QByteArray> |
| 18 | 21 | #include <QString> |
| 19 | 22 | #include <QFileInfo> |
| 20 | −#include <quazip/quazip.h> | |
| 21 | −#include <quazip/JlCompress.h> | |
| 23 | +#include <quazip5/quazip.h> | |
| 24 | +#include <quazip5/JlCompress.h> | |
| 22 | 25 | #include "ResourceManager.h" |
| 23 | 26 | |
| 24 | 27 | #include "FileScriptingInterface.h" |
| @@ -28,27 +31,43 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent · 3 unmodified lines | ||
| 28 | 31 | // nothing for now |
| 29 | 32 | } |
| 30 | 33 | |
| 31 | −void FileScriptingInterface::downloadZip() { | |
| 32 | − QUrl url(*parent); | |
| 34 | +void FileScriptingInterface::runUnzip(QString path, QString importURL) { | |
| 35 | + downloadZip(path, importURL); | |
| 36 | + | |
| 37 | +} | |
| 38 | + | |
| 39 | +QString FileScriptingInterface::getTempDir() { | |
| 40 | + QTemporaryDir dir; | |
| 41 | + dir.setAutoRemove(false); | |
| 42 | + return dir.path(); | |
| 43 | + // remember I must do something to delete this temp dir later | |
| 44 | +} | |
| 45 | + | |
| 46 | +void FileScriptingInterface::downloadZip(QString path, const QString link) { | |
| 47 | + QUrl url = QUrl(link); | |
| 33 | 48 | auto request = ResourceManager::createResourceRequest(nullptr, url); |
| 34 | − connect(request, &ResourceRequest::finished, this, &FileScriptingInterface::unzipFile); | |
| 49 | + connect(request, &ResourceRequest::finished, this, [this, path]{ | |
| 50 | + unzipFile(path); | |
| 51 | + }); | |
| 35 | 52 | request->send(); |
| 36 | 53 | } |
| 37 | 54 | |
| 38 | 55 | // clement's help :D |
| 39 | −void FileScriptingInterface::unzipFile() { | |
| 56 | +void FileScriptingInterface::unzipFile(QString path) { | |
| 40 | 57 | ResourceRequest* request = qobject_cast<ResourceRequest*>(sender()); |
| 41 | 58 | QUrl url = request->getUrl(); |
| 42 | 59 | |
| 43 | 60 | if (request->getResult() == ResourceRequest::Success) { |
| 44 | 61 | qDebug() << "Zip file was downloaded"; |
| 45 | − QTemporaryDir dir; | |
| 62 | + QDir dir(path); | |
| 46 | 63 | QByteArray compressedFileContent = request->getData(); // <-- Downloaded file is in here |
| 47 | 64 | QBuffer buffer(&compressedFileContent); |
| 48 | 65 | buffer.open(QIODevice::ReadOnly); |
| 49 | 66 | |
| 67 | + //QString zipFileName = QFile::decodeName(compressedFileContent); | |
| 50 | 68 | QString dirName = dir.path(); |
| 51 | − JlCompress::extractDir(buffer, dirName); | |
| 69 | + qDebug() << "Zip directory is stored at: " + dirName; | |
| 70 | + JlCompress::extractDir(&buffer, dirName); | |
| 52 | 71 | |
| 53 | 72 | QFileInfoList files = dir.entryInfoList(); |
| 54 | 73 | foreach (QFileInfo file, files) { |
| @@ -67,7 +86,7 @@ void FileScriptingInterface::unzipFile() { · 12 unmodified lines | ||
| 67 | 86 | }*/ |
| 68 | 87 | |
| 69 | 88 | |
| 70 | − //QString zipFileName = QFile::decodeName(&compressedFileContent); | |
| 89 | + | |
| 71 | 90 | |
| 72 | 91 | //QFile file = |
| 73 | 92 | //need to convert this byte array to a file |
| @@ -100,10 +119,10 @@ void FileScriptingInterface::recursiveFileScan(QFileInfo file, QString* dirName) · 26 unmodified lines | ||
| 100 | 119 | QFileInfoList files; |
| 101 | 120 | |
| 102 | 121 | if (file.fileName().contains(".zip")) { |
| 103 | − JlCompress::extractDir(file); | |
| 122 | + JlCompress::extractDir(file.fileName()); | |
| 104 | 123 | qDebug() << "Extracting archive: " + file.fileName(); |
| 105 | 124 | } |
| 106 | − files = file.entryInfoList(); | |
| 125 | + files = file.dir().entryInfoList(); | |
| 107 | 126 | |
| 108 | 127 | /*if (files.empty()) { |
| 109 | 128 | files = JlCompress::getFileList(file.fileName()); |
| @@ -111,7 +130,7 @@ void FileScriptingInterface::recursiveFileScan(QFileInfo file, QString* dirName) · 1 unmodified line | ||
| 111 | 130 | |
| 112 | 131 | foreach (QFileInfo file, files) { |
| 113 | 132 | qDebug() << "Looking into file: " + file.fileName(); |
| 114 | − recursiveFileScan(file, &dirName); | |
| 133 | + recursiveFileScan(file, dirName); | |
| 115 | 134 | } |
| 116 | 135 | return; |
| 117 | 136 | } |