games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Replaced CFileInfo with more correct and efficient alternative

Browse Source
This commit is contained in:
Zyx-2000
2016-01-26 14:51:38 +01:00
parent c385c8757b
commit 70e3c81b9f
17 changed files with 65 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/filesystem/ResourceID.cpp
View File

@@ -1,7 +1,6 @@
#include "StdInc.h"
#include "ResourceID.h"
#include "CFileInfo.h"
#include "FileInfo.h"
// trivial to_upper that completely ignores localization and only work with ASCII
// Technically not a problem since
@@ -23,28 +22,45 @@ static inline void toUpper(std::string & string)
for (char & symbol : string)
toUpper(symbol);
}
#else
static inline void toUpper(std::string & string)
{
boost::to_upper(string);
}
#endif
static inline EResType::Type readType(const std::string& name)
{
return EResTypeHelper::getTypeFromExtension(FileInfo::GetExtension(name).to_string());
}
static inline std::string readName(std::string name)
{
const auto dotPos = name.find_last_of('.');
if (dotPos != std::string::npos)
name.resize(dotPos);
toUpper(name);
return name;
}
ResourceID::ResourceID()
:type(EResType::OTHER)
{
}
ResourceID::ResourceID(std::string name)
:type(EResType::UNDEFINED)
ResourceID::ResourceID(std::string name_)
:type{readType(name_)},
name{readName(std::move(name_))}
{
CFileInfo info(std::move(name));
setType(info.getType());
setName(info.getStem());
}
ResourceID::ResourceID(std::string name, EResType::Type type)
:type(EResType::UNDEFINED)
ResourceID::ResourceID(std::string name_, EResType::Type type_)
:type{type_},
name{readName(std::move(name_))}
{
setType(type);
setName(std::move(name));
}
std::string ResourceID::getName() const
@@ -56,7 +72,7 @@ EResType::Type ResourceID::getType() const
{
return type;
}
#if 0
void ResourceID::setName(std::string name)
{
// setName shouldn't be used if type is UNDEFINED
@@ -72,26 +88,17 @@ void ResourceID::setName(std::string name)
this->name.erase(dotPos);
}
#ifdef ENABLE_TRIVIAL_TOUPPER
toUpper(this->name);
#else
// strangely enough but this line takes 40-50% of filesystem loading time
boost::to_upper(this->name);
#endif
}
void ResourceID::setType(EResType::Type type)
{
this->type = type;
}
#endif
EResType::Type EResTypeHelper::getTypeFromExtension(std::string extension)
{
#ifdef ENABLE_TRIVIAL_TOUPPER
toUpper(extension);
#else
boost::to_upper(extension);
#endif
static const std::map<std::string, EResType::Type> stringToRes =
{