Merge pull request #5 from santoshndev/disk-usage-fix

Fixed disk usage data issue

Author: santoshndev

classes/output/main.php

@@ -94,12 +94,7 @@ public function get_disk_usage() {
             return get_string('notcalculated', 'block_site_stats');
         }
 
-        $unit = get_string('sizemb', 'block_site_stats');
-        if ($diskusagecache > 1024) {
-            $unit = get_string('sizegb', 'block_site_stats');
-        }
-
-        return $diskusagecache . $unit;
+        return $diskusagecache;
     }
     /**
      * Export the data for template

classes/task/diskusage.php

@@ -44,7 +44,7 @@ public function execute() {
         global $CFG;
         $cache = cache::make('block_site_stats', 'sitestats');
         $diskusage = get_directory_size($CFG->dataroot);
-        $disksize = number_format(ceil($diskusage / 1048576));
+        $disksize = display_size($diskusage);
         $cache->set('diskusage', $disksize);
         return true;
     }

lang/en/block_site_stats.php

@@ -31,6 +31,4 @@
 $string['privacy:metadata'] = 'The Site Statistics block only shows data stored in other locations.';
 $string['site_stats:myaddinstance'] = 'Add a new Site Statistics block to Dashboard';
 $string['site_stats:view'] = 'View Site Statistics block content';
-$string['sizegb'] = ' GB';
-$string['sizemb'] = ' MB';
 $string['users'] = 'Users';

lang/hi/block_site_stats.php

@@ -31,6 +31,4 @@
 $string['privacy:metadata'] = 'साइट आँकड़े ब्लॉक केवल अन्य स्थानों में संग्रहित डेटा दिखाता है।';
 $string['site_stats:myaddinstance'] = 'डैशबोर्ड पर नया साइट आँकड़ा ब्लॉक जोड़ें';
 $string['site_stats:view'] = 'साइट आँकड़े ब्लॉक की सामग्री देखें';
-$string['sizegb'] = ' जीबी';
-$string['sizemb'] = ' एमबी';
 $string['users'] = 'उपयोगकर्ता';

lang/mr/block_site_stats.php

@@ -31,6 +31,4 @@
 $string['privacy:metadata'] = 'साइट सांख्यिकी ब्लॉक फक्त इतर स्थानांतील डेटा दर्शवितो.';
 $string['site_stats:myaddinstance'] = 'डॅशबोर्डवर नविन साइट सांख्यिकी ब्लॉक जोडा';
 $string['site_stats:view'] = 'साइट सांख्यिकी ब्लॉक सामग्री पहा';
-$string['sizegb'] = ' जीबी';
-$string['sizemb'] = ' एमबी';
 $string['users'] = 'वापरकर्ते';

tests/output/main_test.php

@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 namespace block_site_stats\output;
 
 use advanced_testcase;
@@ -95,20 +96,17 @@ public function test_get_activities_count(): void {
      * @return void
      */
     public function test_get_disk_usage(): void {
-        global $CFG;
         // Test when the diskusage scheduled task is not run.
         $diskusage = $this->main->get_disk_usage();
         $expected = get_string('notcalculated', 'block_site_stats');
         $this->assertEquals($expected, $diskusage);
 
         // Test when the diskusage scheduled task is run.
-        $diskusage = get_directory_size($CFG->dataroot);
-        $disksize = number_format(ceil($diskusage / 1048576));
         $task = new diskusage();
         $status = $task->execute();
         if ($status) {
             $diskusage = $this->main->get_disk_usage();
-            $this->assertEquals($disksize . ' MB', $diskusage);
+            $this->assertNotEquals($expected, $diskusage);
         }
     }
 }

tests/privacy/provider_test.php

@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 namespace block_site_stats\privacy;
 
 use advanced_testcase;

tests/site_stats_test.php

@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 namespace block_site_stats;
 use advanced_testcase;
 use block_site_stats;

version.php

@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024050403;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = '1.0.1';
+$plugin->version   = 2024050404;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = '1.0.2';
 $plugin->requires  = 2022111800;        // Requires this Moodle version.
 $plugin->component = 'block_site_stats'; // Full name of the plugin (used for diagnostics).
 $plugin->maturity = MATURITY_STABLE;