jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor refactoring and Content-Type header

Browse source
This commit is contained in:
Christophe Fajardo 2022-01-20 18:10:30 +01:00
commit abf2a5ea4e
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sunshine/process.cpp
View file

@ -190,31 +190,31 @@ std::vector<ctx_t> &proc_t::get_apps() {
return _apps;
}
#define CHECK_EXPECTED_EXTENTIONS(extention) (extention == "png" || extention == "jpg" || extention == "jpeg")
/// Gets application image from application list.
/// Returns default image if image configuration is not set.
std::string proc_t::get_app_image(int app_id) {
/// returns http content-type header compatible image type
std::tuple<std::string, std::string> proc_t::get_app_image(int app_id) {
auto app_index = app_id -1;
if(app_index < 0 || app_index >= _apps.size()) {
BOOST_LOG(error) << "Couldn't find app with ID ["sv << app_id << ']';
return SUNSHINE_ASSETS_DIR "/box.png";
return { SUNSHINE_ASSETS_DIR "/box.png", "png" };
}
auto app_image_path = _apps[app_index].image_path;
if (app_image_path.empty()) {
return SUNSHINE_ASSETS_DIR "/box.png";
return { SUNSHINE_ASSETS_DIR "/box.png", "png" };
}
auto image_extention = std::filesystem::path(app_image_path).extension().string();
image_extention = image_extention.substr(1, image_extention.length() - 1);
std::error_code code;
if (!std::filesystem::exists(app_image_path, code) || !CHECK_EXPECTED_EXTENTIONS(image_extention)) {
return SUNSHINE_ASSETS_DIR "/box.png";
if (!std::filesystem::exists(app_image_path, code) || !CHECK_EXPECTED_PICTURE_EXTENTIONS(image_extention)) {
return { SUNSHINE_ASSETS_DIR "/box.png", "png" };
}
return app_image_path;
// return only "content-type" http header compatible image type.
return { app_image_path, image_extention == "jpg" ? "jpeg" : image_extention };
}
proc_t::~proc_t() {