New upstream version 1.2.3.6

1 files changed, 162 insertions, 156 deletions

diff --git a/ResourcesManager.cpp b/ResourcesManager.cpp
index 3971531..96fb894 100644
--- a/ResourcesManager.cpp
+++ b/ResourcesManager.cpp
@@ -1,211 +1,217 @@
 /** \file ResourcesManager.cpp
 \brief Define the class to manage and load the resources linked with the themes
 \author alpha_one_x86
-\version 0.3
-\date 2010
-\licence GPL3, see the file COPYING */ 
+\licence GPL3, see the file COPYING */
 
 #include <QDir>
 #include <QFile>
 #include <QApplication>
-#include <QFSFileEngine>
 #include <QFileInfo>
 
 
 #include "ResourcesManager.h"
 
+QRegularExpression ResourcesManager::slashEnd;
+
 /// \brief Create the manager and load the defaults variables
 ResourcesManager::ResourcesManager()
 {
-	ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"start");
-	//load the internal path
-	searchPath<<QString(":/");
-	//load the user path but only if exists and writable
-	//load the ultracopier path
-	#ifdef ULTRACOPIER_VERSION_PORTABLE
-		#ifdef ULTRACOPIER_VERSION_PORTABLEAPPS
-			ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Information,"Ultracopier is compiled with the flag: ULTRACOPIER_VERSION_PORTABLEAPPS");
-			//load the data folder path
-			QDir dir(QApplication::applicationDirPath());
-			dir.cdUp();
-			dir.cdUp();
-			dir.cd("Data");
-			searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-			writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-		#else
-			ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Information,"Ultracopier is compiled with the flag: ULTRACOPIER_VERSION_PORTABLE");
-			//load the ultracopier path
-			QDir dir(QApplication::applicationDirPath());
-			dir.cd("Data");
-			searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-			writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-		#endif
-	#else
-		ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Information,"Ultracopier is compiled as user privacy mode");
-		#ifdef Q_OS_WIN32
-			#define EXTRA_HOME_PATH "\\ultracopier\\"
-		#else
-			#define EXTRA_HOME_PATH "/.config/Ultracopier/"
-		#endif
-		#ifdef Q_OS_LINUX
-			if(QDir("/usr/share/ultracopier/").exists())
-				searchPath<<"/usr/share/ultracopier/";
-			if(QDir("/usr/lib/ultracopier/").exists())
-				searchPath<<"/usr/lib/ultracopier/";
-		#endif
-		//load the user path but only if exists and writable
-		QDir dir(QFSFileEngine::homePath()+EXTRA_HOME_PATH);
-		if(dir.exists())
-		{
-			writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-			searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-		} //if not exists try to create it
-		else if(dir.mkpath(dir.absolutePath()))
-		{
-			//if created, then have write permissions
-			writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-			searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-		}
-		//load the ultracopier path
-		searchPath<<ResourcesManager::AddSlashIfNeeded(QApplication::applicationDirPath());
-	#endif
-	searchPath.removeDuplicates();
-	#ifdef ULTRACOPIER_DEBUG
-	index=0;
-	loop_size=searchPath.size();
-	while(index<loop_size) //look at each val
-	{
-		ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Information,"searchPath.at("+QString::number(index)+"): "+searchPath.at(index));
-		index++;
-	}
-	ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Information,"writablePath: "+writablePath);
-	#endif // ULTRACOPIER_DEBUG
+    slashEnd=QRegularExpression(QStringLiteral("[/\\\\]$"));
+
+    //load the internal path
+    searchPath<<QString(QStringLiteral(":/"));
+    #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE
+        //load the user path but only if exists and writable
+        //load the ultracopier path
+        #ifdef ULTRACOPIER_VERSION_PORTABLE
+            #ifdef ULTRACOPIER_VERSION_PORTABLEAPPS
+                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Ultracopier is compiled with the flag: ULTRACOPIER_VERSION_PORTABLEAPPS");
+                //load the data folder path
+                QDir dir(QApplication::applicationDirPath());
+                dir.cdUp();
+                dir.cdUp();
+                dir.cd(QStringLiteral("Data");
+                searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+                writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+            #else
+                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Ultracopier is compiled with the flag: ULTRACOPIER_VERSION_PORTABLE");
+                //load the ultracopier path
+                QDir dir(QApplication::applicationDirPath());
+                dir.cd(QStringLiteral("Data"));
+                searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+                writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+            #endif
+        #else
+            ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Ultracopier is compiled as user privacy mode");
+            #ifdef Q_OS_WIN32
+                #define EXTRA_HOME_PATH QStringLiteral("\\ultracopier\\")
+            #else
+                #define EXTRA_HOME_PATH QStringLiteral("/.config/Ultracopier/")
+            #endif
+            #ifdef Q_OS_LINUX
+                QDir linuxArchIndepDir(QStringLiteral("/usr/share/ultracopier/"));
+                if(linuxArchIndepDir.exists())
+                    searchPath<<ResourcesManager::AddSlashIfNeeded(linuxArchIndepDir.absolutePath());
+                QDir linuxPluginsDir(QStringLiteral("/usr/lib/ultracopier/"));
+                if(linuxPluginsDir.exists())
+                    searchPath<<ResourcesManager::AddSlashIfNeeded(linuxPluginsDir.absolutePath());
+            #endif
+            //load the user path but only if exists and writable
+            QDir dir(QDir::homePath()+EXTRA_HOME_PATH);
+            if(dir.exists())
+            {
+                writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+                searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+            } //if not exists try to create it
+            else if(dir.mkpath(dir.absolutePath()))
+            {
+                //if created, then have write permissions
+                writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+                searchPath<<ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+            }
+            //load the ultracopier path
+            searchPath<<ResourcesManager::AddSlashIfNeeded(QApplication::applicationDirPath());
+        #endif
+    #else
+    QDir dir(QApplication::applicationDirPath());
+    writablePath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+    #endif
+    searchPath.removeDuplicates();
+    #ifdef ULTRACOPIER_DEBUG
+    int index=0;
+    const int &loop_size=searchPath.size();
+    while(index<loop_size) //look at each val
+    {
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("searchPath.at(")+QString::number(index)+QStringLiteral("): ")+searchPath.at(index));
+        index++;
+    }
+    ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("writablePath: ")+writablePath);
+    #endif // ULTRACOPIER_DEBUG
 }
 
 /// \brief Destroy the resource manager
 ResourcesManager::~ResourcesManager()
 {
-	ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"start");
 }
 
 /// \brief Get folder presence and the path
-QString ResourcesManager::getFolderReadPath(const QString &path)
+QString ResourcesManager::getFolderReadPath(const QString &path) const
 {
-	index=0;
-	loop_size=searchPath.size();
-	while(index<loop_size) //look at each val
-	{
-		QDir dir(searchPath.at(index)+path);
-		if(dir.exists()) // if the path have been found, then return the full path
-			return ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-		index++;
-	}
-	return "";
+    int index=0;
+    const int &loop_size=searchPath.size();
+    while(index<loop_size) //look at each val
+    {
+        QDir dir(searchPath.at(index)+path);
+        if(dir.exists()) // if the path have been found, then return the full path
+            return ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+        index++;
+    }
+    return QStringLiteral("");
 }
 
 /// \brief Get folder presence, the path and check in the folder and sub-folder the file presence
-QString ResourcesManager::getFolderReadPathMultiple(const QString &path,const QStringList &fileToCheck)
+QString ResourcesManager::getFolderReadPathMultiple(const QString &path,const QStringList &fileToCheck) const
 {
-	index=0;
-	loop_size=searchPath.size();
-	while(index<loop_size) //look at each val
-	{
-		QDir dir(searchPath.at(index)+path);
-		if(checkFolderContent(dir.absolutePath(),fileToCheck))
-			return dir.absolutePath()+QDir::separator();
-		index++;
-	}
-	return "";
+    int index=0;
+    const int &loop_size=searchPath.size();
+    while(index<loop_size) //look at each val
+    {
+        QDir dir(searchPath.at(index)+path);
+        if(checkFolderContent(dir.absolutePath(),fileToCheck))
+            return dir.absolutePath()+QDir::separator();
+        index++;
+    }
+    return QStringLiteral("");
 }
 
-bool ResourcesManager::checkFolderContent(const QString &path,const QStringList &fileToCheck)
+bool ResourcesManager::checkFolderContent(const QString &path,const QStringList &fileToCheck) const
 {
-	QDir dir(path);
-	if(dir.exists()) // if the path have been found, then return the full path
-	{
-		bool allFileToCheckIsFound=true;
-		index=0;
-		loop_size=fileToCheck.size();
-		QString partialPath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
-		while(index<loop_size) //look at each val
-		{
-			if(!QFile::exists(partialPath+fileToCheck.at(index))) //if a file have been not found, consider the folder as not suitable
-			{
-				allFileToCheckIsFound=false;
-				break;
-			}
-			index++;
-		}
-		if(allFileToCheckIsFound==true) // if all file into have been found then return this path
-			return true;
-	}
-	return false;
+    QDir dir(path);
+    if(dir.exists()) // if the path have been found, then return the full path
+    {
+        bool allFileToCheckIsFound=true;
+        int index=0;
+        const int &loop_size=fileToCheck.size();
+        QString partialPath=ResourcesManager::AddSlashIfNeeded(dir.absolutePath());
+        while(index<loop_size) //look at each val
+        {
+            if(!QFile::exists(partialPath+fileToCheck.at(index))) //if a file have been not found, consider the folder as not suitable
+            {
+                allFileToCheckIsFound=false;
+                break;
+            }
+            index++;
+        }
+        if(allFileToCheckIsFound==true) // if all file into have been found then return this path
+            return true;
+    }
+    return false;
 }
 
 /// \brief add / or \ in function of the platform at the end of path if both / and \ are not found
 QString ResourcesManager::AddSlashIfNeeded(const QString &path)
 {
-	if(path.contains(QRegExp("[/\\\\]$")))
-		return path;
-	else
-		return path+QDir::separator();
+    if(path.contains(slashEnd))
+        return path;
+    else
+        return path+QDir::separator();
 }
 
 /// \brief get the writable path
-QString ResourcesManager::getWritablePath()
+QString ResourcesManager::getWritablePath() const
 {
-	return writablePath;
+    return writablePath;
 }
 
 /// \brief disable the writable path, if ultracopier is unable to write into
 bool ResourcesManager::disableWritablePath()
 {
-	bool returnVal=true;
-	if(writablePath=="")
-		returnVal=false;
-	else
-		writablePath="";
-	return returnVal;
+    bool returnVal=true;
+    if(writablePath.isEmpty())
+        returnVal=false;
+    else
+        writablePath=QStringLiteral("");
+    return returnVal;
 }
 
 /// \brief get the read path
-QStringList ResourcesManager::getReadPath()
+QStringList ResourcesManager::getReadPath() const
 {
-	return searchPath;
+    return searchPath;
 }
 
 /// \brief remove folder
 bool ResourcesManager::removeFolder(const QString &dir)
 {
-	ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"folder to remove: "+dir);
-	bool errorFound=false;
-	QDir currentDir(dir);
-	QFileInfoList files = currentDir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
-	int index=0;
-	int loop_size=files.size();
-	while(index<loop_size)
-	{
-		if(files.at(index).isFile())
-		{
-			QFile file(files.at(index).absoluteFilePath());
-			if(!file.remove())
-			{
-				errorFound=true;
-				ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Critical,"remove file failed: "+file.errorString());
-			}
-			else
-				ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"file removed: "+file.fileName());
-		}
-		else if(files.at(index).isDir())
-			removeFolder(files.at(index).absoluteFilePath());
-		else
-			ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Warning,"unknow file type for: "+files.at(index).absoluteFilePath());
-		index++;
-	}
-	if(!currentDir.rmpath(dir))
-	{
-		ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Critical,"remove path failed, check right and if is empty: "+dir);
-		errorFound=true;
-	}
-	return !errorFound;
+    ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"folder to remove: "+dir);
+    bool errorFound=false;
+    QDir currentDir(dir);
+    QFileInfoList files = currentDir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
+    int index=0;
+    const int &loop_size=files.size();
+    while(index<loop_size)
+    {
+        if(files.at(index).isFile())
+        {
+            QFile file(files.at(index).absoluteFilePath());
+            if(!file.remove())
+            {
+                errorFound=true;
+                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"remove file failed: "+file.errorString());
+            }
+            else
+                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file removed: "+file.fileName());
+        }
+        else if(files.at(index).isDir())
+            removeFolder(files.at(index).absoluteFilePath());
+        else
+            ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unknow file type for: "+files.at(index).absoluteFilePath());
+        index++;
+    }
+    if(!currentDir.rmpath(dir))
+    {
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"remove path failed, check right and if is empty: "+dir);
+        errorFound=true;
+    }
+    return !errorFound;
 }