Skip to content

A self-hosted media server and file management system

fix: remove video_id from record as metadata covers everything now

aminnausin5339cfefc5b9
diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.php
index 7f0eb903..ee7c9a21 100644
--- a/app/Http/Controllers/Api/V1/RecordController.php
+++ b/app/Http/Controllers/Api/V1/RecordController.php
@@ -59,7 +59,6 @@ class RecordController extends Controller {
$record = Record::create([
'user_id' => Auth::id(),
- 'video_id' => $validated['video_id'],
'metadata_id' => $video->metadata?->id,
'name' => $video->metadata ? $video->metadata->title : $video->name, // should be like meta data id in a persistent table that doesnt delete that has name episode season if available and displays depending on what data exists
]);
diff --git a/app/Http/Controllers/Api/V1/VideoController.php b/app/Http/Controllers/Api/V1/VideoController.php
index 340f3fdd..a72f5f32 100755
--- a/app/Http/Controllers/Api/V1/VideoController.php
+++ b/app/Http/Controllers/Api/V1/VideoController.php
@@ -74,7 +74,7 @@ class VideoController extends Controller {
$metadata->update(['view_count' => $metadata->view_count + 1]);
} else {
Log::alert('RESETING VIEWS ON METADATA:' . $metadata->id, [$metadata]);
- $metadata->update(['view_count' => Record::where('video_id', $video->id)->whereNull('metadata_id')->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) + 1]);
+ $metadata->update(['view_count' => ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) + 1]);
}
return $this->success(new VideoResource($video->load('metadata.videoTags.tag')));
diff --git a/app/Http/Resources/RecordResource.php b/app/Http/Resources/RecordResource.php
index e1a20e81..c6863efc 100755
--- a/app/Http/Resources/RecordResource.php
+++ b/app/Http/Resources/RecordResource.php
@@ -27,7 +27,7 @@ class RecordResource extends JsonResource {
'folder' => $folder ?? ['name' => 'Unknown'],
'metadata' => $metadata,
'category' => $category,
- 'video_id' => $this->video_id ?? $metadata->video_id ?? null,
+ 'video_id' => $metadata->video_id ?? null,
'video_name' => $metadata->title ?? $video->name ?? $this->name ?? 'Deleted',
'file_name' => $this->name,
],
diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.php
index 85b96711..dfdf0019 100755
--- a/app/Jobs/VerifyFiles.php
+++ b/app/Jobs/VerifyFiles.php
@@ -294,7 +294,10 @@ class VerifyFiles implements ShouldQueue {
if (is_null($metadata->bitrate) && ! isset($changes['bitrate'])) {
$changes['bitrate'] = $audioMetadata['bitrate'] ?? null;
}
- is_null($metadata->view_count) ? $changes['view_count'] = Record::where('video_id', $video->id)->whereNull('metadata_id')->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) : $stored['view_count'] = $metadata->view_count;
+
+ if (is_null($metadata->view_count)) {
+ $changes['view_count'] = ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0);
+ }
if (! empty($changes)) {
$changes['date_scanned'] = date('Y-m-d h:i:s A');
diff --git a/app/Models/Record.php b/app/Models/Record.php
index 03ea37b6..9179534c 100755
--- a/app/Models/Record.php
+++ b/app/Models/Record.php
@@ -10,7 +10,6 @@ class Record extends Model {
protected $fillable = [
'user_id',
- 'video_id',
'name',
'metadata_id',
];
diff --git a/database/migrations/2025_06_09_032707_drop_video_id_from_records.php b/database/migrations/2025_06_09_032707_drop_video_id_from_records.php
new file mode 100644
index 00000000..b0029b31
--- /dev/null
+++ b/database/migrations/2025_06_09_032707_drop_video_id_from_records.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+ /**
+ * Run the migrations.
+ */
+ public function up(): void {
+ Schema::table('records', function (Blueprint $table) {
+ $table->dropForeign(['video_id']);
+ $table->dropColumn('video_id');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void {
+ Schema::table('records', function (Blueprint $table) {
+ $table->unsignedBigInteger('video_id')->nullable();
+ $table->foreign('video_id')
+ ->references('id')
+ ->on('videos')
+ ->nullOnDelete();
+ });
+ }
+};
diff --git a/resources/js/components/inputs/ButtonText.vue b/resources/js/components/inputs/ButtonText.vue
index 2288e6f6..3f0b864c 100755
--- a/resources/js/components/inputs/ButtonText.vue
+++ b/resources/js/components/inputs/ButtonText.vue
@@ -1,11 +1,13 @@
<script setup lang="ts">
+import { computed } from 'vue';
+
const props = withDefaults(
defineProps<{
class?: string;
type?: 'reset' | 'submit' | 'button' | undefined;
disabled?: boolean;
title?: string;
- variant?: 'default' | 'ghost';
+ variant?: 'default' | 'ghost' | 'transparent' | 'form';
to?: string;
target?: string;
text?: string;
@@ -17,18 +19,46 @@ const props = withDefaults(
target: '_blank',
},
);
+
+const variantClass = computed(() => {
+ switch (props.variant) {
+ case 'ghost':
+ return '';
+ case 'transparent':
+ return [
+ 'transition',
+ 'hover:bg-white hover:dark:bg-primary-dark-800',
+ 'focus:outline-none hover:text-gray-900 dark:text-neutral-100',
+ 'hocus:ring-[0.125rem] hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-white',
+ 'aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:ring-1 aria-disabled:opacity-60',
+ 'disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:hover:ring-1 disabled:opacity-60',
+ ].join(' ');
+ case 'form':
+ return [
+ 'inline-flex items-center justify-center px-4 py-2 text-sm transition-colors border dark:border-neutral-600 rounded-md focus:outline-none',
+ 'focus:ring-1 focus:ring-neutral-100 dark:focus:ring-neutral-400 focus:ring-offset-1 hover:bg-neutral-100 dark:hover:bg-neutral-900',
+ 'aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:ring-1 aria-disabled:opacity-60',
+ 'disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:hover:ring-1 disabled:opacity-60',
+ ].join(' ');
+ default:
+ return [
+ 'h-10 max-h-full rounded-md ',
+ 'p-2 shadow-sm',
+ 'focus:outline-none text-gray-900 dark:text-neutral-100',
+ 'ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500 hover:ring-violet-400 hover:dark:ring-violet-700',
+ 'bg-white dark:bg-primary-dark-800',
+ 'aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:ring-1 aria-disabled:opacity-60',
+ 'disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:ring-1 disabled:opacity-60',
+ ].join(' ');
+ }
+});
</script>
<template>
<router-link
v-if="to"
:to="to"
- :class="`${props.class ? props.class + ' ' : ''}p-2 flex items-center justify-center h-10 max-h-full gap-2
- shadow-sm rounded-md cursor-pointer focus:outline-none
- ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem]
- focus:ring-indigo-400 dark:focus:ring-indigo-500 hover:ring-violet-400 hover:dark:ring-violet-700
- text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800
- aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:ring-1 aria-disabled:opacity-60`"
+ :class="['flex items-center justify-center cursor-pointer', props.class, variantClass]"
:type="type"
:title="title"
:aria-disabled="disabled"
@@ -39,18 +69,7 @@ const props = withDefaults(
</slot>
<slot name="icon"> </slot>
</router-link>
- <button
- v-else
- :class="`p-2 flex items-center justify-center h-10 max-h-full gap-2
- shadow-sm rounded-md cursor-pointer focus:outline-none
- ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem]
- focus:ring-indigo-400 dark:focus:ring-indigo-500 hover:ring-violet-400 hover:dark:ring-violet-700
- text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800
- disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:ring-1 disabled:opacity-60 ${props.class ?? ''}`"
- :type="type"
- :disabled="disabled"
- :title="title ?? 'Button'"
- >
+ <button v-else :class="['flex items-center justify-center cursor-pointer', props.class, variantClass]" :type="type" :disabled="disabled" :title="title ?? 'Button'">
<slot name="text">
<p class="line-clamp-1 flex-1 text-left" v-if="text">{{ text }}</p>
</slot>
diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vue
index 7ff0ece7..72d41264 100755
--- a/resources/js/components/panels/VideoSidebar.vue
+++ b/resources/js/components/panels/VideoSidebar.vue
@@ -5,7 +5,6 @@ import { ref, watch, type Ref } from 'vue';
import { useContentStore } from '@/stores/ContentStore';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { RouterLink } from 'vue-router';
import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
@@ -13,8 +12,8 @@ import FolderCard from '@/components/cards/FolderCard.vue';
import RecordCard from '@/components/cards/RecordCard.vue';
import EditFolder from '@/components/forms/EditFolder.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
-import useModal from '@/composables/useModal';
import TableBase from '@/components/table/TableBase.vue';
+import useModal from '@/composables/useModal';
const editFolderModal = useModal({ title: 'Edit Folder Details', submitText: 'Submit Details' });
const shareModal = useModal({ title: 'Share Video' });
@@ -91,11 +90,11 @@ watch(
v-if="stateRecords.length > 0"
to="/history"
:title="'View All Watch History'"
- :class="'text-sm h-6 mx-auto mt-4 mb-2 hover:!bg-white dark:!bg-primary-dark-800/70 !bg-primary-800 dark:hover:!bg-primary-dark-600'"
+ :class="'text-sm h-6 mx-auto mt-2 mb-2 hover:!bg-white dark:!bg-primary-dark-800/70 !bg-primary-800 dark:hover:!bg-primary-dark-600 line-clamp-1 truncate !rounded-full hover:!ring-violet-400 hover:dark:!ring-violet-700 hover:ring-[0.125rem]'"
+ :variant="'form'"
+ target=""
>
- <template #text>
- {{ 'View More' }}
- </template>
+ <template #text>View More</template>
</ButtonText>
<h3 v-show="stateRecords.length < 1" class="text-gray-500 dark:text-gray-400 tracking-wider w-full py-2">Nothing Yet...</h3>
</section>
diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.ts
index 976aef8e..0a92f12c 100644
--- a/resources/js/types/resources.ts
+++ b/resources/js/types/resources.ts
@@ -88,7 +88,7 @@ export interface RecordResource {
folder?: Folder | { name: string };
metadata?: Metadata;
category?: Category;
- video_id?: number;
+ video_id?: number; // from metadata so eventually remove
video_name?: string;
file_name?: string;
};