Use NAS as primary storage — direct upload when enabled

When NAS storage is enabled, uploaded files go directly to the NAS share
(users/{username}/videos/{title-slug}/) with no permanent local copy kept.
Thumbnails and video are fetched from NAS on demand for streaming/playback.
When NAS is disabled, files are organised into the same directory schema
in local storage.

- VideoController: branch upload flow on NAS enabled/disabled
- NasSyncService: add uploadDirectToNas() for direct NAS writes,
  organizeLocalFiles() for local NAS-schema, localVideoDir() resolver,
  deleteLocalAssets() for post-sync cleanup
- GenerateHlsJob: download from NAS via ensureLocalCopy() when local
  file is absent (NAS-primary mode); clean up temp after HLS generation
- CompressVideoJob: place compressed file alongside original (any dir)
- Video/VideoSlide models: localVideoPath(), localThumbnailPath(),
  thumbnailStorageKey(), localPath(), storageKey() helpers for
  format-agnostic path resolution (old flat paths + new NAS-schema paths)
- MediaController: serve thumbnails from NAS-mirrored paths with NAS fallback
- SuperAdminController: use model path helpers for file deletion
- NasFreeLocalStorage: scan new users/ tree in addition to legacy flat dirs
- Settings: rename "NAS Storage Sync" tab to "NAS Storage", update description

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

app/Http/Controllers/VideoController.php

@@ -254,16 +254,56 @@ class VideoController extends Controller
             ]);
         }
 
-        if (! $isAudioUpload) {
-            CompressVideoJob::dispatch($video)
-                ->onQueue('video-processing')
-                ->onConnection('database');
-        }
+        $nas = app(\App\Services\NasSyncService::class);
 
-        try {
-            NasSyncVideoJob::dispatch($video);
-        } catch (\Throwable $e) {
-            \Illuminate\Support\Facades\Log::warning('NasSyncVideoJob dispatch failed: ' . $e->getMessage());
+        if ($nas->isEnabled()) {
+            // ── NAS-primary: push directly to NAS, delete local temp files ──
+            try {
+                $video->load('slides');
+
+                // Build slide abs-paths map for audio uploads
+                $slideAbsPaths = [];
+                foreach ($slideFiles as $pos => $fname) {
+                    $slideAbsPaths[$pos] = storage_path('app/public/thumbnails/' . $fname);
+                }
+
+                $tempThumbAbs = $thumbnailPath ? storage_path('app/' . $thumbnailPath) : null;
+                // For audio, thumbnail IS slide 0 — don't pass separately (handled via slides)
+                if ($isAudioUpload) $tempThumbAbs = null;
+
+                $nas->uploadDirectToNas(
+                    $video,
+                    storage_path('app/' . $path),
+                    $tempThumbAbs,
+                    $slideAbsPaths
+                );
+                $video->refresh();
+            } catch (\Throwable $e) {
+                \Log::error('uploadDirectToNas failed: ' . $e->getMessage());
+            }
+
+            // For non-audio: HLS generation still runs (downloads from NAS, keeps HLS local)
+            if (! $isAudioUpload) {
+                \App\Jobs\GenerateHlsJob::dispatch($video->fresh())
+                    ->onQueue('video-processing')
+                    ->onConnection('database');
+            }
+        } else {
+            // ── Local storage: move into NAS-mirrored local directory schema ──
+            try {
+                $video->load('slides');
+                $nas->organizeLocalFiles($video);
+                $video->refresh();
+            } catch (\Throwable $e) {
+                \Log::error('organizeLocalFiles failed: ' . $e->getMessage());
+            }
+
+            // Compress + HLS pipeline for local storage
+            if (! $isAudioUpload) {
+                CompressVideoJob::dispatch($video)
+                    ->onQueue('video-processing')
+                    ->onConnection('database');
+            }
         }
 
         $video->load('user');
@@ -450,7 +490,7 @@ class VideoController extends Controller
 
         $slides = $video->slides()->orderBy('position')->get()->map(fn($s) => [
             'id'  => $s->id,
-            'url' => asset('storage/thumbnails/' . $s->filename),
+            'url' => $s->url,
         ])->values();
 
         return response()->json([
@@ -460,7 +500,7 @@ class VideoController extends Controller
                 'title'          => $video->title,
                 'description'    => $video->description,
                 'thumbnail'      => $video->thumbnail,
-                'thumbnail_url'  => $video->thumbnail ? asset('storage/thumbnails/'.$video->thumbnail) : null,
+                'thumbnail_url'  => $video->thumbnail_url,
                 'visibility'     => $video->visibility ?? 'public',
                 'type'           => $video->type ?? 'generic',
                 'download_access' => $video->download_access,
@@ -492,11 +532,23 @@ class VideoController extends Controller
 
         if ($request->hasFile('thumbnail')) {
             if ($video->thumbnail) {
-                Storage::delete('public/thumbnails/'.$video->thumbnail);
+                Storage::delete($video->thumbnailStorageKey());
+            }
+            if (str_starts_with($video->path, 'users/')) {
+                // New-format video: store thumbnail in the video's local dir
+                $nas      = app(\App\Services\NasSyncService::class);
+                $localDir = $nas->localVideoDir($video);
+                @mkdir($localDir, 0755, true);
+                $ext      = $request->file('thumbnail')->getClientOriginalExtension();
+                $request->file('thumbnail')->move($localDir, "thumb.{$ext}");
+                $userSlug = $nas->userSlug($video->user);
+                $data['thumbnail'] = 'users/' . $userSlug . '/videos/' . basename($localDir) . "/thumb.{$ext}";
+            } else {
+                // Legacy video: keep in flat thumbnails dir
+                $thumbFilename = self::generateFilename($request->file('thumbnail')->getClientOriginalExtension());
+                $data['thumbnail'] = $request->file('thumbnail')->storeAs('public/thumbnails', $thumbFilename);
+                $data['thumbnail'] = basename($data['thumbnail']);
             }
-            $thumbFilename = self::generateFilename($request->file('thumbnail')->getClientOriginalExtension());
-            $data['thumbnail'] = $request->file('thumbnail')->storeAs('public/thumbnails', $thumbFilename);
-            $data['thumbnail'] = basename($data['thumbnail']);
         }
 
         if (! isset($data['visibility'])) {
@@ -510,8 +562,8 @@ class VideoController extends Controller
             $keptOrder = json_decode($request->input('slides_order', '[]'), true) ?: [];
 
             // Delete slides not in the kept list
-            $video->slides()->whereNotIn('id', $keptOrder)->each(function ($slide) {
-                Storage::delete('public/thumbnails/' . $slide->filename);
+            $video->slides()->whereNotIn('id', $keptOrder)->each(function ($slide) use (&$slidesChanged) {
+                Storage::delete($slide->storageKey());
                 $slide->delete();
                 $slidesChanged = true;
             });
@@ -526,10 +578,27 @@ class VideoController extends Controller
             // Add new slides
             if ($request->hasFile('slides_add')) {
                 $nextPos = count($keptOrder);
+                $isNewFormat = str_starts_with($video->path, 'users/');
+                if ($isNewFormat) {
+                    $nas      = app(\App\Services\NasSyncService::class);
+                    $localDir = $nas->localVideoDir($video);
+                    @mkdir("{$localDir}/slides", 0755, true);
+                    $userSlug = $nas->userSlug($video->user);
+                    $relDir   = 'users/' . $userSlug . '/videos/' . basename($localDir);
+                }
                 foreach ($request->file('slides_add') as $file) {
-                    $fname = self::generateFilename($file->getClientOriginalExtension());
-                    $file->storeAs('public/thumbnails', $fname);
-                    VideoSlide::create(['video_id' => $video->id, 'filename' => $fname, 'position' => $nextPos++]);
+                    if ($isNewFormat) {
+                        // Create placeholder record to get the auto-increment ID
+                        $slide = VideoSlide::create(['video_id' => $video->id, 'filename' => '__pending__', 'position' => $nextPos]);
+                        $ext   = $file->getClientOriginalExtension();
+                        $file->move("{$localDir}/slides", "{$slide->id}.{$ext}");
+                        $slide->update(['filename' => "{$relDir}/slides/{$slide->id}.{$ext}"]);
+                    } else {
+                        $fname = self::generateFilename($file->getClientOriginalExtension());
+                        $file->storeAs('public/thumbnails', $fname);
+                        VideoSlide::create(['video_id' => $video->id, 'filename' => $fname, 'position' => $nextPos]);
+                    }
+                    $nextPos++;
                     $slidesChanged = true;
                 }
             }
@@ -601,9 +670,9 @@ class VideoController extends Controller
             'details'       => ['owner_id' => $video->user_id, 'type' => $video->type],
         ]);
 
-        Storage::delete('public/videos/'.$video->filename);
+        Storage::delete($video->path);
         if ($video->thumbnail) {
-            Storage::delete('public/thumbnails/'.$video->thumbnail);
+            Storage::delete($video->thumbnailStorageKey());
         }
 
         $nasSync = app(\App\Services\NasSyncService::class);
@@ -694,7 +763,7 @@ class VideoController extends Controller
             abort(404, 'Video not found');
         }
 
-        $path = storage_path('app/public/videos/'.$video->filename);
+        $path = $video->localVideoPath();
 
         // If not on local disk, try to pull from NAS (primary storage when NAS is enabled)
         if (! file_exists($path)) {
@@ -822,7 +891,7 @@ class VideoController extends Controller
         $this->checkDownloadAccess($video);
         $this->recordDownload($video, 'video');
 
-        $path = storage_path('app/public/videos/' . $video->filename);
+        $path = $video->localVideoPath();
 
         // If not on local disk, try to pull from NAS
         if (! file_exists($path)) {
@@ -875,7 +944,7 @@ class VideoController extends Controller
 
         $ffmpeg  = \App\Models\Setting::ffmpegBinary();
         $ffprobe = config('ffmpeg.ffprobe', '/usr/bin/ffprobe');
-        $audioPath = storage_path('app/public/videos/' . $video->filename);
+        $audioPath = $video->localVideoPath();
 
         if (! file_exists($audioPath)) {
             return response()->json(['error' => 'Audio file not found'], 404);
@@ -918,9 +987,7 @@ class VideoController extends Controller
         }
 
         $slides      = $video->slides()->orderBy('position')->get();
-        $validSlides = $slides->filter(fn($s) => file_exists(
-            storage_path('app/public/thumbnails/' . $s->filename)
-        ))->values();
+        $validSlides = $slides->filter(fn($s) => file_exists($s->localPath()))->values();
 
         $scale = 'scale=1280:720:force_original_aspect_ratio=decrease,'
                . 'pad=1280:720:(ow-iw)/2:(oh-ih)/2:color=black,format=yuv420p';
@@ -941,7 +1008,7 @@ class VideoController extends Controller
             $inputs = '';
             $scaleFc = [];
             foreach ($validSlides as $i => $slide) {
-                $imgPath  = storage_path('app/public/thumbnails/' . $slide->filename);
+                $imgPath  = $slide->localPath();
                 $inputs  .= ' -loop 1 -t ' . number_format($T + 1, 3) . ' -i ' . escapeshellarg($imgPath);
                 $scaleFc[] = "[{$i}:v]{$scale}[s{$i}]";
             }
@@ -966,7 +1033,7 @@ class VideoController extends Controller
                  . ' -c:a aac -b:a 192k -movflags +faststart -shortest';
 
         } elseif ($validSlides->count() === 1) {
-            $imgPath = storage_path('app/public/thumbnails/' . $validSlides->first()->filename);
+            $imgPath = $validSlides->first()->localPath();
             $cmd = "{$ffmpeg} -y"
                  . ' -loop 1 -r 1 -i ' . escapeshellarg($imgPath)
                  . ' -i ' . escapeshellarg($audioPath)
@@ -1057,7 +1124,7 @@ class VideoController extends Controller
     {
         $this->checkDownloadAccess($video);
 
-        $path = storage_path('app/public/videos/' . $video->filename);
+        $path = $video->localVideoPath();
 
         if (! file_exists($path)) {
             abort(404, 'Video file not found.');
@@ -1274,8 +1341,8 @@ class VideoController extends Controller
     {
         // If video has a thumbnail, convert + resize to a small JPEG for WhatsApp/social previews
         if ($video->thumbnail) {
-            $path = storage_path('app/public/thumbnails/' . $video->thumbnail);
-            if (file_exists($path)) {
+            $path = $video->localThumbnailPath();
+            if ($path && file_exists($path)) {
                 $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION));
                 // Load source image via GD
                 $src = match($ext) {