Remove any confusing legacy sizing files; everything in the panel is true MB (1000) not MiB
This commit is contained in:
parent
2d95204e9a
commit
6967b76ae6
4 changed files with 0 additions and 107 deletions
|
@ -1,28 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Pterodactyl\Providers;
|
||||
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
class MacroServiceProvider extends ServiceProvider
|
||||
{
|
||||
/**
|
||||
* Bootstrap the application services.
|
||||
*/
|
||||
public function boot()
|
||||
{
|
||||
File::macro('humanReadableSize', function ($path, $precision = 2) {
|
||||
$size = File::size($path);
|
||||
static $units = ['B', 'kB', 'MB', 'GB', 'TB'];
|
||||
|
||||
$i = 0;
|
||||
while (($size / 1024) > 0.9) {
|
||||
$size = $size / 1024;
|
||||
$i++;
|
||||
}
|
||||
|
||||
return round($size, ($i < 2) ? 0 : $precision) . ' ' . $units[$i];
|
||||
});
|
||||
}
|
||||
}
|
|
@ -1,34 +1,4 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* This software is licensed under the terms of the MIT license.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
if (! function_exists('human_readable')) {
|
||||
/**
|
||||
* Generate a human-readable filesize for a given file path.
|
||||
*
|
||||
* @param string $path
|
||||
* @param int $precision
|
||||
* @return string
|
||||
*/
|
||||
function human_readable($path, $precision = 2)
|
||||
{
|
||||
if (is_numeric($path)) {
|
||||
$i = 0;
|
||||
while (($path / 1024) > 0.9) {
|
||||
$path = $path / 1024;
|
||||
$i++;
|
||||
}
|
||||
|
||||
return round($path, $precision) . ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'][$i];
|
||||
}
|
||||
|
||||
return app('file')->humanReadableSize($path, $precision);
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('is_digit')) {
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue