Skip to content

A self-hosted media server and file management system

working editing but datepicker is overflow

aminnausin145b511c0457
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.php
index 17d4cc89..fae86766 100644
--- a/app/Http/Controllers/Api/V1/MetadataController.php
+++ b/app/Http/Controllers/Api/V1/MetadataController.php
@@ -23,12 +23,15 @@ class MetadataController extends Controller
try {
$validated = $request->validated();
- $existingData = Metadata::where('video_id', $request->video_id)->first();
- if($existingData) return $this->error($existingData, 'Metadata already exists for this video!', 500);
-
$video = Video::where('id', $request->video_id)->first();
if(!$video) return $this->error(null, 'Video does not exist', 404);
+ $videoInUse = Metadata::where('video_id', $request->video_id)->first();
+ if($videoInUse) return $this->error($videoInUse, 'Metadata already exists for this video!', 500);
+
+ $metadataExists = Metadata::where('composite_id', $video->folder->path . "/" . basename($video->path))->first();
+ if($metadataExists) return $this->error($metadataExists, 'Metadata already exists for another video!', 500);
+
$validated['editor_id'] = Auth::user()->id;
$validated['composite_id'] = $video->folder->path . "/" . basename($video->path);
diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.php
index 1d5b3fe7..f5a6d383 100644
--- a/app/Http/Controllers/Api/V1/SeriesController.php
+++ b/app/Http/Controllers/Api/V1/SeriesController.php
@@ -49,8 +49,8 @@ class SeriesController extends Controller
public function store(SeriesStoreRequest $request)
{
try {
- $validated = $request->validated($request);
-
+ $validated = $request->validated();
+
$folder = Folder::where('id', $request->folder_id)->first();
if(!$folder) return $this->error(null, 'Folder does not exist', 404);
@@ -60,7 +60,6 @@ class SeriesController extends Controller
$seriesExists = Series::where('composite_id', $folder->path)->first();
if($seriesExists) return $this->error($seriesExists, 'Series already exists for another folder!', 500);
- $validated['folder_id'] = $folder->id;
$validated['editor_id'] = Auth::user()->id;
$validated['composite_id'] = $folder->path;
$series = Series::create($validated);
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 04c5aa95..2be92429 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -83,7 +83,7 @@ class DirectoryController extends Controller
}
$videoList = VideoResource::collection( Video::where('folder_id', $folderRaw->id)->get());
- $data['folder'] = array('id'=>$folderRaw->id, 'name'=>$folderRaw->name, 'series'=>(isset($folderRaw->series) ? new SeriesResource($folderRaw->series) : null), 'videos'=>$videoList);
+ $data['folder'] = array('id'=>$folderRaw->id, 'name'=>$folderRaw->name, 'videos'=>$videoList, 'series'=>(isset($folderRaw->series) ? new SeriesResource($folderRaw->series) : null));
return $this->success($data, '', 200);
diff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.php
index 79dc8859..4ffde03b 100755
--- a/app/Http/Resources/FolderResource.php
+++ b/app/Http/Resources/FolderResource.php
@@ -23,8 +23,8 @@ class FolderResource extends JsonResource
],
'relationships' => [
'category_id' => (string)$this->category->id,
- 'series' => $this->series
- ]
+ ],
+ 'series' => $this->series
];
}
}
diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vue
index c55d81c1..6208488d 100644
--- a/resources/js/components/forms/EditFolder.vue
+++ b/resources/js/components/forms/EditFolder.vue
@@ -120,8 +120,6 @@ const form = useForm({
const handleSubmit = async () => {
form.submit(
async (fields) => {
- console.log(fields);
-
if(!props.folder?.series?.id){
return mediaAPI.createSeries(fields);
}
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vue
index cbb216cc..fc512885 100755
--- a/resources/js/components/forms/EditVideo.vue
+++ b/resources/js/components/forms/EditVideo.vue
@@ -72,10 +72,11 @@ const handleSubmit = async () => {
console.log(props.video);
return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);
- // if(props.video.metadata){
- // return mediaAPI.updateMetadata(props.video.metadata.id, fields);
+ // if(props.video.relationships.metadata.id){
+ // return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);
// }
- // else return mediaAPI.updateVideo(props.video.id, fields);
+
+ // else return mediaAPI.createMetadata(props.video.id, fields);
},
{
onSuccess: (response) => {
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 37213012..4c2e9380 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -20,7 +20,7 @@ const ContentStore = useContentStore();
const AuthStore = useAuthStore();
const { stateVideo, stateFolder } = storeToRefs(ContentStore);
const { userData } = storeToRefs(AuthStore);
-const { updateVideoData } = ContentStore;
+const { updateVideoData, updateFolderData } = ContentStore;
const defaultDescription = `After defeating the
@@ -61,13 +61,15 @@ const handleVideoDetailsUpdate = (res) => {
const handleSeriesUpdate = (res) => {
if (res?.data) {
stateFolder.value = { ...stateFolder.value, series: {...res.data} }
+
+ updateFolderData(res.data, stateFolder.value.id);
}
- console.log(stateFolder?.series?.thumbnail_url);
editFolderModal.toggleModal(false);
}
watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true });
+// watch(() => stateFolder.value, () => {console.log(stateFolder.value);}, { immediate: true, deep: true });
</script>
<template>
diff --git a/resources/js/service/mediaAPI.js b/resources/js/service/mediaAPI.js
index e220b074..a0786800 100755
--- a/resources/js/service/mediaAPI.js
+++ b/resources/js/service/mediaAPI.js
@@ -16,6 +16,9 @@ export default{
updateVideo(id,data){
return API.patch(`/videos/${id}`, data)
},
+ createMetadata(data){
+ return API.post(`/metadata/`, data)
+ },
updateMetadata(id,data){
return API.patch(`/metadata/${id}`, data)
},
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index 38ae78e2..7922602a 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -23,7 +23,7 @@ export const useContentStore = defineStore('Content', () => {
const fullRecordsLoaded = ref(false);
const stateDirectory = ref({id:7, name:'anime', folders: []})
- const stateFolder = ref({id:7, name:'ODDTAXI', videos: []})
+ const stateFolder = ref({id:7, name:'ODDTAXI', videos: [], series: null})
const statePlaylist = ref([]);
const stateFilteredPlaylist = ref([]);
@@ -144,7 +144,11 @@ export const useContentStore = defineStore('Content', () => {
console.log(error ?? data?.message);
return Promise.reject(false);
}
- stateFolder.value = {id: nextFolder.id, name: nextFolder.attributes.name, videos: data.data};
+
+ console.log(nextFolder);
+
+
+ stateFolder.value = {id: nextFolder.id, name: nextFolder.attributes.name, videos: data.data, series: nextFolder.series ?? null};
pageTitle.value = stateFolder.value.name;
InitPlaylist();
@@ -237,6 +241,14 @@ export const useContentStore = defineStore('Content', () => {
}
}
+ const updateFolderData = (data, id) => {
+ const localIndex = Object.keys(stateDirectory.value.folders).find((entry) => stateDirectory.value.folders[entry].id == id);
+
+ if(localIndex) {
+ stateDirectory.value.folders[localIndex] = {...stateDirectory.value.folders[localIndex], series: {...data}};
+ }
+ }
+
watch(searchQuery, playlistFilter, {immediate: false});
return {
@@ -246,6 +258,7 @@ export const useContentStore = defineStore('Content', () => {
getRecords, createRecord, deleteRecord, recordsSort,
getCategory, getFolder,
updateViewCount, updateVideoData,
+ updateFolderData,
playlistSeek, playlistFind, playlistSort
};
});
\ No newline at end of file