Empty directories are now being backed up (#1008)

* Empty directories are now being backed up * Updated tests and style
spatie · Dec 12, 2019 · 2ac1388 · 2ac1388
1 parent 4901940
commit 2ac1388
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/Tasks/Backup/BackupJob.php b/src/Tasks/Backup/BackupJob.php
@@ -202,13 +202,13 @@ protected function directoriesUsedByBackupJob(): array
 
     protected function createZipContainingEveryFileInManifest(Manifest $manifest)
     {
-        consoleOutput()->info("Zipping {$manifest->count()} files...");
+        consoleOutput()->info("Zipping {$manifest->count()} files and directories...");
 
         $pathToZip = $this->temporaryDirectory->path(config('backup.backup.destination.filename_prefix').$this->filename);
 
         $zip = Zip::createForManifest($manifest, $pathToZip);
 
-        consoleOutput()->info("Created zip containing {$zip->count()} files. Size is {$zip->humanReadableSize()}");
+        consoleOutput()->info("Created zip containing {$zip->count()} files and directories. Size is {$zip->humanReadableSize()}");
 
         $this->sendNotification(new BackupZipWasCreated($pathToZip));
 

diff --git a/src/Tasks/Backup/FileSelection.php b/src/Tasks/Backup/FileSelection.php
@@ -69,8 +69,7 @@ public function selectedFiles()
 
         $finder = (new Finder())
             ->ignoreDotFiles(false)
-            ->ignoreVCS(false)
-            ->files();
+            ->ignoreVCS(false);
 
         if ($this->shouldFollowLinks) {
             $finder->followLinks();

diff --git a/src/Tasks/Backup/Zip.php b/src/Tasks/Backup/Zip.php
@@ -100,7 +100,11 @@ public function add($files, string $nameInZip = null): self
         }
 
         foreach ($files as $file) {
-            if (file_exists($file)) {
+            if (is_dir($file)) {
+                $this->zipFile->addEmptyDir($file);
+            }
+
+            if (is_file($file)) {
                 $this->zipFile->addFile($file, ltrim($nameInZip, DIRECTORY_SEPARATOR)).PHP_EOL;
             }
             $this->fileCount++;

diff --git a/tests/FileSelectionTest.php b/tests/FileSelectionTest.php
@@ -29,10 +29,14 @@ public function it_can_select_all_the_files_in_a_directory_and_subdirectories()
         $testFiles = $this->getTestFiles([
                 '.dotfile',
                 '1Mb.file',
+                'directory1',
+                'directory1/directory1',
                 'directory1/directory1/file1.txt',
                 'directory1/directory1/file2.txt',
                 'directory1/file1.txt',
                 'directory1/file2.txt',
+                'directory2',
+                'directory2/directory1',
                 'directory2/directory1/file1.txt',
                 'file1.txt',
                 'file2.txt',
@@ -52,6 +56,8 @@ public function it_can_exclude_files_from_a_given_subdirectory()
         $testFiles = $this->getTestFiles([
                 '.dotfile',
                 '1Mb.file',
+                'directory2',
+                'directory2/directory1',
                 'directory2/directory1/file1.txt',
                 'file1.txt',
                 'file2.txt',
@@ -71,8 +77,10 @@ public function it_can_exclude_files_with_wildcards_from_a_given_subdirectory()
         $testFiles = $this->getTestFiles([
                 '.dotfile',
                 '1Mb.file',
+                'directory1',
                 'directory1/file1.txt',
                 'directory1/file2.txt',
+                'directory2',
                 'file1.txt',
                 'file2.txt',
                 'file3.txt',
@@ -113,6 +121,7 @@ public function it_can_exclude_files_from_multiple_directories()
         $testFiles = $this->getTestFiles([
                 '.dotfile',
                 '1Mb.file',
+                'directory1',
                 'directory1/file1.txt',
                 'directory1/file2.txt',
                 'file1.txt',