Adding infinite expiration time

axeloz · Jul 7, 2023 · 5d617d6 · 5d617d6
1 parent 3504b0a
commit 5d617d6
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 29 deletions.
diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php
@@ -136,7 +136,14 @@ public function completeBundle(Request $request, Bundle $bundle) {
 		// Saving metadata
 		try {
 			$bundle->completed		= true;
-			$bundle->expires_at		= time()+$bundle->expiry;
+
+			// Infinite expiry
+			if ($bundle->expiry == 'forever') {
+				$bundle->expires_at = null;
+			}
+			else {
+				$bundle->expires_at		= time()+$bundle->expiry;
+			}
 			$bundle->fullsize		= $size;
 			$bundle->preview_link	= route('bundle.preview', ['bundle' => $bundle, 'auth' => $bundle->preview_token]);
 			$bundle->download_link	= route('bundle.zip.download', ['bundle' => $bundle, 'auth' => $bundle->preview_token]);
@@ -171,7 +178,12 @@ public function deleteBundle(Request $request, Bundle $bundle) {
 				$f->forceDelete();
 			}
 
-			return response()->json(new BundleResource($bundle));
+			// Finally deleting bundle
+			$bundle->forceDelete();
+
+			return response()->json([
+				'success'	=> true
+			]);
 		}
 		catch (Exception $e) {
 			return response()->json([

diff --git a/app/Http/Middleware/GuestAccess.php b/app/Http/Middleware/GuestAccess.php
@@ -30,7 +30,9 @@ public function handle(Request $request, Closure $next): Response
 		abort_if($bundle->preview_token !== $request->auth, 403);
 
 		// Aborting if bundle expired
-		abort_if($bundle->expires_at->isBefore(Carbon::now()), 404);
+		if (! empty($bundle->expires_at)) {
+			abort_if($bundle->expires_at->isBefore(Carbon::now()), 404);
+		}
 
 		// Aborting if max download is reached
 		abort_if( ($bundle->max_downloads ?? 0) > 0 && $bundle->downloads >= $bundle->max_downloads, 404);

diff --git a/config/sharing.php b/config/sharing.php
@@ -5,17 +5,17 @@
     'max_filesize'			=> env('UPLOAD_MAX_FILESIZE', '5M'),
     'max_files'				=> env('UPLOAD_MAX_FILES', 100),
     'expiry_values'			=> [
-        '1H'    => 'one-hour',
-        '2H'    => 'two-hours',
-        '6H'    => 'six-hours',
-        '12H'   => 'twelve-hours',
-        '24H'   => 'one-day',
-        '48H'   => 'two-days',
-        '1W'    => 'one-week',
-        '2W'    => 'two-weeks',
-        '1M'    => 'one-month',
-        '3M'    => 'three-months',
-        '6M'    => 'six-months'
+        '1H'    	=> 'one-hour',
+        '2H'    	=> 'two-hours',
+        '6H'    	=> 'six-hours',
+        '12H'   	=> 'twelve-hours',
+        '24H'   	=> 'one-day',
+        '48H'   	=> 'two-days',
+        '1W'    	=> 'one-week',
+        '2W'    	=> 'two-weeks',
+        '1M'    	=> 'one-month',
+        '3M'    	=> 'three-months',
+        '6M'    	=> 'six-months',
     ],
     'default_expiry'		=> 86400, // 1 Day,
 

diff --git a/lang/en/app.php b/lang/en/app.php
@@ -86,5 +86,8 @@
 	'unexpected-error' => 'An unexpected error has occurred',
 	'login-to-get-bundles' => 'to get your bundles',
 	'you-are-logged-in' => 'You are logged in as ":username"',
-	'logout'	=> 'Logout'
+	'logout'	=> 'Logout',
+	'forever'	=> 'Forever',
+	'yes'	=> 'Yes',
+	'no'	=> 'No',
 ];
diff --git a/lang/fr/app.php b/lang/fr/app.php
@@ -86,5 +86,8 @@
 	'unexpected-error' => 'Une erreur inattendue est survenue',
 	'to-get-bundles' => 'pour accéder à vos archives',
 	'you-are-logged-in' => 'Vous êtes connecté(e) en tant que ":username"',
-	'logout'	=> 'Déconnexion'
+	'logout'	=> 'Déconnexion',
+	'forever' => 'Infinie',
+	'yes'	=> 'Oui',
+	'no'	=> 'Non',
 ];
diff --git a/resources/views/download.blade.php b/resources/views/download.blade.php
@@ -14,20 +14,24 @@
 			created_at: null,
 			expires_at: null,
 			expired: null,
+			interval: null,
 
 			init: function() {
 				this.updateTimes()
 
-				window.setInterval( () => {
+				this.interval = window.setInterval( () => {
 					this.updateTimes()
 				}, 5000)
+
 			},
 
 			updateTimes: function() {
 				this.created_at = moment(this.metadata.created_at).fromNow()
 
-				if (! this.isExpired()) {
-					this.expires_at =moment(this.metadata.expires_at).fromNow()
+				if (this.metadata.expiry) {
+					if (! this.isExpired()) {
+						this.expires_at = moment(this.metadata.expires_at).fromNow()
+					}
 				}
 			},
 
@@ -91,19 +95,24 @@
 					<span class="font-title text-xs text-primary uppercase mr-1">
 						@lang('app.upload-expiry')
 					</span>
-					<span x-text="expires_at"></span>
+					<template x-if="expires_at">
+						<span x-text="expires_at"></span>
+					</template>
+					<template x-if="! expires_at">
+						<span>@lang('app.forever')</span>
+					</template>
 				</p>
 				<p class="w-1/2 px-1 mt-1">
 					<span class="font-title text-xs text-primary uppercase mr-1">
-						@lang('app.fullsize')
+						@lang('app.files')
 					</span>
-					<span x-text="humanSize(metadata.fullsize)"></span>
+					<span x-text="Object.keys(metadata.files).length"></span>
 				</p>
 				<p class="w-1/2 px-1 mt-1">
 					<span class="font-title text-xs text-primary uppercase mr-1">
-						@lang('app.max-downloads')
+						@lang('app.fullsize')
 					</span>
-					<span x-text="metadata.max_downloads > 0 ? metadata.max_download : '∞'"></span>
+					<span x-text="humanSize(metadata.fullsize)"></span>
 				</p>
 				<p class="w-1/2 px-1 mt-1">
 					<span class="font-title text-xs text-primary uppercase mr-1">
@@ -113,9 +122,9 @@
 				</p>
 				<p class="w-1/2 px-1 mt-1">
 					<span class="font-title text-xs text-primary uppercase mr-1">
-						@lang('app.password')
+						@lang('app.max-downloads')
 					</span>
-					<span x-text="metadata.password ? 'yes': 'no'"></span>
+					<span x-text="metadata.max_downloads > 0 ? metadata.max_downloads : '∞'"></span>
 				</p>
 				<p class="w-full px-1 mt-1" x-show="metadata.description">
 					<span class="font-title text-xs text-primary uppercase mr-1">

diff --git a/resources/views/upload.blade.php b/resources/views/upload.blade.php
@@ -259,7 +259,8 @@
 						}
 					})
 					.then( (response) => {
-						this.syncData(response.data)
+						//this.syncData(response.data)
+						window.location.href = '/'
 					})
 					.catch( (error) => {
 
@@ -457,9 +458,9 @@ class="w-full text-slate-700 bg-transparent h-8 p-0 py-1 border-b border-primary
 								name="expiry"
 								id="upload-expiry"
 							>
-								<option value="0"></option>
+								<option value="forever">@lang('app.forever')</option>
 								@foreach (config('sharing.expiry_values') as $k => $e)
-									<option value="{{ Upload::getExpirySeconds($k) }}" {{ $e == config('sharing.default_expiry') ? 'selected' : '' }}>@lang('app.'.$e)</option>
+									<option value="{{ Upload::getExpirySeconds($k) }}">@lang('app.'.$e)</option>
 								@endforeach
 							</select>
 						</div>