Skip to content

Show compressed columns when compressed entries present #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JakeWharton merged 1 commit into from
Aug 7, 2026
+8 −4
Merged

Show compressed columns when compressed entries present #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
**Changed**
- Replace `com.jakewharton.diffuse.io.Size` with `me.saket.bytesize.ByteSize` in the APIs.
- Eliminate `data class` from public APIs.
- Show compressed columns when compressed entries present.

**Fixed**
- Significantly improve `.jar` diff performance.
Expand Down
2 changes: 1 addition & 1 deletion reports/src/main/kotlin/com/jakewharton/diffuse/diff/AabDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.jakewharton.diffuse.report.text.AabDiffTextReport

internal class AabDiff(val oldAab: Aab, val newAab: Aab) : BinaryDiff {
inner class ModuleDiff(val oldModule: Aab.Module, val newModule: Aab.Module) {
val archive = ArchiveFilesDiff(oldModule.files, newModule.files, includeCompressed = false)
val archive = ArchiveFilesDiff(oldModule.files, newModule.files)
val dex =
DexDiff(
oldModule.dexes.map { it.withMapping(oldAab.apiMapping) },
Expand Down
2 changes: 1 addition & 1 deletion reports/src/main/kotlin/com/jakewharton/diffuse/diff/AarDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal class AarDiff(
val newAar: Aar,
val newMapping: ApiMapping,
) : BinaryDiff {
val archive = ArchiveFilesDiff(oldAar.files, newAar.files, includeCompressed = false)
val archive = ArchiveFilesDiff(oldAar.files, newAar.files)
val jars = JarsDiff(oldAar.jars, oldMapping, newAar.jars, newMapping)
val manifest = AndroidManifestDiff(oldAar.manifest, newAar.manifest)

Expand Down
5 changes: 4 additions & 1 deletion reports/src/main/kotlin/com/jakewharton/diffuse/diff/ArchiveFilesDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import me.saket.bytesize.binaryBytes
internal class ArchiveFilesDiff(
val oldFiles: ArchiveFiles,
val newFiles: ArchiveFiles,
val includeCompressed: Boolean = true,
val includeCompressed: Boolean = oldFiles.isCompressed || newFiles.isCompressed,
) {
data class Change(
val path: String,
Expand Down Expand Up @@ -235,3 +235,6 @@ internal fun ArchiveFilesDiff.toDetailReport() = buildString {
.renderText()
)
}

private val ArchiveFiles.isCompressed: Boolean
get() = values.any { it.isCompressed }
2 changes: 1 addition & 1 deletion reports/src/main/kotlin/com/jakewharton/diffuse/diff/JarDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal class JarDiff(
val newJar: Jar,
val newMapping: ApiMapping,
) : BinaryDiff {
val archive = ArchiveFilesDiff(oldJar.files, newJar.files, includeCompressed = false)
val archive = ArchiveFilesDiff(oldJar.files, newJar.files)
val jars = JarsDiff(listOf(oldJar), oldMapping, listOf(newJar), newMapping)

val changed = jars.changed || archive.changed
Expand Down