A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix metadata composite id including media/
aminnausinb452fb450f91
diff --git a/app/Jobs/CleanFolderPaths.php b/app/Jobs/CleanFolderPaths.phpindex 12ef439e..e48170f6 100644--- a/app/Jobs/CleanFolderPaths.php+++ b/app/Jobs/CleanFolderPaths.php@@ -47,7 +47,7 @@ class CleanFolderPaths implements ShouldQueue$stored = $folder->toArray();- if(strpos($stored['path'], '\\')){+ if (strpos($stored['path'], '\\')) {$newPath = str_replace('\\\\', '/', $stored['path']); // Replace double back-slashes first$newPath = str_replace('\\', '/', $newPath); // Replace single back-slashes$changes['path'] = $newPath;@@ -71,8 +71,8 @@ class CleanFolderPaths implements ShouldQueue$dataCache = Storage::json('public/dataCache.json') ?? array();$dataCache[date("Y-m-d-h:i:sa")] = array(- "job" => "cleanFolderPaths",- "message" => $msg,+ "job" => "cleanFolderPaths",+ "message" => $msg,"data" => $transactions,);Storage::disk('public')->put('dataCache.json', json_encode($dataCache, JSON_UNESCAPED_SLASHES));diff --git a/app/Jobs/CleanVideoPaths.php b/app/Jobs/CleanVideoPaths.phpindex 1c1fecf4..01932ba0 100644--- a/app/Jobs/CleanVideoPaths.php+++ b/app/Jobs/CleanVideoPaths.php@@ -33,7 +33,7 @@ class CleanVideoPaths implements ShouldQueuereturn;}- if(count($this->videos) == 0){+ if (count($this->videos) == 0) {dump('Video Data Lost');return;}@@ -46,17 +46,16 @@ class CleanVideoPaths implements ShouldQueue$changes = array();$stored = $video->toArray();-- if(strpos($stored['path'], '\\')){++ if (strpos($stored['path'], '\\')) {$newPath = str_replace('\\\\', '/', $stored['path']); // Replace double back-slashes first$newPath = str_replace('\\', '/', $newPath); // Replace single back-slashes$changes['path'] = $newPath;}- if(count($changes) > 0){+ if (count($changes) > 0) {array_push($transactions, [...$stored, ...$changes]);}-} catch (\Throwable $th) {dump('Error cannot clean file path ' . $th->getMessage() . ' Cancelling ' . count($transactions) . ' updates');$error = true;@@ -64,7 +63,7 @@ class CleanVideoPaths implements ShouldQueue}}- if(count($transactions) == 0 || $error == true) return;+ if (count($transactions) == 0 || $error == true) return;Video::upsert($transactions, 'id', ['path']);$msg = 'Updated ' . count($transactions) . ' video path(s) from id ' . ($transactions[0]['id']) . ' to ' . ($transactions[count($transactions) - 1]['id']);@@ -72,11 +71,10 @@ class CleanVideoPaths implements ShouldQueue$dataCache = Storage::json('public/dataCache.json') ?? array();$dataCache[date("Y-m-d-h:i:sa")] = array(- "job"=>"cleanVideoPaths",- "message"=>$msg,- "data"=>$transactions,+ "job" => "cleanVideoPaths",+ "message" => $msg,+ "data" => $transactions,);Storage::disk('public')->put('dataCache.json', json_encode($dataCache, JSON_UNESCAPED_SLASHES));}}-diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.phpindex 0f99e8ed..b2ad450f 100755--- a/app/Jobs/IndexFiles.php+++ b/app/Jobs/IndexFiles.php@@ -37,29 +37,30 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique$this->generateData();}- public function generateData() {+ public function generateData()+ {$path = "public/media/";$dbOut = "";- if(!Storage::exists($path)){+ if (!Storage::exists($path)) {$error = 'Invalid Directory: "media"';-- dd(json_encode(array("success"=>false, "result"=>"", "error"=>$error), JSON_UNESCAPED_SLASHES));++ dd(json_encode(array("success" => false, "result" => "", "error" => $error), JSON_UNESCAPED_SLASHES));}$realPath = Storage::path($path);- $directories = $this->generateCategories($realPath);+ $directories = $this->generateCategories($realPath);$subDirectories = $this->generateFolders($path, $directories["data"]["categoryStructure"]);$files = $this->generateVideos($path, $subDirectories["data"]["folderStructure"], $directories["data"]["categoryStructure"]);- if(isset($files["updatedFolderStructure"])) $subDirectories["data"]["folderStructure"] = $files["updatedFolderStructure"];+ if (isset($files["updatedFolderStructure"])) $subDirectories["data"]["folderStructure"] = $files["updatedFolderStructure"];$categories = $directories["categoryChanges"];$folders = $subDirectories["folderChanges"];$videos = $files["videoChanges"];-+$seriesEntries = $subDirectories["seriesChanges"];$metaDataEntries = $files["metadataChanges"];@@ -76,46 +77,44 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique$videoDeletions = array();- foreach ($categories as $categoryChange){ // for each in stored, remove from new (delete)+ foreach ($categories as $categoryChange) { // for each in stored, remove from new (delete)$changeID = $categoryChange['id'];$changeName = $categoryChange["name"];$changeMediaContent = $categoryChange["media_content"] ?? 'False';$changeAction = $categoryChange["action"];- if($changeAction === "INSERT"){+ if ($changeAction === "INSERT") {$dbOut .= "INSERT INTO [Categories] VALUES ($changeID, $changeName, $changeMediaContent );\n"; // insert$transaction = $categoryChange;unset($transaction["action"]);array_push($categoryTransactions, $transaction);- }- else{+ } else {$dbOut .= "DELETE FROM [Categories] WHERE [Categories].[ID] = {$changeID};\n";array_push($categoryDeletions, $changeID);}}- foreach ($folders as $folderChange){ // for each in stored, remove from new (delete)+ foreach ($folders as $folderChange) { // for each in stored, remove from new (delete)$changeID = $folderChange['id'];$changeName = $folderChange["name"];$changePath = $folderChange["path"];$changeCategoryID = $folderChange["category_id"];$changeAction = $folderChange["action"];- if($changeAction === "INSERT"){+ if ($changeAction === "INSERT") {$dbOut .= "INSERT INTO [Folders] VALUES ({$changeID}, {$changeName}, {$changePath}, {$changeCategoryID} );\n"; // insert$transaction = $folderChange;unset($transaction["action"]);array_push($folderTransactions, $transaction);- }- else{+ } else {$dbOut .= "DELETE FROM [Folders] WHERE [Folder].[ID] = {$changeID};\n";array_push($folderDeletions, $changeID);}}- foreach ($seriesEntries as $seriesChange){ // log series additions+ foreach ($seriesEntries as $seriesChange) { // log series additions$folderID = $seriesChange['folder_id'];$compositeID = $seriesChange["composite_id"];@@ -124,7 +123,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUniquearray_push($seriesTransactions, $seriesChange);}- foreach ($videos as $videoChange){ // for each in stored, remove from new (delete)+ foreach ($videos as $videoChange) { // for each in stored, remove from new (delete)$changeID = $videoChange['id'];$changeName = $videoChange["name"];$changePath = $videoChange["path"];@@ -132,20 +131,19 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique$changeDate = $videoChange["date"];$changeAction = $videoChange["action"];- if($changeAction === "INSERT"){+ if ($changeAction === "INSERT") {$dbOut .= "INSERT INTO [Videos] VALUES ({$changeID}, {$changeName}, {$changePath}, {$changeFolderID}, {$changeDate} );\n"; // insert$transaction = $videoChange;unset($transaction["action"]);array_push($videoTransactions, $transaction);- }- else{+ } else {$dbOut .= "DELETE FROM [Videos] WHERE [Video].[ID] = {$changeID};\n";array_push($videoDeletions, $changeID);}}- foreach ($metaDataEntries as $metadataChange){ // log metadata additions+ foreach ($metaDataEntries as $metadataChange) { // log metadata additions$videoID = $metadataChange['video_id'];$compositeID = $metadataChange["composite_id"];@@ -158,7 +156,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUniqueVideo::destroy($videoDeletions);Folder::destroy($folderDeletions);Category::destroy($categoryDeletions);-+// Series::upsert(['folder_id'=>1,'composite_id'=>'anime/frieren'], 'composite_id', ['folder_id']);// Metadata::upsert(['video_id'=>1,'composite_id'=>'anime/frieren/S1E02.mp4'], 'composite_id', ['video_id']);@@ -168,25 +166,26 @@ class IndexFiles implements ShouldQueue, ShouldBeUniqueVideo::insert($videoTransactions);Metadata::upsert($metadataTransactions, 'composite_id', ['video_id']);- // One day logging should be put in the database+ // // One day logging should be put in the databaseStorage::disk('public')->put('categories.json', json_encode($directories["data"], JSON_UNESCAPED_SLASHES));Storage::disk('public')->put('folders.json', json_encode($subDirectories["data"], JSON_UNESCAPED_SLASHES));Storage::disk('public')->put('videos.json', json_encode($files["data"], JSON_UNESCAPED_SLASHES));- $data = array("categories"=>$categories,"folders"=>$folders,"videos"=>$videos);+ $data = array("categories" => $categories, "folders" => $folders, "videos" => $videos);$dataCache = Storage::json('public/dataCache.json') ?? array();- $dataCache[date("Y-m-d-h:i:sa")] = array("job"=>"index", "data"=>$data);+ $dataCache[date("Y-m-d-h:i:sa")] = array("job" => "index", "data" => $data);// TODO: stop adding empty data cache entries if the last entry was also empty. Need to check last one but popping removes it and loses the key so I cannot add it back on if it wasnt empty.-+Storage::disk('public')->put('dataCache.json', json_encode($dataCache, JSON_UNESCAPED_SLASHES));dump('Categories | Folders | Videos | Data | SQL | DataCache', $directories, $subDirectories, $files, $data, $dbOut, $dataCache);}- private function generateCategories($path){- $data = Storage::json('public/categories.json') ?? array("next_ID"=>1, "categoryStructure" => array()); //array("anime"=>1,"tv"=>2,"yogscast"=>3); // read from json+ private function generateCategories($path)+ {+ $data = Storage::json('public/categories.json') ?? array("next_ID" => 1, "categoryStructure" => array()); //array("anime"=>1,"tv"=>2,"yogscast"=>3); // read from json$scanned = array_map("htmlspecialchars", scandir($path)); // read folder structure$currentID = $data["next_ID"];@@ -206,39 +205,39 @@ class IndexFiles implements ShouldQueue, ShouldBeUniquesave current to json*/- foreach ($scanned as $local){ // O(n) where n = number of already known categories- if(is_dir($local)) continue; //? . and .. are dirs+ foreach ($scanned as $local) { // O(n) where n = number of already known categories+ if (is_dir($local)) continue; //? . and .. are dirs$name = basename($local);- if(isset($stored[$name])){ // If scanned is in stored, add to current, remove from stored+ if (isset($stored[$name])) { // If scanned is in stored, add to current, remove from stored$current[$name] = $stored[$name]; // add to currentunset($stored[$name]); // remove from stored- }- else{ // If scanned not in stored, add to current, add to new (insert), id++- $generated = array("id"=>$currentID,"name"=>$name,"media_content"=>'False', "action"=>"INSERT");+ } else { // If scanned not in stored, add to current, add to new (insert), id+++ $generated = array("id" => $currentID, "name" => $name, "media_content" => 'False', "action" => "INSERT");$current[$name] = $currentID; // add to currentarray_push($changes, $generated); // add to new (insert)$currentID++;}}- foreach ($stored as $remainingID){- $generated = array("id"=>$remainingID,"name"=>null,"media_content"=>null, "action"=>"DELETE"); // delete by id+ foreach ($stored as $remainingID) {+ $generated = array("id" => $remainingID, "name" => null, "media_content" => null, "action" => "DELETE"); // delete by idarray_push($changes, $generated); // add to new (delete)}$data["next_ID"] = $currentID;$data["categoryStructure"] = $current;- return array("categoryChanges"=> $changes, "data" => $data);+ return array("categoryChanges" => $changes, "data" => $data);}- private function generateFolders($path, $categoryStructure){- $data = Storage::json('public/folders.json') ?? array("next_ID"=>1,"folderStructure"=>array()); //array("anime/frieren"=>array("id"=>0,"name"=>"frieren"),"starwars/andor"=>array("id"=1,"name"="andor")); // read from json+ private function generateFolders($path, $categoryStructure)+ {+ $data = Storage::json('public/folders.json') ?? array("next_ID" => 1, "folderStructure" => array()); //array("anime/frieren"=>array("id"=>0,"name"=>"frieren"),"starwars/andor"=>array("id"=1,"name"="andor")); // read from json$scannedCategories = array_keys($categoryStructure);$cost = 0;-+$currentID = $data["next_ID"];$stored = $data["folderStructure"];$changes = array(); // send to db@@ -275,44 +274,44 @@ class IndexFiles implements ShouldQueue, ShouldBeUniqueforeach ($scannedCategories as $category) { // O(n) where n = number of folders * 2 (for scan)$cost++;-+$folders = Storage::directories("$path/$category"); // Immediate folders (dont scan sub folders)- foreach ($folders as $folder){+ foreach ($folders as $folder) {$cost++;$name = basename($folder);$key = "$category/$name";- if($name === ".thumbs") continue;+ if ($name === ".thumbs") continue;- if(isset($stored[$key])){+ if (isset($stored[$key])) {$current[$key] = $stored[$key]; // add to currentunset($stored[$key]); // remove from stored- }- else{- $generated = array("id"=>$currentID,"name"=>$name,"path"=>$key, "category_id"=>$categoryStructure[$category], "action"=>"INSERT");- $series = array("folder_id"=>$currentID,"composite_id"=>$key);- $current[$key] = array("id"=>$currentID, "last_scan"=>-1); // add to current- array_push($changes, $generated);+ } else {+ $generated = array("id" => $currentID, "name" => $name, "path" => $key, "category_id" => $categoryStructure[$category], "action" => "INSERT");+ $series = array("folder_id" => $currentID, "composite_id" => $key);+ $current[$key] = array("id" => $currentID, "last_scan" => -1); // add to current+ array_push($changes, $generated);array_push($seriesChanges, $series); // add to new (insert)$currentID++;}}}- foreach ($stored as $remainingFolder){- $generated = array("id"=>$remainingFolder['id'],"name"=>null,"path"=>null, "category_id"=>null, "action"=>"DELETE"); // delete by id -> Used to store just ID -> Now store id and last_scan+ foreach ($stored as $remainingFolder) {+ $generated = array("id" => $remainingFolder['id'], "name" => null, "path" => null, "category_id" => null, "action" => "DELETE"); // delete by id -> Used to store just ID -> Now store id and last_scanarray_push($changes, $generated); // add to new (delete)$cost++;}$data["next_ID"] = $currentID;$data["folderStructure"] = $current;- return array("folderChanges"=>$changes, "data" =>$data, "cost"=>$cost, "seriesChanges"=>$seriesChanges);+ return array("folderChanges" => $changes, "data" => $data, "cost" => $cost, "seriesChanges" => $seriesChanges);}- private function generateVideos($path, $folderStructure){- $data = Storage::json('public/videos.json') ?? array("next_ID"=>1,"videoStructure"=>array()); //array("anime/frieren/S1E01.mp4"=>array("id"=>0,"name"=>"S1E01"),"starwars/andor/S1E01.mkv"=>array("id"=1,"name"="S1E01.mkv")); // read from json+ private function generateVideos($path, $folderStructure)+ {+ $data = Storage::json('public/videos.json') ?? array("next_ID" => 1, "videoStructure" => array()); //array("anime/frieren/S1E01.mp4"=>array("id"=>0,"name"=>"S1E01"),"starwars/andor/S1E01.mkv"=>array("id"=1,"name"="S1E01.mkv")); // read from json$scannedFolders = array_keys($folderStructure);$cost = 0;@@ -326,7 +325,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique$foldersCopy = $folderStructure;$unModefiedFolders = array();$rawPath = Storage::path('');-+// foreach ($stored as $savedVideo){ // O(n) where n = number of already known categories// $currentID = max($currentID, $savedVideo + 1); // gets max currently used id// $cost ++;@@ -361,29 +360,28 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique$cost++;$folderAccessTime = filemtime("{$rawPath}public/media/$folder/");- if($folderAccessTime <= $folderStructure[$folder]["last_scan"]){- $unModefiedFolders["storage/". basename($path) . "/$folder"] = 1;+ if ($folderAccessTime <= $folderStructure[$folder]["last_scan"]) {+ $unModefiedFolders["storage/" . basename($path) . "/$folder"] = 1;continue;}$files = Storage::files("$path$folder"); // Immediate folders (dont scan sub folders)$foldersCopy[$folder]['last_scan'] = $folderAccessTime;- foreach ($files as $file){+ foreach ($files as $file) {$cost++;$ext = pathinfo($file, PATHINFO_EXTENSION);- if (strtolower($ext) !== 'mp4' && strtolower($ext) !== 'mkv' ) continue;+ if (strtolower($ext) !== 'mp4' && strtolower($ext) !== 'mkv') continue;$name = basename($file);- $cleanName = basename($file,".$ext");- $key = "storage/". basename($path) . "/$folder/$name";+ $cleanName = basename($file, ".$ext");+ $key = "storage/" . basename($path) . "/$folder/$name";$rawFile = "$rawPath$file";- if(isset($stored[$key])){+ if (isset($stored[$key])) {$current[$key] = $stored[$key]; // add to currentunset($stored[$key]); // remove from stored- }- else{- $generated = array("id"=>$currentID,"name"=>$cleanName,"path"=>$key, "folder_id"=>$folderStructure[$folder]["id"], "date" => date("Y-m-d g:i A", filemtime($rawFile)), "action"=>"INSERT");- $metadata = array("video_id"=>$currentID,"composite_id"=>basename($path) . "/$folder/$name");+ } else {+ $generated = array("id" => $currentID, "name" => $cleanName, "path" => $key, "folder_id" => $folderStructure[$folder]["id"], "date" => date("Y-m-d g:i A", filemtime($rawFile)), "action" => "INSERT");+ $metadata = array("video_id" => $currentID, "composite_id" => "$folder/$name");$current[$key] = $currentID; // add to currentarray_push($changes, $generated); // add to new (insert)array_push($metadataChanges, $metadata); // create metadata (insert)@@ -392,20 +390,20 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique}}- foreach ($stored as $video => $remainingID){ // unseen videos- if(isset($unModefiedFolders[dirname($video)])){ // if folder was not modefied+ foreach ($stored as $video => $remainingID) { // unseen videos+ if (isset($unModefiedFolders[dirname($video)])) { // if folder was not modefied$current[$video] = $stored[$video]; // see videocontinue;- }- $generated = array("id"=>$remainingID,"name"=>null,"path"=>null, "folder_id"=>null, "date" => null, "action"=>"DELETE"); // delete by id+ }+ $generated = array("id" => $remainingID, "name" => null, "path" => null, "folder_id" => null, "date" => null, "action" => "DELETE"); // delete by idarray_push($changes, $generated); // add to new (delete)$cost++;}- if($foldersCopy === $folderStructure) $foldersCopy = null;+ if ($foldersCopy === $folderStructure) $foldersCopy = null;$data["next_ID"] = $currentID;$data["videoStructure"] = $current;- return array("videoChanges"=>$changes, "data" =>$data, "cost"=>$cost, "updatedFolderStructure"=>$foldersCopy, "metadataChanges"=>$metadataChanges);+ return array("videoChanges" => $changes, "data" => $data, "cost" => $cost, "updatedFolderStructure" => $foldersCopy, "metadataChanges" => $metadataChanges);}}diff --git a/app/Jobs/SyncFiles.php b/app/Jobs/SyncFiles.phpindex 279804a3..8b9ea9ec 100755--- a/app/Jobs/SyncFiles.php+++ b/app/Jobs/SyncFiles.php@@ -39,23 +39,24 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique$this->syncCache();}- public function syncCache() {+ public function syncCache()+ {// Idea: Compare categories folders and videos json files with data on sql server. Sync local copies with sql server if this is master storage (ie all files should be available)// -> then if you index files, it should delete sql entries correctly if anything there does not exist locally$path = "public/media/";- if(!Storage::exists($path)){+ if (!Storage::exists($path)) {$error = 'Invalid Directory: "media"';-- dd(json_encode(array("success"=>false, "result"=>"", "error"=>$error), JSON_UNESCAPED_SLASHES));++ dd(json_encode(array("success" => false, "result" => "", "error" => $error), JSON_UNESCAPED_SLASHES));}- $directories = $this->generateCategories();+ $directories = $this->generateCategories();$subDirectories = $this->generateFolders($path);$files = $this->generateVideos($path, $subDirectories["data"]["folderStructure"], $directories["data"]["categoryStructure"]);- if(isset($files["updatedFolderStructure"])) $subDirectories["data"]["folderStructure"] = $files["updatedFolderStructure"];+ if (isset($files["updatedFolderStructure"])) $subDirectories["data"]["folderStructure"] = $files["updatedFolderStructure"];$categories = $directories["categoryChanges"];$folders = $subDirectories["folderChanges"];@@ -65,17 +66,18 @@ class SyncFiles implements ShouldQueue, ShouldBeUniqueStorage::disk('public')->put('folders.json', json_encode($subDirectories["data"], JSON_UNESCAPED_SLASHES));Storage::disk('public')->put('videos.json', json_encode($files["data"], JSON_UNESCAPED_SLASHES));- $data = array("categories"=>$categories,"folders"=>$folders,"videos"=>$videos);-+ $data = array("categories" => $categories, "folders" => $folders, "videos" => $videos);+$dataCache = Storage::json('public/dataCache.json') ?? array();- $dataCache[date("Y-m-d-h:i:sa")] = array("job"=>"sync", "data"=>$data);+ $dataCache[date("Y-m-d-h:i:sa")] = array("job" => "sync", "data" => $data);Storage::disk('public')->put('dataCache.json', json_encode($dataCache, JSON_UNESCAPED_SLASHES));- if(!$this->batch()) dump('Categories | Folders | Videos | Data | dataCache', $directories, $subDirectories, $files, $data, $dataCache);+ if (!$this->batch()) dump('Categories | Folders | Videos | Data | dataCache', $directories, $subDirectories, $files, $data, $dataCache);}- private function generateCategories(){- $data = Storage::json('public/categories.json') ?? array("next_ID"=>1, "categoryStructure" => array()); //array("anime"=>1,"tv"=>2,"yogscast"=>3); // read from json+ private function generateCategories()+ {+ $data = Storage::json('public/categories.json') ?? array("next_ID" => 1, "categoryStructure" => array()); //array("anime"=>1,"tv"=>2,"yogscast"=>3); // read from json$scanned = Category::all(); // read folder structure$currentID = $data["next_ID"];@@ -91,33 +93,33 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique$id = $category->id;$current[$name] = $id;- if(!isset($stored[$name])){+ if (!isset($stored[$name])) {// category is not cached locally// add- array_push($changes, array("id"=>$id,"name"=>$name,"action"=>"ADD"));- }- else if(isset($stored[$name])){- if($stored[$name] != $id){+ array_push($changes, array("id" => $id, "name" => $name, "action" => "ADD"));+ } else if (isset($stored[$name])) {+ if ($stored[$name] != $id) {// category is cached locally but id is not the same// overwrite- array_push($changes, array("id"=>$id,"name"=>$name,"action"=>"OVERWRITE"));+ array_push($changes, array("id" => $id, "name" => $name, "action" => "OVERWRITE"));}// else category is cached locally and id is correct// no actionunset($stored[$name]);}- if($id >= $currentID) $currentID = $id + 1;+ if ($id >= $currentID) $currentID = $id + 1;}$data["next_ID"] = $currentID;$data["categoryStructure"] = $current;- return array("categoryChanges"=> $changes, "data" => $data);+ return array("categoryChanges" => $changes, "data" => $data);}- private function generateFolders($path){- $data = Storage::json('public/folders.json') ?? array("next_ID"=>1,"folderStructure"=>array()); //array("anime/frieren"=>array("id"=>0,"name"=>"frieren"),"starwars/andor"=>array("id"=1,"name"="andor")); // read from json+ private function generateFolders($path)+ {+ $data = Storage::json('public/folders.json') ?? array("next_ID" => 1, "folderStructure" => array()); //array("anime/frieren"=>array("id"=>0,"name"=>"frieren"),"starwars/andor"=>array("id"=1,"name"="andor")); // read from json$cost = 0;$scanned = Folder::all();@@ -132,18 +134,17 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique$path = $folder->path;$name = $folder->name;$id = $folder->id;- $current[$path] = array("id"=>$id,"last_scan"=>-1);+ $current[$path] = array("id" => $id, "last_scan" => -1);- if(!isset($stored[$path])){+ if (!isset($stored[$path])) {// folder is not cached locally// add- array_push($changes, array("id"=>$id,"name"=>$name, "last_scan"=>-1, "action"=>"ADD"));- }- else if(isset($stored[$path])){- if($stored[$path]['id'] != $id || !isset($stored[$path]['last_scan'])){+ array_push($changes, array("id" => $id, "name" => $name, "last_scan" => -1, "action" => "ADD"));+ } else if (isset($stored[$path])) {+ if ($stored[$path]['id'] != $id || !isset($stored[$path]['last_scan'])) {// folder is cached locally but id is not the same// overwrite- array_push($changes, array("id"=>$id,"name"=>$name, "last_scan"=>-1, "action"=>"OVERWRITE"));+ array_push($changes, array("id" => $id, "name" => $name, "last_scan" => -1, "action" => "OVERWRITE"));}// else folder is cached locally and is correct// no action@@ -151,18 +152,19 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique}$cost += 1;- if($id >= $currentID){+ if ($id >= $currentID) {$currentID = $id + 1;}}$data["next_ID"] = $currentID;$data["folderStructure"] = $current;- return array("folderChanges"=> $changes, "data" => $data, "cost"=>$cost);+ return array("folderChanges" => $changes, "data" => $data, "cost" => $cost);}- private function generateVideos($path, $folderStructure){- $data = Storage::json('public/videos.json') ?? array("next_ID"=>1,"videoStructure"=>array()); //array("anime/frieren/S1E01.mp4"=>array("id"=>0,"name"=>"S1E01"),"starwars/andor/S1E01.mkv"=>array("id"=1,"name"="S1E01.mkv")); // read from json+ private function generateVideos($path, $folderStructure)+ {+ $data = Storage::json('public/videos.json') ?? array("next_ID" => 1, "videoStructure" => array()); //array("anime/frieren/S1E01.mp4"=>array("id"=>0,"name"=>"S1E01"),"starwars/andor/S1E01.mkv"=>array("id"=1,"name"="S1E01.mkv")); // read from json$scanned = Video::all();$cost = 0;@@ -182,16 +184,15 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique$id = $video->id;$current[$path] = $id;- if(!isset($stored[$path])){+ if (!isset($stored[$path])) {// video is not cached locally// add- array_push($changes, array("id"=>$id,"name"=>$name,"action"=>"ADD"));- }- else if(isset($stored[$path])){- if($stored[$path] != $id){+ array_push($changes, array("id" => $id, "name" => $name, "action" => "ADD"));+ } else if (isset($stored[$path])) {+ if ($stored[$path] != $id) {// video is cached locally but id is not the same// overwrite- array_push($changes, array("id"=>$id,"name"=>$name,"action"=>"OVERWRITE"));+ array_push($changes, array("id" => $id, "name" => $name, "action" => "OVERWRITE"));}// else video is cached locally and id is correct// no action@@ -199,11 +200,11 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique}$cost += 1;- if($id >= $currentID) $currentID = $id + 1;+ if ($id >= $currentID) $currentID = $id + 1;}$data["next_ID"] = $currentID;$data["videoStructure"] = $current;- return array("videoChanges"=> $changes, "data" => $data, "cost"=>$cost, "updatedFolderStructure"=>$foldersCopy);+ return array("videoChanges" => $changes, "data" => $data, "cost" => $cost, "updatedFolderStructure" => $foldersCopy);}}diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.phpindex 6679902e..32fe996e 100755--- a/app/Jobs/VerifyFiles.php+++ b/app/Jobs/VerifyFiles.php@@ -38,7 +38,7 @@ class VerifyFiles implements ShouldQueuereturn;}- if(count($this->videos) == 0){+ if (count($this->videos) == 0) {dump('Video Data Lost');return;}@@ -59,36 +59,36 @@ class VerifyFiles implements ShouldQueuepreg_match('![0-9]+!', $episodeRaw[0] ?? '', $episode);- if(is_null($metadata->duration)){+ if (is_null($metadata->duration)) {// dump(str_replace('\\', '/', Storage::path('')) . 'public/' . substr($video->path, 8));$ffprobe = FFMpegFFProbe::create();$duration = floor($ffprobe->format(str_replace('\\', '/', Storage::path('')) . 'public/' . substr($video->path, 8)) // extracts file information- ->get('duration'));+ ->get('duration'));$changes['duration'] = $duration;}- if(is_null($metadata->episode) && count($episode) == 1) $changes['episode'] = (int)$episode[0];- if(is_null($metadata->season) && count($season) == 1) $changes['season'] = (int)$season[0];+ if (is_null($metadata->episode) && count($episode) == 1) $changes['episode'] = (int)$episode[0];+ if (is_null($metadata->season) && count($season) == 1) $changes['season'] = (int)$season[0];- if(is_null($metadata->title)){+ if (is_null($metadata->title)) {$newTitle = count($season) == 1 ? 'S' . $season[0] : '';$newTitle .= count($episode) == 1 ? 'E' . $episode[0] : '';- if($newTitle != '') $changes['title'] = $newTitle;+ if ($newTitle != '') $changes['title'] = $newTitle;else $changes['title'] = $video->name;- }+ }is_null($metadata->view_count) ? $changes['view_count'] = Record::where('video_id', $video->id)->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) : $stored['view_count'] = $metadata->view_count;- if(count($changes) > 0){+ if (count($changes) > 0) {array_push($transactions, [...$stored, ...$changes]);// dump([...$stored, ...$changes]);// dump($changes);// dump($video->name);}// dump($metadata->toArray());-+} catch (\Throwable $th) {//throw $th;dump('Error cannot verify file metadata ' . $th->getMessage() . ' Cancelling ' . count($transactions) . ' updates');@@ -98,8 +98,8 @@ class VerifyFiles implements ShouldQueue}try {- if(count($transactions) == 0 || $error == true) return;- Metadata::upsert($transactions, 'id' , ['video_id','title','duration','season','episode','view_count']);+ if (count($transactions) == 0 || $error == true) return;+ Metadata::upsert($transactions, 'id', ['video_id', 'title', 'duration', 'season', 'episode', 'view_count']);// Video::upsert($transactions, 'id', ['title','duration','season','episode','view_count']);dump('Updated ' . count($transactions) . ' videos from id ' . ($transactions[0]['video_id']) . ' to ' . ($transactions[count($transactions) - 1]['video_id']));} catch (\Throwable $th) {@@ -107,4 +107,3 @@ class VerifyFiles implements ShouldQueue}}}-diff --git a/app/Jobs/VerifyFolders.php b/app/Jobs/VerifyFolders.phpindex 6e55b069..5a483e8e 100644--- a/app/Jobs/VerifyFolders.php+++ b/app/Jobs/VerifyFolders.php@@ -33,7 +33,7 @@ class VerifyFolders implements ShouldQueuereturn;}- if(count($this->folders) == 0){+ if (count($this->folders) == 0) {dump('Folder Data Lost');return;}@@ -49,20 +49,20 @@ class VerifyFolders implements ShouldQueue$stored = $series->toArray();- if(is_null($series->episodes)) $changes['episodes'] = Video::where('folder_id', $folder->id)->count();+ if (is_null($series->episodes)) $changes['episodes'] = Video::where('folder_id', $folder->id)->count();- if(is_null($series->title)){+ if (is_null($series->title)) {$changes['title'] = $folder->name;- }+ }- if(count($changes) > 0){+ if (count($changes) > 0) {array_push($transactions, [...$stored, ...$changes]);// dump([...$stored, ...$changes]);// dump($changes);// dump($folder->name);}// dump($series->toArray());-+} catch (\Throwable $th) {//throw $th;dump('Error cannot verify folder series data ' . $th->getMessage() . ' Cancelling ' . count($transactions) . ' updates');@@ -72,8 +72,8 @@ class VerifyFolders implements ShouldQueue}try {- if(count($transactions) == 0 || $error == true) return;- Series::upsert($transactions, 'id' , ['folder_id','title','episodes']);+ if (count($transactions) == 0 || $error == true) return;+ Series::upsert($transactions, 'id', ['folder_id', 'title', 'episodes']);// Video::upsert($transactions, 'id', ['title','duration','season','episode','view_count']);dump('Updated ' . count($transactions) . ' folders from id ' . ($transactions[0]['folder_id']) . ' to ' . ($transactions[count($transactions) - 1]['folder_id']));} catch (\Throwable $th) {@@ -81,4 +81,3 @@ class VerifyFolders implements ShouldQueue}}}-