A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: download setting columns poorly named
aminnausined25e8be120e
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.phpindex d170761a..063113f9 100755--- a/app/Http/Controllers/Api/V1/CategoryController.php+++ b/app/Http/Controllers/Api/V1/CategoryController.php@@ -107,11 +107,11 @@ class CategoryController extends Controller {}$validated = $request->validate([- 'allow_downloads' => 'sometimes|boolean',- 'require_login_for_downloads' => 'sometimes|boolean',+ 'downloads_enabled' => 'sometimes|boolean',+ 'downloads_require_auth' => 'sometimes|boolean',]);$category->update($validated);- return response($category->only(['allow_downloads', 'require_login_for_downloads']));+ return response($category->only(['downloads_enabled', 'downloads_require_auth']));}}diff --git a/app/Http/Controllers/Api/V1/Media/MediaController.php b/app/Http/Controllers/Api/V1/Media/MediaController.phpindex e25a069a..1a63559e 100644--- a/app/Http/Controllers/Api/V1/Media/MediaController.php+++ b/app/Http/Controllers/Api/V1/Media/MediaController.php@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Storage;class MediaController extends Controller {public function download(Video $video) {- if (! $video->downloadsEnabled() || (Auth::id() === null && $video->folder->category->require_login_for_downloads)) {+ if (! $video->downloadsEnabled() || (Auth::id() === null && $video->folder->category->downloads_require_auth)) {abort(403);}diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.phpindex 0a4a7613..d26936dd 100644--- a/app/Http/Controllers/Api/V1/SeriesController.php+++ b/app/Http/Controllers/Api/V1/SeriesController.php@@ -93,10 +93,10 @@ class SeriesController extends Controller {}$validated = $request->validate([- 'allow_downloads' => 'sometimes|boolean',+ 'downloads_enabled' => 'sometimes|boolean',]);$series->update($validated);- return response($series->only(['allow_downloads']));+ return response($series->only(['downloads_enabled']));}}diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.phpindex e655e982..d1aadff9 100755--- a/app/Http/Resources/CategoryResource.php+++ b/app/Http/Resources/CategoryResource.php@@ -40,8 +40,8 @@ class CategoryResource extends JsonResource {'created_at' => $this->created_at,'last_scan' => $this->last_scan,'is_private' => $authenticatedRequest ? $this->is_private : false,- 'allow_downloads' => $authenticatedRequest ? $this->allow_downloads : false,- 'require_login_for_downloads' => $authenticatedRequest ? $this->require_login_for_downloads : true,+ 'downloads_enabled' => $authenticatedRequest ? $this->downloads_enabled : false,+ 'downloads_require_auth' => $authenticatedRequest ? $this->downloads_require_auth : true,];}}diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.phpindex 4d0b5b83..8329c413 100644--- a/app/Http/Resources/SeriesResource.php+++ b/app/Http/Resources/SeriesResource.php@@ -31,7 +31,7 @@ class SeriesResource extends JsonResource {'created_at' => $this->created_at,'updated_at' => $this->updated_at,'edited_at' => $this->edited_at,- 'allow_downloads' => $this->allow_downloads,+ 'downloads_enabled' => $this->downloads_enabled,];}}diff --git a/app/Models/Category.php b/app/Models/Category.phpindex 77b2ec3d..81674b24 100755--- a/app/Models/Category.php+++ b/app/Models/Category.php@@ -13,11 +13,11 @@ class Category extends Model {public $timestamps = false;- protected $fillable = ['name', 'default_folder_id', 'editor_id', 'allow_downloads', 'require_login_for_downloads'];+ protected $fillable = ['name', 'default_folder_id', 'editor_id', 'downloads_enabled', 'downloads_require_auth'];protected $casts = [- 'allow_downloads' => 'boolean',- 'require_login_for_downloads' => 'boolean',+ 'downloads_enabled' => 'boolean',+ 'downloads_require_auth' => 'boolean',];public function folders(): HasMany {@@ -37,6 +37,6 @@ class Category extends Model {}public function downloadsEnabled(): bool {- return $this->allow_downloads;+ return $this->downloads_enabled;}}diff --git a/app/Models/Folder.php b/app/Models/Folder.phpindex a19a8330..3fde3aa3 100755--- a/app/Models/Folder.php+++ b/app/Models/Folder.php@@ -69,6 +69,6 @@ class Folder extends Model {return false;}- return $this->series?->allow_downloads ?? false;+ return $this->series?->downloads_enabled ?? false;}}diff --git a/app/Models/Series.php b/app/Models/Series.phpindex 217eb797..7d44bae6 100644--- a/app/Models/Series.php+++ b/app/Models/Series.php@@ -59,7 +59,7 @@ class Series extends Model {'file_count','thumbnail_url','edited_at',- 'allow_downloads',+ 'downloads_enabled',];protected $casts = [@@ -71,7 +71,7 @@ class Series extends Model {'edited_at' => 'datetime',- 'allow_downloads' => 'boolean',+ 'downloads_enabled' => 'boolean',];public function folder(): BelongsTo {@@ -106,6 +106,6 @@ class Series extends Model {return false;}- return $this->allow_downloads;+ return $this->downloads_enabled;}}diff --git a/database/migrations/2026_04_09_213400_add_downloadable_flags_to_libraries_and_folders.php b/database/migrations/2026_04_09_213400_add_downloadable_flags_to_libraries_and_folders.phpindex 17c2fa89..4049c0c5 100644--- a/database/migrations/2026_04_09_213400_add_downloadable_flags_to_libraries_and_folders.php+++ b/database/migrations/2026_04_09_213400_add_downloadable_flags_to_libraries_and_folders.php@@ -10,12 +10,12 @@ return new class extends Migration {*/public function up(): void {Schema::table('categories', function (Blueprint $table) {- $table->boolean('allow_downloads')->default(false);- $table->boolean('require_login_for_downloads')->default(true);+ $table->boolean('downloads_enabled')->default(false);+ $table->boolean('downloads_require_auth')->default(true);});Schema::table('series', function (Blueprint $table) {- $table->boolean('allow_downloads')->default(true);+ $table->boolean('downloads_enabled')->default(true);});}@@ -24,11 +24,11 @@ return new class extends Migration {*/public function down(): void {Schema::table('categories', function (Blueprint $table) {- $table->dropColumn(['allow_downloads', 'require_login_for_downloads']);+ $table->dropColumn(['downloads_enabled', 'downloads_require_auth']);});Schema::table('series', function (Blueprint $table) {- $table->dropColumn('allow_downloads');+ $table->dropColumn('downloads_enabled');});}};diff --git a/resources/js/components/cards/data/LibraryCard.vue b/resources/js/components/cards/data/LibraryCard.vueindex 68077ee8..3fc18589 100644--- a/resources/js/components/cards/data/LibraryCard.vue+++ b/resources/js/components/cards/data/LibraryCard.vue@@ -88,12 +88,12 @@ const handleTogglePrivacy = async (id: number, currentValue: boolean) => {};const handleToggleDownloads = async (id: number, currentValue: boolean) => {- if (processing.value || !props.data?.id || currentValue !== props.data.allow_downloads) return;+ if (processing.value || !props.data?.id || currentValue !== props.data.downloads_enabled) return;try {processing.value = true;- await setLibraryDownloadSettings(id, { allow_downloads: !currentValue });+ await setLibraryDownloadSettings(id, { downloads_enabled: !currentValue });await queryClient.invalidateQueries({ queryKey: ['categories'] });toast.success(`${currentValue ? 'Disabled' : 'Enabled'} Library Downloads.`);@@ -106,12 +106,12 @@ const handleToggleDownloads = async (id: number, currentValue: boolean) => {};const handleToggleDownloadPrivacy = async (id: number, currentValue: boolean) => {- if (processing.value || !props.data?.id || currentValue !== props.data.require_login_for_downloads) return;+ if (processing.value || !props.data?.id || currentValue !== props.data.downloads_require_auth) return;try {processing.value = true;- await setLibraryDownloadSettings(id, { require_login_for_downloads: !currentValue });+ await setLibraryDownloadSettings(id, { downloads_require_auth: !currentValue });await queryClient.invalidateQueries({ queryKey: ['categories'] });toast.success(`${currentValue ? 'Disabled' : 'Enabled'} Library Downloads for Guest Users.`);@@ -149,7 +149,7 @@ watch(<ProiconsLock class="size-5" /></div><div- v-show="data?.allow_downloads"+ v-show="data?.downloads_enabled"class="bg-surface-2 text-primary dark:text-foreground-0 ring-r-button size-7 shrink-0 rounded-full p-1 pt-0.5 ring-1"title="is downloadable">diff --git a/resources/js/components/cards/data/LibraryFolderCard.vue b/resources/js/components/cards/data/LibraryFolderCard.vueindex 08be943d..daab5765 100644--- a/resources/js/components/cards/data/LibraryFolderCard.vue+++ b/resources/js/components/cards/data/LibraryFolderCard.vue@@ -27,16 +27,16 @@ const queryClient = useQueryClient();const processing = ref(false);const stateLibraryIsDownloadable = computed(() => {- return stateLibraries.value.find((lib) => lib.id === stateLibraryId.value)?.allow_downloads ?? false;+ return stateLibraries.value.find((lib) => lib.id === stateLibraryId.value)?.downloads_enabled ?? false;});const handleToggleDownloads = async (id: number, currentValue: boolean) => {- if (processing.value || !props.data?.id || currentValue !== props.data.series?.allow_downloads) return;+ if (processing.value || !props.data?.id || currentValue !== props.data.series?.downloads_enabled) return;try {processing.value = true;- await setSeriesDownloadSettings(id, { allow_downloads: !currentValue });+ await setSeriesDownloadSettings(id, { downloads_enabled: !currentValue });await queryClient.invalidateQueries({ queryKey: ['libraryFolders', stateLibraryId.value] });toast.success(`${currentValue ? 'Disabled' : 'Enabled'} Folder Downloads.`);@@ -62,7 +62,7 @@ const handleToggleDownloads = async (id: number, currentValue: boolean) => {class="ring-primary/90 absolute inset-0 flex h-full w-full flex-col items-end gap-2 rounded-t-xl p-2.5 transition duration-(--duration-input) ease-in-out ring-inset hover:ring-2"><div- v-show="data.series?.allow_downloads && stateLibraryIsDownloadable"+ v-show="data.series?.downloads_enabled && stateLibraryIsDownloadable"class="bg-surface-2 text-primary dark:text-foreground-0 ring-r-button size-7 shrink-0 rounded-full p-1 pt-0.5 ring-1"title="is downloadable">diff --git a/resources/js/components/menus/LibraryCardMenu.vue b/resources/js/components/menus/LibraryCardMenu.vueindex a5ad8c00..758a6153 100644--- a/resources/js/components/menus/LibraryCardMenu.vue+++ b/resources/js/components/menus/LibraryCardMenu.vue@@ -71,19 +71,19 @@ const props = withDefaults(<template #icon> <CircumFolderOn class="order-1 size-4" /></template></ButtonText>- <ButtonText :title="'Toggle Downloads'" @click="handleToggleDownloads(data.id, data.allow_downloads)" :disabled="processing">- <p class="flex-1 text-start">{{ data.allow_downloads ? 'Disable Downloads' : 'Enable Downloads' }}</p>- <template #icon> <TablerDownloadOff v-if="!data.allow_downloads" class="size-4" /> <TablerDownload v-else class="size-4" /></template>+ <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></ButtonText><ButtonText- v-if="data.allow_downloads"- :title="`${data.require_login_for_downloads ? 'Enable' : 'Disable'} Guest Downloads`"- @click="handleToggleDownloadPrivacy(data.id, data.require_login_for_downloads)"+ v-if="data.downloads_enabled"+ :title="`${data.downloads_require_auth ? 'Enable' : 'Disable'} Guest Downloads`"+ @click="handleToggleDownloadPrivacy(data.id, data.downloads_require_auth)":disabled="processing">- <p class="flex-1 text-start">{{ data.require_login_for_downloads ? 'Guest Downloads' : 'Private Downloads' }}</p>- <template #icon> <TablerDownloadOff v-if="!data.require_login_for_downloads" class="size-4" /> <TablerDownload v-else class="size-4" /></template>+ <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></ButtonText><ButtonTextdiff --git a/resources/js/components/menus/LibraryFolderCardMenu.vue b/resources/js/components/menus/LibraryFolderCardMenu.vueindex 953368b5..2bd321f2 100644--- a/resources/js/components/menus/LibraryFolderCardMenu.vue+++ b/resources/js/components/menus/LibraryFolderCardMenu.vue@@ -46,11 +46,11 @@ const props = withDefaults(<ButtonTextv-if="libraryDownloadsEnabled && data.series":title="'Toggle Downloads'"- @click="handleToggleDownloads(data.series.id, data.series.allow_downloads ?? false)"+ @click="handleToggleDownloads(data.series.id, data.series.downloads_enabled ?? false)":disabled="processing">- <p class="flex-1 text-start">{{ data.series?.allow_downloads ? 'Disable Downloads' : 'Enable Downloads' }}</p>- <template #icon> <TablerDownload v-if="data.series?.allow_downloads" class="size-4" /> <TablerDownloadOff v-else class="size-4" /></template>+ <p class="flex-1 text-start">{{ data.series?.downloads_enabled ? 'Disable Downloads' : 'Enable Downloads' }}</p>+ <template #icon> <TablerDownload v-if="data.series?.downloads_enabled" class="size-4" /> <TablerDownloadOff v-else class="size-4" /></template></ButtonText><ButtonText v-if="FLAGS.USE_REMOVABLE_FOLDERS" class="text-danger dark:text-foreground-0 dark:bg-danger-3! dark:hocus:bg-danger!" title="Remove From Server" disabled>diff --git a/resources/js/contracts/media.ts b/resources/js/contracts/media.tsindex e8b87bfd..0eb120f6 100644--- a/resources/js/contracts/media.ts+++ b/resources/js/contracts/media.ts@@ -12,8 +12,8 @@ export interface CategoryResource {created_at?: string;last_scan: number;is_private?: boolean;- allow_downloads: boolean;- require_login_for_downloads: boolean;+ downloads_enabled: boolean;+ downloads_require_auth: boolean;}//#region Folders@@ -56,7 +56,7 @@ export interface SeriesResource {created_at?: string;updated_at?: string;edited_at?: string;- allow_downloads: boolean;+ downloads_enabled: boolean;}//#endregiondiff --git a/resources/js/service/siteAPI.ts b/resources/js/service/siteAPI.tsindex 3c08727c..0957152d 100644--- a/resources/js/service/siteAPI.ts+++ b/resources/js/service/siteAPI.ts@@ -45,11 +45,11 @@ export function toggleCategoryPrivacy(id: number, value: boolean) {return API.post(`/categories/${id}/privacy/`, { is_private: value });}-export function setLibraryDownloadSettings(id: number, data: { allow_downloads?: boolean; require_login_for_downloads?: boolean }) {+export function setLibraryDownloadSettings(id: number, data: { downloads_enabled?: boolean; downloads_require_auth?: boolean }) {return API.put(`/categories/${id}/downloads`, data);}-export function setSeriesDownloadSettings(id: number, data: { allow_downloads?: boolean }) {+export function setSeriesDownloadSettings(id: number, data: { downloads_enabled?: boolean }) {return API.put(`/series/${id}/downloads`, data);}diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.tsindex c4bfebcb..f4b574a4 100644--- a/resources/js/stores/ContentStore.ts+++ b/resources/js/stores/ContentStore.ts@@ -15,7 +15,16 @@ import mediaAPI from '@/service/mediaAPI.ts';// dir: {id: 1, name: 'anime', folders: ["id": "6", "name": "Frieren", "path": "anime/Frieren", "file_count": 28, "category_id": "1","series": null] } -> api/categories/1 -> folders dont hold video data// folder: {id: 11, name: 'BOCCHI THE ROCK', videos: [id, name, pat, date, metadata], series: {}}-const emptyLibrary: CategoryResource = { id: 0, name: '', folders: [], folders_count: 0, total_size: 0, last_scan: -1 };+const emptyLibrary: CategoryResource = {+ id: 0,+ name: '',+ folders: [],+ folders_count: 0,+ total_size: 0,+ last_scan: -1,+ downloads_enabled: false,+ downloads_require_auth: false,+};const emptyFolder: FolderResource = { id: 0, name: '', title: '', path: '', file_count: 0, total_size: 0, is_majority_audio: false, category_id: 0, videos: [], last_scan: -1 };const emptyMedia: VideoResource = { id: 0, name: '', path: '', view_count: 0, video_tags: [], created_at: '', subtitles: [] };