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

New configuration options for automatically uploading the avatars to an external server.

Browse Source
This commit is contained in:
lotodore
2009-03-01 23:09:14 +00:00
parent 4de0913bf2
commit 16decacb6b
14 changed files with 172 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/avatarmanager.h
+8 -2
View File
@@ -41,7 +41,8 @@ class AvatarManager
{
public:
AvatarManager();
AvatarManager(bool useExternalServer = false, const std::string &externalServerAddress = "",
const std::string &externalServerUser = "", const std::string &externalServerPassword = "");
~AvatarManager();
bool Init(const std::string &dataDir, const std::string &cacheDir);
@@ -56,7 +57,7 @@ public:
bool GetHashForAvatar(const std::string &fileName, MD5Buf &md5buf) const;
bool GetAvatarFileName(const MD5Buf &md5buf, std::string &fileName) const;
bool HasAvatar(const MD5Buf &md5buf) const;
bool StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, unsigned size);
bool StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, unsigned size, bool upload);
static bool IsValidAvatarFileType(AvatarFileType avatarFileType, const unsigned char *fileHeader, unsigned fileHeaderSize);
@@ -79,6 +80,11 @@ private:
mutable boost::mutex m_cacheDirMutex;
std::string m_cacheDir;
const bool m_useExternalServer;
const std::string m_externalServerAddress;
const std::string m_externalServerUser;
const std::string m_externalServerPassword;
boost::shared_ptr<UploaderThread> m_uploader;
};
src/core/common/avatarmanager.cpp
+11 -4
View File
@@ -53,7 +53,10 @@ struct AvatarFileState
ifstream inputStream;
};
AvatarManager::AvatarManager()
AvatarManager::AvatarManager(bool useExternalServer, const std::string &externalServerAddress,
const string &externalServerUser, const string &externalServerPassword)
: m_useExternalServer(useExternalServer), m_externalServerAddress(externalServerAddress),
m_externalServerUser(externalServerUser), m_externalServerPassword(externalServerPassword)
{
m_uploader.reset(new UploaderThread());
}
@@ -65,7 +68,7 @@ AvatarManager::~AvatarManager()
}
bool
AvatarManager::Init(const std::string &dataDir, const std::string &cacheDir)
AvatarManager::Init(const string &dataDir, const string &cacheDir)
{
bool retVal = true;
bool tmpRet;
@@ -324,7 +327,7 @@ AvatarManager::HasAvatar(const MD5Buf &md5buf) const
}
bool
AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, unsigned size)
AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, unsigned size, bool upload)
{
bool retVal = false;
string cacheDir;
@@ -361,7 +364,11 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil
if (!o.fail())
{
o.write((const char *)data, size);
//m_uploader->QueueUpload(fileName, size);
if (upload && m_useExternalServer)
{
m_uploader->QueueUpload(m_externalServerAddress, m_externalServerUser, m_externalServerPassword, fileName, size);
}
{
boost::mutex::scoped_lock lock(m_cachedAvatarsMutex);
m_cachedAvatars.insert(AvatarMap::value_type(md5buf, fileName));