Skip to content

A self-hosted media server and file management system

better file dates

aminnausinecd7319e8a76
diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.php
index e3203fe6..e796c5a3 100644
--- a/app/Http/Resources/MetadataResource.php
+++ b/app/Http/Resources/MetadataResource.php
@@ -24,6 +24,7 @@ class MetadataResource extends JsonResource {
'file_size' => $this->file_size,
'date_released' => $this->date_released,
'date_updated' => $this->updated_at,
+ 'date_uploaded' => $this->date_uploaded,
],
'relationships' => [
'video_id' => $this->video_id,
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index 3a8d5f9b..d3273c8b 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -39,6 +39,7 @@ class VideoResource extends JsonResource {
'video_tags' => $metadata ? VideoTagResource::collection($metadata->videotags) : [],
'date_released' => $metadata ? $metadata->date_released : null,
'date_updated' => $metadata ? $metadata->updated_at : null,
+ 'date_uploaded' => $metadata ? $metadata->date_uploaded : null,
// ],
// 'relationships' => [
// 'folder_id' => (string)$this->folder->id,
diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.php
index 91f196d3..80f9e5dd 100755
--- a/app/Jobs/IndexFiles.php
+++ b/app/Jobs/IndexFiles.php
@@ -452,7 +452,6 @@ class IndexFiles implements ShouldBeUnique, ShouldQueue {
if ($folderAccessTime <= $folderStructure[$folder]['last_scan']) {
$unModefiedFolders['storage/' . basename($path) . "/$folder"] = 1;
-
continue;
}
diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.php
index 01231f9e..47acd9e8 100755
--- a/app/Jobs/VerifyFiles.php
+++ b/app/Jobs/VerifyFiles.php
@@ -175,6 +175,13 @@ class VerifyFiles implements ShouldQueue {
$changes['mime_type'] = File::mimeType($filePath) ?? null;
}
+ if (is_null($metadata->date_uploaded)) {
+ $mtime = filemtime($filePath);
+ $ctime = filectime($filePath);
+
+ $changes['date_uploaded'] = date('Y-m-d h:i A', $mtime < $ctime ? $mtime : $ctime);
+ }
+
$mime_type = isset($changes['mime_type']) ? $changes['mime_type'] : $metadata->mime_type;
// if description is null and episode is null and the file is of type audio, generate description from audio tags
@@ -270,7 +277,7 @@ class VerifyFiles implements ShouldQueue {
return 'No Changes Found';
}
- Metadata::upsert($transactions, 'id', ['video_id', 'title', 'description', 'duration', 'season', 'episode', 'view_count', 'uuid', 'file_size', 'mime_type', 'poster_url', 'date_scanned']);
+ Metadata::upsert($transactions, 'id', ['video_id', 'title', 'description', 'duration', 'season', 'episode', 'view_count', 'uuid', 'file_size', 'mime_type', 'poster_url', 'date_scanned', 'date_uploaded']);
$summary = 'Updated ' . count($transactions) . ' videos from id ' . ($transactions[0]['video_id']) . ' to ' . ($transactions[count($transactions) - 1]['video_id']);
dump($summary);
diff --git a/app/Jobs/VerifyFolders.php b/app/Jobs/VerifyFolders.php
index 2e6f4598..82bb6e57 100644
--- a/app/Jobs/VerifyFolders.php
+++ b/app/Jobs/VerifyFolders.php
@@ -151,9 +151,9 @@ class VerifyFolders implements ShouldQueue {
private function getThumbnailAsFile($url, $compositePath) {
try {
- dump('Getting thumbnail');
$response = Http::get($url);
if ($response->successful()) {
+ dump('Getting thumbnail');
$imageContent = $response->body();
$path = 'thumbnails/' . $compositePath . '.webp';
Storage::disk('public')->put($path, $imageContent);
diff --git a/app/Models/Metadata.php b/app/Models/Metadata.php
index 5ec14c5c..0d4c8389 100644
--- a/app/Models/Metadata.php
+++ b/app/Models/Metadata.php
@@ -27,6 +27,11 @@ class Metadata extends Model {
'poster_url',
'date_released',
'date_scanned',
+ 'date_uploaded',
+ ];
+
+ protected $casts = [
+ 'date_uploaded' => 'datetime',
];
public function video(): BelongsTo {
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vue
index 26d32050..bde50d67 100755
--- a/resources/js/components/cards/VideoCard.vue
+++ b/resources/js/components/cards/VideoCard.vue
@@ -114,7 +114,7 @@ watch(props, handlePropsUpdate, { immediate: true, deep: true });
</span>
<h4 class="text-end truncate" title="Date Uploaded">
- {{ toFormattedDate(new Date(props.data?.date + ' GMT')) }}
+ {{ toFormattedDate(new Date(props.data?.date_uploaded ?? props.data.date + ' GMT')) }}
</h4>
<span class="sm:hidden w-full flex flex-wrap gap-1 scrollbar-minimal scrollbar-hover" title="Tags">
diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.ts
index 12e373e7..996964b8 100644
--- a/resources/js/types/resources.ts
+++ b/resources/js/types/resources.ts
@@ -44,6 +44,7 @@ export interface MetadataResource {
file_size?: number;
date_released?: string;
date_updated?: string;
+ date_uploaded?: string;
};
relationships: {
video_id?: number;
@@ -127,6 +128,7 @@ export interface VideoResource {
video_tags: VideoTagResource[];
date_released?: string;
date_updated?: string;
+ date_uploaded?: string;
// folder_id: number;
metadata?: Metadata;
// editor?: User;