Skip to content

A self-hosted media server and file management system

api simplification yay

aminnausinbb8e99e3d58a
diff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.php
index 6000f7a1..000b8c02 100755
--- a/app/Http/Resources/FolderResource.php
+++ b/app/Http/Resources/FolderResource.php
@@ -20,7 +20,10 @@ class FolderResource extends JsonResource
'path' => $this->path,
'file_count' => $this->videos->count(),
'category_id' => (string)$this->category->id,
- 'series' => $this->series
+ 'videos' => $this->when($request->videos, function () {
+ return VideoResource::collection($this->videos);
+ }),
+ 'series' => new SeriesResource($this->series)
];
}
}
diff --git a/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vue
index eef6c8d4..ef0471c1 100755
--- a/resources/js/components/cards/RecordCard.vue
+++ b/resources/js/components/cards/RecordCard.vue
@@ -3,11 +3,11 @@ import ButtonCorner from '../inputs/ButtonCorner.vue';
import CircumShare1 from '~icons/circum/share-1';
import CircumPlay1 from '~icons/circum/play-1';
-import { toTimeSpan } from '../../service/util';
+import { toFormattedDate, toTimeSpan } from '../../service/util';
import { computed } from 'vue';
const props = defineProps(['record']);
-const rawDate = new Date(props.record.created_at.replace(' ', 'T'));
+const rawDate = new Date(props.record?.attributes.created_at?.replace(' ', 'T'));
const timeSpan = toTimeSpan(rawDate);
const videoLink = computed(() => {
@@ -51,10 +51,13 @@ const videoLink = computed(() => {
</div>
</section>
<section class="flex flex-col sm:flex-row sm:justify-between w-full">
- <h3 class="hidden lg:block text-neutral-500 w-full text-wrap truncate sm:text-nowrap">
+ <h3
+ class="hidden lg:block text-neutral-500 w-full text-wrap truncate sm:text-nowrap"
+ :title="props.record.relationships.folder_name"
+ >
{{ props.record.relationships.folder_name }}
</h3>
- <h3 class="hidden lg:block truncate text-right text-neutral-500 w-full line-clamp-2">
+ <h3 class="hidden lg:block truncate text-right text-neutral-500 w-full line-clamp-2" :title="toFormattedDate(rawDate)">
{{ timeSpan }}
</h3>
<h3 class="lg:hidden text-neutral-500 w-full text-wrap truncate sm:text-nowrap">
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vue
index d22d1843..e843ccdc 100755
--- a/resources/js/components/cards/VideoCard.vue
+++ b/resources/js/components/cards/VideoCard.vue
@@ -3,6 +3,7 @@ import useMetaData from '../../composables/useMetaData';
import { watch } from 'vue';
import { RouterLink } from 'vue-router';
+import { toFormattedDate } from '../../service/util';
const props = defineProps(['data', 'index', 'currentID']);
const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: true });
@@ -40,8 +41,8 @@ watch(props, handlePropsUpdate, { immediate: true });
{{ metaData?.fields?.views }}
</h3>
- <h3 class="line-clamp-1 sm:min-w-40">
- {{ props.data?.date }}
+ <h3 class="line-clamp-1 text-end">
+ {{ toFormattedDate(new Date(props.data?.date + ' GMT')) }}
</h3>
</section>
</RouterLink>
diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vue
index d6fe1240..8f8f7d4e 100755
--- a/resources/js/components/panels/VideoSidebar.vue
+++ b/resources/js/components/panels/VideoSidebar.vue
@@ -17,7 +17,7 @@ const shareModal = useModal({ title: 'Share Video' });
const shareLink = ref('');
const { selectedSideBar } = storeToRefs(appStore);
-const { records, stateDirectory, stateFolder } = storeToRefs(contentStore);
+const { stateRecords, stateDirectory, stateFolder } = storeToRefs(contentStore);
const handleShare = (link) => {
if (!link || link[0] !== '/') return;
@@ -44,7 +44,7 @@ const handleShare = (link) => {
/>
</section>
<section v-if="selectedSideBar === 'history'" id="list-content-history" class="flex space-y-2 flex-wrap">
- <RecordCard v-for="record in records.slice(0, 10)" :key="record.id" :record="record" />
+ <RecordCard v-for="record in stateRecords.slice(0, 10)" :key="record.id" :record="record" />
<RouterLink to="/history" class="text-center text-sm dark:text-neutral-400 mx-auto p-3 hover:underline">View More</RouterLink>
</section>
<ModalBase :modalData="shareModal">
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 16f65b6f..61ae03e2 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -51,20 +51,12 @@ const handlePropsUpdate = () => {
};
const handleVideoDetailsUpdate = (res) => {
- if (res?.data) {
- stateVideo.value = { index: stateVideo.value.index, ...res.data };
- updateVideoData({ index: stateVideo.value.index, ...res.data }, stateVideo.value.index);
- }
+ updateVideoData(res?.data);
editVideoModal.toggleModal(false);
};
const handleSeriesUpdate = (res) => {
- if (res?.data) {
- stateFolder.value = { ...stateFolder.value, series: { ...res.data } };
-
- updateFolderData(res.data, stateFolder.value.id);
- }
-
+ updateFolderData(res?.data);
editFolderModal.toggleModal(false);
};
diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.ts
index 9fd5b8a5..28040a9e 100644
--- a/resources/js/service/mediaAPI.ts
+++ b/resources/js/service/mediaAPI.ts
@@ -31,4 +31,7 @@ export default {
getCategory(query) {
return API.get(`/${query}`);
},
+ getFolder(id: number) {
+ return API.get(`/folders/${id}?videos=true`);
+ },
};
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index 99ab749a..12be340f 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -1,13 +1,12 @@
-import recordsAPI from '@/service/recordsAPI';
-import mediaAPI from '@/service/mediaAPI.ts';
-import { toFormattedDate } from '@/service/util';
-
-import { computed, ref } from 'vue';
import { defineStore, storeToRefs } from 'pinia';
-import { useAppStore } from './AppStore';
+import { computed, ref } from 'vue';
import { useAuthStore } from './AuthStore';
+import { useAppStore } from './AppStore';
+import { useToast } from '@/composables/useToast';
import { useRoute } from 'vue-router';
-import { useToast } from '../composables/useToast';
+
+import recordsAPI from '@/service/recordsAPI';
+import mediaAPI from '@/service/mediaAPI.ts';
export const useContentStore = defineStore('Content', () => {
const AppStore = useAppStore();
@@ -17,31 +16,46 @@ export const useContentStore = defineStore('Content', () => {
const toast = useToast();
const fullRecordsLoaded = ref(false);
- const records = ref([]);
+ const stateRecords = ref([]);
// 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 videoSortColumn = ref('title');
+ const videoSortDir = ref(1);
+
const stateDirectory = ref({ id: 7, name: 'anime', folders: [] });
const stateFolder = ref({ id: 7, name: 'ODDTAXI', videos: [], series: null });
- const statePlaylist = ref([]); // use videos from state folder?
- const stateFilteredPlaylist = computed((query) => {
- return query
- ? statePlaylist.value.filter((video) => {
+ const stateFilteredPlaylist = computed(() => {
+ // let dir = videoSortDir.value;
+ let list = stateFolder.value.videos;
+ // let list = statePlaylist.value.sort((videoA, videoB) => {
+ // if (videoSortColumn.value === 'date') {
+ // let dateA = new Date(videoA[videoSortColumn.value]);
+ // let dateB = new Date(videoB[videoSortColumn.value]);
+ // return (dateB - dateA) * dir;
+ // }
+ // if (videoSortColumn.value === 'name' || videoSortColumn.value === 'title')
+ // return videoA[videoSortColumn.value].localeCompare(videoB[videoSortColumn.value]) * dir;
+ // return (videoB[videoSortColumn.value] - videoA[videoSortColumn.value]) * dir;
+ // });
+
+ return searchQuery.value
+ ? list.filter((video) => {
{
try {
let strRepresentation = [video.name, video.date].join(' ').toLowerCase();
// console.log(strRepresentation);
- return strRepresentation.includes(query.toLowerCase());
+ return strRepresentation.includes(searchQuery.value.toLowerCase());
} catch (error) {
console.log(error);
return false;
}
}
})
- : statePlaylist.value;
+ : list;
}); // use a computed ref?
const stateVideo = ref({});
@@ -49,30 +63,75 @@ export const useContentStore = defineStore('Content', () => {
const { userData } = storeToRefs(AuthStore);
const searchQuery = ref('');
- const filterQuery = ref({ search: '', season: -1, tag: '' });
- async function updateViewCount(id) {
- const { data, error } = await mediaAPI.viewVideo(id);
+ async function recordsSort(column = 'created_at', dir = 1) {
+ let tempList = stateRecords.value.sort((recordA, recordB) => {
+ if (column === 'created_at') {
+ let dateA = new Date(recordA['created_at']);
+ let dateB = new Date(recordB['created_at']);
+ return (dateB - dateA) * dir;
+ }
+ return recordB?.relationships[column]?.localeCompare(recordA?.relationships[column]) * dir;
+ });
+ stateRecords.value = tempList;
+ return tempList;
+ }
- if (error || !data?.success) {
- console.log(error ?? data?.message);
- return Promise.reject([]);
+ function playlistFind(id) {
+ let result = stateFilteredPlaylist.value.length > 0 ? stateFilteredPlaylist.value[0] : {};
+
+ if (id && stateVideo.value.id === id) return;
+
+ if (!isNaN(parseInt(id))) {
+ result = stateFilteredPlaylist.value.find((video) => {
+ return video.id === id;
+ });
+ }
+ if (!result) toast.add({ type: 'danger', title: 'Invalid Video', description: 'Selected video cannot be found...' });
+ else {
+ stateVideo.value = result;
+ document.title = `${stateFolder.value.name} · ${stateVideo.value?.title ?? stateVideo.value?.name}`;
}
- stateVideo.value.view_count += 1;
- return Promise.resolve(stateVideo.value);
}
+ // needs to go in the computed property
+ async function playlistSort(column = 'name', dir = 1) {
+ // videoSort.value = { ...videoSort.value, column, dir };
+
+ let parsedDir = parseInt(dir);
+
+ videoSortDir.value = !isNaN(parsedDir) ? parsedDir : 1;
+ videoSortColumn.value = column;
+ searchQuery.value = '';
+ // console.log(videoSortDir.value);
+
+ // console.log('outter', videoSort);
+
+ // let tempList = statePlaylist.value.sort((videoA, videoB) => {
+ // if (column === 'date') {
+ // let dateA = new Date(videoA[column]);
+ // let dateB = new Date(videoB[column]);
+ // return (dateB - dateA) * dir;
+ // }
+ // if (column === 'name' || column === 'title') return videoA[column].localeCompare(videoB[column]) * dir;
+ // return (videoB[column] - videoA[column]) * dir;
+ // });
+ // statePlaylist.value = tempList;
+ // return tempList;
+ }
+
+ //#region DATA FETCHING
async function getRecords(limit) {
if (!userData.value) return;
if (fullRecordsLoaded.value) {
- Promise.resolve(records.value);
+ Promise.resolve(stateRecords.value);
return;
}
if (!limit) fullRecordsLoaded.value = true;
- records.value = [];
+ stateRecords.value = [];
const { data, error } = await recordsAPI.getRecords(limit ? `?limit=${limit}` : '');
@@ -80,71 +139,40 @@ export const useContentStore = defineStore('Content', () => {
console.log(error ?? data?.message);
return Promise.reject([]);
}
- records.value = data?.data ?? []; // always overwrite because if limit is set and results cached, no request is made. Otherwise its a full request.
-
- return Promise.resolve(records.value);
- }
-
- async function createRecord(id) {
- if (!userData.value) return;
- const { data, error } = await recordsAPI.createRecord({ video_id: id });
-
- if (error || !data?.success) {
- console.log(error ?? data?.message);
- return Promise.reject([]);
- }
- records.value = [data?.data, ...records.value];
- return Promise.resolve(records.value);
- }
-
- async function deleteRecord(id) {
- const recordID = parseInt(id);
- const { data, error } = await recordsAPI.deleteRecord(`/${recordID}`);
- if (error || !data?.success) {
- console.log(error ?? data?.message);
- return false;
- }
+ stateRecords.value = data?.data ?? []; // always overwrite because if limit is set and results cached, no request is made. Otherwise its a full request.
- records.value = records.value.filter((record) => {
- return record.id != recordID;
- });
-
- return true;
+ return Promise.resolve(stateRecords.value);
}
- const recordsSort = (column = 'created_at', dir = 1) => {
- let tempList = records.value.sort((recordA, recordB) => {
- if (column === 'created_at') {
- let dateA = new Date(recordA['created_at']);
- let dateB = new Date(recordB['created_at']);
- return (dateB - dateA) * dir;
- }
- return recordB?.relationships[column]?.localeCompare(recordA?.relationships[column]) * dir;
- });
- records.value = tempList;
- return tempList;
- };
-
async function getCategory(URL_CATEGORY, URL_FOLDER) {
- const { data, error } = await mediaAPI.getCategory(`${URL_CATEGORY}${URL_FOLDER ? '/' + URL_FOLDER : ''}`); // => {dir: {id,name,folderCount}, folder: {id,name,videos[],series}}
+ const { data: response, error } = await mediaAPI.getCategory(`${URL_CATEGORY}${URL_FOLDER ? '/' + URL_FOLDER : ''}`); // => {dir: {id,name,folderCount}, folder: {id,name,videos[],series}}
// statedir (list of folders) = dir => /api/categories/1
// statefolder (list of videos) = folder => /api/folders/8?videos=true
- if (error || !data?.success) {
- toast.add({ type: 'danger', title: 'Error', description: data?.message ?? 'Unable to load data.' });
+ if (error || !response?.success) {
+ toast.add({ type: 'danger', title: 'Error', description: response?.message ?? 'Unable to load data.' });
pageTitle.value = 'Folder not Found';
- console.log(error ?? data?.message);
+ console.log(error ?? response?.message);
return false;
}
- stateDirectory.value = data.data.dir;
- stateFolder.value = data.data.folder;
+ stateDirectory.value = response.data.dir;
+ stateFolder.value = response.data.folder;
// folders.value = data.data.dir.folders;
pageTitle.value = stateFolder.value.name;
- InitPlaylist();
+ if (!stateFolder.value.id) {
+ toast.add({ type: 'danger', title: 'Invalid folder', description: `The folder '${stateFolder.value.name}' does not exist.` });
+ return false;
+ }
+
+ searchQuery.value = '';
+
+ playlistFind(route.query?.video);
+
+ // InitPlaylist();
return true;
}
@@ -158,108 +186,99 @@ export const useContentStore = defineStore('Content', () => {
return;
}
- const { data, error } = await mediaAPI.getVideos({ folder_id: nextFolder.id }); // get videos with given folder id (list of videos organised by folder id)
+ const { data, error } = await mediaAPI.getFolder(nextFolder.id); // get videos with given folder id (list of videos organised by folder id)
- if (error || !data?.success) {
+ if (error) {
toast.add({ type: 'danger', title: 'Invalid folder', description: `The folder '${nextFolderName}' does not exist.` });
pageTitle.value = 'Folder not Found';
console.log(error ?? data?.message);
return Promise.reject(false);
}
- // console.log(nextFolder);
-
- stateFolder.value = { id: nextFolder.id, name: nextFolder.name, videos: data.data, series: nextFolder.series ?? null };
+ stateFolder.value = { ...data.data };
pageTitle.value = stateFolder.value.name;
- InitPlaylist();
+ playlistFind(route.query?.video);
return Promise.resolve(true);
}
+ //#endregion
- //Playlist and Search
+ //#region DATA UPDATES
- // PlaylistSeek (index) next previous specific
- function playlistSeek(direction) {
- let nextIndex = stateVideo.value.index + direction;
- if (nextIndex < 0 || nextIndex > statePlaylist.value.length) return;
+ async function updateViewCount(id) {
+ const { data, error } = await mediaAPI.viewVideo(id);
- stateVideo.value = statePlaylist.value[nextIndex];
- document.title = `${stateFolder.value.name} · ${stateVideo.value?.title ?? stateVideo.value?.name}`;
+ if (error || !data?.success) {
+ console.log(error ?? data?.message);
+ return Promise.reject([]);
+ }
+ stateVideo.value.view_count += 1;
+ return Promise.resolve(stateVideo.value);
}
- function playlistFind(id) {
- let result = statePlaylist.value.length > 0 ? statePlaylist.value[0] : {};
-
- if (id && stateVideo.value.id === id) return;
+ //these should go maybe in video player and record card idk
+ async function createRecord(id) {
+ if (!userData.value) return;
+ const { data, error } = await recordsAPI.createRecord({ video_id: id });
- if (!isNaN(parseInt(id))) {
- result = statePlaylist.value.find((video) => {
- return video.id === id;
- });
- }
- if (!result) toast.add({ type: 'danger', title: 'Invalid Video', description: 'Selected video cannot be found...' });
- else {
- stateVideo.value = result;
- document.title = `${stateFolder.value.name} · ${stateVideo.value?.title ?? stateVideo.value?.name}`;
+ if (error || !data?.success) {
+ console.log(error ?? data?.message);
+ return Promise.reject([]);
}
+ stateRecords.value = [data?.data, ...stateRecords.value];
+ return Promise.resolve(stateRecords.value);
}
- // InitPlaylist (set up playlist with indexes and current video)
- async function InitPlaylist() {
- filterQuery.value = { search: '', season: -1, tag: '' };
- if (!stateFolder.value.id) {
- toast.add({ type: 'danger', title: 'Invalid folder', description: `The folder '${stateFolder.value.name}' does not exist.` });
- return;
+ async function deleteRecord(id) {
+ const recordID = parseInt(id);
+ const { data, error } = await recordsAPI.deleteRecord(`/${recordID}`);
+ if (error || !data?.success) {
+ console.log(error ?? data?.message);
+ return false;
}
- statePlaylist.value = stateFolder.value.videos.map((video, index) => {
- video.date = toFormattedDate(new Date(video.date + ' GMT'));
- return { index, ...video };
+ stateRecords.value = stateRecords.value.filter((record) => {
+ return record.id != recordID;
});
- playlistSort();
- searchQuery.value = '';
- playlistFind(route.query?.video);
+
+ return true;
}
- const playlistSort = (column = 'name', dir = 1) => {
- let tempList = statePlaylist.value.sort((videoA, videoB) => {
- if (column === 'date') {
- let dateA = new Date(videoA[column]);
- let dateB = new Date(videoB[column]);
- return (dateB - dateA) * dir;
- }
- if (column === 'name' || column === 'title') return videoA[column].localeCompare(videoB[column]) * dir;
- return (videoB[column] - videoA[column]) * dir;
- });
+ async function updateVideoData(data) {
+ if (!data) return;
- stateFilteredPlaylist.value = tempList;
- return tempList;
- };
+ stateVideo.value = { ...stateVideo.value, ...data };
- const updateVideoData = (data, index) => {
- const localIndex = Object.keys(statePlaylist.value).find((entry) => statePlaylist.value[entry].index == index);
+ stateFolder.value = {
+ ...stateFolder.value,
+ videos: stateFolder.value.videos.map((video) => {
+ return video.id === stateVideo.value.id ? stateVideo.value : video;
+ }),
+ };
+ }
- if (localIndex) {
- statePlaylist.value[localIndex] = { ...data };
- }
- };
+ async function updateFolderData(data) {
+ if (!data) return;
- const updateFolderData = (data, id) => {
- const localIndex = Object.keys(stateDirectory.value.folders).find((entry) => stateDirectory.value.folders[entry].id == id);
+ stateFolder.value = { ...stateFolder.value, series: { ...data } };
- if (localIndex) {
- stateDirectory.value.folders[localIndex] = { ...stateDirectory.value.folders[localIndex], series: { ...data } };
- }
- };
+ stateDirectory.value = {
+ ...stateDirectory.value,
+ folders: stateDirectory.value.folders.map((folder) => {
+ return folder.id === stateFolder.value.id ? { ...folder, series: { ...data } } : folder;
+ }),
+ };
+ }
+
+ //#endregion
return {
// folders,
- records,
+ stateRecords,
stateDirectory,
stateFolder,
stateVideo,
searchQuery,
- filterQuery,
stateFilteredPlaylist,
getRecords,
createRecord,
@@ -270,7 +289,6 @@ export const useContentStore = defineStore('Content', () => {
updateViewCount,
updateVideoData,
updateFolderData,
- playlistSeek,
playlistFind,
playlistSort,
};
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index 468d0acc..d1d2c4dd 100755
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -21,12 +21,12 @@ const confirmModal = useModal({ title: 'Delete Record?', submitText: 'Confim' })
const searchQuery = ref('');
const { pageTitle, selectedSideBar } = storeToRefs(appStore);
-const { records } = storeToRefs(ContentStore);
+const { stateRecords } = storeToRefs(ContentStore);
const { getRecords, deleteRecord, recordsSort } = ContentStore;
const filteredRecords = computed(() => {
let tempList = searchQuery.value
- ? records.value.filter((video) => {
+ ? stateRecords.value.filter((video) => {
{
try {
let strRepresentation = [video.relationships?.video_name, video.relationships?.folder_name, video.created_at]
@@ -39,7 +39,7 @@ const filteredRecords = computed(() => {
}
}
})
- : records.value;
+ : stateRecords.value;
return tempList;
});
diff --git a/routes/api.php b/routes/api.php
index c1925db3..3974c1a8 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -33,9 +33,9 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::post('/login', [AuthController::class, 'login']); // Deprecate
Route::post('/register', [AuthController::class, 'register']); // Deprecate
-Route::post('/videos', [VideoController::class, 'getFrom']);
Route::patch('/videos/watch/{video}', [VideoController::class, 'watch']);
-Route::post('/folders', [FolderController::class, 'getFrom']);
+Route::get('/folders', [FolderController::class, 'getFrom']);
+Route::get('/videos', [VideoController::class, 'getFrom']);
Route::resource('/videos', VideoController::class)->only(['show', 'update']);
Route::resource('/folders', FolderController::class)->only(['show']);
@@ -43,4 +43,4 @@ Route::resource('/categories', CategoryController::class)->only(['show']);
Route::resource('/playback', PlaybackController::class)->only(['store']);
Route::get('/{dir}', [DirectoryController::class, 'showDirectoryAPI']);
-Route::get('/{dir}/{folderName}', [DirectoryController::class, 'showDirectoryAPI']);
\ No newline at end of file
+Route::get('/{dir}/{folderName}', [DirectoryController::class, 'showDirectoryAPI']);