A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
Fix cache inconsistencies causing mass deletions
aminnausin6402ca4e6140
diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.phpindex 83e86a2b..1f1aa65f 100644--- a/app/Jobs/IndexFiles.php+++ b/app/Jobs/IndexFiles.php@@ -160,7 +160,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique$dataCache[date("Y-m-d-h:i:sa")] = array("job"=>"index", "data"=>$data);Storage::disk('public')->put('dataCache.json', json_encode($dataCache, JSON_UNESCAPED_SLASHES));- dump('Directories | Sub Directories | Files | Data | dbOut | dataCache', $directories, $subDirectories, $files, $data, $dbOut, $dataCache);+ dump('Categories | Folders | Videos | Data | SQL | DataCache', $directories, $subDirectories, $files, $data, $dbOut, $dataCache);}private function generateCategories($path){@@ -332,18 +332,18 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique*/+foreach ($scannedFolders as $folder) { // O(n) where n = number of folders * 2 (for scan)$cost++;$folderAccessTime = filemtime("{$rawPath}public\media\\$folder\\");if($folderAccessTime <= $folderStructure[$folder]["last_scan"]){- $unModefiedFolders[$folder] = 1;+ $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){$cost++;$ext = pathinfo($file, PATHINFO_EXTENSION);@@ -353,7 +353,6 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique$cleanName = basename($file,".$ext");$key = "storage\\". basename($path) . "\\$folder\\$name";$rawFile = "$rawPath$file";-if(isset($stored[$key])){$current[$key] = $stored[$key]; // add to currentunset($stored[$key]); // remove from stored@@ -367,9 +366,9 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique}}- foreach ($stored as $video => $remainingID){- if(isset($unModefiedFolders[dirname($video)])){- $current[$video] = $stored[$video];+ 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 iddiff --git a/app/Jobs/SyncFiles.php b/app/Jobs/SyncFiles.phpindex d0c98d8b..730ebf8a 100644--- a/app/Jobs/SyncFiles.php+++ b/app/Jobs/SyncFiles.php@@ -69,7 +69,7 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique$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));- dump('Directories | Sub Directories | Files | Data | dataCache', $directories, $subDirectories, $files, $data, $dataCache);+ dump('Categories | Folders | Videos | Data | dataCache', $directories, $subDirectories, $files, $data, $dataCache);}private function generateCategories($path){@@ -175,8 +175,8 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique// from database with each video// if that exists locally in stored, overwrite with db data (add to current) if different else add to current// if not exists, add db directly to current- $path = $video->path;$name = $video->name;+ $path = dirname($video->path) . "\\" . basename($video->path);$id = $video->id;$current[$path] = $id;@@ -193,7 +193,6 @@ class SyncFiles implements ShouldQueue, ShouldBeUnique}// else video is cached locally and id is correct// no action-unset($stored[$path]);}