From a177fa68d4ef084963654ca44d149239e3344641 Mon Sep 17 00:00:00 2001
From: Davide Depau <davide@depau.eu>
Date: Fri, 17 Aug 2018 22:09:41 +0200
Subject: [PATCH] Use patched dmg2img to display size of DMG partitions
---
.../java/eu/depau/etchdroid/img_types/DMGImage.kt | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt b/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt
index 6417f19..f16dfe0 100644
--- a/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt
+++ b/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt
@@ -10,13 +10,14 @@ import eu.depau.etchdroid.utils.Partition
import eu.depau.etchdroid.utils.PartitionBuilder
import java.io.File
-private val partRegex = Regex("partition (\\d+): (.*) \\((.+) : \\d+\\)")
+val SECTOR_SIZE = 512
+private val partRegex = Regex("partition (\\d+): begin=(\\d+), size=(\\d+), decoded=(\\d+), firstsector=(\\d+), sectorcount=(\\d+), blocksruncount=(\\d+)\\s+(.*) \\((.+) : \\d+\\)", RegexOption.MULTILINE)
private fun readPartitionTable(dmg2img: File, libDir: String, file: File): Pair<PartitionTableType?, List<Partition>?> {
val pt = ArrayList<Partition>()
var ptType: PartitionTableType? = null
- val pb = ProcessBuilder(dmg2img.path, "-l", file.path)
+ val pb = ProcessBuilder(dmg2img.path, "-v", "-l", file.path)
pb.environment()["LD_LIBRARY_PATH"] = libDir
pb.redirectErrorStream(true)
@@ -27,10 +28,17 @@ private fun readPartitionTable(dmg2img: File, libDir: String, file: File): Pair<
val matches = partRegex.findAll(out)
matchloop@ for (m in matches) {
- val (number, label, type) = m.destructured
+ val (
+ number, begin, size,
+ decoded, firstsector,
+ sectorcount, blocksruncount,
+ label, type
+ ) = m.destructured
+
val pb = PartitionBuilder()
pb.number = number.toInt()
+ pb.size = SECTOR_SIZE * sectorcount.toLong()
if (label.isNotEmpty())
pb.fsLabel = label