Add S3 opt support to import_wp2static_options

Only the core_options table had a blob_value
column, so it was necessary to know which columns
to query. We check if the option_spec has an array
type which is the only type that uses blob_value,
and we only query the blob_value column in that
case.

Author: john-shaffer

src/CLI.php

@@ -722,12 +722,19 @@ public function import_wp2static_options( array $args, array $assoc_args ): void
             foreach ( Options::optionSpecs() as $option_spec ) {
                 Options::importFromWP2Static( $option_spec );
             }
+            foreach ( S3\S3Options::optionSpecs() as $option_spec ) {
+                Options::importFromWP2Static( $option_spec );
+            }
             return;
         }
 
         foreach ( $args as $option_name ) {
             $option_spec = Options::optionSpecs()[ $option_name ] ?? null;
 
+            if ( ! $option_spec ) {
+                $option_spec = S3\S3Options::optionSpecs()[ $option_name ] ?? null;
+            }
+
             if ( ! $option_spec ) {
                 WP_CLI::error(
                     'Unknown option: ' . $option_name

src/Options.php

@@ -763,41 +763,86 @@ public static function importFromWP2Static(
     ): void {
         global $wpdb;
 
-        $wp2static_table_name = $wpdb->prefix . 'wp2static_core_options';
+        if ( $option_spec->wp2static_table ) {
+            $wp2static_table_name = $wpdb->prefix . $option_spec->wp2static_table;
+        } else {
+            $wp2static_table_name = $wpdb->prefix . 'wp2static_core_options';
+        }
 
-        $wp2static_option = $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT value, blob_value FROM $wp2static_table_name WHERE name = %s;",
-                $option_spec->name
-            )
-        );
+        $wp2static_name = $option_spec->wp2static_name ?? $option_spec->name;
 
-        if ( ! $wp2static_option ) {
-            WsLog::l( "Option $option_spec->name not found in WP2Static options" );
-            return;
+        $blob = false;
+        if ( $option_spec->type === 'array' ) {
+            $blob = true;
         }
 
-        $opt = new OptionData(
-            $option_spec,
-            $wp2static_option->blob_value,
-            $wp2static_option->value,
-        );
+        if ( $blob ) {
 
-        WsLog::l(
-            "Imported option $option_spec->name from WP2Static" .
-            'with value: ' . $opt->value .
-            ' and blob value: ' . $opt->blob_value
-        );
+            $wp2static_option = $wpdb->get_row(
+                $wpdb->prepare(
+                    "SELECT value, blob_value FROM $wp2static_table_name WHERE name = %s;",
+                    $wp2static_name
+                )
+            );
 
-        $table_name = self::getTableName();
+            if ( ! $wp2static_option ) {
+                WsLog::l( "Option $option_spec->name not found in WP2Static options" );
+                return;
+            }
 
-        $wpdb->update(
-            $table_name,
-            [
-                'blob_value' => $opt->blob_value,
-                'value' => $opt->value,
-            ],
-            [ 'name' => $option_spec->name ]
-        );
+            $opt = new OptionData(
+                $option_spec,
+                $wp2static_option->blob_value,
+                $wp2static_option->value,
+            );
+
+            WsLog::l(
+                "Imported option $option_spec->name from WP2Static" .
+                ' with value: ' . $opt->value .
+                ' and blob value: ' . $opt->blob_value
+            );
+
+            $table_name = self::getTableName();
+
+            $wpdb->update(
+                $table_name,
+                [
+                    'blob_value' => $opt->blob_value,
+                    'value' => $opt->value,
+                ],
+                [ 'name' => $option_spec->name ]
+            );
+        } else {
+            $wp2static_option = $wpdb->get_row(
+                $wpdb->prepare(
+                    "SELECT value FROM $wp2static_table_name WHERE name = %s;",
+                    $wp2static_name
+                )
+            );
+
+            if ( ! $wp2static_option ) {
+                WsLog::l( "Option $option_spec->name not found in WP2Static options" );
+                return;
+            }
+
+            $opt = new OptionData(
+                $option_spec,
+                null,
+                $wp2static_option->value,
+            );
+
+            WsLog::l(
+                "Imported option $option_spec->name from WP2Static" .
+                ' with value: ' . $opt->value
+            );
+
+            $table_name = self::getTableName();
+
+            $wpdb->update(
+                $table_name,
+                [ 'value' => $opt->value ],
+                [ 'name' => $option_spec->name ]
+            );
+        }
     }
 }