tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUI image thumbnails: look in all possible directory and try harder to return something if the requested size is not available

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-01-03 15:33:29 +01:00
parent bb06a94a52
commit a7a66ebc03
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/utils/rclutil.cpp
View File

@ -619,11 +619,17 @@ static const string& thumbnailsdir()
return thumbnailsd; return thumbnailsd;
} }
// Place for 1024x1024 files
static const string thmbdirxxlarge = "xx-large";
// Place for 512x512 files
static const string thmbdirxlarge = "x-large";
// Place for 256x256 files // Place for 256x256 files
static const string thmbdirlarge = "large"; static const string thmbdirlarge = "large";
// 128x128 // 128x128
static const string thmbdirnormal = "normal"; static const string thmbdirnormal = "normal";
static const vector<string> thmbdirs{thmbdirxxlarge, thmbdirxlarge, thmbdirlarge, thmbdirnormal};
static void thumbname(const string& url, string& name) static void thumbname(const string& url, string& name)
{ {
string digest; string digest;
@ -635,26 +641,47 @@ static void thumbname(const string& url, string& name)
bool thumbPathForUrl(const string& url, int size, string& path) bool thumbPathForUrl(const string& url, int size, string& path)
{ {
string name; string name, path128, path256, path512, path1024;
thumbname(url, name); thumbname(url, name);
if (size <= 128) { if (size <= 128) {
path = path_cat(thumbnailsdir(), thmbdirnormal); path = path_cat(thumbnailsdir(), thmbdirnormal);
path = path_cat(path, name); path = path_cat(path, name);
path128 = path;
} else if (size <= 256) {
path = path_cat(thumbnailsdir(), thmbdirlarge);
path = path_cat(path, name);
path256 = path;
} else if (size <= 512) {
path = path_cat(thumbnailsdir(), thmbdirxlarge);
path = path_cat(path, name);
path512 = path;
} else {
path = path_cat(thumbnailsdir(), thmbdirxxlarge);
path = path_cat(path, name);
path1024 = path;
}
if (access(path.c_str(), R_OK) == 0) {
return true;
}
// Not found in requested size. Try to find any size and return it. Let the client scale.
for (const auto& tdir : thmbdirs) {
path = path_cat(thumbnailsdir(), tdir);
path = path_cat(path, name);
if (access(path.c_str(), R_OK) == 0) { if (access(path.c_str(), R_OK) == 0) {
return true; return true;
} }
} }
path = path_cat(thumbnailsdir(), thmbdirlarge);
path = path_cat(path, name);
if (access(path.c_str(), R_OK) == 0) {
return true;
}
// File does not exist. Path corresponds to the large version at this point, // File does not exist. Return appropriate path anyway.
// fix it if needed.
if (size <= 128) { if (size <= 128) {
path = path_cat(path_home(), thmbdirnormal); path = path128;
path = path_cat(path, name); } else if (size <= 256) {
path = path256;
} else if (size <= 512) {
path = path512;
} else {
path = path1024;
} }
return false; return false;
} }