Merge pull request #2125 from nextcloud/artonge/sort_by_taken_date

Use original date time to order files in UI
nextcloud · Nov 13, 2023 · 2340fc3 · 2340fc3
2 parents 951daca + 7a2c013
commit 2340fc3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/lib/Listener/OriginalDateTimeMetadataProvider.php b/lib/Listener/OriginalDateTimeMetadataProvider.php
@@ -54,7 +54,7 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		if (!in_array($node->getMimeType(), Application::IMAGE_MIMES)) {
+		if (!in_array($node->getMimeType(), Application::IMAGE_MIMES) && !in_array($node->getMimeType(), Application::VIDEO_MIMES)) {
 			return;
 		}
 

diff --git a/src/store/files.js b/src/store/files.js
@@ -57,7 +57,7 @@ const mutations = {
 			file.fileid = file.fileid.toString()
 
 			// Precalculate dates as it is expensive.
-			const date = moment(file.lastmod)
+			const date = moment((file.metadataPhotosOriginalDateTime * 1000) || file.lastmod)
 			file.timestamp = date.unix() // For sorting
 			file.month = date.format('YYYYMM') // For grouping by month
 			file.day = date.format('MMDD') // For On this day
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ public function handle(Event $event): void { @@
     			return;
     		}
-    		if (!in_array($node->getMimeType(), Application::IMAGE_MIMES)) {
+    		if (!in_array($node->getMimeType(), Application::IMAGE_MIMES) && !in_array($node->getMimeType(), Application::VIDEO_MIMES)) {
     			return;
     		}
@@ Expand Down @@