History

Working download and unpackage from Clara.io

elisa-lj11 committed 10 years ago

Commit 615627e1 parent 49712065 files · +28 −11Browse files

Showing the changes to libraries/script-engine/src/FileScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/FileScriptingInterface.cpp+5−4
@@ -38,7 +38,8 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url) { · 37 unmodified lines
38}38}
39 39
40bool FileScriptingInterface::testUrl(QUrl url) {40bool 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 return false;43 return false;
43}44}
44 45
@@ -80,14 +81,14 @@ void FileScriptingInterface::unzipFile(QString path) { · 35 unmodified lines
80 81
81 //QString zipFileName = QFile::decodeName(compressedFileContent);82 //QString zipFileName = QFile::decodeName(compressedFileContent);
82 QString dirName = dir.path();83 QString dirName = dir.path();
83 QDir testPath("C:/Users/elisa/Downloads/banana.zip");84 //QDir testPath("C:/Users/elisa/Downloads/banana.zip");
84 qDebug() << "Zip directory is stored at: " + dirName;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 qDebug() << list;88 qDebug() << list;
88 89
89 //QFileInfoList files = dir.entryInfoList();90 //QFileInfoList files = dir.entryInfoList();
90 QFileInfoList files = testPath.entryInfoList();91 QFileInfoList files = dir.entryInfoList();
91 foreach(QFileInfo file, files) {92 foreach(QFileInfo file, files) {
92 qDebug() << "My file: " + file.fileName();93 qDebug() << "My file: " + file.fileName();
93 recursiveFileScan(file, &dirName);94 recursiveFileScan(file, &dirName);