thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CLOUD: Use overriden handle() instead of ClientHandlerCallback in page handlers

Browse source 
Using a dedicated callback object for this was an unnecessary overhead.
This commit is contained in:
Peter Bozsó 2016-07-30 08:45:11 +02:00 • committed by Alexander Tkachev
parent 712410496e
commit a1de322c18
20 changed files with 126 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

32
backends/networking/sdl_net/handlers/resourcehandler.cpp
View file

@ -30,22 +30,6 @@ ResourceHandler::ResourceHandler() {}
ResourceHandler::~ResourceHandler() {}
void ResourceHandler::handle(Client &client) {
Common::String filename = client.path();
filename.deleteChar(0);
// if archive hidden file is requested, ignore
if (filename.size() && filename[0] == '.')
return;
// if file not found, don't set handler either
Common::SeekableReadStream *file = HandlerUtils::getArchiveFile(filename);
if (file == nullptr)
return;
LocalWebserver::setClientGetHandler(client, file, 200, determineMimeType(filename));
}
const char *ResourceHandler::determineMimeType(Common::String &filename) {
// text
if (filename.hasSuffix(".html")) return "text/html";
@ -68,8 +52,20 @@ const char *ResourceHandler::determineMimeType(Common::String &filename) {
/// public
ClientHandlerCallback ResourceHandler::getHandler() {
return new Common::Callback<ResourceHandler, Client &>(this, &ResourceHandler::handle);
void ResourceHandler::handle(Client &client) {
Common::String filename = client.path();
filename.deleteChar(0);
// if archive hidden file is requested, ignore
if (filename.size() && filename[0] == '.')
return;
// if file not found, don't set handler either
Common::SeekableReadStream *file = HandlerUtils::getArchiveFile(filename);
if (file == nullptr)
return;
LocalWebserver::setClientGetHandler(client, file, 200, determineMimeType(filename));
}
} // End of namespace Networking