Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-04 20:34:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some fixes:

Browse source 
* using ContentTypes to resolve static files too
* added some default content types, in the case of mime.types file not present
* resolve extensions with upper case letters in them
This commit is contained in:
hunbernd 2015-11-08 01:52:23 +01:00
parent b847eea57e
commit 0ef9b22a7e
3 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

39
libresapi/src/util/ContentTypes.cpp
View file

@ -1,8 +1,11 @@
#include "ContentTypes.h"
#include <fstream>
#include <cctype>
#include <algorithm>
RsMutex ContentTypes::ctmtx = RsMutex("CTMTX");
std::map<std::string, std::string> ContentTypes::cache;
bool ContentTypes::inited = false;
#ifdef WINDOWS_SYS
//Next to the executable
@ -18,12 +21,18 @@ std::string ContentTypes::cTypeFromExt(const std::string &extension)
RsStackMutex mtx(ctmtx);
if(!inited)
addBasic();
std::string extension2(extension); //lower case
std::transform(extension2.begin(), extension2.end(), extension2.begin(),::tolower);
//looking into the cache
std::map<std::string,std::string>::iterator it;
it = cache.find(extension);
it = cache.find(extension2);
if (it != cache.end())
{
std::cout << "Mime " + it->second + " for extension ." + extension + " was found in cache" << std::endl;
std::cout << "Mime " + it->second + " for extension ." + extension2 + " was found in cache" << std::endl;
return it->second;
}
@ -45,19 +54,35 @@ std::string ContentTypes::cTypeFromExt(const std::string &extension)
else
ext = line.substr(j+1, i-j-1);
if(extension == ext)
if(extension2 == ext)
{
std::string mime = line.substr(0, line.find_first_of("\t "));
cache[extension] = mime;
std::cout << "Mime " + mime + " for extension ." + extension + " was found in mime.types" << std::endl;
cache[extension2] = mime;
std::cout << "Mime " + mime + " for extension ." + extension2 + " was found in mime.types" << std::endl;
return mime;
}
}
}
//nothing found
std::cout << "Mime for " + extension + " was not found in " + filename + " falling back to " << DEFAULTCT << std::endl;
cache[extension] = DEFAULTCT;
std::cout << "Mime for " + extension2 + " was not found in " + filename + " falling back to " << DEFAULTCT << std::endl;
cache[extension2] = DEFAULTCT;
return DEFAULTCT;
}
//Add some basic content-types before first use.
//It keeps webui usable in the case of mime.types file not exists.
void ContentTypes::addBasic()
{
inited = true;
cache["html"] = "text/html";
cache["css"] = "text/css";
cache["js"] = "text/javascript";
cache["jsx"] = "text/jsx";
cache["png"] = "image/png";
cache["jpg"] = "image/jpeg";
cache["jpeg"] = "image/jpeg";
cache["gif"] = "image/gif";
}

2
libresapi/src/util/ContentTypes.h
View file

@ -16,6 +16,8 @@ private:
static std::map<std::string, std::string> cache;
static RsMutex ctmtx;
static const char* filename;
static bool inited;
static void addBasic();
};
#endif // CONTENTTYPES_H