Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-30 20:34:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Read official files before unofficial files.

Browse source 
This is for consistency with other tools #652.
This commit is contained in:
Leonardo Zide 2021-03-13 10:51:35 -08:00
parent 649ecf5c1e
commit f789dd21df
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/lc_library.cpp
View file

@ -24,7 +24,7 @@
# define DEF_MEM_LEVEL MAX_MEM_LEVEL # define DEF_MEM_LEVEL MAX_MEM_LEVEL
#endif #endif
#define LC_LIBRARY_CACHE_VERSION 0x0108 #define LC_LIBRARY_CACHE_VERSION 0x0109
#define LC_LIBRARY_CACHE_ARCHIVE 0x0001 #define LC_LIBRARY_CACHE_ARCHIVE 0x0001
#define LC_LIBRARY_CACHE_DIRECTORY 0x0002 #define LC_LIBRARY_CACHE_DIRECTORY 0x0002
@ -462,7 +462,11 @@ bool lcPiecesLibrary::OpenArchive(std::unique_ptr<lcFile> File, lcZipFileType Zi
} }
mZipFiles[static_cast<int>(ZipFileType)] = std::move(ZipFile); mZipFiles[static_cast<int>(ZipFileType)] = std::move(ZipFile);
mSources.insert(mSources.begin(), std::move(Source));
if (ZipFileType != lcZipFileType::StudStyle)
mSources.emplace_back(std::move(Source));
else
mSources.insert(mSources.begin(), std::move(Source));
return true; return true;
} }
@ -522,7 +526,7 @@ void lcPiecesLibrary::ReadArchiveDescriptions(const QString& OfficialFileName, c
bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir, bool ShowProgress) bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir, bool ShowProgress)
{ {
const QLatin1String BaseFolders[LC_NUM_FOLDERTYPES] = { QLatin1String("unofficial/"), QLatin1String("") }; const QLatin1String BaseFolders[] = { QLatin1String(""), QLatin1String("unofficial/") };
constexpr int NumBaseFolders = LC_ARRAY_COUNT(BaseFolders); constexpr int NumBaseFolders = LC_ARRAY_COUNT(BaseFolders);
QFileInfoList FileLists[NumBaseFolders]; QFileInfoList FileLists[NumBaseFolders];
@ -534,10 +538,10 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir, bool ShowProgress)
FileLists[BaseFolderIdx] = Dir.entryInfoList(); FileLists[BaseFolderIdx] = Dir.entryInfoList();
} }
if (FileLists[LC_FOLDER_OFFICIAL].isEmpty()) if (FileLists[static_cast<int>(lcLibraryFolderType::Official)].isEmpty())
return false; return false;
mHasUnofficial = !FileLists[LC_FOLDER_UNOFFICIAL].isEmpty(); mHasUnofficial = !FileLists[static_cast<int>(lcLibraryFolderType::Unofficial)].isEmpty();
ReadDirectoryDescriptions(FileLists, ShowProgress); ReadDirectoryDescriptions(FileLists, ShowProgress);
for (unsigned int BaseFolderIdx = 0; BaseFolderIdx < LC_ARRAY_COUNT(BaseFolders); BaseFolderIdx++) for (unsigned int BaseFolderIdx = 0; BaseFolderIdx < LC_ARRAY_COUNT(BaseFolders); BaseFolderIdx++)
@ -583,10 +587,10 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir, bool ShowProgress)
if (memcmp(Dst, ".DAT", 4)) if (memcmp(Dst, ".DAT", 4))
continue; continue;
if (mHasUnofficial && IsPrimitive(Name)) if (BaseFolderIdx > 0 && IsPrimitive(Name))
continue; continue;
if (BaseFolderIdx == 0) if (BaseFolderIdx == static_cast<int>(lcLibraryFolderType::Unofficial))
mHasUnofficial = true; mHasUnofficial = true;
const bool SubFile = SubFileDirectories[DirectoryIdx]; const bool SubFile = SubFileDirectories[DirectoryIdx];
@ -594,7 +598,7 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir, bool ShowProgress)
} }
} }
mSources.push_back(std::move(Source)); mSources.emplace_back(std::move(Source));
} }
for (unsigned int BaseFolderIdx = 0; BaseFolderIdx < LC_ARRAY_COUNT(BaseFolders); BaseFolderIdx++) for (unsigned int BaseFolderIdx = 0; BaseFolderIdx < LC_ARRAY_COUNT(BaseFolders); BaseFolderIdx++)
@ -645,7 +649,7 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir, bool ShowProgress)
return true; return true;
} }
void lcPiecesLibrary::ReadDirectoryDescriptions(const QFileInfoList (&FileLists)[LC_NUM_FOLDERTYPES], bool ShowProgress) void lcPiecesLibrary::ReadDirectoryDescriptions(const QFileInfoList (&FileLists)[static_cast<int>(lcLibraryFolderType::Count)], bool ShowProgress)
{ {
QString IndexFileName = QFileInfo(QDir(mCachePath), QLatin1String("index")).absoluteFilePath(); QString IndexFileName = QFileInfo(QDir(mCachePath), QLatin1String("index")).absoluteFilePath();
lcMemFile IndexFile; lcMemFile IndexFile;
@ -672,7 +676,7 @@ void lcPiecesLibrary::ReadDirectoryDescriptions(const QFileInfoList (&FileLists)
} }
} }
for (int FolderIdx = 0; FolderIdx < LC_NUM_FOLDERTYPES; FolderIdx++) for (int FolderIdx = 0; FolderIdx < static_cast<int>(lcLibraryFolderType::Count); FolderIdx++)
{ {
const QFileInfoList& FileList = FileLists[FolderIdx]; const QFileInfoList& FileList = FileLists[FolderIdx];
@ -697,7 +701,7 @@ void lcPiecesLibrary::ReadDirectoryDescriptions(const QFileInfoList (&FileLists)
} }
*Dst = 0; *Dst = 0;
if (FolderIdx == LC_FOLDER_OFFICIAL && mHasUnofficial && mPieces.find(Name) != mPieces.end()) if (FolderIdx > 0 && mPieces.find(Name) != mPieces.end())
continue; continue;
PieceInfo* Info = new PieceInfo(); PieceInfo* Info = new PieceInfo();

10
common/lc_library.h
View file

@ -36,11 +36,11 @@ enum class lcZipFileType
Count Count
}; };
enum lcLibraryFolderType enum class lcLibraryFolderType
{ {
LC_FOLDER_UNOFFICIAL, Official,
LC_FOLDER_OFFICIAL, Unofficial,
LC_NUM_FOLDERTYPES Count
}; };
enum class lcPrimitiveState enum class lcPrimitiveState
@ -196,7 +196,7 @@ protected:
bool OpenArchive(std::unique_ptr<lcFile> File, lcZipFileType ZipFileType); bool OpenArchive(std::unique_ptr<lcFile> File, lcZipFileType ZipFileType);
bool OpenDirectory(const QDir& LibraryDir, bool ShowProgress); bool OpenDirectory(const QDir& LibraryDir, bool ShowProgress);
void ReadArchiveDescriptions(const QString& OfficialFileName, const QString& UnofficialFileName); void ReadArchiveDescriptions(const QString& OfficialFileName, const QString& UnofficialFileName);
void ReadDirectoryDescriptions(const QFileInfoList (&FileLists)[LC_NUM_FOLDERTYPES], bool ShowProgress); void ReadDirectoryDescriptions(const QFileInfoList (&FileLists)[static_cast<int>(lcLibraryFolderType::Count)], bool ShowProgress);
bool ReadArchiveCacheFile(const QString& FileName, lcMemFile& CacheFile); bool ReadArchiveCacheFile(const QString& FileName, lcMemFile& CacheFile);
bool WriteArchiveCacheFile(const QString& FileName, lcMemFile& CacheFile); bool WriteArchiveCacheFile(const QString& FileName, lcMemFile& CacheFile);