A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: VideoInfoPanel does not convey if downloads are allowed without a 403
aminnausinb95c569b1238
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 0a224317..331be0c2 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -73,6 +73,8 @@ class DirectoryController extends Controller {'id' => $category->id,'name' => $category->name,'folders' => null,+ 'downloads_enabled' => $category->downloads_enabled,+ 'downloads_require_auth' => $category->downloads_require_auth,],'folder' => ['id' => null,diff --git a/app/Services/PathResolverService.php b/app/Services/PathResolverService.phpindex 83cd6dfe..d77601fc 100644--- a/app/Services/PathResolverService.php+++ b/app/Services/PathResolverService.php@@ -15,7 +15,7 @@ class PathResolverService {: $query;}- public function resolveCategory(string $identifier, bool $onlyPublic = false, array $select = ['id', 'name', 'default_folder_id', 'is_private']): Category {+ public function resolveCategory(string $identifier, bool $onlyPublic = false, array $select = ['id', 'name', 'default_folder_id', 'is_private', 'downloads_enabled', 'downloads_require_auth']): Category {return $this->firstSuccessful([fn () => $this->resolveCategoryByName($identifier, $select, $onlyPublic),fn () => $this->resolveCategoryById($identifier, $select, $onlyPublic),diff --git a/resources/js/components/labels/SectionLabel.vue b/resources/js/components/labels/SectionLabel.vuenew file mode 100644index 00000000..2dece5bf--- /dev/null+++ b/resources/js/components/labels/SectionLabel.vue@@ -0,0 +1,14 @@+<script setup lang="ts">+defineProps<{ text?: string; subtext?: string }>();+</script>++<template>+ <p v-if="text || $slots">+ <slot>{{ text }}</slot>+ <slot name="subtext" class="block font-normal">+ <span v-if="subtext" class="text-foreground-2 block leading-none font-normal normal-case">+ {{ subtext }}+ </span>+ </slot>+ </p>+</template>diff --git a/resources/js/components/menus/LibraryCardMenu.vue b/resources/js/components/menus/LibraryCardMenu.vueindex b1389e25..fe67fa9f 100644--- a/resources/js/components/menus/LibraryCardMenu.vue+++ b/resources/js/components/menus/LibraryCardMenu.vue@@ -10,6 +10,7 @@ import { toast } from '@aminnausin/cedar-ui';import TablerDownloadOff from '@/components/icons/TablerDownloadOff.vue';import TablerDownload from '@/components/icons/TablerDownload.vue';+import SectionLabel from '@/components/labels/SectionLabel.vue';import ProiconsArrowSync from '~icons/proicons/arrow-sync';import ProiconsLockOpen from '~icons/proicons/lock-open';@@ -84,6 +85,7 @@ const { isAdmin } = useAuth();</ButtonText><template v-if="isAdmin">+ <SectionLabel class="-mb-1 hidden h-auto! bg-transparent!"> Access Control </SectionLabel><ButtonText :title="'Toggle Downloads'" @click="handleToggleDownloads(data.id, data.downloads_enabled)" :disabled="processing"><p class="flex-1 text-start">{{ data.downloads_enabled ? 'Disable Downloads' : 'Enable Downloads' }}</p><template #icon> <TablerDownloadOff v-if="!data.downloads_enabled" class="size-4" /> <TablerDownload v-else class="size-4" /></template>@@ -92,8 +94,8 @@ const { isAdmin } = useAuth();<ButtonTextv-if="data.downloads_enabled":title="`${data.downloads_require_auth ? 'Enable' : 'Disable'} Guest Downloads`"- @click="handleToggleDownloadPrivacy(data.id, data.downloads_require_auth)":disabled="processing"+ @click="handleToggleDownloadPrivacy(data.id, data.downloads_require_auth)"><p class="flex-1 text-start">{{ data.downloads_require_auth ? 'Guest Downloads' : 'Private Downloads' }}</p><template #icon> <TablerDownloadOff v-if="!data.downloads_require_auth" class="size-4" /> <TablerDownload v-else class="size-4" /></template>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex ac259e5b..d2bed4c0 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -8,7 +8,6 @@ import { ContextMenuItem } from '@/components/cedar-ui/context-menu';import { useContentStore } from '@/stores/ContentStore';import { resetSubtitles } from '@/service/media/subtitles';import { useModalStore } from '@/stores/ModalStore';-import { useAuthStore } from '@/stores/AuthStore';import { BasePopover } from '@/components/cedar-ui/popover';import { storeToRefs } from 'pinia';import { HoverCard } from '@/components/cedar-ui/hover-card';@@ -16,6 +15,7 @@ import { MediaType } from '@/types/types';import { BadgeTag } from '@/components/cedar-ui/badge';import { emitSeek } from '@/service/player/seekBus';import { useRoute } from 'vue-router';+import { useAuth } from '@/composables/auth/useAuth';import { toast } from '@aminnausin/cedar-ui';import EditFolderModal from '@/components/modals/EditFolderModal.vue';@@ -35,10 +35,11 @@ const defaultDescription = `No description yet.`;const props = defineProps<{ getCurrentTime: () => number }>();-const { stateVideo, stateFolder } = storeToRefs(useContentStore());-const { userData } = storeToRefs(useAuthStore());+const { stateVideo, stateFolder, stateDirectory } = storeToRefs(useContentStore());const { title, description: parsedDescription, views } = useMetaData(stateVideo);+const { userData } = useAuth();+const descriptionRef = useTemplateRef('description');const mobilePopover = useTemplateRef('mobile-popover');const popover = useTemplateRef('popover');@@ -65,9 +66,15 @@ const popoverItems = computed(() => {icon: TablerDownload,text: 'Download',action: () => {+ if (stateDirectory.value.downloads_require_auth && !userData.value?.id) {+ toast.error('Error', { description: 'This download requires you to login.' });+ return;+ }+window.open(`/api/media/${stateVideo.value.id}/download`, '_blank');},- disabled: false,+ hidden: !stateDirectory.value.downloads_enabled || !stateFolder.value.series?.downloads_enabled,+ disabled: !stateVideo.value.id,},{icon: LucideCaptions,