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]>
This commit is contained in:
1 parent
296d605864
commit
6b3ab5b65e
11 files changed
+869
-125
No files matched your search
+28
-10
@@ -33,10 +33,23 @@ class GenerateHlsJob implements ShouldQueue
|
||||
return;
|
||||
}
|
||||
|
||||
$sourcePath = storage_path('app/' . $video->path);
|
||||
if (!file_exists($sourcePath)) {
|
||||
Log::error('GenerateHlsJob: Source file missing', ['path' => $sourcePath]);
|
||||
return;
|
||||
$sourcePath = storage_path('app/' . $video->path);
|
||||
$nasDownloaded = null; // track a NAS-fetched local copy so we can clean it up
|
||||
|
||||
if (! file_exists($sourcePath)) {
|
||||
// NAS-primary mode: file lives on NAS, download a temporary local copy
|
||||
$nas = app(\App\Services\NasSyncService::class);
|
||||
if ($nas->isEnabled()) {
|
||||
$localCopy = $nas->ensureLocalCopy($video);
|
||||
if ($localCopy) {
|
||||
$sourcePath = $localCopy;
|
||||
$nasDownloaded = $localCopy;
|
||||
}
|
||||
}
|
||||
if (! file_exists($sourcePath)) {
|
||||
Log::error('GenerateHlsJob: Source file missing', ['path' => $sourcePath]);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$hlsDir = 'public/hls/' . $video->id;
|
||||
@@ -149,14 +162,19 @@ class GenerateHlsJob implements ShouldQueue
|
||||
'encoder' => $encoder,
|
||||
]);
|
||||
|
||||
// NAS-primary storage: push the final compressed file to NAS (overwriting
|
||||
// the uncompressed copy synced at upload time), then free local disk.
|
||||
// HLS segments are kept local — they're small and serving them locally
|
||||
// avoids per-segment SMB latency during HLS playback.
|
||||
$nas = app(\App\Services\NasSyncService::class);
|
||||
if ($nas->isEnabled()) {
|
||||
$nas->syncVideo($video);
|
||||
$nas->deleteLocalVideo($video);
|
||||
if ($nasDownloaded) {
|
||||
// NAS-primary mode: video was fetched from NAS for HLS generation.
|
||||
// The original is already on NAS — just delete the local temp copy.
|
||||
@unlink($nasDownloaded);
|
||||
} else {
|
||||
// Local-storage mode: push the (compressed) file to NAS and free local disk.
|
||||
// HLS segments stay local — per-segment SMB latency would hurt playback.
|
||||
$nas->syncVideo($video);
|
||||
$nas->deleteLocalVideo($video);
|
||||
$nas->deleteLocalAssets($video);
|
||||
}
|
||||
}
|
||||
|
||||
} catch (\Exception $e) {
|
||||
|
||||
Reference in new issue
Block a user