Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Support old and new data files

Browse source
This commit is contained in:
kervala 2016-06-19 21:04:31 +02:00
parent 28e790481c
commit c8e66a5427
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -667,11 +667,21 @@ bool CConfigFile::foundTemporaryFiles(const QString &directory) const
if (!dir.cd("data") && dir.exists()) return false; if (!dir.cd("data") && dir.exists()) return false;
QStringList filter;
filter << "*.string_cache";
if (dir.exists("packed_sheets.bnp"))
{
filter << "*.packed_sheets";
filter << "*.packed";
filter << "*.pem";
}
// temporary files // temporary files
if (!dir.entryList(QStringList() << "*.string_cache" << "*.packed_sheets" << "*.packed" << "*.pem", QDir::Files).isEmpty()) return true; if (!dir.entryList(filter, QDir::Files).isEmpty()) return true;
// fonts directory is not needed anymore // fonts directory is not needed anymore
if (dir.cd("fonts") && dir.exists()) return true; if (dir.exists("fonts.bnp") && dir.cd("fonts") && dir.exists()) return true;
return false; return false;
} }

31
code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
View file

@ -17,21 +17,6 @@
#include "stdpch.h" #include "stdpch.h"
#include "filescleaner.h" #include "filescleaner.h"
#include "operation.h" #include "operation.h"
#include "utils.h"
#include "nel/misc/big_file.h"
#include "nel/misc/callback.h"
#include "nel/misc/file.h"
#include "nel/misc/path.h"
#include "7z.h"
#include "7zAlloc.h"
#include "7zBuf.h"
#include "7zCrc.h"
#include "qzipreader.h"
#include <sys/stat.h>
#ifdef DEBUG_NEW #ifdef DEBUG_NEW
#define new DEBUG_NEW #define new DEBUG_NEW
@ -63,8 +48,18 @@ bool CFilesCleaner::exec()
if (!dir.cd("data") && dir.exists()) return false; if (!dir.cd("data") && dir.exists()) return false;
QStringList filter;
filter << "*.string_cache";
if (dir.exists("packed_sheets.bnp"))
{
filter << "*.packed_sheets";
filter << "*.packed";
filter << "*.pem";
}
// temporary files // temporary files
QStringList files = dir.entryList(QStringList() << "*.string_cache" << "*.packed_sheets" << "*.packed" << "*.pem", QDir::Files); QStringList files = dir.entryList(filter, QDir::Files);
if (m_listener) if (m_listener)
{ {
@ -83,8 +78,8 @@ bool CFilesCleaner::exec()
++filesCount; ++filesCount;
} }
// fonts directory is not needed anymore // fonts directory is not needed anymore if fonts.bnp exists
if (dir.cd("fonts") && dir.exists()) if (dir.exists("fonts.bnp") && dir.cd("fonts") && dir.exists())
{ {
dir.removeRecursively(); dir.removeRecursively();
} }