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

Avatar upload/download fixes. Verbose logging (temporary).

Browse Source
This commit is contained in:
lotodore
2009-03-21 21:14:09 +00:00
parent 60a9beb417
commit 43a13f5297
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientthread.cpp
-1
View File
@@ -649,7 +649,6 @@ ClientThread::CheckAvatarDownloads()
{ {
if (m_avatarDownloader && m_avatarDownloader->HasDownloadResult()) if (m_avatarDownloader && m_avatarDownloader->HasDownloadResult())
{ {
LOG_MSG("Avatar Download done.");
unsigned playerId; unsigned playerId;
boost::shared_ptr<AvatarData> tmpAvatar(new AvatarData); boost::shared_ptr<AvatarData> tmpAvatar(new AvatarData);
m_avatarDownloader->GetDownloadResult(playerId, tmpAvatar->fileData); m_avatarDownloader->GetDownloadResult(playerId, tmpAvatar->fileData);
src/net/common/downloaderthread.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ DownloaderThread::Main()
if (m_curDownloadData && !m_curDownloadData->filename.empty()) if (m_curDownloadData && !m_curDownloadData->filename.empty())
{ {
path filepath(m_curDownloadData->filename); path filepath(m_curDownloadData->filename);
m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string().c_str()); m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string());
m_downloadInProgress = true; m_downloadInProgress = true;
} }
} }
src/net/common/uploaderthread.cpp
+4 -1
View File
@@ -73,7 +73,10 @@ UploaderThread::Main()
if (!data.filename.empty() && data.filesize > 0) if (!data.filename.empty() && data.filesize > 0)
{ {
path filepath(data.filename); path filepath(data.filename);
m_uploadHelper->Init(data.address + filepath.leaf(), filepath.file_string().c_str(), data.user, data.pwd); LOG_MSG("Target URL: " + data.address + filepath.leaf());
LOG_MSG("Filename: " + filepath.file_string());
LOG_MSG("Filesize: " << data.filesize);
m_uploadHelper->Init(data.address + filepath.leaf(), filepath.file_string(), data.user, data.pwd, data.filesize);
m_uploadInProgress = true; m_uploadInProgress = true;
} }
} }
src/net/common/uploadhelper.cpp
+1 -2
View File
@@ -48,8 +48,7 @@ UploadHelper::~UploadHelper()
void void
UploadHelper::InternalInit(const string &/*url*/, const string &targetFileName, const string &user, const string &password, int filesize) UploadHelper::InternalInit(const string &/*url*/, const string &targetFileName, const string &user, const string &password, int filesize)
{ {
// Open target file for writing. // Open target file for reading.
// Open target file for writing.
GetData()->targetFile = fopen(targetFileName.c_str(), "rb"); GetData()->targetFile = fopen(targetFileName.c_str(), "rb");
if (!GetData()->targetFile) if (!GetData()->targetFile)
throw NetException(__FILE__, __LINE__, ERR_SOCK_TRANSFER_OPEN_FAILED, 0); throw NetException(__FILE__, __LINE__, ERR_SOCK_TRANSFER_OPEN_FAILED, 0);