mirror of
https://github.com/tw93/Mole.git
synced 2026-03-22 20:15:07 +00:00
refactor: use bytes_to_human_kb for dynamic size formatting
- Replace inline dynamic formatting with shared bytes_to_human_kb() - Apply to both clean and purge commands - Simplify movie comparison with integer arithmetic
This commit is contained in:
29
bin/clean.sh
29
bin/clean.sh
@@ -1022,24 +1022,7 @@ perform_cleanup() {
|
||||
|
||||
if [[ $total_size_cleaned -gt 0 ]]; then
|
||||
local freed_size_human
|
||||
local freed_value
|
||||
local freed_unit
|
||||
|
||||
# ============================================
|
||||
# Dynamic size formatting (KB → MB → GB)
|
||||
# ============================================
|
||||
if ((total_size_cleaned < 1024)); then
|
||||
freed_value="$total_size_cleaned"
|
||||
freed_unit="KB"
|
||||
elif ((total_size_cleaned < 1024 * 1024)); then
|
||||
freed_value=$(printf "%.2f" "$(echo "scale=4; $total_size_cleaned/1024" | bc)")
|
||||
freed_unit="MB"
|
||||
else
|
||||
freed_value=$(printf "%.2f" "$(echo "scale=4; $total_size_cleaned/1024/1024" | bc)")
|
||||
freed_unit="GB"
|
||||
fi
|
||||
|
||||
freed_size_human="${freed_value}${freed_unit}"
|
||||
freed_size_human=$(bytes_to_human_kb "$total_size_cleaned")
|
||||
|
||||
if [[ "$DRY_RUN" == "true" ]]; then
|
||||
local stats="Potential space: ${GREEN}${freed_size_human}${NC}"
|
||||
@@ -1072,12 +1055,10 @@ perform_cleanup() {
|
||||
|
||||
summary_details+=("$summary_line")
|
||||
|
||||
# Movie comparison only if unit is GB and >= 1GB
|
||||
if [[ "$freed_unit" == "GB" ]] &&
|
||||
[[ $(echo "$freed_value >= 1" | bc) -eq 1 ]]; then
|
||||
|
||||
local movies
|
||||
movies=$(printf "%.0f" "$(echo "scale=2; $freed_value/4.5" | bc)")
|
||||
# Movie comparison only if >= 1GB (1048576 KB)
|
||||
if ((total_size_cleaned >= 1048576)); then
|
||||
local freed_gb=$((total_size_cleaned / 1048576))
|
||||
local movies=$((freed_gb * 10 / 45))
|
||||
|
||||
if [[ $movies -gt 0 ]]; then
|
||||
if [[ $movies -eq 1 ]]; then
|
||||
|
||||
@@ -210,12 +210,12 @@ perform_purge() {
|
||||
fi
|
||||
|
||||
if [[ $total_size_cleaned -gt 0 ]]; then
|
||||
local freed_gb
|
||||
freed_gb=$(echo "$total_size_cleaned" | awk '{printf "%.2f", $1/1024/1024}')
|
||||
local freed_size_human
|
||||
freed_size_human=$(bytes_to_human_kb "$total_size_cleaned")
|
||||
|
||||
local summary_line="Space freed: ${GREEN}${freed_gb}GB${NC}"
|
||||
local summary_line="Space freed: ${GREEN}${freed_size_human}${NC}"
|
||||
if [[ "${MOLE_DRY_RUN:-0}" == "1" ]]; then
|
||||
summary_line="Would free: ${GREEN}${freed_gb}GB${NC}"
|
||||
summary_line="Would free: ${GREEN}${freed_size_human}${NC}"
|
||||
fi
|
||||
[[ $total_items_cleaned -gt 0 ]] && summary_line+=" | Items: $total_items_cleaned"
|
||||
summary_line+=" | Free: $(get_free_space)"
|
||||
|
||||
Reference in New Issue
Block a user