Feature - show and filter exif tags and rating

appinfo/routes.php

@@ -53,6 +53,10 @@ function w($base, $param)
 
         ['name' => 'Tags#set', 'url' => '/api/tags/set/{id}', 'verb' => 'PATCH'],
 
+        ['name' => 'EmbeddedTags#flat', 'url' => '/api/embedded-tags/flat', 'verb' => 'GET'],
+        ['name' => 'EmbeddedTags#hierarchical', 'url' => '/api/embedded-tags/hierarchical', 'verb' => 'GET'],
+        ['name' => 'EmbeddedTags#count', 'url' => '/api/embedded-tags/count', 'verb' => 'GET'],
+
         ['name' => 'Map#clusters', 'url' => '/api/map/clusters', 'verb' => 'GET'],
         ['name' => 'Map#init', 'url' => '/api/map/init', 'verb' => 'GET'],
 

lib/Controller/DaysController.php

@@ -68,6 +68,8 @@ public function day(array $dayIds): Http\Response
                 $this->isHidden(),
                 $this->isMonthView(),
                 $this->isReverse(),
+                $this->getMinRating(),
+                $this->getEmbeddedTags(),
                 $this->getTransformations(),
             );
 
@@ -114,6 +116,18 @@ private function getTransformations(): array
             $transforms[] = [$this->tq, 'transformMapBoundsFilter', $bounds];
         }
 
+        // Min rating filter - only if SQL filtering is enabled
+        if ($this->tq->shouldFilterExifBySQL() && ($minRating = $this->getMinRating())) {
+            $transforms[] = [$this->tq, 'transformMinRatingFilter', $minRating];
+        }
+
+        // Embedded tags filter - only if SQL filtering is enabled
+        if ($this->tq->shouldFilterExifBySQL() && ($embeddedTags = $this->getEmbeddedTags())) {
+            if (!empty($embeddedTags)) {
+                $transforms[] = [$this->tq, 'transformEmbeddedTagsFilter', $embeddedTags];
+            }
+        }
+
         // Limit number of responses for day query
         if ($limit = $this->request->getParam('limit')) {
             $transforms[] = [$this->tq, 'transformLimit', (int) $limit];
@@ -168,6 +182,8 @@ private function preloadDays(array &$days): void
             $this->isHidden(),
             $this->isMonthView(),
             $this->isReverse(),
+            $this->getMinRating(),
+            $this->getEmbeddedTags(),
             $this->getTransformations(),
         );
 
@@ -178,6 +194,15 @@ private function preloadDays(array &$days): void
                 continue;
             }
 
+            // Only include photos that are in the fileIds array (if it exists)
+            $dayData = $drefMap[$dayId];
+            if (isset($dayData['fileIds']) && !empty($dayData['fileIds'])) {
+                $photoFileId = (int) $photo['fileid'];
+                if (!in_array($photoFileId, $dayData['fileIds'], true)) {
+                    continue;
+                }
+            }
+
             if (!($drefMap[$dayId]['detail'] ?? null)) {
                 $drefMap[$dayId]['detail'] = [];
             }
@@ -215,4 +240,20 @@ private function isReverse(): bool
     {
         return null !== $this->request->getParam('reverse');
     }
+
+    private function getMinRating(): int
+    {
+        return (int) $this->request->getParam('minRating') ?? 0;
+    }
+
+    private function getEmbeddedTags(): array
+    {
+        $embeddedTagsParam = $this->request->getParam('embeddedTags');
+        if ($embeddedTagsParam) {
+            // Decode URI-encoded string before splitting
+            $decoded = urldecode($embeddedTagsParam);
+            return explode(',', $decoded);
+        }
+        return [];
+    }
 }

lib/Controller/EmbeddedTagsController.php

@@ -0,0 +1,158 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Varun Patil <radialapps@gmail.com>
+ * @author Varun Patil <radialapps@gmail.com>
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Memories\Controller;
+
+use OCA\Memories\Db\EmbeddedTagsQuery;
+use OCA\Memories\Db\FsManager;
+use OCA\Memories\Db\TimelineQuery;
+use OCA\Memories\Exceptions;
+use OCA\Memories\Util;
+use OCP\App\IAppManager;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\Files\IRootFolder;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IRequest;
+use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
+
+class EmbeddedTagsController extends GenericApiController
+{
+    public function __construct(
+        IRequest $request,
+        IConfig $config,
+        IUserSession $userSession,
+        IDBConnection $connection,
+        IRootFolder $rootFolder,
+        IAppManager $appManager,
+        LoggerInterface $logger,
+        TimelineQuery $tq,
+        FsManager $fs,
+        protected EmbeddedTagsQuery $etq,
+    ) {
+        parent::__construct($request, $config, $userSession, $connection, $rootFolder, $appManager, $logger, $tq, $fs);
+    }
+
+    /**
+     * Get tags in flat manner with optional filtering and pagination
+     */
+    #[NoAdminRequired]
+    public function flat(): Http\Response
+    {
+        return Util::guardEx(function () {
+            // Check if user is logged in
+            if (!Util::isLoggedIn()) {
+                throw Exceptions::NotLoggedIn();
+            }
+
+            // Get query parameters
+            $pattern = $this->request->getParam('pattern');
+            $limit = $this->request->getParam('limit');
+            $offset = $this->request->getParam('offset');
+
+            // Validate and sanitize parameters
+            $limit = $limit !== null ? max(1, min(1000, (int) $limit)) : null;
+            $offset = $offset !== null ? max(0, (int) $offset) : null;
+            $pattern = $pattern !== null ? (string) $pattern : null;
+
+            // Get tags
+            $tags = $this->etq->getTagsFlat($pattern, $limit, $offset);
+
+            // Get total count for pagination
+            $totalCount = null;
+            if ($limit !== null || $offset !== null) {
+                $totalCount = $this->etq->getTagsCount($pattern);
+            }
+
+            // Prepare response
+            $response = [
+                'tags' => $tags,
+            ];
+
+            if ($totalCount !== null) {
+                $response['pagination'] = [
+                    'total' => $totalCount,
+                    'limit' => $limit,
+                    'offset' => $offset ?? 0,
+                ];
+            }
+
+            return new JSONResponse($response, Http::STATUS_OK);
+        });
+    }
+
+    /**
+     * Get tags in hierarchical structure
+     */
+    #[NoAdminRequired]
+    public function hierarchical(): Http\Response
+    {
+        return Util::guardEx(function () {
+            // Check if user is logged in
+            if (!Util::isLoggedIn()) {
+                throw Exceptions::NotLoggedIn();
+            }
+
+            // Get query parameters
+            $pattern = $this->request->getParam('pattern');
+            $pattern = $pattern !== null ? (string) $pattern : null;
+
+            // Get tags in hierarchical structure
+            $tags = $this->etq->getTagsHierarchical($pattern);
+
+            return new JSONResponse([
+                'tags' => $tags,
+                'structure' => 'hierarchical'
+            ], Http::STATUS_OK);
+        });
+    }
+
+    /**
+     * Get tags count (useful for pagination info)
+     */
+    #[NoAdminRequired]
+    public function count(): Http\Response
+    {
+        return Util::guardEx(function () {
+            // Check if user is logged in
+            if (!Util::isLoggedIn()) {
+                throw Exceptions::NotLoggedIn();
+            }
+
+            // Get query parameters
+            $pattern = $this->request->getParam('pattern');
+            $pattern = $pattern !== null ? (string) $pattern : null;
+
+            // Get count
+            $count = $this->etq->getTagsCount($pattern);
+
+            return new JSONResponse([
+                'count' => $count,
+                'pattern' => $pattern
+            ], Http::STATUS_OK);
+        });
+    }
+} 

lib/Controller/OtherController.php

@@ -109,6 +109,9 @@ public function getUserConfig(): Http\Response
                 'livephoto_autoplay' => 'true' === $getAppConfig('livephotoAutoplay', 'false'),
                 'livephoto_loop' => 'true' === $getAppConfig('livephotoLoop', 'false'),
                 'sidebar_filepath' => 'true' === $getAppConfig('sidebarFilepath', false),
+                'metadata_in_slideshow' => 'true' === $getAppConfig('metadataInSlideshow', 'false'),
+                'metadata_in_gallery' => 'true' === $getAppConfig('metadataInGallery', 'false'),
+                'enable_exif_photo_rating_in_gallery' => 'true' === $getAppConfig('enableExifPhotoRatingInGallery', 'false'),
 
                 // folder settings
                 'folders_path' => $getAppConfig('foldersPath', '/'),