Showing the changes to libraries/script-engine/src/FileScriptingInterface.cpp (1 of 5 files). Show all
Unified · Split
| @@ -38,7 +38,8 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url) { · 37 unmodified lines | ||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | bool FileScriptingInterface::testUrl(QUrl url) { |
| 41 | − if (url.toString().contains(".zip")) return true; | |
| 41 | + if (url.toString().contains(".zip") && url.toString().contains("fbx")) return true; | |
| 42 | + qDebug() << "This model is not a .fbx packaged in a .zip. Please try with another model."; | |
| 42 | 43 | return false; |
| 43 | 44 | } |
| 44 | 45 | |
| @@ -80,14 +81,14 @@ void FileScriptingInterface::unzipFile(QString path) { · 35 unmodified lines | ||
| 80 | 81 | |
| 81 | 82 | //QString zipFileName = QFile::decodeName(compressedFileContent); |
| 82 | 83 | QString dirName = dir.path(); |
| 83 | − QDir testPath("C:/Users/elisa/Downloads/banana.zip"); | |
| 84 | + //QDir testPath("C:/Users/elisa/Downloads/banana.zip"); | |
| 84 | 85 | qDebug() << "Zip directory is stored at: " + dirName; |
| 85 | − QStringList list = JlCompress::extractDir(testPath.path(), "C:/Users/elisa/Downloads/test"); | |
| 86 | + QStringList list = JlCompress::extractDir(dirName, "C:/Users/elisa/Downloads/test"); | |
| 86 | 87 | |
| 87 | 88 | qDebug() << list; |
| 88 | 89 | |
| 89 | 90 | //QFileInfoList files = dir.entryInfoList(); |
| 90 | − QFileInfoList files = testPath.entryInfoList(); | |
| 91 | + QFileInfoList files = dir.entryInfoList(); | |
| 91 | 92 | foreach(QFileInfo file, files) { |
| 92 | 93 | qDebug() << "My file: " + file.fileName(); |
| 93 | 94 | recursiveFileScan(file, &dirName); |