mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-22 07:52:51 +02:00
Code Issues Projects Releases Wiki Activity

- added code to download and display image preview for mod selections if they exist

Browse Source
This commit is contained in:
Mark Vejvoda
2011-04-07 23:51:22 +00:00
parent 4a160355c7
commit 788d81ba7e
5 changed files with 246 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/shared_lib/include/platform/posix/miniftpclient.h
View File

@@ -38,7 +38,8 @@ enum FTP_Client_CallbackType {
ftp_cct_Tileset = 1,
ftp_cct_Techtree = 2,
ftp_cct_Scenario = 3,
ftp_cct_DownloadProgress = 4
ftp_cct_File = 4,
ftp_cct_DownloadProgress = 5
};
class FTPClientCallbackInterface {
@@ -50,6 +51,7 @@ public:
double upload_total;
double upload_now;
string currentFilename;
FTP_Client_CallbackType downloadType;
};
virtual void FTPClient_CallbackEvent(string itemName,
@@ -79,6 +81,9 @@ protected:
Mutex mutexScenarioList;
vector<pair<string,string> > scenarioList;
Mutex mutexFileList;
vector<pair<string,string> > fileList;
void getMapFromServer(pair<string,string> mapFilename);
pair<FTP_Client_ResultType,string> getMapFromServer(pair<string,string> mapFileName, string ftpUser, string ftpUserPassword);
@@ -91,13 +96,17 @@ protected:
void getScenarioFromServer(pair<string,string> fileName);
pair<FTP_Client_ResultType,string> getScenarioInternalFromServer(pair<string,string> fileName);
void getFileFromServer(pair<string,string> fileName);
pair<FTP_Client_ResultType,string> getFileInternalFromServer(pair<string,string> fileName);
Mutex mutexProgressMutex;
string fileArchiveExtension;
string fileArchiveExtractCommand;
string fileArchiveExtractCommandParameters;
pair<FTP_Client_ResultType,string> getFileFromServer(pair<string,string> fileNameTitle,
pair<FTP_Client_ResultType,string> getFileFromServer(FTP_Client_CallbackType downloadType,
pair<string,string> fileNameTitle,
string remotePath, string destFileSaveAs, string ftpUser,
string ftpUserPassword, vector <string> *wantDirListOnly=NULL);
@@ -120,6 +129,7 @@ public:
void addTilesetToRequests(string tileSetName,string URL="");
void addTechtreeToRequests(string techtreeName,string URL="");
void addScenarioToRequests(string fileName,string URL="");
void addFileToRequests(string fileName,string URL="");
FTPClientCallbackInterface * getCallBackObject();
void setCallBackObject(FTPClientCallbackInterface *value);

110
source/shared_lib/sources/platform/posix/miniftpclient.cpp
View File

@@ -49,6 +49,7 @@ struct FtpFile {
FTPClientThread *ftpServer;
string currentFilename;
bool isValidXfer;
FTP_Client_CallbackType downloadType;
};
static size_t my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
@@ -201,6 +202,7 @@ int file_progress(struct FtpFile *out,double download_total, double download_now
stats.upload_total = upload_total;
stats.upload_now = upload_now;
stats.currentFilename = out->currentFilename;
stats.downloadType = out->downloadType;
MutexSafeWrapper safeMutex(out->ftpServer->getProgressMutex(),string(__FILE__) + "_" + intToStr(__LINE__));
out->ftpServer->getCallBackObject()->FTPClient_CallbackEvent(out->itemName, ftp_cct_DownloadProgress, make_pair(ftp_crt_SUCCESS,""), &stats);
@@ -274,7 +276,8 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getMapFromServer(pair<string
NULL,
this,
"",
false
false,
ftp_cct_Map
};
//curl_global_init(CURL_GLOBAL_DEFAULT);
@@ -401,6 +404,14 @@ void FTPClientThread::addScenarioToRequests(string fileName,string URL) {
}
}
void FTPClientThread::addFileToRequests(string fileName,string URL) {
std::pair<string,string> item = make_pair(fileName,URL);
MutexSafeWrapper safeMutex(&mutexFileList,string(__FILE__) + "_" + intToStr(__LINE__));
if(std::find(fileList.begin(),fileList.end(),item) == fileList.end()) {
fileList.push_back(item);
}
}
void FTPClientThread::getTilesetFromServer(pair<string,string> tileSetName) {
bool findArchive = executeShellCommand(this->fileArchiveExtractCommand);
@@ -652,8 +663,8 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getTilesetFromServer(pair<st
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("FTPClientThread::getTilesetFromServer [%s] remotePath [%s] destFileSaveAs [%s] getFolderContents = %d\n",tileSetName.first.c_str(),remotePath.c_str(),destFileSaveAs.c_str(),getFolderContents);
pair<FTP_Client_ResultType,string> result = getFileFromServer(tileSetName,
remotePath, destFileSaveAs,ftpUser, ftpUserPassword, pWantDirListOnly);
pair<FTP_Client_ResultType,string> result = getFileFromServer(ftp_cct_Tileset,
tileSetName, remotePath, destFileSaveAs,ftpUser, ftpUserPassword, pWantDirListOnly);
// Extract the archive
if(result.first == ftp_crt_SUCCESS) {
@@ -683,7 +694,8 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getTilesetFromServer(pair<st
if( fileFromList != "models" && fileFromList != "textures" &&
fileFromList != "sounds") {
result = getFileFromServer(tileSetName,
result = getFileFromServer(ftp_cct_Tileset,
tileSetName,
remotePath + fileFromList,
destFileSaveAsNewFile + fileFromList,
ftpUser, ftpUserPassword);
@@ -884,8 +896,8 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getTechtreeFromServer(pair<
remotePath = techtreeName.second;
}
pair<FTP_Client_ResultType,string> result = getFileFromServer(techtreeName,
remotePath, destFileSaveAs, ftpUser, ftpUserPassword);
pair<FTP_Client_ResultType,string> result = getFileFromServer(ftp_cct_Techtree,
techtreeName, remotePath, destFileSaveAs, ftpUser, ftpUserPassword);
// Extract the archive
if(result.first == ftp_crt_SUCCESS) {
@@ -935,8 +947,8 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getScenarioInternalFromServ
remotePath = fileName.second;
}
pair<FTP_Client_ResultType,string> result = getFileFromServer(fileName,
remotePath, destFileSaveAs, "", "");
pair<FTP_Client_ResultType,string> result = getFileFromServer(ftp_cct_Scenario,
fileName, remotePath, destFileSaveAs, "", "");
// Extract the archive
if(result.first == ftp_crt_SUCCESS) {
@@ -954,7 +966,72 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getScenarioInternalFromServ
}
pair<FTP_Client_ResultType,string> FTPClientThread::getFileFromServer(pair<string,string> fileNameTitle,
void FTPClientThread::getFileFromServer(pair<string,string> fileName) {
pair<FTP_Client_ResultType,string> result = make_pair(ftp_crt_FAIL,"");
bool findArchive = true;
string ext = extractExtension(fileName.first);
if(ext == "7z") {
findArchive = executeShellCommand(this->fileArchiveExtractCommand);
}
if(findArchive == true) {
result = getFileInternalFromServer(fileName);
}
MutexSafeWrapper safeMutex(this->getProgressMutex(),string(__FILE__) + "_" + intToStr(__LINE__));
if(this->pCBObject != NULL) {
this->pCBObject->FTPClient_CallbackEvent(fileName.first,ftp_cct_File,result,NULL);
}
}
pair<FTP_Client_ResultType,string> FTPClientThread::getFileInternalFromServer(pair<string,string> fileName) {
// Root folder for the techtree
//string destRootFolder = this->scenariosPath.second;
//endPathWithSlash(destRootFolder);
//string destRootArchiveFolder = destRootFolder;
//destRootFolder += fileName.first;
//endPathWithSlash(destRootFolder);
//string destFile = this->scenariosPath.second;
//endPathWithSlash(destFile);
//destFile += fileName.first;
//string destFileSaveAs = destFile + this->fileArchiveExtension;
//endPathWithSlash(destFile);
string destFile = fileName.first;
string destFileSaveAs = fileName.first;
//string remotePath = fileName.first + this->fileArchiveExtension;
//if(fileName.second != "") {
// remotePath = fileName.second;
//}
string remotePath = fileName.second;
pair<FTP_Client_ResultType,string> result = getFileFromServer(ftp_cct_File,
fileName,remotePath, destFileSaveAs, "", "");
// Extract the archive
if(result.first == ftp_crt_SUCCESS) {
string ext = extractExtension(destFileSaveAs);
if(ext == "7z") {
string destRootArchiveFolder = extractDirectoryPathFromFile(destFileSaveAs);
string extractCmd = getFullFileArchiveExtractCommand(this->fileArchiveExtractCommand,
this->fileArchiveExtractCommandParameters, destRootArchiveFolder,
destFileSaveAs);
if(executeShellCommand(extractCmd) == false) {
result.first = ftp_crt_FAIL;
result.second = "failed to extract archive!";
}
}
}
return result;
}
pair<FTP_Client_ResultType,string> FTPClientThread::getFileFromServer(FTP_Client_CallbackType downloadType,
pair<string,string> fileNameTitle,
string remotePath, string destFileSaveAs,
string ftpUser, string ftpUserPassword, vector <string> *wantDirListOnly) {
pair<FTP_Client_ResultType,string> result = make_pair(ftp_crt_FAIL,"");
@@ -980,7 +1057,8 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getFileFromServer(pair<stri
NULL,
this,
"",
false
false,
downloadType
};
CURL *curl = SystemFlags::initHTTP();
@@ -1164,6 +1242,18 @@ void FTPClientThread::execute() {
safeMutex4.ReleaseLock();
}
MutexSafeWrapper safeMutex5(&mutexFileList,string(__FILE__) + "_" + intToStr(__LINE__));
if(fileList.size() > 0) {
pair<string,string> file = fileList[0];
fileList.erase(fileList.begin() + 0);
safeMutex5.ReleaseLock();
getFileFromServer(file);
}
else {
safeMutex5.ReleaseLock();
}
if(this->getQuitStatus() == false) {
sleep(25);
}