From 7a03f622aa2ec7dfc78e6b57b9dba9bb49ff29a0 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 11 Oct 2022 13:38:09 -0700
Subject: [PATCH] Fix viewer delete (fix #67)

---
 src/components/Photo.vue    | 35 ++++++++++-------------------------
 src/components/Timeline.vue |  2 +-
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/components/Photo.vue b/src/components/Photo.vue
index abd3b561..17cb5bdc 100644
--- a/src/components/Photo.vue
+++ b/src/components/Photo.vue
@@ -38,6 +38,7 @@
 <script lang="ts">
 import { Component, Prop, Emit, Mixins } from 'vue-property-decorator';
 import { IDay, IPhoto } from "../types";
+import { subscribe, unsubscribe } from '@nextcloud/event-bus';
 
 import { showError } from '@nextcloud/dialogs'
 import { getPreviewUrl } from "../services/FileUtils";
@@ -63,7 +64,7 @@ export default class Photo extends Mixins(GlobalMixin) {
     @Prop() rowHeight: number;
     @Prop() day: IDay;
 
-    @Emit('reprocess') emitReprocess(remPhotos: IPhoto[]) {}
+    @Emit('delete') emitDelete(remPhotos: IPhoto[]) {}
     @Emit('select') emitSelect(data: IPhoto) {}
     @Emit('clickImg') emitClickImg(component: any) {}
 
@@ -150,6 +151,13 @@ export default class Photo extends Mixins(GlobalMixin) {
         // Key to store sidebar state
         const SIDEBAR_KEY = 'memories:sidebar-open';
 
+        // Subscribe to delete events
+        const deleteHandler = ({ fileid }) => {
+            const photo = this.day.detail.find(p => p.fileid === fileid);
+            this.emitDelete([photo]);
+        };
+        subscribe('files:file:deleted', deleteHandler);
+
         // Open viewer
         globalThis.OCA.Viewer.open({
             path: photo.filename,   // path
@@ -162,9 +170,7 @@ export default class Photo extends Mixins(GlobalMixin) {
                     localStorage.removeItem(SIDEBAR_KEY);
                 }
                 globalThis.OCA.Files.Sidebar.close();
-
-                // Check for any deleted files and remove them from the main view
-                this.processDeleted();
+                unsubscribe('files:file:deleted', deleteHandler);
             },
         });
 
@@ -174,27 +180,6 @@ export default class Photo extends Mixins(GlobalMixin) {
         }
     }
 
-    /** Remove deleted files from main view */
-    processDeleted() {
-        // This is really an ugly hack, but the viewer
-        // does not provide a way to get the deleted files
-
-        // Compare new and old list of ids
-        const newIds = new Set(this.day.fileInfos.map(f => f.fileid));
-        const remIds = new Set([...this.day.origFileIds].filter(x => !newIds.has(x)));
-
-        // Exit if nothing to do
-        if (remIds.size === 0) {
-            return;
-        }
-        this.day.origFileIds = newIds;
-
-        // Remove deleted files from details
-        // Get IPhotos of the deleted file Ids
-        const remPhotos = this.day.detail.filter(p => remIds.has(p.fileid));
-        this.emitReprocess(remPhotos);
-    }
-
     toggleSelect() {
         if (this.data.flag & this.c.FLAG_PLACEHOLDER) {
             return;
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 899c2817..fc408d81 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -65,7 +65,7 @@
                             :rowHeight="rowHeight"
                             :day="item.day"
                             @select="selectPhoto"
-                            @reprocess="deleteFromViewWithAnimation"
+                            @delete="deleteFromViewWithAnimation"
                             @clickImg="clickPhoto" />
                 </div>
             </div>