Fixed bugs with restoring volumes

timmyomahony · Dec 11, 2020 · 1692e00 · 1692e00
1 parent 2c04ed3
commit 1692e00
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,6 @@
     "description": "Backend module for remote-sync and remote-backup",
     "type": "craft-module",
     "license": "proprietary",
-    "version": "1.4.0",
     "authors": [
         {
             "name": "Timmy O'Mahony",

diff --git a/src/assets/RemoteCoreUtility/dist/js/RemoteCoreUtility.js b/src/assets/RemoteCoreUtility/dist/js/RemoteCoreUtility.js
@@ -125,7 +125,7 @@
             this.addListener(
             $row.find(".delete-button"),
             "click",
-            this.delete.bind(this, options[i].value)
+            this.delete.bind(this, options[i].filename)
             );
         }
 

diff --git a/src/helpers/RemoteFile.php b/src/helpers/RemoteFile.php
@@ -57,7 +57,8 @@ public static function toHTMLOptions($array, $format="Y-m-d H:i:s") {
             $text = $file->datetime->format($format);
             $options[$i] = [
                 "text" => $text,
-                "title" => $title
+                "title" => $title,
+                "filename" => $file->filename
             ];
         }
         return $options;

diff --git a/src/services/ProviderService.php b/src/services/ProviderService.php
@@ -335,8 +335,9 @@ private function restoreVolumesZip($zipPath)
                     $absDir = $tmpDir . DIRECTORY_SEPARATOR . $dir;
                     $files = FileHelper::findFiles($absDir);
                     foreach ($files as $file) {
+                        Craft::debug("-- " . $file, "remote-core");
                         if (is_file($file)) {
-                            $relPath = str_replace($tmpDir . DIRECTORY_SEPARATOR, '', $file);
+                            $relPath = str_replace($tmpDir . DIRECTORY_SEPARATOR . $volume->handle, '', $file);
                             $stream = fopen($file, 'r');
                             if ($volume->fileExists($relPath)) {
                                 $volume->updateFileByStream($relPath, $stream, []);