Skip to content

Commit e3ee066

Browse files
authored
Merge pull request #12 from Pabloferrandezroca/reemplazarSimpleBackup
Reemplazar simple backup
2 parents cc3132b + 7dd3c4a commit e3ee066

File tree

3 files changed

+31
-23
lines changed

3 files changed

+31
-23
lines changed

Controller/Backup.php

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919

2020
namespace FacturaScripts\Plugins\Backup\Controller;
2121

22-
use Coderatio\SimpleBackup\SimpleBackup;
22+
use DatabaseBackupManager\MySQLBackup;
2323
use FacturaScripts\Core\Base\Controller;
2424
use FacturaScripts\Core\Base\ControllerPermissions;
2525
use FacturaScripts\Core\Cache;
2626
use FacturaScripts\Core\Response;
2727
use FacturaScripts\Core\Tools;
2828
use FacturaScripts\Core\UploadedFile;
2929
use FacturaScripts\Dinamic\Model\User;
30+
use PDO;
3031
use RecursiveDirectoryIterator;
3132
use RecursiveIteratorIterator;
3233
use ZipArchive;
@@ -243,12 +244,16 @@ protected function createSqlAction(): void
243244
}
244245

245246
$file_name = date('Y-m-d_H-i-s') . '.sql';
246-
SimpleBackup::setDatabase([
247-
Tools::config('db_name'),
248-
Tools::config('db_user'),
249-
Tools::config('db_pass'),
250-
Tools::config('db_host')
251-
])->storeAfterExportTo($folder, $file_name);
247+
248+
//definimos la configurcion de la base de datos y el directorio de backup
249+
$db = new PDO('mysql:host=' . Tools::config('db_host') . ';port=' . Tools::config('db_port') . ';dbname=' . Tools::config('db_name'), Tools::config('db_user'), Tools::config('db_pass'));
250+
$backupDir = Tools::folder('MyFiles', 'Backups');
251+
252+
$backup = new MySQLBackup($db, $backupDir);
253+
254+
//exportamos la base de datos a un archivo y le cambiamos el nombre para que tenga el formato correcto
255+
$file = $backup->backup();
256+
rename($file, Tools::folder('MyFiles', 'Backups', $file_name));
252257

253258
$file_path = Tools::folder('MyFiles', 'Backups', $file_name);
254259
if (false === file_exists($file_path)) {
@@ -610,13 +615,11 @@ private function restoreBackupAction(): void
610615
$this->dataBase->close();
611616

612617
// importamos el backup
613-
$backup = SimpleBackup::setDatabase([
614-
Tools::config('db_name'),
615-
Tools::config('db_user'),
616-
Tools::config('db_pass'),
617-
Tools::config('db_host')
618-
])->importFrom($sqlFile);
619-
if (false === $backup->getResponse()->status) {
618+
$db = new PDO('mysql:host=' . Tools::config('db_host') . ';port=' . Tools::config('db_port') . ';dbname=' . Tools::config('db_name'), Tools::config('db_user'), Tools::config('db_pass'));
619+
$backup = new MySQLBackup($db);
620+
621+
$restore = $backup->restore($sqlFile);
622+
if (true !== $restore) {
620623
Tools::log()->error('record-save-error');
621624
$this->dataBase->connect();
622625
Cache::clear();

Cron.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919

2020
namespace FacturaScripts\Plugins\Backup;
2121

22-
use Coderatio\SimpleBackup\SimpleBackup;
22+
use DatabaseBackupManager\MySQLBackup;
2323
use FacturaScripts\Core\Plugins;
2424
use FacturaScripts\Core\Template\CronClass;
2525
use FacturaScripts\Core\Tools;
26+
use PDO;
2627
use RecursiveDirectoryIterator;
2728
use RecursiveIteratorIterator;
2829
use ZipArchive;
@@ -129,12 +130,16 @@ protected function createSqlFile(): bool
129130
}
130131

131132
$file_name = date('Y-m-d_H-i-s') . '.sql';
132-
SimpleBackup::setDatabase([
133-
Tools::config('db_name'),
134-
Tools::config('db_user'),
135-
Tools::config('db_pass'),
136-
Tools::config('db_host')
137-
])->storeAfterExportTo($folder, $file_name);
133+
134+
//definimos la configurcion de la base de datos y el directorio de backup
135+
$db = new PDO('mysql:host=' . Tools::config('db_host') . ';port=' . Tools::config('db_port') . ';dbname=' . Tools::config('db_name'), Tools::config('db_user'), Tools::config('db_pass'));
136+
$backupDir = Tools::folder('MyFiles', 'Backups');
137+
138+
$backup = new MySQLBackup($db, $backupDir);
139+
140+
//exportamos la base de datos a un archivo y le cambiamos el nombre para que tenga el formato correcto
141+
$file = $backup->backup();
142+
rename($file, Tools::folder('MyFiles', 'Backups', $file_name));
138143

139144
$file_path = Tools::folder('MyFiles', 'Backups', $file_name);
140145
if (false === file_exists($file_path)) {

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"require": {
16-
"coderatio/simple-backup": "1.0.*",
17-
"ext-zip": "*"
16+
"ext-zip": "*",
17+
"julio101290/mysql-backup": "^1.0"
1818
}
1919
}

0 commit comments

Comments
 (0)