0ct0pu5/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cards View: Refactor generateLensInfo() to fix rendering bug #3918

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-11-27 15:41:48 +01:00
parent eb63cb8324
commit 5bc61b496f
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
frontend/src/model/photo.js
View file

@ -984,25 +984,21 @@ export class Photo extends RestModel {
generateLensInfo = memoizeOne(
(lens, lensId, lensMake, lensModel, cameraModel, fNumber, iso, exposure, focalLength) => {
let info = [];
const id = lensId ? lensId : lens && lens.ID ? lens.ID : 1;
const make = lensMake ? lensMake : lens && lens.Make ? lens.Make : "";
const model = (lensModel ? lensModel : lens && lens.Model ? lens.Model : "").replace(
"f/",
"ƒ/"
);
// Example: EF-S18-55mm f/3.5-5.6 IS STM
if (lens && lens.Model && lens.ID > 1) {
if (lens.Model.length > 7) {
info.push(lens.Model);
} else {
info.push(lens.Make + " " + lens.Model);
}
} else if (lensId > 1) {
if (!lensModel && !!lensMake) {
info.push(lensMake);
} else {
lensModel = lensModel.replace("f/", "ƒ/");
if (lensModel.length > 45) {
return lensModel;
} else {
info.push(lensModel);
}
if (id > 1) {
if (!model && !!make) {
info.push(make);
} else if (model.length > 45) {
return model;
} else if (model) {
info.push(model);
}
}
@ -1010,11 +1006,11 @@ export class Photo extends RestModel {
info.push(focalLength + "mm");
}
if (fNumber && (!lensModel || !lensModel.endsWith(fNumber.toString()))) {
if (fNumber && (!model || !model.endsWith(fNumber.toString()))) {
info.push("ƒ/" + fNumber);
}
if (iso && lensModel.length < 27) {
if (iso && model.length < 27) {
info.push("ISO " + iso);
}