JMR-devandClaude Opus 5
cfd705af05
Every conversion writes a full-size file into <cacheDir>/conversions/. save()
published it and deleted it, but reset() -- what the "Start over" button on the
Converted and Joined states calls -- dropped the File reference and left the file
behind. Converting something and deciding not to save it is an ordinary path
through the UI, so it leaked a full-size copy every time. cacheDir is evictable,
so this was never unbounded growth; it was the app relying on the OS to clean up
after it, and on a device under no storage pressure "eventually" means never.
OutputPublisher.clearStaging() was written for exactly this and called from
nowhere. It is NOT wired up here -- it is deleted. It emptied the directory
unconditionally, and the convert tab, the join tab and ConcatEngine's
concat_list.txt all share that directory with no per-job namespacing (D8), so a
blanket delete could take a file out from under a running job. Two narrower
methods replace it:
discardStaged(file) one file, guarded. The handle reaches the ViewModel as a
path string in WorkInfo.outputData and becomes a File with
nothing checking where it points, so this compares the
CANONICAL parent against the staging dir -- the naive
string comparison accepts conversions/../elsewhere.
sweepStaging(now) age-based, for orphans no ViewModel is left to clean up.
The cleanup handle is a ViewModel field, not something read back out of the state
machine, because the state machine cannot answer it on the path that needs it
most: a failed save lands on Failed(message), which carries no file reference at
all. On that path the file is deliberately kept -- it may be the only copy of an
hour of transcoding and the destination did not receive it, so deleting to tidy a
cache directory would destroy the work. It stays collectable by a later reset()
or by the sweep.
The sweep runs once per process from a new Application subclass, off the main
thread. The reason it cannot race a live job is the grace period, not ordering:
WorkManager initialises through androidx.startup's InitializationProvider, a
ContentProvider, so it is already up before onCreate() and can be resuming a
worker in this same process while the sweep runs. StagingSweep only collects a
file nothing has written to for 24 hours. Outputs are written continuously and
keep their own mtime fresh; concat_list.txt is the one file written once and then
only read, and a WorkManager attempt is capped by the six-hour foreground-service
budget with retries restarting doWork() from the top, so no attempt can hold a
file still for a day. sweepStaging() also re-reads each timestamp immediately
before deleting, closing the window between listing the directory and acting on
the list -- unlinking an inode a running job still holds open would end with the
job reporting success for a path that no longer exists.
The rule itself is a pure function over (name, lastModifiedMs) pairs and a clock.
Timestamps are values rather than Files so the tests measure the arithmetic --
the grace boundary, and a clock that moved backwards -- rather than the
filesystem's mtime granularity.
Tests cover the tool AND the wiring, because the wiring is where the defect was.
A pure rule test and a Robolectric test of OutputPublisher both stay green when
the discardStaged call is deleted from reset(), which would have made the number
read as coverage of a bug that was still there. So both ViewModels are driven --
through a real WorkManager, to Converted/Joined -- and then asserted on the
filesystem: Start over deletes the staged file; a successful save leaves nothing
to delete twice; a failed save keeps the file and a later reset collects it, which
pins the argued decision above rather than leaving it as a comment. Verified by
deleting the discardStaged line from both reset() methods: 4 of the 6 fail with
"reset() should have discarded exactly the staged file expected:<[...]> but
was:<[]>", and the two save-path tests correctly stay green.
Three things made that reachable, all reusing what was already here:
- Both ViewModels now resolve their publisher through ConversionDependencies,
like the workers already did. They were the only place bypassing the seam.
- MediaProbe joins that seam too. It spawns FFprobe, and FFmpegKit's loader
throws a bare java.lang.Error when the native library is absent -- which its
own `catch (e: Exception)` cannot catch, so every JVM test died on the file
pick. Instrumented tests are unaffected and still get the real probe.
That error path is a LATENT PRODUCTION HAZARD, recorded in the KDoc and
deliberately not fixed here: onInputPicked does not catch it either, so a
missing .so would surface as an uncaught error rather than the "could not read
this file" the code was written to give. It cannot fire on a device that ships
the libraries, so widening MediaProbe's catch to Throwable would change the
pick path on the strength of a condition no user meets. Its own commit.
- reset()'s cleanup dispatcher is a constructor parameter defaulting to
Dispatchers.IO, which makes the delete assertable and states the ordering --
Idle is published synchronously, the delete is dispatched -- as a decision
rather than an accident. @JvmOverloads keeps the single-argument constructor
that viewModel()'s AndroidViewModelFactory looks up reflectively.
androidx-work-testing was already in the catalog and already inside the prerelease
guard via its androidx. group, so it needed no new pinning argument.
Robolectric is added for the one assertion no pure function can make: that the
file is really gone from a real cacheDir. It is PINNED at 4.16.1 and belongs with
ktlint/detekt/jacoco rather than the floating libraries. The prerelease guard in
app/build.gradle.kts only covers androidx., junit and com.arthenica, so
org.robolectric is unguarded and a "4.+" would resolve to 4.17-beta-3; beyond
that, a bump changes which android-all jar the tests execute against, which is the
same "a tool moved under a diff that cannot explain it" failure the linters are
pinned for.
Two things Robolectric needed. testOptions did not exist in this module at all;
it now sets isIncludeAndroidResources so the merged manifest and resource table
reach the JVM tests, and grants --enable-native-access, which Java 25 otherwise
warns about four times per run when Robolectric's native runtime calls
System.load(). And robolectric.properties pins sdk=36: Robolectric defaults to the
manifest's targetSdk of 37, there is no android-all jar for 37, and the class
fails to initialise before any test body runs. 36 is where CI's emulator matrix
already stops, so this does not widen the gap -- API 37 was already a manual check
on the Pixel 10 Pro XL before each release.
Known and left alone: a conversion that fails inside the worker never reaches
Converted, so pendingStaged is never set and any partial output relies on the
sweep alone. reset()'s delete is also fire-and-forget on viewModelScope, so it is
cancelled if the Activity finishes first. The sweep is the backstop for both.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
148 lines
8.9 KiB
TOML
148 lines
8.9 KiB
TOML
[versions]
|
|
# Build tooling. Pinned, never floating. agp and kotlin are coupled (below); ksp is
|
|
# staged for a later phase and unapplied today -- KSP2 versions independently of Kotlin.
|
|
#
|
|
# AGP 9 has BUILT-IN Kotlin: it compiles Kotlin itself rather than delegating to the
|
|
# org.jetbrains.kotlin.android plugin, which is incompatible with its DSL and fails the
|
|
# build if applied. DO NOT add it.
|
|
#
|
|
# By default AGP compiles with the KGP it bundles -- 2.2.10 for AGP 9.3.1, per its POM --
|
|
# and that version caps jvmTarget at 24, which would cap the app's bytecode below the JDK
|
|
# everything else runs on. The root build.gradle.kts therefore puts KGP on the buildscript
|
|
# classpath explicitly, which AGP's built-in Kotlin picks up instead. That is the only
|
|
# reason `kotlin` here can be ahead of what AGP ships.
|
|
#
|
|
# The Compose compiler plugin is versioned in lockstep with Kotlin and is read from this
|
|
# same `kotlin` entry, so the two cannot drift. Raising `kotlin` means checking that a
|
|
# matching compose-compiler-gradle-plugin exists.
|
|
agp = "9.3.1"
|
|
kotlin = "2.4.10"
|
|
ksp = "2.3.11"
|
|
|
|
# AndroidX / Compose -- floating on minor + patch. The prerelease guard in
|
|
# app/build.gradle.kts is what keeps `+` from selecting an alpha: several of these
|
|
# (lifecycle, navigation, work, datastore, annotation) publish alphas and RCs with
|
|
# version numbers ABOVE their newest stable, and Gradle's `+` would take them.
|
|
# Bare `+`, not "2026.+": the year is the major in this scheme (YYYY.MM.PP), so a
|
|
# 2026-prefixed float would quietly stop finding releases on 1 January and keep
|
|
# building green against a frozen BOM.
|
|
composeBom = "+"
|
|
coreKtx = "1.+"
|
|
activityCompose = "1.+"
|
|
lifecycle = "2.+"
|
|
navigation = "2.+"
|
|
work = "2.+"
|
|
datastore = "1.+"
|
|
media3 = "1.+"
|
|
room = "2.+"
|
|
documentfile = "1.+"
|
|
annotation = "1.+"
|
|
|
|
# Test -- floating, same rules as above.
|
|
junit = "4.+"
|
|
androidxJunit = "1.+"
|
|
espressoCore = "3.+"
|
|
# PINNED, unlike its neighbours. Under semver a 0.x minor is allowed to break, and
|
|
# this library is load-bearing exactly where breakage is hardest to see: the wrapper
|
|
# reaches for smartexception.java.Exceptions only when an FFmpeg call FAILS, so a
|
|
# moved class surfaces as an R8 missing-class error at release time, or as a crash on
|
|
# the error path -- the least-exercised code in the app. Bump it deliberately.
|
|
smartException = "0.2.1"
|
|
|
|
# Lint/format. PINNED, deliberately, while the libraries above float.
|
|
#
|
|
# A library bump that misbehaves usually still compiles. An analysis-tool bump does
|
|
# something worse: a new rule in ktlint or detekt makes files nobody touched stop
|
|
# passing, so CI goes red on a PR whose diff cannot explain it. Upgrading these is
|
|
# therefore an act with its own commit -- run the tool, read the new findings, fix or
|
|
# relax them -- which is exactly the reviewable step floating is meant to skip.
|
|
#
|
|
# ktlint owns formatting; detekt owns static analysis (its formatting ruleset stays
|
|
# off, so the two can never disagree about the same line).
|
|
# detekt 2.0 is the only line with Gradle 9 support -- stable 1.23.x tops out at
|
|
# Gradle 8.12, and this project is on 9.7.1.
|
|
ktlint = "14.2.0"
|
|
detekt = "2.0.0-alpha.6"
|
|
# JaCoCo coverage agent. Pinned rather than inheriting whatever Gradle 9.7.1 bundles,
|
|
# so the agent version that reads Kotlin 2.2.10 bytecode is stated, not implied.
|
|
jacoco = "0.8.15"
|
|
|
|
# Robolectric. PINNED, and it belongs with ktlint/detekt/jacoco above rather than with
|
|
# the floating libraries, for two reasons that both point the same way.
|
|
#
|
|
# First, the prerelease guard in app/build.gradle.kts only covers the groups this project
|
|
# floats -- "androidx.", "junit", "com.arthenica" -- so org.robolectric is unguarded, and
|
|
# a "4.+" here would resolve straight to 4.17-beta-3, which is the newest thing published.
|
|
# Second, Robolectric is not a library the app ships: it is the JVM's Android runtime, and
|
|
# a version bump changes which android-all jar the tests execute against. That is the same
|
|
# "a tool moved under a diff that cannot explain it" failure the linters are pinned for.
|
|
#
|
|
# 4.16.1 is the newest RELEASED version; the 4.17 line is beta-only at the time of writing.
|
|
robolectric = "4.16.1"
|
|
|
|
[libraries]
|
|
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
|
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
|
|
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
|
|
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" }
|
|
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
|
|
|
|
# Compose — versions come from the BOM, so no version.ref here.
|
|
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
|
|
compose-material3 = { group = "androidx.compose.material3", name = "material3" }
|
|
compose-material3-windowsize = { group = "androidx.compose.material3", name = "material3-window-size-class" }
|
|
compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
|
|
compose-ui = { group = "androidx.compose.ui", name = "ui" }
|
|
compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
|
|
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
|
|
compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
|
|
compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
|
|
compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
|
|
|
|
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
|
|
androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" }
|
|
androidx-work-testing = { group = "androidx.work", name = "work-testing", version.ref = "work" }
|
|
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" }
|
|
androidx-documentfile = { group = "androidx.documentfile", name = "documentfile", version.ref = "documentfile" }
|
|
androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "annotation" }
|
|
|
|
# Media3 — the hardware fast path (Apache-2.0).
|
|
media3-transformer = { group = "androidx.media3", name = "media3-transformer", version.ref = "media3" }
|
|
media3-effect = { group = "androidx.media3", name = "media3-effect", version.ref = "media3" }
|
|
media3-common = { group = "androidx.media3", name = "media3-common", version.ref = "media3" }
|
|
media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3" }
|
|
media3-muxer = { group = "androidx.media3", name = "media3-muxer", version.ref = "media3" }
|
|
|
|
# Room — job history. Added in a later phase; KSP plugin stays unapplied until then.
|
|
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
|
|
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
|
|
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
|
|
|
|
# Required at runtime by the ffmpeg-kit-next wrapper: AbstractSession.fail()
|
|
# references smartexception.java.Exceptions. Debug builds tolerate its absence through
|
|
# lazy class loading, so this only surfaces as a crash on the first FFmpeg error --
|
|
# or, as it did here, as an R8 missing-class error.
|
|
smart-exception-java = { group = "com.arthenica", name = "smart-exception-java", version.ref = "smartException" }
|
|
|
|
junit = { group = "junit", name = "junit", version.ref = "junit" }
|
|
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
|
|
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
|
|
|
|
# Robolectric — an Android runtime for the JVM test source set, so file-lifecycle behaviour
|
|
# that needs a real Context can be verified without a device. The instrumented suite cannot
|
|
# run on the development host at all (see CLAUDE.md), so an androidTest-only red test is not
|
|
# a TDD loop anyone here can execute.
|
|
robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
|
|
|
|
[plugins]
|
|
# com.android.application and org.jetbrains.kotlin.plugin.compose are deliberately absent.
|
|
# They come from the root buildscript classpath (see build.gradle.kts) so that a newer KGP
|
|
# can override AGP's bundled one, and the module applies them by id(). An alias here would
|
|
# be dead weight that reads like the source of truth.
|
|
#
|
|
# ktlint and detekt are ordinary plugin-portal resolutions and stay aliases.
|
|
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
|
|
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
|
|
detekt = { id = "dev.detekt", version.ref = "detekt" }
|
|
# DO NOT add org.jetbrains.kotlin.android — AGP 9 built-in Kotlin makes it a build failure.
|