Changeset 3743505 for optimazz/trunk/includes/Modules/Cache/Storage/DiskStorage.php

Timestamp:

10/13/2026 10:00:51 AM (13 days ago)

Author:

shiponkarmakar

Message:

Release v1.1.0

File:

• optimazz/trunk/includes/Modules/Cache/Storage/DiskStorage.php (modified) (4 diffs)

optimazz/trunk/includes/Modules/Cache/Storage/DiskStorage.php

@@ -29 +29 @@
 
         public function purge_all() {
+                if ( is_multisite() ) {
+                        \Optimazz_Cache_Engine::purge_site_dir( self::site_dir() ); // This site only.
+                        return;
+                }
                 \Optimazz_Cache_Engine::purge_all();
+        }
+
+        /**
+         * Cache folder of the current network site.
+         *
+         * @return string
+         */
+        private static function site_dir() {
+                $site = get_site();
+                return \Optimazz_Cache_Engine::site_dir( $site ? $site->domain : (string) wp_parse_url( home_url(), PHP_URL_HOST ), $site ? $site->path : '/' );
         }
 
@@ -39 +53 @@
         public function stats() {
                 $root = \Optimazz_Cache_Engine::cache_root();
+                $skip = array();
+                if ( is_multisite() ) {
+                        // Count this site's folder only, not other sites nested inside it.
+                        $root = self::site_dir();
+                        $skip = array_values( array_diff( \Optimazz_Cache_Engine::site_roots(), array( $root ) ) );
+                }
                 if ( ! is_dir( $root ) ) {
                         return array(
@@ -49 +69 @@
                 $files = 0;
                 $bytes = 0;
-                // A page (one URL) is stored as several variants in its own folder —
-                // desktop/mobile, http/https, query strings. "Cached pages" counts the
-                // pages, so it matches what the preloader reports; 'files' is kept for
-                // the raw variant count.
+                // A page (one URL) is stored as several variants — desktop/mobile,
+                // http/https, logged-in buckets. "Cached pages" counts the pages, so it
+                // matches what the preloader reports; 'files' is kept for the raw
+                // variant count.
                 $dirs  = array();
                 $it    = new \RecursiveIteratorIterator(
-                        new \RecursiveDirectoryIterator( $root, \FilesystemIterator::SKIP_DOTS )
+                        new \RecursiveCallbackFilterIterator(
+                                new \RecursiveDirectoryIterator( $root, \FilesystemIterator::SKIP_DOTS ),
+                                static function ( $file ) use ( $skip ) {
+                                        // Skip other network sites' folders (empty on a single site).
+                                        return ! ( $file->isDir() && in_array( rtrim( $file->getPathname(), '/' ) . '/', $skip, true ) );
+                                }
+                        )
                 );
                 foreach ( $it as $file ) {
@@ -66 +92 @@
                                 ++$files;
                                 $bytes += (int) $file->getSize();
-                                $dirs[ $file->getPath() ] = true;
+                                // File name: {scheme}-{device}-{user}[-{query}].html. One page = its
+                                // folder. At the site root the query part counts too, because plain
+                                // permalinks (?page_id=5) keep every page there; elsewhere query
+                                // variants (e.g. /shop/?orderby=price) are the same page.
+                                $parts   = explode( '-', $file->getBasename( '.html' ), 4 );
+                                $at_root = false === strpos( trim( substr( $file->getPath(), strlen( $root ) ), '/' ), '/' );
+                                $dirs[ $file->getPath() . '|' . ( $at_root && isset( $parts[3] ) ? $parts[3] : '' ) ] = true;
                         }
                 }