Merge pull request #87 from WP2Static/infinite-crawl

infinite crawl, flat files to DB

Author: leonstafford

composer.lock

@@ -2,9 +2,9 @@
 Contributors: leonstafford
 Tags: security, performance, static
 Requires at least: 3.2
-Tested up to: 5.4.1
+Tested up to: 5.4.2
 Requires PHP: 7.3
-Stable tag: 6.6.18
+Stable tag: 6.6.19
 
 Publish your website as static HTML for improved performance and security.
 
@@ -128,8 +128,10 @@ Everyone's WordPress hosting environment and configuration is unique, with diffe
 
 == Changelog ==
 
-= 6.6.18 =
+= 6.6.19 =
 
+ * granular crawl and deploy progress indicators
+ * no more txt files polluting uploads dir, slowing things down
  * progress indicator on WP_CLI generate cmd
  * finally supporting UTF/multibyte URLs!
  * preserve font hex values in parsed stylesheets

readme.txt

@@ -17,63 +17,13 @@ public function __construct() {
             [ 'wpenv' ]
         );
 
-        $this->path = '';
-        $this->name = '';
-    }
-
-    public function setToCurrentArchive() : void {
-        $handle = fopen(
-            $this->settings['wp_uploads_path'] .
-                '/WP2STATIC-CURRENT-ARCHIVE.txt',
-            'r'
-        );
-
-        if ( ! is_resource( $handle ) ) {
-            return;
-        }
-
-        $path = stream_get_line( $handle, 0 );
-
-        if ( ! $path ) {
-            return;
-        }
-
-        $this->path = $path;
+        $this->path = $this->settings['wp_uploads_path'] . '/static-html-output/';
         $this->name = basename( $this->path );
     }
 
-    public function currentArchiveExists() : bool {
-        return is_file(
-            $this->settings['wp_uploads_path'] .
-            '/WP2STATIC-CURRENT-ARCHIVE.txt'
-        );
-    }
-
     public function create() : void {
-        $this->name = $this->settings['wp_uploads_path'] .
-            '/wp-static-html-output-' . time();
-
-        $this->path = $this->name . '/';
-        $this->name = basename( $this->path );
-
-        if ( wp_mkdir_p( $this->path ) ) {
-            $result = file_put_contents(
-                $this->settings['wp_uploads_path'] .
-                    '/WP2STATIC-CURRENT-ARCHIVE.txt',
-                $this->path
-            );
-
-            if ( ! $result ) {
-                WsLog::l( 'USER WORKING DIRECTORY NOT WRITABLE' );
-            }
-
-            chmod(
-                $this->settings['wp_uploads_path'] .
-                    '/WP2STATIC-CURRENT-ARCHIVE.txt',
-                0664
-            );
-        } else {
-            WsLog::l( "Couldn't create archive directory at $this->path" );
+        if ( ! wp_mkdir_p( $this->path ) ) {
+            Logger::l( "Couldn't create archive directory at $this->path" );
         }
     }
 }

src/Archive.php

@@ -12,14 +12,9 @@ class ArchiveProcessor extends StaticHTMLOutput {
      * @var Archive
      */
     public $archive;
-    /**
-     * @var string
-     */
-    public $target_folder;
 
     public function __construct() {
         $this->archive = new Archive();
-        $this->archive->setToCurrentArchive();
 
         $this->loadSettings(
             [
@@ -29,14 +24,13 @@ public function __construct() {
                 'processing',
                 'netlify',
                 'zip',
-                'folder',
             ]
         );
     }
 
     public function renameWPDirectory( string $source, string $target ) : void {
         if ( empty( $source ) || empty( $target ) ) {
-            WsLog::l(
+            Logger::l(
                 'Failed trying to rename: ' .
                 'Source: ' . $source .
                 ' to: ' . $target
@@ -54,7 +48,7 @@ public function renameWPDirectory( string $source, string $target ) : void {
                 $original_dir
             );
         } else {
-            WsLog::l(
+            Logger::l(
                 'Trying to rename non-existent directory: ' .
                 $original_dir
             );
@@ -146,89 +140,6 @@ public function put_safety_file( string $dirname ) : bool {
         return true;
     }
 
-    public function copyStaticSiteToPublicFolder() : void {
-        if ( $this->settings['selected_deployment_option'] === 'folder' ) {
-            $target_folder = trim( $this->settings['targetFolder'] );
-            $this->target_folder = $target_folder;
-
-            if ( ! $target_folder ) {
-                return;
-            }
-
-            // instantiate with safe defaults
-            $directory_exists = true;
-            $directory_empty = false;
-            $dir_has_safety_file = false;
-
-            // CHECK #1: directory exists or can be created
-            $directory_exists = is_dir( $target_folder );
-
-            if ( $directory_exists ) {
-                $directory_empty = $this->dir_is_empty( $target_folder );
-            } else {
-                if ( wp_mkdir_p( $target_folder ) ) {
-                    if ( ! $this->put_safety_file( $target_folder ) ) {
-                        WsLog::l(
-                            'Couldn\'t put safety file in ' .
-                            'Target Directory' .
-                            $target_folder
-                        );
-
-                        die();
-                    }
-                } else {
-                    WsLog::l(
-                        'Couldn\'t create Target Directory: ' .
-                        $target_folder
-                    );
-
-                    die();
-                }
-            }
-
-            // CHECK #2: check directory empty and add safety file
-            if ( $directory_empty ) {
-                if ( ! $this->put_safety_file( $target_folder ) ) {
-                    WsLog::l(
-                        'Couldn\'t put safety file in ' .
-                        'Target Directory' .
-                        $target_folder
-                    );
-
-                    die();
-                }
-            }
-
-            $dir_has_safety_file =
-                $this->dir_has_safety_file( $target_folder );
-
-            if ( $directory_empty || $dir_has_safety_file ) {
-                $this->recursive_copy(
-                    $this->archive->path,
-                    $this->target_folder
-                );
-
-                if ( ! $this->put_safety_file( $target_folder ) ) {
-                    WsLog::l(
-                        'Couldn\'t put safety file in ' .
-                        'Target Directory' .
-                        $target_folder
-                    );
-
-                    die();
-                }
-            } else {
-                WsLog::l(
-                    'Target Directory wasn\'t empty ' .
-                    'or didn\'t contain safety file ' .
-                    $target_folder
-                );
-
-                die();
-            }
-        }
-    }
-
     public function createNetlifySpecialFiles() : void {
         if ( $this->settings['selected_deployment_option'] !== 'netlify' ) {
             return;
@@ -262,7 +173,7 @@ public function create_zip() : void {
         $zip_archive = new ZipArchive();
 
         if ( $zip_archive->open( $temp_zip, ZIPARCHIVE::CREATE ) !== true ) {
-            WsLog::l( 'Could not create archive' );
+            Logger::l( 'Could not create archive' );
             return;
         }
 
@@ -284,7 +195,7 @@ public function create_zip() : void {
                     str_replace( $this->archive->path, '', $filename )
                 )
                 ) {
-                    WsLog::l( 'Could not add file: ' . $filename );
+                    Logger::l( 'Could not add file: ' . $filename );
                     return;
                 }
             }