mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-11 19:04:05 +02:00
Code Issues Projects Releases Wiki Activity

Fix bug where thumbnails would not always show in the search

Browse Source
This commit is contained in:
Simon Robertshaw
2012-08-13 21:08:55 +01:00
parent 723677d431
commit 651546b5bf
2 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/client/ThumbnailBroker.cpp
View File

@@ -96,6 +96,9 @@ void ThumbnailBroker::RenderThumbnail(GameSave * gameSave, int width, int height
void ThumbnailBroker::RetrieveThumbnail(int saveID, int saveDate, int width, int height, ThumbnailListener * tListener) void ThumbnailBroker::RetrieveThumbnail(int saveID, int saveDate, int width, int height, ThumbnailListener * tListener)
{ {
#ifdef DEBUG
std::cout << typeid(*this).name() << " New Thumbnail Retrieval request for " << saveID << ":" << saveDate << std::endl;
#endif
AttachThumbnailListener(tListener); AttachThumbnailListener(tListener);
pthread_mutex_lock(&thumbnailQueueMutex); pthread_mutex_lock(&thumbnailQueueMutex);
bool running = thumbnailQueueRunning; bool running = thumbnailQueueRunning;
@@ -126,7 +129,12 @@ void ThumbnailBroker::FlushThumbQueue()
if(CheckThumbnailListener(thumbnailComplete.front().first)) if(CheckThumbnailListener(thumbnailComplete.front().first))
thumbnailComplete.front().first->OnThumbnailReady(thumbnailComplete.front().second); thumbnailComplete.front().first->OnThumbnailReady(thumbnailComplete.front().second);
else else
{
#ifdef DEBUG
std::cout << typeid(*this).name() << " Listener lost, discarding request" << std::endl;
#endif
delete thumbnailComplete.front().second; delete thumbnailComplete.front().second;
}
thumbnailComplete.pop_front(); thumbnailComplete.pop_front();
} }
pthread_mutex_unlock(&thumbnailQueueMutex); pthread_mutex_unlock(&thumbnailQueueMutex);
@@ -138,13 +146,13 @@ void ThumbnailBroker::thumbnailQueueProcessTH()
while(true) while(true)
{ {
//Shutdown after 2 seconds of idle //Shutdown after 2 seconds of idle
if(time(NULL) - lastAction > 2) //if(time(NULL) - lastAction > 2)
{ //{
pthread_mutex_lock(&thumbnailQueueMutex); // pthread_mutex_lock(&thumbnailQueueMutex);
thumbnailQueueRunning = false; // thumbnailQueueRunning = false;
pthread_mutex_unlock(&thumbnailQueueMutex); // pthread_mutex_unlock(&thumbnailQueueMutex);
break; // break;
} //}
//Renderer //Renderer
pthread_mutex_lock(&thumbnailQueueMutex); pthread_mutex_lock(&thumbnailQueueMutex);
@@ -215,7 +223,7 @@ void ThumbnailBroker::thumbnailQueueProcessTH()
pthread_mutex_unlock(&thumbnailQueueMutex); pthread_mutex_unlock(&thumbnailQueueMutex);
} }
} }
else if(!thumbnail) else
{ {
//Check for ongoing requests //Check for ongoing requests
bool requested = false; bool requested = false;
@@ -225,6 +233,10 @@ void ThumbnailBroker::thumbnailQueueProcessTH()
{ {
requested = true; requested = true;
#ifdef DEBUG
std::cout << typeid(*this).name() << " Request for " << req.ID.SaveID << ":" << req.ID.SaveDate << " found, appending." << std::endl;
#endif
//Add the current listener to the item already being requested //Add the current listener to the item already being requested
(*iter).SubRequests.push_back(req.SubRequests.front()); (*iter).SubRequests.push_back(req.SubRequests.front());
} }
@@ -242,24 +254,21 @@ void ThumbnailBroker::thumbnailQueueProcessTH()
pthread_mutex_unlock(&thumbnailQueueMutex); pthread_mutex_unlock(&thumbnailQueueMutex);
//If it's not already being requested, request it //If it's not already being requested, request it
if(!requested && CheckThumbnailListener(req.SubRequests.front().CompletedListener)) std::stringstream urlStream;
urlStream << "http://" << STATICSERVER << "/" << req.ID.SaveID;
if(req.ID.SaveDate)
{ {
std::stringstream urlStream; urlStream << "_" << req.ID.SaveDate;
urlStream << "http://" << STATICSERVER << "/" << req.ID.SaveID; }
if(req.ID.SaveDate) urlStream << "_small.pti";
{
urlStream << "_" << req.ID.SaveDate;
}
urlStream << "_small.pti";
#ifdef DEBUG #ifdef DEBUG
std::cout << typeid(*this).name() << " Creating new request for " << req.ID.SaveID << ":" << req.ID.SaveDate << std::endl; std::cout << typeid(*this).name() << " Creating new request for " << req.ID.SaveID << ":" << req.ID.SaveDate << std::endl;
#endif #endif
req.HTTPContext = http_async_req_start(NULL, (char *)urlStream.str().c_str(), NULL, 0, 1); req.HTTPContext = http_async_req_start(NULL, (char *)urlStream.str().c_str(), NULL, 0, 1);
req.RequestTime = time(NULL); req.RequestTime = time(NULL);
currentRequests.push_back(req); currentRequests.push_back(req);
}
} }
else else
{ {
@@ -275,7 +284,6 @@ void ThumbnailBroker::thumbnailQueueProcessTH()
} }
std::list<ThumbnailRequest>::iterator iter = currentRequests.begin(); std::list<ThumbnailRequest>::iterator iter = currentRequests.begin();
std::list<ThumbnailRequest>::iterator end = currentRequests.end();
while (iter != currentRequests.end()) while (iter != currentRequests.end())
{ {
lastAction = time(NULL); lastAction = time(NULL);
@@ -304,8 +312,11 @@ void ThumbnailBroker::thumbnailQueueProcessTH()
} }
else else
{ {
thumbnail = new Thumbnail(req.ID.SaveID, req.ID.SaveID, thumbData, ui::Point(128, 128)); //Error thumbnail
free(thumbData); VideoBuffer errorThumb(128, 128);
errorThumb.SetCharacter(64, 64, 'x', 255, 255, 255, 255);
thumbnail = new Thumbnail(req.ID.SaveID, req.ID.SaveID, errorThumb.Buffer, ui::Point(errorThumb.Width, errorThumb.Height));
} }
if(thumbnailCache.size() >= THUMB_CACHE_SIZE) if(thumbnailCache.size() >= THUMB_CACHE_SIZE)

5
src/interface/SaveButton.cpp
View File

@@ -1,4 +1,5 @@
#include <iostream> #include <iostream>
#include <typeinfo>
#include "SaveButton.h" #include "SaveButton.h"
#include "client/SaveInfo.h" #include "client/SaveInfo.h"
@@ -19,7 +20,8 @@ SaveButton::SaveButton(Point position, Point size, SaveInfo * save):
actionCallback(NULL), actionCallback(NULL),
voteColour(255, 0, 0), voteColour(255, 0, 0),
selectable(false), selectable(false),
selected(false) selected(false),
waitingForThumb(false)
{ {
if(save) if(save)
{ {
@@ -125,6 +127,7 @@ void SaveButton::Tick(float dt)
ThumbnailBroker::Ref().RenderThumbnail(file->GetGameSave(), Size.X-3, Size.Y-25, this); ThumbnailBroker::Ref().RenderThumbnail(file->GetGameSave(), Size.X-3, Size.Y-25, this);
} }
} }
/*Thumbnail * tempThumb; /*Thumbnail * tempThumb;
float scaleFactorY = 1.0f, scaleFactorX = 1.0f; float scaleFactorY = 1.0f, scaleFactorX = 1.0f;
if(!thumbnail) if(!thumbnail)