add support for sufix/prefix and add suport for read/write dbs

README.md

@@ -91,12 +91,20 @@ return [
          * accidentally end up committing these backups.
          */
         'path' => 'backups',
+
+        /*
+         * By default the backups will be stored as a zipfile with a
+         * timestamp as the filename. With these options You can
+         * specify a prefix and a suffix for the filename.
+         */
+        'prefix' => '',
+        'suffix' => '',
     ],
-    
+
     'clean' => [
         /*
          * The clean command will remove all backups on all configured filesystems
-         * that are older than this amount of days.
+         * that are older then this amount of days.
          */
         'maxAgeInDays' => 90,
     ],
@@ -109,8 +117,6 @@ return [
         'dump_command_path' => '',
     ],
 ];
-
-
 ```
 
 ## Usage
@@ -123,12 +129,18 @@ Use this command start the backup and store the zipfile to the filesystem(s) you
 php artisan backup:run
 ```
 
+A zip-file, containing all files in the directories you specified along the dump of your database, will be created on the filesystem(s) you specified in the config-file.
+
 If you want to take a backup of only the db (without all other files that you might have configured) you can use this command:
 ``` bash
 php artisan backup:run --only-db
 ```
 
-A zip-file, containing all files in the directories you specified along the dump of your database, will be created on the filesystem(s) you specified in the config-file.
+You can also manually specify a prefix and suffix to be used in the filename of the zipfile.
+``` bash
+php artisan backup:run --prefix="backup-" --suffix="-manual".
+```
+These arguments take precedence over the prefix and suffix specified in the config file.
 
 ### Cleanup
 

src/BackupHandlers/Database/DatabaseBuilder.php

@@ -38,9 +38,31 @@ protected function buildMySQL(array $config)
             $config['database'],
             $config['username'],
             $config['password'],
-            $config['host'],
+            $this->determineHost($config),
             $port,
             $socket
         );
     }
+
+    /**
+     * Determine the host from the given config
+     *
+     * @param array $config
+     * @return string
+     * @throws Exception
+     */
+    public function determineHost(array $config)
+    {
+        if (isset($config['host']))
+        {
+            return $config['host'];
+        }
+
+        if (isset($config['read']['host']))
+        {
+            return $config['read']['host'];
+        }
+
+        throw new Exception('could not determine host from config');
+    }
 }

src/Commands/BackupCommand.php

@@ -41,13 +41,7 @@ public function fire()
         $backupZipFile = $this->createZip($files);
 
         foreach ($this->getTargetFileSystems() as $fileSystem) {
-            $this->comment('Start uploading backup to '.$fileSystem.'-filesystem...');
-
-            $disk = Storage::disk($fileSystem);
-
-            $this->copyFile($backupZipFile, $disk, $this->getBackupDestinationFileName(), $fileSystem == 'local');
-
-            $this->comment('Backup stored on '.$fileSystem.'-filesystem in file '.$this->getBackupDestinationFileName());
+            $this->copyFileToFileSystem($backupZipFile, $fileSystem);
         }
 
         $this->info('Backup successfully completed');
@@ -177,7 +171,54 @@ protected function writeIgnoreFile($disk, $dumpDirectory)
      */
     protected function getBackupDestinationFileName()
     {
-        return config('laravel-backup.destination.path').'/'.date('YmdHis').'.zip';
+        $backupDirectory = config('laravel-backup.destination.path');
+        $backupFilename = $this->getPrefix() . date('YmdHis') . $this->getSuffix() . '.zip';
+        return $backupDirectory . $backupFilename;
+    }
+
+    /**
+     * Get the prefix to be used in the filename of the backup file.
+     * 
+     * @return string
+     */
+    public function getPrefix()
+    {
+        if ($this->option('prefix') != '') {
+            return $this->option('prefix');
+        }
+
+        return config('laravel-backup.destination.prefix');
+    }
+
+    /**
+     * Get the suffix to be used in the filename of the backup file.
+     *
+     * @return string
+     */
+    public function getSuffix()
+    {
+        if ($this->option('suffix') != '') {
+            return $this->option('suffix');
+        }
+
+        return config('laravel-backup.destination.suffix');
+    }
+
+    /**
+     * Copy the given file to given filesystem
+     *
+     * @param string $file
+     * @param $fileSystem
+     */
+    public function copyFileToFileSystem($file, $fileSystem)
+    {
+        $this->comment('Start uploading backup to ' . $fileSystem . '-filesystem...');
+
+        $disk = Storage::disk($fileSystem);
+
+        $this->copyFile($file, $disk, $this->getBackupDestinationFileName(), $fileSystem == 'local');
+
+        $this->comment('Backup stored on ' . $fileSystem . '-filesystem in file "' . $this->getBackupDestinationFileName() . '"');
     }
 
     /**
@@ -189,6 +230,8 @@ protected function getOptions()
     {
         return [
             ['only-db', null, InputOption::VALUE_NONE, 'Only backup the database.'],
+            ['prefix', null, InputOption::VALUE_REQUIRED, 'The name of the zip file will get prefixed with this string.'],
+            ['suffix', null, InputOption::VALUE_REQUIRED, 'The name of the zip file will get suffixed with this string.'],
         ];
     }
 }

src/config/laravel-backup.php

@@ -48,6 +48,14 @@
          * accidentally end up committing these backups.
          */
         'path' => 'backups',
+
+        /*
+         * By default the backups will be stored as a zipfile with a
+         * timestamp as the filename. With these options You can
+         * specify a prefix and a suffix for the filename.
+         */
+        'prefix' => '',
+        'suffix' => '',
     ],
 
     'clean' => [

tests/DatabaseBuilderTest.php

@@ -22,4 +22,15 @@ public function testMySQL()
 
         $this->assertInstanceOf('Spatie\Backup\BackupHandlers\Database\Databases\MySQLDatabase', $database);
     }
+
+    public function testDetermineHost()
+    {
+        $databaseBuilder = new DatabaseBuilder();
+
+        $determineHostResult = $databaseBuilder->determineHost(['host' => 'testhost']);
+        $this->assertSame('testhost', $determineHostResult);
+
+        $determineHostResult = $databaseBuilder->determineHost(['read' => ['host' => 'testhost']]);
+        $this->assertSame('testhost', $determineHostResult);
+    }
 }