switching to the main site progress

elisa-lj11 committed 10 years ago

Commit 49712061 parent c36fc294 files · +16 −13Browse files

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

Unified · Split

libraries/script-engine/src/FileScriptingInterface.cpp+13−7

@@ -80,12 +80,18 @@ void FileScriptingInterface::unzipFile(QString path) { · 79 unmodified lines
80		80
81	//QString zipFileName = QFile::decodeName(compressedFileContent);	81	//QString zipFileName = QFile::decodeName(compressedFileContent);
82	QString dirName = dir.path();	82	QString dirName = dir.path();
		83	QDir testPath("C:/Users/elisa/Downloads/banana.zip");
83	qDebug() << "Zip directory is stored at: " + dirName;	84	qDebug() << "Zip directory is stored at: " + dirName;
84	JlCompress::extractDir(&buffer, dirName);	85	QStringList list = JlCompress::extractDir(testPath.path(), "C:/Users/elisa/Downloads/test");
85		86
86	QFileInfoList files = dir.entryInfoList();	87	qDebug() << list;
87	foreach (QFileInfo file, files) {	88
88	recursiveFileScan(file, &dirName);	89	//QFileInfoList files = dir.entryInfoList();
		90	QFileInfoList files = testPath.entryInfoList();
		91	foreach(QFileInfo file, files) {
		92	qDebug() << "My file: " + file.fileName();
		93	recursiveFileScan(file, &dirName);
		94
89	}	95	}
90		96
91		97
@@ -126,15 +132,15 @@ void FileScriptingInterface::unzipFile(QString path) { · 34 unmodified lines
126	}	132	}
127		133
128	void FileScriptingInterface::recursiveFileScan(QFileInfo file, QString* dirName) {	134	void FileScriptingInterface::recursiveFileScan(QFileInfo file, QString* dirName) {
129	if (!file.isDir()) {	135	/*if (!file.isDir()) {
130	qDebug() << "Regular file logged: " + file.fileName();	136	qDebug() << "Regular file logged: " + file.fileName();
131	return;	137	return;
132	}	138	}*/
133	QFileInfoList files;	139	QFileInfoList files;
134		140
135	if (file.fileName().contains(".zip")) {	141	if (file.fileName().contains(".zip")) {
		142	qDebug() << "Extracting archive: " + file.fileName();
136	JlCompress::extractDir(file.fileName());	143	JlCompress::extractDir(file.fileName());
137	qDebug() << "Extracting archive: " + file.fileName();
138	}	144	}
139	files = file.dir().entryInfoList();	145	files = file.dir().entryInfoList();
140		146