Module:NBlocks: Difference between revisions

← Older edit

@@ Line 11: / Line 11: @@
 end
-function p.raw_blocks_to_kilobytes(blocks)
+function p.raw_blocks_to_kib(blocks)
 	return blocks * 128
 end
-function p.raw_blocks_to_megabytes(blocks)
+function p.raw_blocks_to_mib(blocks)
 	return blocks / 8
 end
@@ Line 23: / Line 23: @@
 end
-function p.raw_megabytes_to_blocks(megabytes)
+function p.raw_mib_to_blocks(mib)
-	return math.ceil(megabytes * 8)
+	return math.ceil(mib * 8)
+end
+function get_display_unit(size)
+	if     size >= 1024 * 1024 * 1024 then
+		return size / 1024 / 1024 / 1024, 'GiB'
+	elseif size >= 1024 * 1024 then
+		return size / 1024 / 1024, 'MiB'
+	elseif size >= 1024 then
+		return size / 1024, 'KiB'
+	else
+		return size, 'bytes'
+	end
+end
+function p.raw_format_bytes(bytes)
+	-- this needs to do bytes, kib, and gib too
+	local formatted_size, unit = get_display_unit(tonumber(bytes))
+	return string.format("%.2f", formatted_size) .. ' ' .. unit
 end
@@ Line 36: / Line 54: @@
 function p.blocks_to_bytes(frame)
-	return blocks_to_bytes(frame.args[1])
+	return p.raw_blocks_to_bytes(frame.args[1])
 end
-function p.blocks_to_kilobytes(frame)
+function p.blocks_to_kib(frame)
-	return blocks_to_kilobytes(frame.args[1])
+	return p.raw_blocks_to_kib(frame.args[1])
 end
-function p.blocks_to_megabytes(frame)
+function p.blocks_to_mib(frame)
-	return blocks_to_megabytes(frame.args[1])
+	return p.raw_blocks_to_mib(frame.args[1])
 end
 function p.bytes_to_blocks(frame)
-	return bytes_to_blocks(frame.args[1])
+	return p.raw_bytes_to_blocks(frame.args[1])
+end
+function p.mib_to_blocks(frame)
+	return p.raw_mib_to_blocks(frame.args[1])
 end
-function p.megabytes_to_blocks(frame)
+function p.format_bytes(frame)
-	return megabytes_to_blocks(frame.args[1])
+	return p.raw_format_bytes(frame.args[1])
 end
 return p