Skip to content

A self-hosted media server and file management system

v0.15.1b Video Player Patch (#107)

Amin Nausin39cdaaa43f20
diff --git a/.env.example b/.env.example
index c2329324..3b78babb 100755
--- a/.env.example
+++ b/.env.example
@@ -97,3 +97,5 @@ VITE_REVERB_PORT="${REVERB_PORT}"
VITE_REVERB_SCHEME="${REVERB_SCHEME}"
TRUSTED_PROXIES=*
+
+PLAUSIBLE_URL=
diff --git a/.github/workflows/ci-docker-release.yml b/.github/workflows/ci-docker-release.yml
index 8d346e71..70a4fbe1 100644
--- a/.github/workflows/ci-docker-release.yml
+++ b/.github/workflows/ci-docker-release.yml
@@ -60,7 +60,7 @@ jobs:
- name: Commit linted files
uses: stefanzweifel/git-auto-commit-action@v5
with:
- commit_message: 'Fixes coding style'
+ commit_message: 'chore: lint coding style (pint)'
# ==========================
# Laravel Tests
@@ -142,6 +142,7 @@ jobs:
if: success()
outputs:
tag: ${{ steps.set_release_info.outputs.TAG }}
+ docker-tag: ${{ steps.set_release_info.outputs.DOCKER_TAG}}
prerelease: ${{ steps.set_release_info.outputs.PRERELEASE }}
steps:
- name: 读取仓库的内容
@@ -155,20 +156,17 @@ jobs:
# Set the tag and prerelease based on the branch or dispatch
if [[ "${{ github.event_name }}" == "workflow_dispatch" && -n "${{ github.event.inputs.tag }}" ]]; then
echo "TAG=${{ github.event.inputs.tag }}-$TIMESTAMP" >> $GITHUB_OUTPUT
+ echo "DOCKER_TAG=${{ github.event.inputs.tag }}-$TIMESTAMP" >> $GITHUB_OUTPUT
echo "PRERELEASE=false" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
echo "TAG=beta-$SHORT_SHA" >> $GITHUB_OUTPUT
+ echo "DOCKER_TAG=beta-$SHORT_SHA" >> $GITHUB_OUTPUT
echo "PRERELEASE=true" >> $GITHUB_OUTPUT
else
echo "TAG=latest-$SHORT_SHA" >> $GITHUB_OUTPUT
+ echo "DOCKER_TAG=latest" >> $GITHUB_OUTPUT
echo "PRERELEASE=false" >> $GITHUB_OUTPUT
fi
-
- echo "Current TAG value: ${TAG}"
- echo "Current TAG value: TAG=beta-$SHORT_SHA"
- echo "TAG=beta-$SHORT_SHA" >> $GITHUB_OUTPUT
- echo "PRERELEASE=true" >> $GITHUB_OUTPUT
-
# ==========================
# Publish Docker Image
# ==========================
@@ -184,8 +182,7 @@ jobs:
- name: Update .env.docker
run: |
- sed -i "s/DOCKER_RELEASE=.*/DOCKER_RELEASE=${{ needs.get-release-tags.outputs.tag }}/" docker/.env.docker
-
+ sed -i "s/DOCKER_RELEASE=.*/DOCKER_RELEASE=${{ needs.get-release-tags.outputs.docker-tag }}/" docker/.env.docker
- name: 登陆 Login to Docker Hub
uses: docker/login-action@v3
with:
@@ -196,8 +193,9 @@ jobs:
uses: docker/build-push-action@v5
with:
push: true
- tags: aminnausin/mediaserver:${{ needs.get-release-tags.outputs.tag }}
-
+ tags: |
+ aminnausin/mediaserver:${{ needs.get-release-tags.outputs.docker-tag }}
+ aminnausin/mediaserver:${{ needs.get-release-tags.outputs.tag }}
# ==========================
# Check for Docker Changes
# ==========================
diff --git a/.gitignore b/.gitignore
index 94b5359c..5e05037a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,10 @@
-/.phpunit.cache
-/node_modules
-/public/build
-/public/hot
-/public/storage
-/storage/*.key
-/storage/pail
-/vendor
+.phpunit.cache
+node_modules
+public/build
+public/hot
+storage/*.key
+storage/pail
+vendor
.env
.env.backup
.env.production
@@ -16,20 +15,24 @@ Homestead.yaml
auth.json
npm-debug.log
yarn-error.log
-/.fleet
-/.idea
-/.nova
-/.vscode
-/.zed
+.fleet
+.idea
+.nova
+.vscode
+.zed
-/media/*
-/.vite/*
-storage/app/public/*
+.vite/*
+storage/app/public/media/*
+storage/app/public/thumbnails/*/*
+storage/app/public/posters/*
storage/debugbar/*
storage/framework/*
storage/logs/*
-/databaseBackups
-/old
-/pulsesrc
-/data
+public/storage
+databaseBackups
+old
+pulsesrc
+data/media/*
+data/thumbnails/*/*
+data/posters/*
install.sh
diff --git a/app/Console/Commands/IndexFilesCommand.php b/app/Console/Commands/IndexFilesCommand.php
new file mode 100644
index 00000000..3d76d819
--- /dev/null
+++ b/app/Console/Commands/IndexFilesCommand.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\TaskStatus;
+use App\Http\Controllers\DirectoryController;
+use App\Jobs\IndexFiles;
+use App\Jobs\SyncFiles;
+use App\Services\TaskService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+class IndexFilesCommand extends Command {
+ /**
+ * The name and signature of the console command.
+ *
+ * @var string
+ */
+ protected $signature = 'mediaServer:index';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Index Media Files';
+
+ protected $controller;
+
+ /**
+ * Execute the console command.
+ */
+ public function handle() {
+ $taskService = new TaskService;
+ $this->controller = new DirectoryController($taskService);
+
+ return $this->handleTask();
+ }
+
+ public function handleTask() {
+ $name = 'Console Index Files';
+ $description = 'Looks for folder and video changes in in all Libraries.';
+ $this->info('Starting Index Files');
+ try {
+ $task = $this->controller->setupTask(null, $name, $description, 2);
+ $chain = [
+ new SyncFiles($task->id),
+ new IndexFiles($task->id),
+ ];
+ $batch = $this->controller->setupBatch($chain, $task);
+ $task->update(['batch_id' => $batch->id]);
+ $this->info('Index Files Queued!');
+
+ return true;
+ } catch (\Throwable $th) {
+ if ($task) {
+ $task->update(['status' => TaskStatus::FAILED, 'ended_at' => now(), 'summary' => $th->getMessage()]);
+ }
+ Log::error($th->getMessage());
+ $this->error($th->getMessage());
+
+ return false;
+ }
+ }
+}
diff --git a/app/Http/Resources/TasksResource.php b/app/Http/Resources/TasksResource.php
index cef1a2fc..e5dccc20 100644
--- a/app/Http/Resources/TasksResource.php
+++ b/app/Http/Resources/TasksResource.php
@@ -27,7 +27,7 @@ class TasksResource extends JsonResource {
return [
'id' => $this->id,
- 'user' => $user->name,
+ 'user' => $user?->name ?? 'System',
'status_key' => $this->status,
'status' => TaskStatus::getLabel($this->status),
'name' => $this->name,
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index c07e84e7..b580c1ec 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -24,11 +24,11 @@ class VideoResource extends JsonResource {
'path' => $this->path,
'date' => $this->date,
'title' => $metadata?->title ?: $this->name,
- 'description' => $metadata?->description ?: $this->description, // ?: $this->folder->series->description
- 'duration' => $metadata?->duration ?: $this->duration,
- 'episode' => $metadata?->episode ?: $this->episode,
- 'season' => $metadata?->season ?: $this->season,
- 'view_count' => $metadata?->view_count ?: $this->view_count,
+ 'description' => $metadata?->description, // ?: $this->folder->series->description
+ 'duration' => $metadata?->duration,
+ 'episode' => $metadata?->episode,
+ 'season' => $metadata?->season,
+ 'view_count' => $metadata?->view_count,
'file_size' => $metadata?->file_size ?: null,
'video_tags' => VideoTagResource::collection($metadata->videoTags ?? []),
'date_released' => $metadata?->date_released ?: null,
diff --git a/app/Jobs/ScheduledIndexFiles.php b/app/Jobs/ScheduledIndexFiles.php
index 9287bfa4..f514a042 100644
--- a/app/Jobs/ScheduledIndexFiles.php
+++ b/app/Jobs/ScheduledIndexFiles.php
@@ -32,6 +32,7 @@ class ScheduledIndexFiles implements ShouldQueue {
public function handleTask() {
$name = 'Scheduled Index Files';
$description = 'Looks for folder and video changes in in all Libraries.';
+ $task = null;
try {
$task = $this->controller->setupTask(null, $name, $description, 2);
$chain = [
@@ -41,13 +42,11 @@ class ScheduledIndexFiles implements ShouldQueue {
$batch = $this->controller->setupBatch($chain, $task);
$task->update(['batch_id' => $batch->id]);
- // return response()->json(['task_id' => $task->id, 'message' => 'Scheduled Task "INDEX FILES" was started.']);
} catch (\Throwable $th) {
if ($task) {
$task->update(['status' => TaskStatus::FAILED, 'ended_at' => now(), 'summary' => $th->getMessage()]);
}
Log::error($th->getMessage());
- // return response()->json(['error' => 'Error cannot index files', 'details' => $th->getMessage()], 500);
}
}
}
diff --git a/commands.txt b/commands.txt
index 065dee6c..1b618b51 100644
--- a/commands.txt
+++ b/commands.txt
@@ -10,4 +10,6 @@ pg_dump -h 127.0.0.1 -p 5432 -U postgres -Fc -d mediaServer -v -f databaseBackup
Fix broken merge to main
- Find the revert commit (the one that caused the deletion of the files). open that in new branch
- git merge main --no-commit into it and fix files you need to restore
-- fkaroundandfindout
\ No newline at end of file
+
+
+192.168.1.1 - - \[.*\] "GET /apps/\d+/connections\?auth_key=mlynf9fmqazebunus8f8&auth_timestamp=\d+&auth_version=1.0&auth_signature=.*
diff --git a/config/app.php b/config/app.php
index 4d5576fb..591d23a4 100755
--- a/config/app.php
+++ b/config/app.php
@@ -56,6 +56,7 @@ return [
*/
'url' => env('APP_URL', 'http://localhost'),
+ 'host' => env('APP_HOST', 'app.test'),
/*
|--------------------------------------------------------------------------
diff --git a/config/services.php b/config/services.php
index 27a36175..c35a78e0 100755
--- a/config/services.php
+++ b/config/services.php
@@ -34,5 +34,8 @@ return [
'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'),
],
],
+ 'plausible' => [
+ 'url' => env('PLAUSIBLE_URL', ''),
+ ],
];
diff --git a/data/avatars/12345.jpg b/data/avatars/12345.jpg
new file mode 100644
index 00000000..3fc9f807
Binary files /dev/null and b/data/avatars/12345.jpg differ
diff --git a/database/migrations/2025_03_05_164830_remove_user_id_not_null_on_tasks.php b/database/migrations/2025_03_05_164830_remove_user_id_not_null_on_tasks.php
new file mode 100644
index 00000000..7cb32abe
--- /dev/null
+++ b/database/migrations/2025_03_05_164830_remove_user_id_not_null_on_tasks.php
@@ -0,0 +1,25 @@
+<?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('tasks', function (Blueprint $table) {
+ $table->unsignedBigInteger('user_id')->nullable()->nullOnDelete()->change();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void {
+ Schema::table('tasks', function (Blueprint $table) {
+ $table->unsignedBigInteger('user_id')->nullOnDelete()->change();
+ });
+ }
+};
diff --git a/resources/js/components/cards/CategoryCard.vue b/resources/js/components/cards/CategoryCard.vue
index 52f15dd3..b62bf4d9 100644
--- a/resources/js/components/cards/CategoryCard.vue
+++ b/resources/js/components/cards/CategoryCard.vue
@@ -90,10 +90,7 @@ watch(
<RouterLink :to="`/${data?.name}`" class="w-full h-40">
<img
class="w-full h-full object-cover rounded-t-md shadow-sm mb-auto ring-1 ring-gray-900/5"
- :src="
- handleStorageURL(defaultFolder?.series?.thumbnail_url) ??
- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
- "
+ :src="handleStorageURL(defaultFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
alt="Folder Cover Art"
/>
</RouterLink>
diff --git a/resources/js/components/cards/CategoryFolderCard.vue b/resources/js/components/cards/CategoryFolderCard.vue
index e9514f4b..1ad1d02a 100644
--- a/resources/js/components/cards/CategoryFolderCard.vue
+++ b/resources/js/components/cards/CategoryFolderCard.vue
@@ -23,10 +23,7 @@ const popover = useTemplateRef('popover');
<RouterLink :to="`/${data?.path}`" class="w-full h-40">
<img
class="w-full h-full object-cover rounded-t-md shadow-sm mb-auto ring-1 ring-gray-900/5"
- :src="
- handleStorageURL(data?.series?.thumbnail_url) ??
- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
- "
+ :src="handleStorageURL(data?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
alt="Folder Cover Art"
/>
</RouterLink>
diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vue
index 848f0031..07026064 100755
--- a/resources/js/components/cards/FolderCard.vue
+++ b/resources/js/components/cards/FolderCard.vue
@@ -42,10 +42,7 @@ const contextMenuItems = computed(() => {
<RelativeHoverCard class="w-full" positionClasses="!p-0 !border-none z-50 -top-5 lg:-left-24" iconHidden :hoverCardDelay="50" :hoverCardLeaveDelay="50">
<template #content>
<img
- :src="
- handleStorageURL(data.series?.thumbnail_url) ??
- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
- "
+ :src="handleStorageURL(data.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
alt="Folder Thumbnail"
class="hidden lg:block h-32 aspect-2/3 object-cover shadow-md"
/>
@@ -61,10 +58,7 @@ const contextMenuItems = computed(() => {
"
>
<img
- :src="
- handleStorageURL(data.series?.thumbnail_url) ??
- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
- "
+ :src="handleStorageURL(data.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
alt="Folder Thumbnail"
class="hidden xs:block lg:hidden max-h-16 sm:w-12 aspect-square object-cover shadow-md rounded-t-lg sm:rounded-sm"
/>
diff --git a/resources/js/components/cards/HoverCard.vue b/resources/js/components/cards/HoverCard.vue
index d85613b8..09a91599 100644
--- a/resources/js/components/cards/HoverCard.vue
+++ b/resources/js/components/cards/HoverCard.vue
@@ -6,6 +6,7 @@ import ProiconsCommentExclamation from '~icons/proicons/comment-exclamation';
const props = withDefaults(
defineProps<{
content?: string;
+ contentTitle?: string;
positionClasses?: string;
hoverCardDelay?: number;
hoverCardLeaveDelay?: number;
@@ -89,9 +90,10 @@ watch(
<ProiconsCommentExclamation v-if="!iconHidden" class="h-5 w-5 mb-auto shrink-0" />
</slot>
<slot name="content">
- <p class="text-pretty h-fit max-h-[50vh] w-full break-words whitespace-pre-wrap">
- {{ content }}
- </p>
+ <div class="flex flex-col gap-2">
+ <h4>{{ contentTitle }}</h4>
+ <p class="dark:text-neutral-400 text-pretty h-fit max-h-[50vh] w-full">{{ content }}</p>
+ </div>
</slot>
</div>
</Transition>
diff --git a/resources/js/components/cards/TaskCard.vue b/resources/js/components/cards/TaskCard.vue
index e275c28b..110f93c5 100644
--- a/resources/js/components/cards/TaskCard.vue
+++ b/resources/js/components/cards/TaskCard.vue
@@ -83,7 +83,7 @@ watch(
class="bg-white dark:bg-primary-dark-800/70 dark:hover:bg-primary-dark-600 hover:bg-primary-800 p-3 rounded-xl ring-1 ring-gray-900/5 flex gap-4 w-full items-center flex-wrap"
>
<div class="flex flex-col gap-2 sm:gap-1 flex-1 relative">
- <HoverCard :content="data.description ?? ''" class="flex gap-x-4 gap-y-2 items-center">
+ <HoverCard :content="data.description ?? ''" :content-title="data.summary" class="flex gap-x-4 gap-y-2 items-center">
<template #trigger>
<h2 class="truncate capitalize group">{{ data.id }} - {{ data.name }}</h2>
<p v-if="data.summary" class="truncate text-neutral-500 dark:text-neutral-400 max-w-64 hidden md:block">
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vue
index b308c008..8f54235d 100755
--- a/resources/js/components/cards/VideoCard.vue
+++ b/resources/js/components/cards/VideoCard.vue
@@ -66,27 +66,18 @@ watch(
"
>
<section class="flex justify-between gap-4 w-full items-center overflow-hidden group">
- <HoverCard class="items-end" v-if="data.description" :hover-card-delay="400" :hover-card-leave-delay="300">
+ <HoverCard class="items-end" v-if="data.description" :content="data.description" :content-title="data.title" :hover-card-delay="400" :hover-card-leave-delay="300">
<template #trigger>
<span class="flex">
<h3 class="line-clamp-1">
{{ data.title }}
- <!-- <span class="text-ellipsis text-wrap line-clamp-1 text-sm sm:text-base text-neutral-500 dark:text-neutral-400">{{
- metaData?.fields?.description
- }}</span> -->
</h3>
<ProiconsComment class="my-auto ms-4 group-hover:opacity-20 opacity-100 transition-opacity duration-300 shrink-0 h-5 w-5" title="Description" />
</span>
</template>
- <template #content>
- {{ data.description }}
- </template>
</HoverCard>
- <h3 v-else class="w-full line-clamp-1 flex gap-8 items-end min-w-fit max-w-[30%]" title="Title">
+ <h3 v-else class="flex-1 truncate min-w-[30%]" :title="data.title">
{{ data.title }}
- <!-- <span class="text-ellipsis text-wrap line-clamp-1 text-sm sm:text-base text-neutral-500 dark:text-neutral-400">{{
- metaData?.fields?.description
- }}</span> -->
</h3>
<span class="flex gap-1 truncate text-neutral-500 dark:text-neutral-400 text-sm">
<h4 class="text-nowrap text-start truncate" :title="`File Size: ${data.file_size ? formatFileSize(data.file_size) : ''}`">
diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vue
index c9b45a60..5bd42994 100644
--- a/resources/js/components/dashboard/DashboardTasks.vue
+++ b/resources/js/components/dashboard/DashboardTasks.vue
@@ -88,7 +88,7 @@ const filteredTasks = computed(() => {
? stateTasks.value.filter((task: TaskResource) => {
{
try {
- let strRepresentation = [task.name, task.summary, task.description, task.created_at, task.status].join(' ').toLowerCase();
+ let strRepresentation = [task.name, task.summary, task.description, task.created_at, task.status, task.id].join(' ').toLowerCase();
return strRepresentation.includes(searchQuery.value.toLowerCase());
} catch (error) {
console.log(error);
@@ -110,6 +110,8 @@ const handleSort = async (column = 'date', dir = 1) => {
let valueA = taskA[column as keyof TaskResource];
let valueB = taskB[column as keyof TaskResource];
+ console.log(column);
+
if (valueA && valueB && typeof valueA === 'number' && typeof valueB === 'number') return (valueA - valueB) * dir;
return `${valueA}`?.localeCompare(`${valueB}`) * dir;
});
diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vue
index c0add018..298f1c8a 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -56,7 +56,7 @@ watch(userData, handleAuthEvent, { immediate: false });
<span id="user-name-unauth" v-else class="text-right hidden sm:block">Guest</span>
<img
- :src="userData?.avatar ?? '/storage/avatars/12345.jpg'"
+ :src="userData?.avatar ?? '/storage/avatars/default.jpg'"
class="h-7 w-7 rounded-full ring-2 ring-violet-600/80 object-cover aspect-square"
alt="profile picture"
/></button
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 4dbce948..ba6bda36 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -117,10 +117,7 @@ watch(
<img
id="folder-thumbnail"
class="h-full object-cover rounded-md aspect-2/3 ring-1 ring-gray-900/5"
- :src="
- handleStorageURL(stateFolder?.series?.thumbnail_url) ??
- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
- "
+ :src="handleStorageURL(stateFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
alt="Folder Cover Art"
/>
@@ -154,10 +151,10 @@ watch(
</HoverCard>
<span class="flex flex-1 gap-2 items-end justify-between text-sm pe-1 py-1">
- <span class="flex items-center justify-start gap-1 truncate h-8 sm:h-[22px] dark:text-slate-400 text-slate-500">
+ <span class="flex items-center justify-start gap-1 truncate h-6 sm:h-[22px] dark:text-slate-400 text-slate-500">
<p class="text-nowrap text-start truncate">{{ metaData?.fields.views }}</p>
- <HoverCard :content="personalViewCount > 0 ? `You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}` : ''">
+ <HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`">
<template #trigger>
<ProiconsEye class="w-4 h-4 scale-90 hover:scale-100 transition-all hover:text-white" v-if="personalViewCount > 0" />
</template>
@@ -166,7 +163,7 @@ watch(
{{ ` | ${stateVideo?.metadata?.resolution_height}p` }}
</p>
</span>
- <section class="flex gap-2 justify-end h-8 sm:hidden">
+ <section class="flex gap-2 justify-end sm:hidden">
<Popover popoverClass="!max-w-32 !p-1 !rounded-md !shadow-sm" :vertical-offset-pixels="36" :buttonClass="'!p-1 w-6 h-6 ml-auto mt-auto'" ref="popover">
<template #buttonIcon>
<ProiconsMoreVertical class="h-4 w-4" />
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 9912d197..c3f12d4f 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -4,7 +4,7 @@ import type { FolderResource, UserResource, VideoResource } from '@/types/resour
import type { ContextMenuItem, PopoverItem } from '@/types/types';
import type { Metadata, Series } from '@/types/model';
-import { computed, onMounted, onUnmounted, ref, useTemplateRef, watch, type ComputedRef, type Ref } from 'vue';
+import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch, type ComputedRef, type Ref } from 'vue';
import { handleStorageURL, isInputLikeElement, toFormattedDate, toFormattedDuration } from '@/service/util';
import { UseCreatePlayback } from '@/service/mutations';
import { useVideoPlayback } from '@/service/queries';
@@ -86,7 +86,7 @@ const timeDuration = computed(() => {
const timeElapsed = ref(0);
const timeSeeking = ref('');
const timeAutoSeek = ref(10);
-const currentVolume = ref(0.1);
+const currentVolume = ref(0.5);
const cachedVolume = ref(0.5);
const currentSpeed = ref(1);
@@ -216,19 +216,15 @@ const isPortrait = computed(() => {
});
const audioPoster = computed(() => {
- return (
- handleStorageURL(stateVideo.value?.metadata?.poster_url) ??
- handleStorageURL(stateFolder.value.series?.thumbnail_url) ??
- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
- );
+ return handleStorageURL(stateVideo.value?.metadata?.poster_url) ?? handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';
});
const initVideoPlayer = async () => {
let root = document.getElementById('root');
- isPaused.value = true;
isLooping.value = false;
isPictureInPicture.value = false;
+ currentSpeed.value = 1;
if (!root) return;
@@ -240,6 +236,13 @@ const initVideoPlayer = async () => {
}
metadataId.value = stateVideo.value?.metadata ? stateVideo.value?.metadata.id : NaN;
+ if (!isFullScreen.value) {
+ isPaused.value = true;
+ return;
+ }
+
+ await nextTick();
+ onPlayerPlay();
// url.value = await getMediaUrl(stateVideo.value.path ?? '');
};
@@ -559,7 +562,10 @@ const getProgressTooltip = (event: MouseEvent) => {
const handleLoadSavedVolume = () => {
const savedVolume = parseFloat(localStorage.getItem('videoVolume') ?? '');
- if (isNaN(savedVolume) || !player.value) return;
+ if (isNaN(savedVolume) || !player.value) {
+ handleVolumeChange();
+ return;
+ }
const normalVolume = Math.max(0, Math.min(savedVolume, 1));
currentVolume.value = normalVolume;
diff --git a/resources/js/service/util.ts b/resources/js/service/util.ts
index dd22fe5d..b01217f0 100644
--- a/resources/js/service/util.ts
+++ b/resources/js/service/util.ts
@@ -63,14 +63,14 @@ export function toFormattedDate(
export function toFormattedDuration(rawSeconds: number = 0, leadingZero: boolean = true, format: 'digital' | 'analog' | 'verbose' = 'analog') {
if (isNaN(parseInt(rawSeconds?.toString() ?? '0'))) return null;
- const hoursText = format === 'verbose' ? ' hours' : 'h';
- const minutesText = format === 'verbose' ? ' minutes' : 'm';
- const secondsText = format === 'verbose' ? ' seconds' : 's';
-
const hours = Math.floor(rawSeconds / 3600);
const minutes = Math.floor((rawSeconds % 3600) / 60);
const seconds = Math.floor(rawSeconds % 60);
+ const hoursText = format === 'verbose' ? ` hour${hours == 1 ? '' : 's'}` : 'h';
+ const minutesText = format === 'verbose' ? ` minute${minutes == 1 ? '' : 's'}` : 'm';
+ const secondsText = format === 'verbose' ? ` second${seconds == 1 ? '' : 's'}` : 's';
+
if (format === 'digital') {
return `${hours > 0 ? `${formatInteger(hours)}:` : ''}${formatInteger(minutes)}:${formatInteger(seconds)}`;
}
@@ -215,3 +215,27 @@ export function isInputLikeElement(element: EventTarget | null, key: string): bo
return inputLikeTags.includes((element as HTMLElement).tagName);
}
+
+type SortDir = 1 | -1;
+
+export function sortObject<T>(column: keyof T, direction: SortDir = 1, dateColumns: string[] = ['date', 'date_released']) {
+ return (a: T, b: T): number => {
+ let valueA = a[column];
+ let valueB = b[column];
+
+ if ((valueA instanceof Date && valueB instanceof Date) || dateColumns.includes(String(column))) {
+ let dateA = new Date(String(valueA));
+ let dateB = new Date(String(valueB));
+ return (dateB.getTime() - dateA.getTime()) * direction;
+ }
+
+ let numA = parseFloat(valueA as any);
+ let numB = parseFloat(valueB as any);
+
+ if (!isNaN(numA) && !isNaN(numB)) {
+ return (numA - numB) * direction;
+ }
+
+ return String(valueA).toLowerCase().replace(/\s+/g, ' ').localeCompare(String(valueB).toLowerCase().replace(/\s+/g, ' ')) * direction;
+ };
+}
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index be884499..6753356d 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -7,6 +7,7 @@ import { toast } from '@/service/toaster/toastService';
import recordsAPI from '@/service/recordsAPI';
import mediaAPI from '@/service/mediaAPI.ts';
+import { sortObject } from '@/service/util';
export const useContentStore = defineStore('Content', () => {
const AuthStore = useAuthStore();
@@ -56,17 +57,7 @@ export const useContentStore = defineStore('Content', () => {
})
: list;
- let sortedList = searchedList.sort((videoA, videoB) => {
- if (videoSort.value.column === 'date' || videoSort.value.column === 'date_released') {
- let dateA = new Date(videoA[videoSort.value.column]);
- let dateB = new Date(videoB[videoSort.value.column]);
- return (dateB - dateA) * videoSort.value.dir;
- }
- let valueA = videoA[videoSort.value.column];
- let valueB = videoB[videoSort.value.column];
- if (valueA && valueB && typeof valueA === 'number' && typeof valueB === 'number') return (valueA - valueB) * videoSort.value.dir;
- return `${valueA}`?.toLowerCase().replaceAll(/\s+/g, ' ')?.localeCompare(`${valueB}`?.toLowerCase().replaceAll(/\s+/g, ' ')) * videoSort.value.dir;
- });
+ let sortedList = searchedList.sort(sortObject(videoSort.value.column, videoSort.value.dir));
return sortedList;
}); // use a computed ref?
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index b7df3552..ae0eaeda 100755
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -7,6 +7,12 @@
<meta name="description" content="A self hosted web media server to keep everything in one place.">
<title>{{ config('app.name', 'Media Server') }}</title>
+ <script defer data-domain="{{ config('app.host') }}" src="{{ config('services.plausible.url') }}"></script>
+ <script>
+ window.plausible = window.plausible || function() {
+ (window.plausible.q = window.plausible.q || []).push(arguments)
+ }
+ </script>
<!-- local -->
@vite('resources/css/app.css')
@@ -23,7 +29,7 @@
<body class="bg-primary-950 dark:bg-primary-dark-950 dark:text-[#e2e0e2] font-sans text-gray-900 antialiased dark:[color-scheme:dark]" id="root"> <!-- dark:bg-[#121216] dark:text-[#e2e0e2] text-gray-900 -->
<div id="reverb-config" data-reverb-config='
- @json(["key" => env("REVERB_APP_KEY"), "host" => env("REVERB_HOST"), "port" => env("REVERB_PORT")])'></div>
+ @json(["key" => config("reverb.apps.apps.0.app_id"), "host" => config("reverb.apps.apps.0.options.host"), "port" => config("reverb.apps.apps.0.options.port")])'></div>
@vite('resources/js/app.ts')
<div id='app'></div>
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
index fedb287f..cf2db893 100755
--- a/storage/app/.gitignore
+++ b/storage/app/.gitignore
@@ -1,4 +1,3 @@
-*
!private/
!public/
!.gitignore
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
index d6b7ef32..041a78a9 100755
--- a/storage/app/public/.gitignore
+++ b/storage/app/public/.gitignore
@@ -1,2 +1,3 @@
-*
+/*.*
!.gitignore
+*.db
diff --git a/storage/app/public/avatars/default.jpg b/storage/app/public/avatars/default.jpg
new file mode 100644
index 00000000..3fc9f807
Binary files /dev/null and b/storage/app/public/avatars/default.jpg differ
diff --git a/storage/app/public/thumbnails/default.webp b/storage/app/public/thumbnails/default.webp
new file mode 100644
index 00000000..91274e94
Binary files /dev/null and b/storage/app/public/thumbnails/default.webp differ