Skip to content

A self-hosted media server and file management system

remove manual parsing from history and folders

aminnausin6256e5eeed77
diff --git a/resources/js/components/FolderCard.vue b/resources/js/components/FolderCard.vue
index 94791892..c22b6653 100644
--- a/resources/js/components/FolderCard.vue
+++ b/resources/js/components/FolderCard.vue
@@ -1,21 +1,16 @@
<script setup>
import { RouterLink } from 'vue-router';
- import { storeToRefs } from 'pinia';
- import { useContentStore } from '../stores/ContentStore';
-
- const ContentStore = useContentStore();
- const { folderData } = defineProps(['folderData']);
- const { stateDirectory } = storeToRefs(ContentStore);
+ const { folder, categoryName } = defineProps(['folder', 'categoryName']);
</script>
<template>
- <RouterLink class="p-2 flex flex-wrap rounded-xl dark:bg-primary-dark-800 bg-primary-800 dark:text-white shadow-md w-full divide-y divide-gray-300 group" :to="`/${stateDirectory.name}/${folderData?.folder_name}`">
+ <RouterLink class="p-2 flex flex-wrap rounded-xl dark:bg-primary-dark-800 bg-primary-800 dark:text-white shadow-md w-full divide-y divide-gray-300 group" :to="`/${categoryName}/${folder.attributes.name}`">
<section class="flex justify-between items-baseline w-full">
- <h2 class="text-xl truncate">{{ folderData?.folder_name }}</h2>
+ <h2 class="text-xl truncate">{{ folder.attributes.name }}</h2>
</section>
<aside class="flex justify-between items-center w-full pt-1">
- <h3 class="text-lg text-left text-neutral-500 line-clamp-1">{{folderData?.file_count}} Episode{{folderData?.file_count > 1 ? 's' : ''}}</h3>
+ <h3 class="text-lg text-left text-neutral-500 line-clamp-1">{{folder.attributes.file_count}} Episode{{folder.attributes.file_count !== 1 ? 's' : ''}}</h3>
<button class="hidden group-hover:flex space-x-1 folder-link">
<span class="flex hover:bg-orange-500 hover:stroke-none border-orange-500 border-2 rounded shadow px-2 space-x-1">
Watch
diff --git a/resources/js/components/RecordCard.vue b/resources/js/components/RecordCard.vue
index 42e7197e..00d61a37 100644
--- a/resources/js/components/RecordCard.vue
+++ b/resources/js/components/RecordCard.vue
@@ -1,15 +1,18 @@
<script setup>
+ import { toTimeSpan } from '../service/util';
+
const { record } = defineProps(['record']);
+ const timeSpan = toTimeSpan((new Date(record.attributes.created_at.replace(' ', 'T'))))
</script>
<template>
<div class="p-2 flex flex-wrap rounded-xl dark:bg-primary-dark-800 bg-primary-800 dark:text-white shadow-md w-full divide-y divide-gray-300 group">
<section class="flex justify-between items-baseline w-full">
- <h2 class="text-xl text-left truncate">{{ record.videoName}}</h2>
+ <h2 class="text-xl text-left truncate">{{ record.relationships.video_name }}</h2>
</section>
<aside class="flex justify-between items-center w-full pt-1">
- <h3 class="text-lg text-left text-neutral-500 truncate">{{ record.folderName}}</h3>
- <h3 class="text-lg text-right text-neutral-500 text-nowrap line-clamp-1 truncate">{{ record.timeSpan}}</h3>
+ <h3 class="text-lg text-left text-neutral-500 truncate">{{ record.relationships.folder_name }}</h3>
+ <h3 class="text-lg text-right text-neutral-500 text-nowrap line-clamp-1 truncate">{{ timeSpan }}</h3>
<span class="hidden space-x-1">
<button class="hover:bg-orange-500 hover:stroke-none border-orange-500 border-2 rounded shadow px-2">Watch</button>
<svg xmlns="https://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
diff --git a/resources/js/components/RecordFull.vue b/resources/js/components/RecordFull.vue
index ee739c1d..350dc9c3 100644
--- a/resources/js/components/RecordFull.vue
+++ b/resources/js/components/RecordFull.vue
@@ -1,5 +1,9 @@
<script setup>
+ import { toTimeSpan } from '../service/util';
+
const { record } = defineProps(['record']);
+ const rawDate = new Date(record.attributes.created_at.replace(' ', 'T'));
+ const timeSpan = toTimeSpan(rawDate);
</script>
<template>
@@ -7,12 +11,12 @@
<div class="flex rounded-xl items-center justify-center dark:bg-primary-dark-800 bg-primary-800 dark:hover:bg-neutral-700 hover:bg-slate-200 dark:text-white shadow p-3 w-full group flex-grow cursor-pointer">
<div class="w-full flex-wrap divide-y divide-gray-300">
<section class="flex justify-between items-baseline w-full">
- <h2 class="text-xl text-left truncate">{{record.videoName}}</h2>
- <h2 class="text-xl text-right truncate">{{record.date}}</h2>
+ <h2 class="text-xl text-left truncate">{{ record.relationships.video_name }}</h2>
+ <h2 class="text-xl text-right truncate">{{ `${rawDate.toLocaleDateString('en-ca', {year: "numeric", month: '2-digit', day: '2-digit', hour: '2-digit', hour12:false, minute:'2-digit'})}` }}</h2>
</section>
<aside class="flex justify-between items-center w-full pt-1">
- <h3 class="text-lg text-left text-neutral-500 truncate">{{record.folderName}}</h3>
- <h3 class="text-lg text-right text-neutral-500 text-nowrap line-clamp-1 truncate">{{record.timeSpan}}</h3>
+ <h3 class="text-lg text-left text-neutral-500 truncate">{{ record.relationships.folder_name }}</h3>
+ <h3 class="text-lg text-right text-neutral-500 text-nowrap line-clamp-1 truncate">{{ timeSpan }}</h3>
<span class="hidden space-x-1">
<button class="hover:bg-orange-500 hover:stroke-none border-orange-500 border-2 rounded shadow px-2">Watch</button>
<svg xmlns="https://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vue
index 6fca6faa..5d8b1389 100644
--- a/resources/js/components/panels/VideoSidebar.vue
+++ b/resources/js/components/panels/VideoSidebar.vue
@@ -9,7 +9,7 @@
const contentStore = useContentStore();
const { selectedSideBar } = storeToRefs(appStore);
- const { folders, records } = storeToRefs(contentStore);
+ const { folders, records, stateDirectory } = storeToRefs(contentStore);
</script>
<template>
@@ -19,9 +19,9 @@
<hr class="mt-2 mb-3">
<section v-if="selectedSideBar === 'folders'" id="list-content-folders" class="flex space-y-2 flex-wrap">
- <FolderCard v-for="folder in folders" :key="folder.folder_id" :folder-data="folder"/>
+ <FolderCard v-for="folder in folders" :key="folder.id" :folder="folder" :categoryName="stateDirectory.name"/>
</section>
<section v-if="selectedSideBar === 'history'" id="list-content-history" class="flex space-y-2 flex-wrap">
- <RecordCard v-for="record in records" :key="record.record_id" :record="record"/>
+ <RecordCard v-for="record in records.slice(0, 10)" :key="record.id" :record="record"/>
</section>
</template>
\ No newline at end of file
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index 8e3f05e5..690beaa9 100644
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -1,16 +1,117 @@
import { ref } from "vue";
-import { defineStore } from "pinia";
+import { defineStore, storeToRefs } from "pinia";
+import { useAppStore } from "./AppStore";
+import { useAuthStore } from "./AuthStore";
+import { API } from "../service/api";
export const useContentStore = defineStore('Content', () => {
+ const AppStore = useAppStore();
+ const AuthStore = useAuthStore();
+
const folders = ref([]);
const videos = ref([]);
- const records = ref(['hah']);
+ const records = ref([]);
const stateDirectory = ref({id:7, name:'anime', folders: []})
const stateFolder = ref({id:7, name:'ODDTAXI', videos: []})
+ const { pageTitle } = storeToRefs(AppStore);
+ const { userData } = storeToRefs(AuthStore);
+
+ async function getRecords(limit){
+ if(!userData.value) return;
+
+ const { data, error } = await API.get(`/records${limit ? `?limit=${limit}`: ''}`);
+
+ if(error || !data?.success){
+ console.log(error ?? data?.message);
+ return Promise.reject([]);
+ }
+ records.value = data?.data ?? [];
+
+ return Promise.resolve(records.value)
+ //parseHistory(data.data);
+ }
+
+ async function addRecord(id, limit = 10){
+ if(!userData.value) return;
+ const { data, error } = await API.post('/records', { 'video_id': id });
+
+ if(error || !data?.success){
+ console.log(error ?? data?.message);
+ return Promise.reject([]);
+ }
+
+ records.value = [data?.data, ...records.value.slice(0, Math.max(limit - data?.length, 0))];
+ return Promise.resolve(records.value)
+ //parseHistory([data.data], 10, false);
+ }
+
+ async function deleteRecord(id){
+ const recordID = parseInt(id);
+ const { data, error } = await API.delete(`/records/${recordID}`);
+
+ if(error || !data?.success){
+ // eslint-disable-next-line no-undef
+ toastr['error'](data?.message ?? 'Unable to delete record.');
+ console.log(error ?? data?.message);
+ return;
+ }
+
+ // eslint-disable-next-line no-undef
+ toastr.success('Record deleted!');
+ records.value = records.value.filter((record) => {
+ return record.id != recordID;
+ });
+ }
+
+ async function getCategory(URL_CATEGORY, URL_FOLDER) {
+ const { data, error } = await API.get(`/${URL_CATEGORY} ${URL_FOLDER ? '/' + URL_FOLDER : ''}`)
+
+ if(error || !data?.success){
+ // eslint-disable-next-line no-undef
+ toastr['error'](data?.message ?? 'Unable to load data.');
+ pageTitle.value = 'Folder not Found';
+ console.log(error ?? data?.message);
+ return false;
+ }
+
+ stateDirectory.value = data.data.dir;
+ stateFolder.value = data.data.folder
+ folders.value = data.data.dir.folders;
+ return true;
+ //parseFolders();
+ //loadVideosAndParse();
+ }
+
+ async function getFolder(nextFolderName) {
+ const nextFolder = stateDirectory.value.folders?.find((folder) => {return folder.attributes.name === nextFolderName});
+
+ if(!nextFolder.id){
+ // eslint-disable-next-line no-undef
+ toastr["error"](`The folder '${nextFolderName}' does not exist.`, "Invalid folder");
+ return;
+ }
+
+ const { data, error } = await API.post('/videos', { folder_id: nextFolder.id});
+
+ if(error || !data?.success){
+ // eslint-disable-next-line no-undef
+ toastr["error"](`The folder '${nextFolderName}' does not exist. ${error?.message}`, "Invalid folder");
+ pageTitle.value = 'Folder not Found';
+ console.log(error ?? data?.message);
+ return Promise.reject(false);
+ }
+
+ stateFolder.value = { id: nextFolder.id, name: nextFolder.attributes.name, 'videos': data}
+
+ return Promise.resolve(true);
+ }
+
return {
folders, videos, records,
- stateDirectory, stateFolder
+ stateDirectory, stateFolder,
+ getRecords, addRecord, deleteRecord,
+ getCategory, getFolder
};
});
\ No newline at end of file
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index 13ce7db6..05c5ff12 100644
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -3,80 +3,21 @@
import LayoutBase from '../components/layout/LayoutBase.vue';
import { storeToRefs } from 'pinia';
- import { useAuthStore } from '../stores/AuthStore'
import { useAppStore } from '../stores/AppStore';
- import { onMounted, ref } from 'vue';
- import { API } from '../service/api';
+ import { useContentStore } from '../stores/ContentStore';
+ import { onMounted } from 'vue';
- const records = ref([]);
const appStore = useAppStore();
- const authStore = useAuthStore();
- const { userData } = storeToRefs(authStore)
+ const ContentStore = useContentStore();
const { pageTitle } = storeToRefs(appStore);
+ const { records } = storeToRefs(ContentStore);
+ const { getRecords, deleteRecord } = ContentStore;
- async function loadHistory(){
- if(!userData.value) return;
-
- const { data, error } = await API.get(`/records`);
-
- if(error || !data?.success){
- console.log(error ?? data?.message);
- return;
- }
-
- parseHistory(data.data);
- }
-
- async function deleteRecord(id){
- const recordID = parseInt(id);
- const { data, error } = await API.delete(`/records/${recordID}`);
-
- if(error || !data?.success){
- // eslint-disable-next-line no-undef
- toastr['error'](data?.message ?? 'Unable to delete record.');
- console.log(error ?? data?.message);
- return;
- }
-
- let newRecordsList = records.value.filter((record) => {
- return record.recordID != recordID;
- });
-
- // eslint-disable-next-line no-undef
- toastr.success('Record deleted!');
- records.value = newRecordsList;
- }
-
- function parseHistory(data) {
- let newData = [];
-
- for (let recordCount = 0; recordCount < data.length; recordCount++) {
- const recordID = data[recordCount].id;
- const videoName = data[recordCount].relationships.video_name;
- const folderName = data[recordCount].relationships.folder_name;
- const categoryName = data[recordCount].relationships.category_name;
- const rawDate = (new Date(data[recordCount].attributes.created_at.replace(' ', 'T')));
- const rawAge = Date.now() - rawDate.getTime();
-
- const weeks = Math.round(rawAge / (1000 * 3600 * 24 * 7));
- const days = Math.round(rawAge / (1000 * 3600 * 24));
- const hours = Math.round(rawAge / (1000 * 3600));
- const minutes = Math.round(rawAge / (1000 * 60));
- const seconds = Math.round(rawAge / (1000));
-
- const timeSpan = weeks > 0 ? `${weeks} week${weeks > 1 ? 's' : ''} ago` : days > 0 ? `${days} day${days > 1 ? 's' : ''} ago` : hours > 0 ? `${hours} hour${hours > 1 ? 's' : ''} ago` : minutes > 0 ? `${minutes}m ago` : `${seconds}s ago`
-
- newData.push({videoName, folderName, timeSpan, date:`${rawDate.toLocaleDateString([], {year: "numeric", month: '2-digit', day: '2-digit', hour: '2-digit', hour12:false, minute:'2-digit'}), categoryName}`, recordID})
- }
-
- records.value = newData;
- }
-
onMounted(() => {
- loadHistory();
- pageTitle.value = "Full History";
+ getRecords();
+ pageTitle.value = "History";
})
</script>
@@ -84,7 +25,7 @@
<LayoutBase>
<template v-slot:content>
<section id="content-history" class=" space-y-2 cursor-pointer min-h-[80vh] pt-8">
- <RecordFull v-for="record in records" :record="record" :key="record.recordID" @deleteRecord="deleteRecord(record.recordID)"/>
+ <RecordFull v-for="record in records" :record="record" :key="record.recordID" @deleteRecord="deleteRecord(record.id)"/>
</section>
</template>
<template v-slot:sidebar>