From c85a61165190c9ebe0209c429601ca04b27b474d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Saccoccio?= <git-clement@saccoccio.me>
Date: Thu, 19 Oct 2023 22:12:26 +0300
Subject: [PATCH 1/5] share: show directory structure

---
 appinfo/routes.php                            |  4 ++-
 lib/Controller/FoldersController.php          |  6 +++--
 lib/Db/FsManager.php                          | 11 +++++++-
 src/components/Timeline.vue                   |  2 +-
 src/components/frame/Folder.vue               | 25 +++++++-----------
 .../top-matter/DynamicTopMatter.vue           |  6 ++---
 src/components/top-matter/FolderTopMatter.vue | 26 ++++++++++++++-----
 src/components/top-matter/TopMatter.vue       |  1 +
 src/router.ts                                 |  2 +-
 src/types.ts                                  |  2 --
 10 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index e1c88f9a..6e4a55e6 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 function getWildcard($param)
 {
     return [
@@ -34,7 +36,6 @@ return [
         w(['name' => 'Page#tags', 'url' => '/tags/{name}', 'verb' => 'GET'], 'name'),
 
         // Public folder share
-        ['name' => 'Public#showShare', 'url' => '/s/{token}', 'verb' => 'GET'],
         [
             'name' => 'Public#showAuthenticate',
             'url' => '/s/{token}/authenticate/{redirect}',
@@ -45,6 +46,7 @@ return [
             'url' => '/s/{token}/authenticate/{redirect}',
             'verb' => 'POST',
         ],
+        w(['name' => 'Public#showShare', 'url' => '/s/{token}/{path}', 'verb' => 'GET'], 'path'),
 
         // Public album share
         ['name' => 'PublicAlbum#showShare', 'url' => '/a/{token}', 'verb' => 'GET'],
diff --git a/lib/Controller/FoldersController.php b/lib/Controller/FoldersController.php
index b5bf0bc0..3a742f0b 100644
--- a/lib/Controller/FoldersController.php
+++ b/lib/Controller/FoldersController.php
@@ -15,12 +15,15 @@ class FoldersController extends GenericApiController
 {
     /**
      * @NoAdminRequired
+     *
+     * @PublicPage
      */
     public function sub(string $folder): Http\Response
     {
         return Util::guardEx(function () use ($folder) {
             try {
-                $node = Util::getUserFolder()->get($folder);
+                $rootNode = $this->fs->getShareNode() ?? Util::getUserFolder();
+                $node = $rootNode->get($folder);
             } catch (\OCP\Files\NotFoundException) {
                 throw Exceptions::NotFound('Folder not found');
             }
@@ -60,7 +63,6 @@ class FoldersController extends GenericApiController
                 return [
                     'fileid' => $node->getId(),
                     'name' => $node->getName(),
-                    'path' => $node->getPath(),
                     'previews' => $this->tq->getRootPreviews($root),
                 ];
             }, $folders);
diff --git a/lib/Db/FsManager.php b/lib/Db/FsManager.php
index 582c0e82..9b159ef0 100644
--- a/lib/Db/FsManager.php
+++ b/lib/Db/FsManager.php
@@ -84,7 +84,16 @@ class FsManager
                 throw new \Exception('Share is not a folder');
             }
 
-            $root->addFolder($share);
+            if ($path = $this->getRequestFolder()) {
+                try {
+                    $node = $share->get(Util::sanitizePath($path));
+                } catch (\OCP\Files\NotFoundException $e) {
+                    throw new \Exception("Folder not found: {$e->getMessage()}");
+                }
+                $root->addFolder($node);
+            } else {
+                $root->addFolder($share);
+            }
 
             return $root;
         }
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index c90be78c..ccfb6183 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -580,7 +580,7 @@ export default defineComponent({
       }
 
       // Folder
-      if (this.routeIsFolders) {
+      if (this.routeIsFolders || this.routeIsFolderShare) {
         const path = utils.getFolderRoutePath(this.config.folders_path);
         set(DaysFilterType.FOLDER, path);
         if (this.$route.query.recursive) {
diff --git a/src/components/frame/Folder.vue b/src/components/frame/Folder.vue
index cd9953b4..470f492a 100644
--- a/src/components/frame/Folder.vue
+++ b/src/components/frame/Folder.vue
@@ -58,18 +58,17 @@ export default defineComponent({
   computed: {
     /** Open folder */
     target() {
-      const path = this.data.path
-        .split('/')
-        .filter((x) => x)
-        .slice(2) as string[];
-
-      // Remove base path if present
-      const basePath = this.config.folders_path.split('/').filter((x) => x);
-      if (path.length >= basePath.length && path.slice(0, basePath.length).every((x, i) => x === basePath[i])) {
-        path.splice(0, basePath.length);
+      let currentPath: string[] | string = this.$route.params.path || [];
+      if (typeof currentPath === 'string') {
+        currentPath = currentPath.split('/');
       }
 
-      return { name: 'folders', params: { path } };
+      return {
+        name: this.$route.name,
+        params: {
+          path: [...currentPath, this.data.name],
+        },
+      };
     },
   },
 
@@ -89,12 +88,6 @@ export default defineComponent({
       // Reset state
       this.error = false;
 
-      // Check if valid path present
-      if (!this.data.path) {
-        this.error = true;
-        return;
-      }
-
       // Get preview infos
       const previews = this.data.previews;
       if (previews) {
diff --git a/src/components/top-matter/DynamicTopMatter.vue b/src/components/top-matter/DynamicTopMatter.vue
index bdd9428f..2a2a90e2 100644
--- a/src/components/top-matter/DynamicTopMatter.vue
+++ b/src/components/top-matter/DynamicTopMatter.vue
@@ -35,7 +35,7 @@ export default defineComponent({
     },
 
     currentmatter(): Component | null {
-      if (this.routeIsFolders) {
+      if (this.routeIsFolders || this.routeIsFolderShare) {
         return FolderDynamicTopMatter;
       } else if (this.routeIsPlaces) {
         return PlacesDynamicTopMatterVue;
@@ -53,8 +53,8 @@ export default defineComponent({
         return this.$route.params.name || '';
       }
 
-      // Show share name for public shares
-      if (this.routeIsPublic) {
+      // Show share name for public shares, except for folder share, because the name is already present in the breadcrumbs
+      if (this.routeIsPublic && !this.routeIsFolderShare) {
         return PublicShareHeader.title;
       }
 
diff --git a/src/components/top-matter/FolderTopMatter.vue b/src/components/top-matter/FolderTopMatter.vue
index 70920cd3..d1895a40 100644
--- a/src/components/top-matter/FolderTopMatter.vue
+++ b/src/components/top-matter/FolderTopMatter.vue
@@ -1,16 +1,17 @@
 <template>
   <div class="top-matter">
     <NcBreadcrumbs>
-      <NcBreadcrumb title="Home" :to="{ name: 'folders' }">
-        <template #icon>
-          <HomeIcon :size="20" />
+      <NcBreadcrumb :title="rootFolderName" :to="{ name: $route.name }">
+        <template v-if="routeIsPublic" #icon>
+          <ShareIcon :size="20" />
+          <span class="share-name">{{ rootFolderName }}</span>
         </template>
       </NcBreadcrumb>
       <NcBreadcrumb
         v-for="folder in list"
         :key="folder.idx"
         :title="folder.text"
-        :to="{ name: 'folders', params: { path: folder.path } }"
+        :to="{ name: $route.name, params: { path: folder.path } }"
       />
     </NcBreadcrumbs>
 
@@ -23,7 +24,12 @@
             <TimelineIcon v-else :size="20" />
           </template>
         </NcActionButton>
-        <NcActionButton :aria-label="t('memories', 'Share folder')" @click="share()" close-after-click>
+        <NcActionButton
+          v-if="!routeIsPublic"
+          :aria-label="t('memories', 'Share folder')"
+          @click="share()"
+          close-after-click
+        >
           {{ t('memories', 'Share folder') }}
           <template #icon> <ShareIcon :size="20" /> </template>
         </NcActionButton>
@@ -42,8 +48,8 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions';
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton';
 
 import * as utils from '../../services/utils';
+import * as PublicShareHeader from './PublicShareHeader';
 
-import HomeIcon from 'vue-material-design-icons/Home.vue';
 import ShareIcon from 'vue-material-design-icons/ShareVariant.vue';
 import TimelineIcon from 'vue-material-design-icons/ImageMultiple.vue';
 import FoldersIcon from 'vue-material-design-icons/FolderMultiple.vue';
@@ -56,7 +62,6 @@ export default defineComponent({
     NcBreadcrumb,
     NcActions,
     NcActionButton,
-    HomeIcon,
     ShareIcon,
     TimelineIcon,
     FoldersIcon,
@@ -86,6 +91,10 @@ export default defineComponent({
     recursive(): boolean {
       return !!this.$route.query.recursive;
     },
+
+    rootFolderName(): string {
+      return this.routeIsPublic ? PublicShareHeader.title : 'Home';
+    },
   },
 
   methods: {
@@ -110,6 +119,9 @@ export default defineComponent({
   .breadcrumb {
     min-width: 0;
     height: unset;
+    .share-name {
+      margin-left: 1em;
+    }
   }
 }
 </style>
diff --git a/src/components/top-matter/TopMatter.vue b/src/components/top-matter/TopMatter.vue
index 22846835..8f125521 100644
--- a/src/components/top-matter/TopMatter.vue
+++ b/src/components/top-matter/TopMatter.vue
@@ -45,6 +45,7 @@ export default defineComponent({
     currentmatter() {
       switch (this.$route.name) {
         case _m.routes.Folders.name:
+        case _m.routes.FolderShare.name:
           return FolderTopMatter;
         case _m.routes.Albums.name:
           return AlbumTopMatter;
diff --git a/src/router.ts b/src/router.ts
index bd06c195..d98ba16a 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -110,7 +110,7 @@ export const routes: { [key in RouteId]: RouteConfig } = {
   },
 
   FolderShare: {
-    path: '/s/:token',
+    path: '/s/:token/:path*',
     component: Timeline,
     name: 'folder-share',
     props: (route: Route) => ({ rootTitle: t('memories', 'Shared Folder') }),
diff --git a/src/types.ts b/src/types.ts
index e86ff608..2a0ea1c6 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -156,8 +156,6 @@ export interface IExif {
 }
 
 export interface IFolder extends IPhoto {
-  /** Path to folder */
-  path: string;
   /** Photos for preview images */
   previews?: IPhoto[];
   /** Name of folder */

From 5d884a564cad379e5dc097f30bfc8fd51990a647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Saccoccio?= <git-clement@saccoccio.me>
Date: Thu, 19 Oct 2023 22:50:35 +0300
Subject: [PATCH 2/5] fix: check that share is a folder before trying to acces
 sub-folders

---
 lib/Controller/FoldersController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/FoldersController.php b/lib/Controller/FoldersController.php
index 3a742f0b..aa758b49 100644
--- a/lib/Controller/FoldersController.php
+++ b/lib/Controller/FoldersController.php
@@ -21,8 +21,14 @@ class FoldersController extends GenericApiController
     public function sub(string $folder): Http\Response
     {
         return Util::guardEx(function () use ($folder) {
+            $share = $this->fs->getShareNode();
+            if ($share instanceof Folder) {
+                $rootNode = $share;
+            } else {
+                $rootNode = Util::getUserFolder();
+            }
+
             try {
-                $rootNode = $this->fs->getShareNode() ?? Util::getUserFolder();
                 $node = $rootNode->get($folder);
             } catch (\OCP\Files\NotFoundException) {
                 throw Exceptions::NotFound('Folder not found');

From 3575c0b166c6e971226ef00b43705798ac0a6570 Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Thu, 19 Oct 2023 22:32:34 -0700
Subject: [PATCH 3/5] folder-share: tweaks

Signed-off-by: Varun Patil <radialapps@gmail.com>
---
 lib/Controller/PublicAlbumController.php       |  1 +
 lib/Controller/PublicController.php            |  9 ++++++---
 lib/Db/FsManager.php                           | 18 ++++++++++++++----
 src/components/frame/Folder.vue                |  8 ++++----
 src/components/top-matter/DynamicTopMatter.vue | 13 ++++++++-----
 src/components/top-matter/FolderTopMatter.vue  | 18 ++++++++++++------
 src/components/top-matter/PublicShareHeader.ts |  7 +++++--
 src/services/utils/const.ts                    |  1 +
 8 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/lib/Controller/PublicAlbumController.php b/lib/Controller/PublicAlbumController.php
index 805cd071..06cef037 100644
--- a/lib/Controller/PublicAlbumController.php
+++ b/lib/Controller/PublicAlbumController.php
@@ -81,6 +81,7 @@ class PublicAlbumController extends Controller
 
         // Share info
         $this->initialState->provideInitialState('share_title', $album['name']);
+        $this->initialState->provideInitialState('share_type', 'album');
 
         // Render main template
         $response = new PublicTemplateResponse(Application::APPNAME, 'main', PageController::getMainParams());
diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php
index 3ba4660d..f5f9bbb6 100644
--- a/lib/Controller/PublicController.php
+++ b/lib/Controller/PublicController.php
@@ -98,15 +98,18 @@ class PublicController extends AuthPublicShareController
         // Scripts
         \OCP\Util::addScript(Application::APPNAME, 'memories-main');
 
+        // Get share node
+        $node = $share->getNode();
+
         // Share info
         $this->initialState->provideInitialState('no_download', $share->getHideDownload());
+        $this->initialState->provideInitialState('share_title', $node->getName());
 
-        // Share file id only if not a folder
-        $node = $share->getNode();
         if ($node instanceof \OCP\Files\File) {
             $this->initialState->provideInitialState('single_item', $this->getSingleItemInitialState($node));
+            $this->initialState->provideInitialState('share_type', 'file');
         } elseif ($node instanceof \OCP\Files\Folder) {
-            $this->initialState->provideInitialState('share_title', $node->getName());
+            $this->initialState->provideInitialState('share_type', 'folder');
         } else {
             throw new NotFoundException();
         }
diff --git a/lib/Db/FsManager.php b/lib/Db/FsManager.php
index 91865397..2cff95ac 100644
--- a/lib/Db/FsManager.php
+++ b/lib/Db/FsManager.php
@@ -84,17 +84,24 @@ class FsManager
                 throw new \Exception('Share is not a folder');
             }
 
+            // Folder inside shared folder
             if ($path = $this->getRequestFolder()) {
+                $sanitized = Util::sanitizePath($path);
+                if (null === $sanitized) {
+                    throw new \Exception("Invalid parameter path: {$path}");
+                }
+
+                // Get subnode from share
                 try {
-                    $node = $share->get(Util::sanitizePath($path));
+                    $share = $share->get($sanitized);
                 } catch (\OCP\Files\NotFoundException $e) {
                     throw new \Exception("Folder not found: {$e->getMessage()}");
                 }
-                $root->addFolder($node);
-            } else {
-                $root->addFolder($share);
             }
 
+            // This internally checks if the node is a folder
+            $root->addFolder($share);
+
             return $root;
         }
 
@@ -331,6 +338,9 @@ class FsManager
         return $share;
     }
 
+    /**
+     * Get the share node from the request.
+     */
     public function getShareNode(): ?Node
     {
         $share = $this->getShareObject();
diff --git a/src/components/frame/Folder.vue b/src/components/frame/Folder.vue
index a7d4b834..8ec7b3b9 100644
--- a/src/components/frame/Folder.vue
+++ b/src/components/frame/Folder.vue
@@ -58,15 +58,15 @@ export default defineComponent({
   computed: {
     /** Open folder */
     target() {
-      let currentPath: string[] | string = this.$route.params.path || [];
-      if (typeof currentPath === 'string') {
-        currentPath = currentPath.split('/');
+      let path: string[] | string = this.$route.params.path || [];
+      if (typeof path === 'string') {
+        path = path.split('/');
       }
 
       return {
         name: this.$route.name,
         params: {
-          path: [...currentPath, this.data.name],
+          path: [...path, this.data.name],
         },
       };
     },
diff --git a/src/components/top-matter/DynamicTopMatter.vue b/src/components/top-matter/DynamicTopMatter.vue
index 2a2a90e2..a61b3030 100644
--- a/src/components/top-matter/DynamicTopMatter.vue
+++ b/src/components/top-matter/DynamicTopMatter.vue
@@ -15,9 +15,11 @@ import FolderDynamicTopMatter from './FolderDynamicTopMatter.vue';
 import PlacesDynamicTopMatterVue from './PlacesDynamicTopMatter.vue';
 import OnThisDay from './OnThisDay.vue';
 
-import * as PublicShareHeader from './PublicShareHeader';
 import * as strings from '../../services/strings';
 
+// Auto-hide top header on public shares if redundant
+import './PublicShareHeader';
+
 export default defineComponent({
   name: 'DynamicTopMatter',
 
@@ -50,17 +52,18 @@ export default defineComponent({
     viewName(): string {
       // Show album name for album view
       if (this.routeIsAlbums) {
-        return this.$route.params.name || '';
+        return this.$route.params.name || String();
       }
 
-      // Show share name for public shares, except for folder share, because the name is already present in the breadcrumbs
+      // Show share name for public shares, except for folder share,
+      // because the name is already present in the breadcrumbs
       if (this.routeIsPublic && !this.routeIsFolderShare) {
-        return PublicShareHeader.title;
+        return this.initstate.shareTitle;
       }
 
       // Only static top matter for these routes
       if (this.routeIsTags || this.routeIsPeople || this.routeIsPlaces) {
-        return '';
+        return String();
       }
 
       return strings.viewName(this.$route.name!);
diff --git a/src/components/top-matter/FolderTopMatter.vue b/src/components/top-matter/FolderTopMatter.vue
index d1895a40..3404ecce 100644
--- a/src/components/top-matter/FolderTopMatter.vue
+++ b/src/components/top-matter/FolderTopMatter.vue
@@ -2,9 +2,14 @@
   <div class="top-matter">
     <NcBreadcrumbs>
       <NcBreadcrumb :title="rootFolderName" :to="{ name: $route.name }">
-        <template v-if="routeIsPublic" #icon>
-          <ShareIcon :size="20" />
-          <span class="share-name">{{ rootFolderName }}</span>
+        <template #icon>
+          <template v-if="routeIsPublic">
+            <ShareIcon :size="20" />
+            <span class="share-name">{{ rootFolderName }}</span>
+          </template>
+          <template v-else>
+            <HomeIcon :size="20" />
+          </template>
         </template>
       </NcBreadcrumb>
       <NcBreadcrumb
@@ -48,8 +53,8 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions';
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton';
 
 import * as utils from '../../services/utils';
-import * as PublicShareHeader from './PublicShareHeader';
 
+import HomeIcon from 'vue-material-design-icons/Home.vue';
 import ShareIcon from 'vue-material-design-icons/ShareVariant.vue';
 import TimelineIcon from 'vue-material-design-icons/ImageMultiple.vue';
 import FoldersIcon from 'vue-material-design-icons/FolderMultiple.vue';
@@ -62,6 +67,7 @@ export default defineComponent({
     NcBreadcrumb,
     NcActions,
     NcActionButton,
+    HomeIcon,
     ShareIcon,
     TimelineIcon,
     FoldersIcon,
@@ -93,7 +99,7 @@ export default defineComponent({
     },
 
     rootFolderName(): string {
-      return this.routeIsPublic ? PublicShareHeader.title : 'Home';
+      return this.routeIsPublic ? this.initstate.shareTitle : this.t('memories', 'Home');
     },
   },
 
@@ -120,7 +126,7 @@ export default defineComponent({
     min-width: 0;
     height: unset;
     .share-name {
-      margin-left: 1em;
+      margin-left: 0.75em;
     }
   }
 }
diff --git a/src/components/top-matter/PublicShareHeader.ts b/src/components/top-matter/PublicShareHeader.ts
index 00730639..5d728e75 100644
--- a/src/components/top-matter/PublicShareHeader.ts
+++ b/src/components/top-matter/PublicShareHeader.ts
@@ -1,10 +1,13 @@
 import * as utils from '../../services/utils';
 
 // Shown in dynamic top matter (Timeline::viewName)
-export const title = utils.initstate.shareTitle;
+const title = utils.initstate.shareTitle;
+
+// Hide on album shares only
+const hide = utils.initstate.shareType === 'album';
 
 // Set up hook to monitor recycler scroll to show/hide header
-if (title) {
+if (title && hide) {
   const header = document.querySelector('header#header .header-appname') as HTMLElement;
   let isHidden = false; // cache state to avoid unnecessary DOM updates
 
diff --git a/src/services/utils/const.ts b/src/services/utils/const.ts
index 775b409e..8739cf42 100644
--- a/src/services/utils/const.ts
+++ b/src/services/utils/const.ts
@@ -22,6 +22,7 @@ export const constants = Object.freeze({
 export const initstate = Object.freeze({
   noDownload: loadState('memories', 'no_download', false) !== false,
   shareTitle: loadState('memories', 'share_title', '') as string,
+  shareType: loadState('memories', 'share_type', null) as 'file' | 'folder' | 'album' | null,
   singleItem: loadState('memories', 'single_item', null) as IPhoto | null,
 });
 

From 6f344b863f007cd52ecb1181d0f5588c9444bda1 Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Thu, 19 Oct 2023 22:38:46 -0700
Subject: [PATCH 4/5] folder: hide list on recursive

Signed-off-by: Varun Patil <radialapps@gmail.com>
---
 src/components/top-matter/FolderDynamicTopMatter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/top-matter/FolderDynamicTopMatter.vue b/src/components/top-matter/FolderDynamicTopMatter.vue
index 8b12bca9..8875a997 100644
--- a/src/components/top-matter/FolderDynamicTopMatter.vue
+++ b/src/components/top-matter/FolderDynamicTopMatter.vue
@@ -1,5 +1,5 @@
 <template>
-  <FolderGrid v-if="folders.length" :items="folders" />
+  <FolderGrid v-if="folders.length && !$route.query.recursive" :items="folders" />
 </template>
 
 <script lang="ts">

From 0d155f131514b885d37583a82902c1f1365a8805 Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Thu, 19 Oct 2023 22:41:56 -0700
Subject: [PATCH 5/5] docs: update changelog

Signed-off-by: Varun Patil <radialapps@gmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a010c3..520e268b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 
 - **Breaking**: Nextcloud 26+ and PHP 8 are now required.
+- **Feature**: Folders view in shares ([#880](https://github.com/pulsejet/memories/pull/880))
 - Significant improvements to code quality and maintainability.
 - Improvements to the [documentation](https://memories.gallery/install/).