A free open source IT asset/license management system
Refactor import code, improve error messaging, speed up MySQL import
Brady Wetheringtonf511ce490951
diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.phpindex f9d96b7f05..aad9a3d404 100644--- a/app/Console/Commands/RestoreFromBackup.php+++ b/app/Console/Commands/RestoreFromBackup.php@@ -233,19 +233,20 @@ class RestoreFromBackup extends Command$errcode = $za->open($filename/* , ZipArchive::RDONLY */); // that constant only exists in PHP 7.4 and higherif ($errcode !== true) {- $errors = [+ $error_msg = match ($errcode) {ZipArchive::ER_EXISTS => 'File already exists.',ZipArchive::ER_INCONS => 'Zip archive inconsistent.',ZipArchive::ER_INVAL => 'Invalid argument.',ZipArchive::ER_MEMORY => 'Malloc failure.',- ZipArchive::ER_NOENT => 'No such file ('.$filename.') in directory '.$dir.'.',+ ZipArchive::ER_NOENT => 'No such file (' . $filename . ') in directory ' . $dir . '.',ZipArchive::ER_NOZIP => 'Not a zip archive.',ZipArchive::ER_OPEN => "Can't open file.",ZipArchive::ER_READ => 'Read error.',ZipArchive::ER_SEEK => 'Seek error.',- ];+ default => "Unknown reason: $errcode",+ };- return $this->error('Could not access file: '.$filename.' - '.array_key_exists($errcode, $errors) ? $errors[$errcode] : " Unknown reason: $errcode");+ return $this->error('Could not access file: ' . $filename . ' - ' . $error_msg);}$private_dirs = [@@ -421,12 +422,18 @@ class RestoreFromBackup extends Commandif (strpos($sqlfiles[0], 'db-dumps') === false) {// return $this->error("SQL backup file is missing 'db-dumps' component of full pathname: ".$sqlfiles[0]);// older Snipe-IT installs don't have the db-dumps subdirectory component+ $this->warn("Did not find the 'db-dumps' directory - is this really a Snipe-IT backup file? Continuing anyways...");}$sql_stat = $za->statIndex($sqlfile_indices[0]);// $this->info("SQL Stat is: ".print_r($sql_stat,true));$sql_contents = $za->getStream($sql_stat['name']); // maybe copy *THIS* thing?+ if ($sql_contents === false) {+ $this->error("Unable to open SQL file: " . $sql_stat['name']);+ return -1;+ }+// OKAY, now that we *found* the sql file if we're doing just the guess-prefix thing, we can do that *HERE* I think?if ($this->option('sanitize-guess-prefix')) {$prefix = SQLStreamer::guess_prefix($sql_contents);@@ -458,6 +465,8 @@ class RestoreFromBackup extends Command}$proc_results = proc_open("$mysql_binary -h " .escapeshellarg(config('database.connections.mysql.host')) .+ ' --batch ' .+ ' --binary-mode ' .' -u ' . escapeshellarg(config('database.connections.mysql.username')) . ' ' .' -P ' . escapeshellarg(config('database.connections.mysql.port')) . ' ' .escapeshellarg(config('database.connections.mysql.database')), // yanked -p since we pass via ENV@@ -469,29 +478,6 @@ class RestoreFromBackup extends Commandreturn $this->error('Unable to invoke mysql via CLI');}- // I'm not sure about these?- stream_set_blocking($pipes[1], false); // use non-blocking reads for stdout- stream_set_blocking($pipes[2], false); // use non-blocking reads for stderr-- // $this->info("Stdout says? ".fgets($pipes[1])); //FIXME: I think we might need to set non-blocking mode to use this properly?- // $this->info("Stderr says? ".fgets($pipes[2])); //FIXME: ditto, same.- // should we read stdout?- // fwrite($pipes[0],config("database.connections.mysql.password")."\n"); //this doesn't work :(-- // $sql_contents = fopen($sqlfiles[0], "r"); //NOPE! This isn't a real file yet, silly-billy!-- // FIXME - this feels like it wants to go somewhere else?- // and it doesn't seem 'right' - if you can't get a stream to the .sql file,- // why do we care what's happening with pipes and stdout and stderr?!- if ($sql_contents === false) {- $stdout = fgets($pipes[1]);- $this->info($stdout);- $stderr = fgets($pipes[2]);- $this->info($stderr);-- return false;- }-try {if ($this->option('sanitize-with-prefix') === null) {// "Legacy" direct-piping@@ -521,7 +507,8 @@ class RestoreFromBackup extends Commandthrow $e;}if (! feof($sql_contents) || $bytes_read == 0) {- return $this->error('Not at end of file for sql file, or zero bytes read. aborting!');+ $this->error('Not at end of file for sql file, or zero bytes read. aborting!');+ return -1;}fclose($pipes[0]);