Latest changes

Author: bwmarkle

admin/class-boldgrid-backup-admin-core.php

@@ -1582,9 +1582,7 @@ public function archive_files( &$info ) {
 		);
 		$this->logger->add_memory();
 
-		Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'status', esc_html__( 'Wrapping things up...', 'boldgrid-backup' ) );
-		Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'percentage', 100 );
-
+		// Log size of all files archived. Also handled in V2\Archiver\Steps\Discovery::files().
 		$info['total_size'] += $this->filelist->get_total_size( $filelist );
 
 		if ( true === $status && ! $archive_exists ) {
@@ -1596,17 +1594,6 @@ public function archive_files( &$info ) {
 			return $status;
 		}
 
-		$info['lastmodunix'] = $this->wp_filesystem->mtime( $info['filepath'] );
-
-		// Modify the archive file permissions to help protect from public access.
-		$this->wp_filesystem->chmod( $info['filepath'], 0600 );
-
-		// Add some statistics to the return.
-		$info['filesize'] = $this->wp_filesystem->size( $info['filepath'] );
-
-		// Delete the temporary database dump file.
-		$this->wp_filesystem->delete( $this->db_dump_filepath, false, 'f' );
-
 		return $info;
 	}
 

includes/class-boldgrid-backup-archiver.php

@@ -55,6 +55,11 @@ class Boldgrid_Backup_Archiver {
 	 */
 	private static $is_archiving = false;
 
+	/**
+	 *
+	 */
+	private $is_resuming = false;
+
 	/**
 	 * An instance of Boldgrid_Backup_Admin_Task.
 	 *
@@ -75,15 +80,25 @@ class Boldgrid_Backup_Archiver {
 	 * @since SINCEVERSION
 	 */
 	public function __construct( $id = null ) {
-		$this->core   = apply_filters( 'boldgrid_backup_get_core', null );
-		$this->format = $this->core->settings->get_setting( 'format' );
+		$this->is_resuming = ! is_null( $id );
+		$this->core        = apply_filters( 'boldgrid_backup_get_core', null );
+		$this->format      = $this->core->settings->get_setting( 'format' );
 
 		if ( 'one' === $this->format ) {
 			$this->info = new \Boldgrid\Backup\Archiver\Info( 'one', array() );
 		} else {
 			$this->backup_process = \BoldGrid\Backup\V2\Archiver\Factory::run( $id );
 			$this->info           = new \Boldgrid\Backup\Archiver\Info( 'many', $this->backup_process );
 			$this->resumer        = new \Boldgrid\Backup\V2\Archiver\Resumer();
+
+			if ( $this->is_resuming ) {
+				// Normally, task is initialized in init(). Initialize task now as init() won't be ran.
+				$this->task = new Boldgrid_Backup_Admin_Task();
+				$this->task->init_by_id( $this->info->get_key( 'task_id' ) );
+
+				// Initialize the logger. Mainly for logging done within self::complete().
+				$this->core->logger->init( $this->info->get_key( 'log_filename' ) );
+			}
 		}
 	}
 
@@ -93,6 +108,21 @@ public function __construct( $id = null ) {
 	 * @since SINCEVERSION
 	 */
 	public function complete() {
+		Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'status', esc_html__( 'Wrapping things up...', 'boldgrid-backup' ) );
+		Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'percentage', 100 );
+
+		$filepath = $this->info->get_key( 'filepath' );
+
+		// Add some statistics to the return.
+		$this->info->set_key( 'lastmodunix', $this->core->wp_filesystem->mtime( $filepath ) );
+		$this->info->set_key( 'filesize', $this->core->wp_filesystem->size( $filepath ) );
+
+		// Modify the archive file permissions to help protect from public access.
+		$this->core->wp_filesystem->chmod( $filepath, 0600 );
+
+		// Delete the temporary database dump file.
+		$this->core->wp_filesystem->delete( $this->info->get_key( 'db_dump_filepath' ), false, 'f' );
+
 		// Calculate duration.
 		$this->info->set_key( 'duration', number_format( ( microtime( true ) - $this->info->get_key( 'time_start' ) ), 2, '.', '' ) );
 		$this->info->set_key( 'db_duration', number_format( ( $this->info->get_key( 'db_time_stop' ) - $this->info->get_key( 'time_start' ) ), 2, '.', '' ) );
@@ -218,6 +248,7 @@ public function init() {
 			$this->task->init( [ 'type' => 'backup' ] );
 		}
 		$this->task->start();
+		$this->info->set_key( 'task_id', $this->task->get_id() );
 
 		self::$is_archiving = true;
 
@@ -355,11 +386,11 @@ public static function is_archiving() {
 	/**
 	 *
 	 */
-	public function is_init_incomplete() {
+	public function is_init_complete() {
 		$start = $this->info->get_key( 'time_start' );
 		$end   = $this->info->get_key( 'init_time_end' );
 
-		return ! empty( $start ) && empty( $end );
+		return ! empty( $start ) && ! empty( $end );
 	}
 
 	/**
@@ -370,11 +401,10 @@ public function is_init_incomplete() {
 	 * @since SINCEVERSION
 	 */
 	public function run() {
-		// Todo. If resuming, do we run init again?
-		if ( $this->is_init_incomplete() ) {
-			$this->info->set_key( 'error', __( 'Unable to initialize backup. Previous init was incomplete.', 'boldgrid-backup' ) );
-		} else {
+		if ( ! $this->is_resuming ) {
 			$this->init();
+		} elseif ( ! $this->is_init_complete() ) {
+			$this->info->set_key( 'error', __( 'Unable to initialize backup. Previous init was incomplete.', 'boldgrid-backup' ) );
 		}
 
 		if ( empty( $this->info->get_key( 'error' ) ) ) {

includes/v2/archiver/class-archiver.php

@@ -75,6 +75,7 @@ public function run() {
 
 				if ( ! $step_success ) {
 					// Failed to create zip. todo: cleanup?
+					$this->log( 'ERROR: Step failed.' );
 					return false;
 				}
 			}

includes/v2/archiver/steps/archive_files/class-part.php

@@ -122,13 +122,15 @@ public function add_batch( $batch_filelist_filepath ) {
 
 		$archive_command = 'cd ' . ABSPATH . '; zip ' . $this->filepath . ' ' . $j . ' -@ < ' . $batch_filelist_filepath;
 
-		// error_log( '$archive_command = ' . getmypid() . ' ' . $archive_command );
-
 		$this->archive_files->get_core()->execute_command( $archive_command, $success, $return );
 
 		$new_size = $this->get_size();
 
-		return ( $original_size !== $new_size ) && $success;
+		if ( $success && $original_size === $new_size ) {
+			$this->archive_files->log( 'WARNING: Archive filesize did not change after adding files. It could be that this is not the first attempt, but the first attempt DID finish archiving but DID NOT finish completing the step.' );
+		}
+
+		return $success;
 	}
 
 	/**

includes/v2/archiver/steps/class-archive-files.php

@@ -176,6 +176,8 @@ private function get_next_batch() {
 		 *
 		 * The additional spacing added to make it easier to read in the log.
 		 */
+		// Additional log data availalbe if needed.
+		/*
 		$part_size  = $part->get_size();
 		$batch_zize = $max_batch_size - $remaining_size;
 		$log_data   = array(
@@ -191,6 +193,7 @@ private function get_next_batch() {
 			'part remaining size     ' => size_format( $remaining_size, 2 ) . ' / ' . $remaining_size,
 		);
 		$this->log( 'New batch created and needs processing: ' . print_r( $log_data, 1 ) ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
+		*/
 
 		return $success ? $batch_info : false;
 	}

includes/v2/archiver/steps/class-discovery.php

@@ -56,9 +56,12 @@ private function database() {
 	private function files() {
 		$filelist_creator = new \Boldgrid\Backup\V2\Filelist\Create();
 		$files            = $filelist_creator->run();
+		$total_size       = $filelist_creator->get_total_size();
 
-		\Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'total_size_archived', $filelist_creator->get_total_size() );
-		\Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'total_size_archived_size_format', size_format( $filelist_creator->get_total_size(), 2 ) );
+		\Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'total_size_archived', $total_size );
+		\Boldgrid_Backup_Admin_In_Progress_Data::set_arg( 'total_size_archived_size_format', size_format( $total_size, 2 ) );
+
+		$this->info->set_key( 'total_size', $total_size );
 
 		$filelists = array();