Update error messages and check packages on restore command

Author: abhijitrakas

snapshot-command.php

@@ -10,15 +10,4 @@
 	require_once $wpcli_snapshot_autoloader;
 }
 
-$wpcli_snapshot_verify_required_packages = function() {
-	$utils = new \WP_CLI\Snapshot\Utils();
-	$utils->available_wp_packages();
-};
-
-WP_CLI::add_command(
-	'snapshot',
-	'\WP_CLI\Snapshot\SnapshotCommand',
-	[
-		'before_invoke' => $wpcli_snapshot_verify_required_packages,
-	]
-);
+WP_CLI::add_command( 'snapshot', '\WP_CLI\Snapshot\SnapshotCommand' );

src/SnapshotCommand.php

@@ -98,9 +98,10 @@ public function __construct() {
 			throw new \Exception( 'Snapshot command requires ZipArchive.' );
 		}
 
-		$this->db       = new SnapshotDB();
-		$this->storage  = new SnapshotStorage();
-		$this->progress = Utils\make_progress_bar( 'Creating Backup', 5 );
+		$this->db             = new SnapshotDB();
+		$this->storage        = new SnapshotStorage();
+		$this->snapshot_utils = new WP_CLI\Snapshot\Utils();
+		$this->progress       = Utils\make_progress_bar( 'Creating Backup', 5 );
 
 	}
 
@@ -252,6 +253,7 @@ public function _list( $args, $assoc_args ) {
 	 * @throws WP_CLI\ExitException
 	 */
 	public function restore( $args, $assoc_args ) {
+		$this->snapshot_utils->available_wp_packages(); // Check required packages available or not.
 		$backup_info         = $this->get_backup_info( $args[0] );
 		$snapshot_files      = [];
 		$extra_snapshot_info = $this->db->get_extra_snapshot_info( $backup_info['id'] );

src/utils.php

@@ -61,7 +61,7 @@ private function get_packages_list() {
 		}
 
 		foreach ( $packages_raw_list as $package ) {
-			$this->installed_packages[ $package['name'] ] = $package['name'];
+			$this->installed_packages[] = $package['name'];
 		}
 	}
 
@@ -72,9 +72,11 @@ private function get_packages_list() {
 	 */
 	private function check_missing_packages() {
 		foreach ( $this->required_packages as $package_name => $installation_command ) {
-			if ( empty( $this->installed_packages[ $package_name ] ) ) {
-				$this->missing_packages[ $package_name ] = $installation_command;
+			if ( in_array( $package_name, $this->installed_packages, true ) ) {
+				continue;
 			}
+
+			$this->missing_packages[ $package_name ] = $installation_command;
 		}
 
 		if ( empty( $this->missing_packages ) ) {
@@ -91,10 +93,10 @@ private function check_missing_packages() {
 	 */
 	private function show_missing_packages_info() {
 		foreach ( $this->missing_packages as $package_name => $installation_command ) {
-			WP_CLI::warning( "Missing '$package_name' package. Try '$installation_command'." );
+			WP_CLI::warning( "Missing '{$package_name}' package. Try '{$installation_command}'." );
 		}
 
-		WP_CLI::error( 'Snapshot command needs to be installed above packages.' );
+		WP_CLI::error( 'Snapshot command requires above packages to be installed.' );
 	}
 
 }