RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timeline: improve RAW stacking (#1006) 

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/1010/head
Varun Patil 2024-01-19 09:39:38 -08:00
parent 4bb1f94f35
commit ecc05f5d2b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/Timeline.vue
View File

@ -1071,11 +1071,14 @@ export default defineComponent({
// Store RAW files for stacking // Store RAW files for stacking
if (this.config.stack_raw_files && photo.mimetype === this.c.MIME_RAW) { if (this.config.stack_raw_files && photo.mimetype === this.c.MIME_RAW) {
// Google's RAW naming is inconsistent and retarded. // Google's RAW naming is inconsistent and retarded.
// We will handle this on a case-to-case basis. // We will handle this on a case-to-case basis, unless there's
// a strong argument to always take the basename only upto the
// first dot.
// https://github.com/pulsejet/memories/issues/927
// https://github.com/pulsejet/memories/issues/1006 // https://github.com/pulsejet/memories/issues/1006
// https://github.com/pulsejet/memories/issues/927 (handled in the 2nd pass) if (basename.includes('.ORIGINAL')) {
if (basename.endsWith('.ORIGINAL')) { // Consider basename only upto the first dot
basename = utils.removeExtension(basename); basename = basename.split('.', 1)[0];
} }
// Store the RAW file for stacking with the usable basename // Store the RAW file for stacking with the usable basename
@ -1104,10 +1107,12 @@ export default defineComponent({
const basename = utils.removeExtension(photo.basename ?? String()); const basename = utils.removeExtension(photo.basename ?? String());
const files = toStack.get(basename) ?? []; const files = toStack.get(basename) ?? [];
// Also allow *one* more extension in the filename // If a second dot is present in the name, then split till the first dot
// https://github.com/pulsejet/memories/issues/927 // https://github.com/pulsejet/memories/issues/927
// https://github.com/pulsejet/memories/issues/1006
if (basename.includes('.')) { if (basename.includes('.')) {
const subname = utils.removeExtension(basename); // Consider basename only upto the first dot
const subname = basename.split('.', 1)[0];
files.push(...(toStack.get(subname) ?? [])); files.push(...(toStack.get(subname) ?? []));
} }