Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- force crc refresh right after clearing the cache after file xfer

This commit is contained in:
Mark Vejvoda 2011-03-10 21:50:43 +00:00
parent 330caf7f8a
commit fe2854e3e0
1 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -1966,37 +1966,15 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName, FTP_Client
Checksum::clearFileCache();
vector<string> paths = Config::getInstance().getPathListForType(ptTilesets);
//string cacheLookupId = CacheManager::getFolderTreeContentsCheckSumRecursivelyCacheLookupKey1;
//std::map<string,int32> &crcTreeCache = CacheManager::getCachedItem< std::map<string,int32> >(cacheLookupId);
string pathSearchString = string("/") + itemName + string("/*");
const string filterFileExt = ".xml";
clearFolderTreeContentsCheckSum(paths, pathSearchString, filterFileExt);
clearFolderTreeContentsCheckSumList(paths, pathSearchString, filterFileExt);
// string cacheKey = "";
// size_t count = paths.size();
// for(size_t idx = 0; idx < count; ++idx) {
// string path = paths[idx] + pathSearchString;
//
// cacheKey += path + "_" + filterFileExt + "_";
// }
// if(crcTreeCache.find(cacheKey) != crcTreeCache.end()) {
// SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] CLEARING CACHED checksum for cacheKey [%s]\n",__FILE__,__FUNCTION__,__LINE__,cacheKey.c_str());
// crcTreeCache.erase(cacheKey);
// }
// Refresh CRC
Config &config = Config::getInstance();
int32 tilesetCRC = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTilesets,""), string("/") + gameSettings->getTileset() + string("/*"), ".xml", NULL);
// string cacheLookupId = CacheManager::getFolderTreeContentsCheckSumRecursivelyCacheLookupKey2;
// std::map<string,int32> &crcTreeCache2 = CacheManager::getCachedItem< std::map<string,int32> >(cacheLookupId);
//
// for(size_t idx = 0; idx < paths.size(); ++idx) {
// string path = paths[idx] + pathSearchString;
//
// string cacheKey = path + "_" + filterFileExt;
// if(crcTreeCache2.find(cacheKey) != crcTreeCache2.end()) {
// SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] CLEARING CACHED checksum for cacheKey [%s]\n",__FILE__,__FUNCTION__,__LINE__,cacheKey.c_str());
// crcTreeCache2.erase(cacheKey);
// }
// }
safeMutexFTPProgress.ReleaseLock();
// END
@ -2046,37 +2024,15 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName, FTP_Client
Checksum::clearFileCache();
vector<string> paths = Config::getInstance().getPathListForType(ptTechs);
//string cacheLookupId = CacheManager::getFolderTreeContentsCheckSumRecursivelyCacheLookupKey1;
//std::map<string,int32> &crcTreeCache = CacheManager::getCachedItem< std::map<string,int32> >(cacheLookupId);
string pathSearchString = string("/") + itemName + string("/*");
const string filterFileExt = ".xml";
clearFolderTreeContentsCheckSum(paths, pathSearchString, filterFileExt);
clearFolderTreeContentsCheckSumList(paths, pathSearchString, filterFileExt);
// string cacheKey = "";
// size_t count = paths.size();
// for(size_t idx = 0; idx < count; ++idx) {
// string path = paths[idx] + pathSearchString;
//
// cacheKey += path + "_" + filterFileExt + "_";
// }
// if(crcTreeCache.find(cacheKey) != crcTreeCache.end()) {
// SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] CLEARING CACHED checksum for cacheKey [%s]\n",__FILE__,__FUNCTION__,__LINE__,cacheKey.c_str());
// crcTreeCache.erase(cacheKey);
// }
// Refresh CRC
Config &config = Config::getInstance();
int32 techCRC = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTechs,""), string("/") + gameSettings->getTech() + string("/*"), ".xml", NULL);
// string cacheLookupId = CacheManager::getFolderTreeContentsCheckSumRecursivelyCacheLookupKey2;
// std::map<string,int32> &crcTreeCache2 = CacheManager::getCachedItem< std::map<string,int32> >(cacheLookupId);
//
// for(size_t idx = 0; idx < paths.size(); ++idx) {
// string path = paths[idx] + pathSearchString;
//
// string cacheKey = path + "_" + filterFileExt;
// if(crcTreeCache2.find(cacheKey) != crcTreeCache2.end()) {
// SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] CLEARING CACHED checksum for cacheKey [%s]\n",__FILE__,__FUNCTION__,__LINE__,cacheKey.c_str());
// crcTreeCache2.erase(cacheKey);
// }
// }
safeMutexFTPProgress.ReleaseLock();
// END