TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rely on the lib's formatters

Browse Source
This commit is contained in:
Manav Rathi
2024-07-27 21:35:43 +05:30
parent 08833390bc
commit d1a74da4a4
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx
View File

@@ -4,7 +4,7 @@ import { nameAndExtension } from "@/base/file";
import type { ParsedMetadata } from "@/media/file-metadata";
import { FileType } from "@/media/file-type";
import { UnidentifiedFaces } from "@/new/photos/components/PeopleList";
import type { RawExifTags } from "@/new/photos/services/exif";
import { tagNumericValue, type RawExifTags } from "@/new/photos/services/exif";
import { isMLEnabled } from "@/new/photos/services/ml";
import { EnteFile } from "@/new/photos/types/file";
import { formattedByteSize } from "@/new/photos/utils/units";
@@ -320,28 +320,18 @@ const parseExifInfo = (
const { exif } = tags;
if (exif) {
if (exif.Make && exif.Model) {
if (exif.Make && exif.Model)
info["takenOnDevice"] =
`${exif.Make.description} ${exif.Model.description}`;
}
if (exif.FNumber) {
info.fNumber = `f/${Math.ceil(exif.FNumber.value)}`;
} else if (exif.FocalLength && exif.ApertureValue) {
info.fNumber = `f/${Math.ceil(
exif.FocalLength.value / exif.ApertureValue.value,
)}`;
}
if (exif.FNumber)
info.fNumber = exif.FNumber.description; /* e.g. "f/16" */
if (exif.ExposureTime) {
info["exposureTime"] = `1/${1 / exif.ExposureTime.value}`;
}
if (exif.ExposureTime)
info["exposureTime"] = exif.ExposureTime.description; /* "1/10" */
if (exif.ISOSpeedRatings) {
const iso = exif.ISOSpeedRatings;
const n = Array.isArray(iso) ? (iso[0] ?? 0) / (iso[1] ?? 1) : iso;
info.iso = `ISO${n}`;
}
if (exif.ISOSpeedRatings)
info.iso = `ISO${tagNumericValue(exif.ISOSpeedRatings)}`;
}
return info;
};

17
web/packages/new/photos/services/exif.ts
View File

@@ -535,3 +535,20 @@ export const extractRawExif = async (blob: Blob): Promise<RawExifTags> => {
return tags;
};
/**
* Return a number from a raw Exif tag value.
*
* Some numeric Exif values are stored as arrays of two numbers [p, q]
* represeting a rational number p/q. ExifReader usually converts this and for
* us, but not always.
*
* This function takes such potentially ambiguous (already converted or not)
* values and returns a number.
*/
export const tagNumericValue = (
tag: ExifReader.NumberTag & ExifReader.NumberArrayTag,
) => {
const v = tag.value;
return Array.isArray(v) ? (v[0] ?? 0) / (v[1] ?? 1) : v;
};