Optimizer semi-gardening

This commit is contained in:
2021-01-06 19:57:40 +01:00
parent 2eddcd905d
commit 397c7d3436
2 changed files with 44 additions and 36 deletions
+28 -36
View File
@@ -65,28 +65,17 @@ class optimizer
public static function remove_videos(osu_library $library) public static function remove_videos(osu_library $library)
{ {
foreach ($library->get_videos() as $file) utils::array_delete_if_exists($library->get_videos());
{
if (file_exists($file)) unlink($file);
}
} }
public static function remove_storyboards(osu_library $library) : void public static function remove_storyboards(osu_library $library) : void
{ {
// exclude vital files if they are used in the storyboard // exclude vital files if they are used in the storyboard
$storyboards_safe = $library->get_storyboards(); $vital = array_merge($library->get_backgrounds(), $library->get_audiofiles());
$storyboards_safe = array_diff($storyboards_safe, $library->get_backgrounds()); $sb_safe = array_diff($library->get_storyboards(), $vital);
$storyboards_safe = array_diff($storyboards_safe, $library->get_audiofiles());
foreach ($storyboards_safe as $file) utils::array_delete_if_exists($sb_safe);
{ utils::array_delete_if_exists($library->get_osb_files());
if (file_exists($file)) unlink($file);
}
foreach ($library->get_osb_files() as $file)
{
if (file_exists($file)) unlink($file);
}
} }
private static function build_removand_sublist(array &$queue, string $folder, bool $single_level = false) private static function build_removand_sublist(array &$queue, string $folder, bool $single_level = false)
@@ -189,44 +178,47 @@ class optimizer
return array_intersect_key($files, array_diff($files_lowercase, $exclusions_lowercase)); return array_intersect_key($files, array_diff($files_lowercase, $exclusions_lowercase));
} }
public static function remove_skins(osu_library $library) : void public static function get_junk_files(osu_library $library, $excluded = array()) : array
{ {
$removand = self::build_removand_list($library, true); $removand = self::build_removand_list($library, true);
$exclusions = self::build_excluded_list($library); $exclusions = self::build_excluded_list($library);
$junk_files = self::array_diff_ver_peppy($removand, $exclusions); return self::array_diff_ver_peppy($removand, $exclusions);
}
foreach ($junk_files as $file) public static function remove_skins(osu_library $library) : void
{
$junk_files = self::get_junk_files($library);
foreach ($junk_files as $key => $file)
{ {
if (self::is_skinnable_image($file) || self::is_skinnable_other($file)) if (self::is_skinnable_image($file) || self::is_skinnable_other($file))
{ {
if (file_exists($file)) unlink($file); unset($junk_files[$key]);
} }
} }
utils::array_delete_if_exists($junk_files);
} }
public static function remove_hitsounds(osu_library $library) : void public static function remove_hitsounds(osu_library $library) : void
{ {
$removand = self::build_removand_list($library, true); $junk_files = self::get_junk_files($library, $exclusions);
$exclusions = self::build_excluded_list($library, [ "hitsounds" ]);
$junk_files = self::array_diff_ver_peppy($removand, $exclusions); foreach ($junk_files as $key => $file)
foreach ($junk_files as $file)
{ {
if (self::is_skinnable_sound($file)) if (self::is_skinnable_sound($file))
{ {
if (file_exists($file)) unlink($file); unset($junk_files[$key]);
} }
} }
utils::array_delete_if_exists($junk_files);
$hitsounds_safe = $library->get_hitsounds(); $hitsounds_safe = $library->get_hitsounds();
$hitsounds_safe = array_diff($hitsounds_safe, $library->get_audiofiles()); $hitsounds_safe = array_diff($hitsounds_safe, $library->get_audiofiles());
foreach ($hitsounds_safe as $file) utils::array_delete_if_exists($hitsounds_safe);
{
if (file_exists($file)) unlink($file);
}
} }
public static function full_nuke(osu_library $library) : void public static function full_nuke(osu_library $library) : void
@@ -244,16 +236,16 @@ class optimizer
{ {
$excluded_arg = array(); $excluded_arg = array();
} }
$removand = self::build_removand_list($library);
$exclusions = self::build_excluded_list($library, $excluded_arg);
$junk_files = self::array_diff_ver_peppy($removand, $exclusions); $junk_files = self::get_junk_files($library, $excluded_arg);
foreach ($junk_files as $file) foreach ($junk_files as $key => $file)
{ {
if (!$nuke && self::is_skinnable($file)) continue; // ignore default hitsounds if (!$nuke && self::is_skinnable($file)) continue;
if (file_exists($file)) unlink($file); unset($junk_files[$key]);
} }
utils::array_delete_if_exists($junk_files);
} }
public static function repack_all(osu_library $library) : void public static function repack_all(osu_library $library) : void
+16
View File
@@ -64,4 +64,20 @@ class utils
{ {
return self::remove_trailing_slashes(self::to_unix_slashes($path)); return self::remove_trailing_slashes(self::to_unix_slashes($path));
} }
public static function delete_if_exists(string $file) : void
{
if (file_exists($file))
{
unlink($file);
}
}
public static function array_delete_if_exists(array $files_list) : void
{
foreach ($files_list as $file)
{
self::delete_if_exists($file);
}
}
} }