Refactor uploads

Author: NeoIsRecursive

client/src/components/Actions.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col items-end w-full">
     <div class="flex justify-end">
-      <upload :files="files" />
+      <upload :files="files" v-on:uploaded="handleFileUploaded" />
 
       <button
         v-if="canCreateBackups.isPermitted"
@@ -23,7 +23,6 @@
         :status="file.status"
         :percent="file.progress * 100"
         :file="file"
-        @restore="restore(file)"
       />
     </ul>
   </div>
@@ -58,6 +57,9 @@ export default {
     },
   },
   methods: {
+    handleFileUploaded(file) {
+      this.files = this.files.filter((item) => item.file.uniqueIdentifier !== file.uniqueIdentifier)
+    },
     backup() {
       this.loading = true;
       this.confirming = false;
@@ -80,33 +82,6 @@ export default {
           this.loading = false;
         });
     },
-    restore(file) {
-      this.loading = true;
-      this.confirming = false;
-      file.status = "restoring";
-
-      this.$store.dispatch('backup-provider/setStatus','restore_in_progress');
-
-      this.$axios
-        .post(cp_url("api/backups/restore-from-path"), {
-          path: file.path,
-        })
-        .then(({ data }) => {
-          this.$toast.info(__(data.message));
-        })
-        .catch((error) => {
-          let message = __("statamic-backup::backup.restore.failed");
-
-          if (error.response.data.message) {
-            message = error.response.data.message;
-          }
-          this.$toast.error(__(message));
-        })
-        .finally(() => {
-          this.loading = false;
-          file.status = "restored";
-        });
-    },
   },
 };
 </script>

client/src/components/Upload.vue

@@ -87,11 +87,9 @@ export default {
     });
 
     this.resumable.on("fileSuccess", (file, event) => {
-      const data = JSON.parse(event);
-      this.findFile(file).status = "success";
-      this.findFile(file).path = data.file;
+      const data = JSON.parse(event);;
       this.$toast.success(data.message);
-      this.$emit("uploaded", data.file);
+      this.$emit("uploaded", file);
     });
 
     this.resumable.on("fileError", (file, event) => {

client/src/components/UploadStatus.vue

@@ -52,26 +52,6 @@
       >
         <svg-icon name="micro/circle-with-cross" class="h-4 w-4" />
       </button>
-
-      <button
-        v-if="status === 'success'"
-        @click.prevent="restore"
-        class="btn-primary"
-      >
-        <svg-icon name="folder-home" class="h-4 w-4 mr-2 text-current" />
-        <span>{{ __("statamic-backup::backup.restore.label") }}</span>
-      </button>
-
-      <loading-graphic v-if="status === 'restoring'" :inline="true" text="" />
-
-      <span v-if="status === 'restored'" class="text-green-500 filename">
-        {{ __("statamic-backup::backup.restore.success") }}
-        <svg-icon
-          v-if="status === 'restored'"
-          name="light/check"
-          class="h-4 w-4 ml-2"
-        />
-      </span>
     </div>
   </div>
 </template>
@@ -92,9 +72,6 @@ export default {
     pause() {
       this.$emit("pause", this.file);
     },
-    restore() {
-      this.$emit("restore", this.file);
-    },
   },
 };
 </script>

routes/cp.php

@@ -4,7 +4,6 @@
 use Itiden\Backup\Http\Controllers\Api\BackupController;
 use Itiden\Backup\Http\Controllers\Api\DestroyBackupController;
 use Itiden\Backup\Http\Controllers\Api\RestoreController;
-use Itiden\Backup\Http\Controllers\Api\RestoreFromPathController;
 use Itiden\Backup\Http\Controllers\Api\StateController;
 use Itiden\Backup\Http\Controllers\Api\StoreBackupController;
 use Itiden\Backup\Http\Controllers\DownloadBackupController;
@@ -54,8 +53,4 @@
         Route::post('/restore/{timestamp}', RestoreController::class)
             ->middleware('can:restore backups')
             ->name('restore');
-
-        Route::post('/restore-from-path', RestoreFromPathController::class)
-            ->middleware('can:restore backups')
-            ->name('restore-from-path');
     });

src/Http/Controllers/Api/RestoreFromPathController.php

@@ -6,16 +6,21 @@
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Itiden\Backup\Contracts\Repositories\BackupRepository;
 use Itiden\Backup\DataTransferObjects\ChunkyTestDto;
 use Itiden\Backup\DataTransferObjects\ChunkyUploadDto;
 use Itiden\Backup\Http\Requests\ChunkyUploadRequest;
 use Itiden\Backup\Support\Facades\Chunky;
 
 final readonly class UploadController
 {
-    public function __invoke(ChunkyUploadRequest $request): JsonResponse
+    public function __invoke(ChunkyUploadRequest $request, BackupRepository $repo): JsonResponse
     {
-        return Chunky::put(ChunkyUploadDto::fromRequest($request));
+        return Chunky::put(ChunkyUploadDto::fromRequest($request), onCompleted: function (string $completeFile) use (
+            $repo,
+        ): void {
+            $repo->add($completeFile);
+        });
     }
 
     public function test(Request $request): JsonResponse

src/Http/Controllers/UploadController.php

@@ -4,6 +4,7 @@
 
 namespace Itiden\Backup\Support;
 
+use Closure;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
@@ -12,6 +13,8 @@
 use Itiden\Backup\DataTransferObjects\ChunkyUploadDto;
 use SplFileInfo;
 
+use function Illuminate\Filesystem\join_paths;
+
 final class Chunky
 {
     private Filesystem $disk;
@@ -33,9 +36,10 @@ public function path(?string $path = ''): string
     }
 
     /**
-     * put a from≤ chunks.
+     * Store a chunk of a file. If all chunks are uploaded, merge them into a single file.
+     * @param ?Closure<string> $onCompleted Callback to run when the file is fully uploaded.
      */
-    public function put(ChunkyUploadDto $dto): JsonResponse
+    public function put(ChunkyUploadDto $dto, ?Closure $onCompleted = null): JsonResponse
     {
         if (!$this->disk->putFileAs($dto->path, $dto->file, $dto->filename . '.part' . $dto->currentChunk)) {
             return response()->json(['message' => 'Error saving chunk'], Response::HTTP_INTERNAL_SERVER_ERROR);
@@ -54,6 +58,9 @@ public function put(ChunkyUploadDto $dto): JsonResponse
         }
 
         $completeFile = $this->mergeChunksIntoFile($dto->path, $dto->filename, $dto->totalChunks);
+        if ($onCompleted) {
+            $onCompleted($completeFile);
+        }
         if ($completeFile) {
             return response()->json(
                 ['message' => 'File successfully uploaded', 'file' => $completeFile],
@@ -83,13 +90,15 @@ public function mergeChunksIntoFile(string $path, string $filename, int $totalCh
         }
         fclose($file);
 
+        $targetPath = join_paths('backups', $filename);
+
         // move the file to the backups folder
-        $this->disk->move($path . '/' . $filename, 'backups/' . $filename);
+        $this->disk->move(join_paths($path, $filename), $targetPath);
 
         // delete the chunks
         $this->disk->deleteDirectory($path);
 
-        return $this->path('backups/' . $filename);
+        return $this->path($targetPath);
     }
 
     /**

src/Http/Requests/RestoreFromPathRequest.php

@@ -10,9 +10,9 @@
 use Itiden\Backup\Support\Chunky as ChunkySupport;
 
 /**
- * @method static \Illuminate\Http\JsonResponse put(ChunkyUploadDto $dto)
+ * @method static \Illuminate\Http\JsonResponse put(ChunkyUploadDto $dto, ?Closure<string> $onCompleted = null)
  * @method static \Illuminate\Http\JsonResponse exists(ChunkyTestDto $dto)
- * @method static string path()
+ * @method static string path(string $path = '')
  *
  * @see \Itiden\Backup\Support\Chunky
  */