Fixed: Recursive copy

--HG--
branch : develop

code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp

@@ -63,71 +63,62 @@ bool CFilesCopier::exec()
 
 	FilesToCopy files;
 
+	// create the list of files to copy
 	CFilesCopier::getFilesList(files);
 
+	// copy them
 	return copyFiles(files);
 }
 
-void CFilesCopier::getFilesList(FilesToCopy &files)
+void CFilesCopier::getFile(const QFileInfo &fileInfo, const QDir &srcDir, FilesToCopy &files) const
 {
-	QDir dir(m_sourceDirectory);
+	// full path to file
+	QString fullPath = fileInfo.absoluteFilePath();
 
-	QFileInfoList entries = dir.entryInfoList(m_includeFilter);
+	// full path where to copy file
+	QString dstPath = m_destinationDirectory + "/" + srcDir.relativeFilePath(fullPath);
 
-	foreach(const QFileInfo &entry, entries)
+	if (fileInfo.isDir())
-	{
-		QString fullPath = entry.absoluteFilePath();
-
-		QString dstPath = m_destinationDirectory + "/" + dir.relativeFilePath(fullPath);
-
-		if (entry.isDir())
 	{
+		// create directory
 		QDir().mkpath(dstPath);
 
 		QDir subDir(fullPath);
 
-			QDirIterator it(subDir, QDirIterator::Subdirectories);
+		// get list of all files in directory
-
+		QFileInfoList entries = subDir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
-			while (it.hasNext())
-			{
-				fullPath = it.next();
-
-				if (it.fileName().startsWith('.')) continue;
-
-				QFileInfo fileInfo = it.fileInfo();
-
-				dstPath = m_destinationDirectory + "/" + dir.relativeFilePath(fullPath);
 
-				if (fileInfo.isDir())
+		// proces seach file recursively
+		foreach(const QFileInfo &entry, entries)
 		{
-					QDir().mkpath(dstPath);
+			getFile(entry, srcDir, files);
+		}
 	}
 	else
 	{
+		// add the file to list with all useful information
 		FileToCopy file;
-					file.filename = it.fileName();
+		file.filename = fileInfo.fileName();
-					file.src = it.filePath();
+		file.src = fileInfo.filePath();
 		file.dst = dstPath;
-					file.size = it.fileInfo().size();
+		file.size = fileInfo.size();
-					file.date = it.fileInfo().lastModified().toTime_t();
+		file.date = fileInfo.lastModified().toTime_t();
-					file.permissions = it.fileInfo().permissions();
+		file.permissions = fileInfo.permissions();
 
 		files << file;
 	}
 }
-		}
+
-		else
+void CFilesCopier::getFilesList(FilesToCopy &files) const
 {
-			FileToCopy file;
+	QDir srcDir(m_sourceDirectory);
-			file.filename = entry.fileName();
-			file.src = entry.filePath();
-			file.dst = dstPath;
-			file.size = entry.size();
-			file.date = entry.lastModified().toTime_t();
-			file.permissions = entry.permissions();
 
-			files << file;
+	// only copy all files from filter
-		}
+	QFileInfoList entries = srcDir.entryInfoList(m_includeFilter);
+
+	foreach(const QFileInfo &entry, entries)
+	{
+		getFile(entry, srcDir, files);
 	}
 
 	// copy additional files
@@ -135,18 +126,7 @@ void CFilesCopier::getFilesList(FilesToCopy &files)
 	{
 		QFileInfo fileInfo(fullpath);
 
-		if (fileInfo.isFile())
+		getFile(fileInfo, srcDir, files);
-		{
-			FileToCopy file;
-			file.filename = fileInfo.fileName();
-			file.src = fileInfo.filePath();
-			file.dst = m_destinationDirectory + "/" + fileInfo.fileName();
-			file.size = fileInfo.size();
-			file.date = fileInfo.lastModified().toTime_t();
-			file.permissions = fileInfo.permissions();
-
-			files << file;
-		}
 	}
 }
 

code/ryzom/tools/client/ryzom_installer/src/filescopier.h

@@ -54,7 +54,9 @@ protected:
 
 	typedef QList<FileToCopy> FilesToCopy;
 
-	void getFilesList(FilesToCopy &files);
+	void getFile(const QFileInfo &info, const QDir &srcDir, FilesToCopy &files) const;
+	void getFilesList(FilesToCopy &files) const;
+
 	bool copyFiles(const FilesToCopy &files);
 
 	IOperationProgressListener *m_listener;