Brent SaltzmanandCodex
3c383e46d1
* fix(web,mobile): avoid duplicate manufacturer in camera name Some cameras (e.g. Canon) already include the manufacturer in the EXIF model, which made the details view show "Canon Canon EOS R6m2". Only prepend the make when the model does not already start with it. * refactor(web,mobile): address review feedback on camera name helper - Use toLowerCase instead of toLocaleLowerCase for the comparison - Hoist the whitespace regex to a static in the Dart helper - Match any word of the make, so "EASTMAN KODAK COMPANY" with "KODAK EASYSHARE C875" is deduplicated too - Compute the camera name once in DetailPanel --------- Co-authored-by: Daniel Dietzler <mail@ddietzler.dev> (cherry picked from commit cb2ea1e308d8a85f2f340f50b646f161d3528670)
35 lines
1.2 KiB
TypeScript
35 lines
1.2 KiB
TypeScript
const whitespace = /\s+/;
|
|
|
|
const isWordChar = (char: string | undefined) => char !== undefined && /\w/.test(char);
|
|
|
|
/**
|
|
Builds the display name of a camera from its EXIF make and model.
|
|
|
|
Many cameras (e.g. Canon) already include the manufacturer in the model
|
|
(`Canon EOS R6m2`), so prefixing the make again would produce "Canon Canon EOS R6m2".
|
|
The make is only prepended when the model does not already start with it.
|
|
Makes made up of several words are matched word by word, since the model usually
|
|
repeats only part of them: `NIKON CORPORATION` / `NIKON D850` and
|
|
`EASTMAN KODAK COMPANY` / `KODAK EASYSHARE C875`.
|
|
*/
|
|
export const getCameraName = (make?: string | null, model?: string | null): string => {
|
|
const trimmedMake = make?.trim() ?? '';
|
|
const trimmedModel = model?.trim() ?? '';
|
|
|
|
if (!trimmedMake) {
|
|
return trimmedModel;
|
|
}
|
|
|
|
if (!trimmedModel) {
|
|
return trimmedMake;
|
|
}
|
|
|
|
const lowerModel = trimmedModel.toLowerCase();
|
|
const modelIncludesMake = trimmedMake
|
|
.toLowerCase()
|
|
.split(whitespace)
|
|
.some((word) => lowerModel.startsWith(word) && !isWordChar(lowerModel[word.length]));
|
|
|
|
return modelIncludesMake ? trimmedModel : `${trimmedMake} ${trimmedModel}`;
|
|
};
|