sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Detect avatar file type for download. Not fully working yet.

Browse Source
This commit is contained in:
lotodore
2009-03-22 00:39:25 +00:00
parent 84cbb90e92
commit f2ec0b1ef4
7 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/avatarmanager.h
+2
View File
@@ -53,6 +53,8 @@ public:
static unsigned ChunkReadAvatarFile(boost::shared_ptr<AvatarFileState> fileState, unsigned char *data, unsigned chunkSize);
static int AvatarFileToNetPackets(const std::string &fileName, unsigned requestId, NetPacketList &packets);
static AvatarFileType GetAvatarFileType(const std::string &fileName);
static std::string GetAvatarFileExtension(AvatarFileType fileType);
bool GetHashForAvatar(const std::string &fileName, MD5Buf &md5buf) const;
bool GetAvatarFileName(const MD5Buf &md5buf, std::string &fileName) const;
src/core/common/avatarmanager.cpp
+42 -24
View File
@@ -129,18 +129,10 @@ boost::shared_ptr<AvatarFileState>
AvatarManager::OpenAvatarFileForChunkRead(const std::string &fileName, unsigned &outFileSize, AvatarFileType &outFileType)
{
outFileSize = 0;
outFileType = AVATAR_FILE_TYPE_UNKNOWN;
boost::shared_ptr<AvatarFileState> retVal;
try
{
path filePath(fileName);
string ext(extension(filePath));
if (boost::algorithm::iequals(ext, ".png"))
outFileType = AVATAR_FILE_TYPE_PNG;
else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg"))
outFileType = AVATAR_FILE_TYPE_JPG;
else if (boost::algorithm::iequals(ext, ".gif"))
outFileType = AVATAR_FILE_TYPE_GIF;
outFileType = GetAvatarFileType(fileName);
boost::shared_ptr<AvatarFileState> fileState(new AvatarFileState);
fileState->inputStream.open(fileName.c_str(), ios_base::in | ios_base::binary);
if (!fileState->inputStream.fail())
@@ -243,6 +235,46 @@ AvatarManager::AvatarFileToNetPackets(const string &fileName, unsigned requestId
return retVal;
}
AvatarFileType
AvatarManager::GetAvatarFileType(const string &fileName)
{
AvatarFileType fileType;
path filePath(fileName);
string ext(extension(filePath));
if (boost::algorithm::iequals(ext, ".png"))
fileType = AVATAR_FILE_TYPE_PNG;
else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg"))
fileType = AVATAR_FILE_TYPE_JPG;
else if (boost::algorithm::iequals(ext, ".gif"))
fileType = AVATAR_FILE_TYPE_GIF;
else
fileType = AVATAR_FILE_TYPE_UNKNOWN;
return fileType;
}
string
AvatarManager::GetAvatarFileExtension(AvatarFileType fileType)
{
string ext;
switch (fileType)
{
case AVATAR_FILE_TYPE_PNG:
ext = ".png";
break;
case AVATAR_FILE_TYPE_JPG:
ext = ".jpg";
break;
case AVATAR_FILE_TYPE_GIF:
ext = ".gif";
break;
case AVATAR_FILE_TYPE_UNKNOWN:
break;
}
return ext;
}
bool
AvatarManager::GetHashForAvatar(const std::string &fileName, MD5Buf &md5buf) const
{
@@ -337,21 +369,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil
}
try
{
string ext;
switch (avatarFileType)
{
case AVATAR_FILE_TYPE_PNG:
ext = ".png";
break;
case AVATAR_FILE_TYPE_JPG:
ext = ".jpg";
break;
case AVATAR_FILE_TYPE_GIF:
ext = ".gif";
break;
case AVATAR_FILE_TYPE_UNKNOWN:
break;
}
string ext(GetAvatarFileExtension(avatarFileType));
if (!ext.empty() && !cacheDir.empty())
{
// Check header before storing file.