diff --git a/FileShare-Services/Services/FileLibrary/FileLibraryService.cs b/FileShare-Services/Services/FileLibrary/FileLibraryService.cs index 83234af..070cb1d 100644 --- a/FileShare-Services/Services/FileLibrary/FileLibraryService.cs +++ b/FileShare-Services/Services/FileLibrary/FileLibraryService.cs @@ -189,7 +189,8 @@ namespace FileShare_Services.Services.FileLibrary } var absolutePath = info.FullName; - seen.Add(absolutePath); + if (!seen.Add(absolutePath)) + continue; if (!existing.TryGetValue(absolutePath, out var record)) { diff --git a/FileShare-Web-VUE/src/router/index.ts b/FileShare-Web-VUE/src/router/index.ts index 1de24e8..4d40ffa 100644 --- a/FileShare-Web-VUE/src/router/index.ts +++ b/FileShare-Web-VUE/src/router/index.ts @@ -11,7 +11,7 @@ const router = createRouter({ { path: 'recent/added', name: 'recent-added', component: () => import('../views/RecentAddedView.vue') }, { path: 'recent/played', name: 'recent-played', component: () => import('../views/RecentPlayedView.vue') }, { path: 'browse/:rootId', name: 'browse', component: () => import('../views/BrowseView.vue'), props: true }, - { path: 'browse/:rootId/*', name: 'browse-path', component: () => import('../views/BrowseView.vue'), props: true }, + { path: 'browse/:rootId/:path(.*)', name: 'browse-path', component: () => import('../views/BrowseView.vue'), props: true }, { path: 'search', name: 'search', component: () => import('../views/SearchView.vue') }, ], }, diff --git a/FileShare-Web-VUE/src/views/BrowseView.vue b/FileShare-Web-VUE/src/views/BrowseView.vue index e24251c..cfacc6e 100644 --- a/FileShare-Web-VUE/src/views/BrowseView.vue +++ b/FileShare-Web-VUE/src/views/BrowseView.vue @@ -34,7 +34,7 @@ const rootId = computed(() => Number(route.params.rootId)) const pathFromRoute = computed(() => { const wildcard = route.params.path as string | undefined if (!wildcard) return '' - return decodeURIComponent(wirecard) + return decodeURIComponent(wildcard) }) const browsePathArray = computed(() => pathFromRoute.value ? pathFromRoute.value.split('/') : []) const currentBrowsePath = computed(() => browsePathArray.value.join('/'))