Showing the changes to libraries/script-engine/src/FileScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -31,10 +31,10 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent · 30 unmodified lines | ||
| 31 | 31 | // nothing for now |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | −void FileScriptingInterface::runUnzip(QString path, QUrl url) { | |
| 34 | +void FileScriptingInterface::runUnzip(QString path, QString tempDir, QUrl url) { | |
| 35 | 35 | qDebug() << "Url that was downloaded: " + url.toString(); |
| 36 | 36 | qDebug() << "Path where download is saved: " + path; |
| 37 | − QString file = unzipFile(path); | |
| 37 | + QString file = unzipFile(path, tempDir); | |
| 38 | 38 | if (file != "") { |
| 39 | 39 | qDebug() << "file to upload: " + file; |
| 40 | 40 | QUrl url = QUrl::fromLocalFile(file); |
| @@ -43,6 +43,8 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url) { · 2 unmodified lines | ||
| 43 | 43 | } else { |
| 44 | 44 | qDebug() << "unzip failed"; |
| 45 | 45 | } |
| 46 | + qDebug() << "Removing temporary directory at: " + tempDir; | |
| 47 | + QDir(tempDir).removeRecursively(); | |
| 46 | 48 | } |
| 47 | 49 | |
| 48 | 50 | bool FileScriptingInterface::testUrl(QUrl url) { |
| @@ -72,20 +74,20 @@ void FileScriptingInterface::downloadZip(QString path, const QString link) { · 23 unmodified lines | ||
| 72 | 74 | QUrl url = QUrl(link); |
| 73 | 75 | auto request = ResourceManager::createResourceRequest(nullptr, url); |
| 74 | 76 | connect(request, &ResourceRequest::finished, this, [this, path]{ |
| 75 | − unzipFile(path); | |
| 77 | + unzipFile(path, ""); // so intellisense isn't mad | |
| 76 | 78 | }); |
| 77 | 79 | request->send(); |
| 78 | 80 | } |
| 79 | 81 | |
| 80 | 82 | |
| 81 | −QString FileScriptingInterface::unzipFile(QString path) { | |
| 83 | +QString FileScriptingInterface::unzipFile(QString path, QString tempDir) { | |
| 82 | 84 | |
| 83 | 85 | QDir dir(path); |
| 84 | 86 | QString dirName = dir.path(); |
| 85 | 87 | qDebug() << "Zip directory is stored at: " + dirName; |
| 86 | − QString target = path.section("/", -1) + "/model_repo"; | |
| 88 | + QString target = tempDir + "/model_repo"; | |
| 87 | 89 | qDebug() << "Target path: " + target; |
| 88 | − QStringList list = JlCompress::extractDir(dirName, "C:/Users/elisa/Downloads/test"); | |
| 90 | + QStringList list = JlCompress::extractDir(dirName, target); | |
| 89 | 91 | |
| 90 | 92 | qDebug() << list; |
| 91 | 93 | |