sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Site health, info tab:

Browse Source 
- Change `recurse_dirsize()` to accept an array of excluded paths.
- Change so we don't calculate the sizes of dirs in wp-content twice.
- Add the size in bytes to the "debug" into.
- Add a custom DOM event after the dir sizes request is done. Can be used by plugins to "daisy chain" more requests.
- Move "WordPress directory location" and "WordPress directory size" to the top in the "Directories and Sizes" section.
- Move "Theme directory location" to the "Active Theme" section.
- Fix labels capitalization.

Props xkon, afercia, Clorith, azaozz.
Fixes #46707.

git-svn-id: https://develop.svn.wordpress.org/trunk@45220 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2019-04-16 23:01:45 +00:00
parent 70f16b6bf4
commit e85b26d14c
4 changed files with 80 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/_enqueues/admin/site-health.js
View File

@ -276,6 +276,8 @@ jQuery( document ).ready( function( $ ) {
// Cancel the announcement. // Cancel the announcement.
window.clearTimeout( timeout ); window.clearTimeout( timeout );
} }
$( document ).trigger( 'site-health-info-dirsizes-done' );
} ); } );
} }

6
src/wp-admin/includes/ajax-actions.php
View File

@ -4976,7 +4976,7 @@ function wp_ajax_health_check_get_sizes() {
} }
$sizes_data = WP_Debug_Data::get_sizes(); $sizes_data = WP_Debug_Data::get_sizes();
$all_sizes = array(); $all_sizes = array( 'raw' => 0 );
foreach ( $sizes_data as $name => $value ) { foreach ( $sizes_data as $name => $value ) {
$name = sanitize_text_field( $name ); $name = sanitize_text_field( $name );
@ -4998,6 +4998,10 @@ function wp_ajax_health_check_get_sizes() {
} }
} }
if ( ! empty( $value['raw'] ) ) {
$data['raw'] = (int) $value['raw'];
}
$all_sizes[ $name ] = $data; $all_sizes[ $name ] = $data;
} }

113
src/wp-admin/includes/class-wp-debug-data.php
View File

@ -392,43 +392,39 @@ class WP_Debug_Data {
$not_calculated = __( 'Not calculated' ); $not_calculated = __( 'Not calculated' );
$info['wp-paths-sizes']['fields'] = array( $info['wp-paths-sizes']['fields'] = array(
'wordpress_path' => array(
'label' => __( 'WordPress directory location' ),
'value' => untrailingslashit( ABSPATH ),
),
'wordpress_size' => array(
'label' => __( 'WordPress directory size' ),
'value' => $not_calculated,
'debug' => 'not calculated',
),
'uploads_path' => array( 'uploads_path' => array(
'label' => __( 'Uploads Directory Location' ), 'label' => __( 'Uploads directory location' ),
'value' => $upload_dir['basedir'], 'value' => $upload_dir['basedir'],
), ),
'uploads_size' => array( 'uploads_size' => array(
'label' => __( 'Uploads Directory Size' ), 'label' => __( 'Uploads directory size' ),
'value' => $not_calculated, 'value' => $not_calculated,
'debug' => 'not calculated', 'debug' => 'not calculated',
), ),
'themes_path' => array( 'themes_path' => array(
'label' => __( 'Themes Directory Location' ), 'label' => __( 'Themes directory location' ),
'value' => trailingslashit( get_theme_root() ), 'value' => get_theme_root(),
),
'current_theme_path' => array(
'label' => __( 'Current Theme Directory' ),
'value' => get_template_directory(),
), ),
'themes_size' => array( 'themes_size' => array(
'label' => __( 'Themes Directory Size' ), 'label' => __( 'Themes directory size' ),
'value' => $not_calculated, 'value' => $not_calculated,
'debug' => 'not calculated', 'debug' => 'not calculated',
), ),
'plugins_path' => array( 'plugins_path' => array(
'label' => __( 'Plugins Directory Location' ), 'label' => __( 'Plugins directory location' ),
'value' => trailingslashit( WP_PLUGIN_DIR ), 'value' => WP_PLUGIN_DIR,
), ),
'plugins_size' => array( 'plugins_size' => array(
'label' => __( 'Plugins Directory Size' ), 'label' => __( 'Plugins directory size' ),
'value' => $not_calculated,
'debug' => 'not calculated',
),
'wordpress_path' => array(
'label' => __( 'WordPress Directory Location' ),
'value' => ABSPATH,
),
'wordpress_size' => array(
'label' => __( 'WordPress Directory Size' ),
'value' => $not_calculated, 'value' => $not_calculated,
'debug' => 'not calculated', 'debug' => 'not calculated',
), ),
@ -898,6 +894,10 @@ class WP_Debug_Data {
'label' => __( 'Theme features' ), 'label' => __( 'Theme features' ),
'value' => implode( ', ', $theme_features ), 'value' => implode( ', ', $theme_features ),
), ),
'theme_path' => array(
'label' => __( 'Theme directory location' ),
'value' => get_template_directory(),
),
); );
// Populate a list of all themes available in the install. // Populate a list of all themes available in the install.
@ -1137,68 +1137,71 @@ class WP_Debug_Data {
} }
// Go through the various installation directories and calculate their sizes. // Go through the various installation directories and calculate their sizes.
$all_sizes = array( // No trailing slashes.
'wordpress_size' => array( $paths = array(
'path' => ABSPATH, 'wordpress_size' => untrailingslashit( ABSPATH ),
'size' => 0, 'themes_size' => get_theme_root(),
), 'plugins_size' => WP_PLUGIN_DIR,
'themes_size' => array( 'uploads_size' => $upload_dir['basedir'],
'path' => trailingslashit( get_theme_root() ),
'size' => 0,
),
'plugins_size' => array(
'path' => trailingslashit( WP_PLUGIN_DIR ),
'size' => 0,
),
'uploads_size' => array(
'path' => $upload_dir['basedir'],
'size' => 0,
),
); );
$exclude = $paths;
unset( $exclude['wordpress_size'] );
$exclude = array_values( $exclude );
$size_total = 0; $size_total = 0;
$all_sizes = array();
// Loop over all the directories we want to gather the sizes for. // Loop over all the directories we want to gather the sizes for.
foreach ( $all_sizes as $name => $attributes ) { foreach ( $paths as $name => $path ) {
$dir_size = null; // Default to timeout. $dir_size = null; // Default to timeout.
$results = array(
'path' => $path,
'raw' => 0,
);
if ( microtime( true ) - WP_START_TIMESTAMP < $max_execution_time ) { if ( microtime( true ) - WP_START_TIMESTAMP < $max_execution_time ) {
$dir_size = recurse_dirsize( $attributes['path'], null, $max_execution_time ); if ( 'wordpress_size' === $name ) {
$dir_size = recurse_dirsize( $path, $exclude, $max_execution_time );
} else {
$dir_size = recurse_dirsize( $path, null, $max_execution_time );
}
} }
if ( false === $dir_size ) { if ( false === $dir_size ) {
// Error reading. // Error reading.
$all_sizes[ $name ]['size'] = __( 'The size cannot be calculated. The directory is not accessible. Usually caused by invalid permissions.' ); $results['size'] = __( 'The size cannot be calculated. The directory is not accessible. Usually caused by invalid permissions.' );
$all_sizes[ $name ]['debug'] = 'not accessible'; $results['debug'] = 'not accessible';
// Stop total size calculation. // Stop total size calculation.
$size_total = null; $size_total = null;
} elseif ( null === $dir_size ) { } elseif ( null === $dir_size ) {
// Timeout. // Timeout.
$all_sizes[ $name ]['size'] = __( 'The directory size calculation has timed out. Usually caused by a very large number of sub-directories and files.' ); $results['size'] = __( 'The directory size calculation has timed out. Usually caused by a very large number of sub-directories and files.' );
$all_sizes[ $name ]['debug'] = 'timeout while calculating size'; $results['debug'] = 'timeout while calculating size';
// Stop total size calculation. // Stop total size calculation.
$size_total = null; $size_total = null;
} else { } else {
$is_subdir = ( strpos( $attributes['path'], ABSPATH ) === 0 ); if ( null !== $size_total ) {
// phpcs:ignore WordPress.WP.CapitalPDangit.Misspelled
if ( null !== $size_total && ( 'wordpress_size' === $name || ! $is_subdir ) ) {
$size_total += $dir_size; $size_total += $dir_size;
} }
$all_sizes[ $name ]['size'] = size_format( $dir_size, 2 ); $results['raw'] = $dir_size;
$all_sizes[ $name ]['debug'] = $all_sizes[ $name ]['size']; $results['size'] = size_format( $dir_size, 2 );
$results['debug'] = $results['size'] . " ({$dir_size} bytes)";
} }
$all_sizes[ $name ] = $results;
} }
if ( $size_db > 0 ) { if ( $size_db > 0 ) {
$database_size = size_format( $size_db, 2 ); $database_size = size_format( $size_db, 2 );
$all_sizes['database_size'] = array( $all_sizes['database_size'] = array(
'raw' => $size_db,
'size' => $database_size, 'size' => $database_size,
'debug' => $database_size, 'debug' => $database_size . " ({$size_db} bytes)",
); );
} else { } else {
$all_sizes['database_size'] = array( $all_sizes['database_size'] = array(
@ -1208,11 +1211,13 @@ class WP_Debug_Data {
} }
if ( null !== $size_total && $size_db > 0 ) { if ( null !== $size_total && $size_db > 0 ) {
$total_size = size_format( $size_total + $size_db, 2 ); $total_size = $size_total + $size_db;
$total_size_mb = size_format( $total_size, 2 );
$all_sizes['total_size'] = array( $all_sizes['total_size'] = array(
'size' => $total_size, 'raw' => $total_size,
'debug' => $total_size, 'size' => $total_size_mb,
'debug' => $total_size_mb . " ({$total_size} bytes)",
); );
} else { } else {
$all_sizes['total_size'] = array( $all_sizes['total_size'] = array(

14
src/wp-includes/functions.php
View File

@ -7072,17 +7072,25 @@ function get_dirsize( $directory, $max_execution_time = null ) {
* @since 5.2.0 $max_execution_time parameter added. * @since 5.2.0 $max_execution_time parameter added.
* *
* @param string $directory Full path of a directory. * @param string $directory Full path of a directory.
* @param string $exclude Optional. Full path of a subdirectory to exclude from the total. * @param string|array $exclude Optional. Full path of a subdirectory to exclude from the total, or array of paths.
* Expected without trailing slash(es).
* @param int $max_execution_time Maximum time to run before giving up. In seconds. * @param int $max_execution_time Maximum time to run before giving up. In seconds.
* The timeout is global and is measured from the moment WordPress started to load. * The timeout is global and is measured from the moment WordPress started to load.
* @return int|false|null Size in MB if a valid directory. False if not. Null if timeout. * @return int|false|null Size in bytes if a valid directory. False if not. Null if timeout.
*/ */
function recurse_dirsize( $directory, $exclude = null, $max_execution_time = null ) { function recurse_dirsize( $directory, $exclude = null, $max_execution_time = null ) {
$size = 0; $size = 0;
$directory = untrailingslashit( $directory ); $directory = untrailingslashit( $directory );
if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) { if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) ) {
return false;
}
if (
( is_string( $exclude ) && $directory === $exclude ) ||
( is_array( $exclude ) && in_array( $directory, $exclude, true ) )
) {
return false; return false;
} }