Move SSD remaining MainActivity JSON details to typed Kotlin
ober
15e07cd0477ade21c3e0127e53df008db497b7c2
--- a/.build.yml +++ b/.build.yml @@ -5,7 +5,7 @@ packages: - make=4.4.1-r4 sources: # Build dependency: full immutable commit, mirrored in dependencies.lock.json. - - "https://git.sr.ht/~lisp/jerboa#a00ba7377703ede19f3df6957fd5d1bdc629f568" + - "https://git.sr.ht/~lisp/jerboa#827fdca88b92fe51dcc04dca3c09a245a7d03f4e" # The second source is the build subject selected by the SourceHut submitter. - https://git.sr.ht/~lisp/jerboa-android tasks: @@ -14,6 +14,6 @@ tasks: test "$(apk info -v chez-scheme)" = chez-scheme-10.3.0-r2 test "$(apk info -v git)" = git-2.54.0-r0 test "$(apk info -v make)" = make-4.4.1-r4 - test "$(git -C ../jerboa rev-parse HEAD)" = a00ba7377703ede19f3df6957fd5d1bdc629f568 - test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 9f30077ca1a84204d07c2812e2f6cfe40ff3d90d + test "$(git -C ../jerboa rev-parse HEAD)" = 827fdca88b92fe51dcc04dca3c09a245a7d03f4e + test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 00f6aa18dac4f12834f49bc6bd3d70a5114e37ad JERBOA="chez --libdirs .:../jerboa/lib --script" make test --- a/dependencies.lock.json +++ b/dependencies.lock.json @@ -11,8 +11,8 @@ "generator_runtime": { "name": "jerboa", "repository": "https://git.sr.ht/~lisp/jerboa", - "commit": "a00ba7377703ede19f3df6957fd5d1bdc629f568", - "tree": "9f30077ca1a84204d07c2812e2f6cfe40ff3d90d" + "commit": "827fdca88b92fe51dcc04dca3c09a245a7d03f4e", + "tree": "00f6aa18dac4f12834f49bc6bd3d70a5114e37ad" }, "assurance_tools": { "osv_scanner": { --- a/scripts/verify-supply-chain.sh +++ b/scripts/verify-supply-chain.sh @@ -3,8 +3,8 @@ set -eu repo=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd -P) lock="$repo/dependencies.lock.json" -jerboa_commit=a00ba7377703ede19f3df6957fd5d1bdc629f568 # gitsafe:ignore -jerboa_tree=9f30077ca1a84204d07c2812e2f6cfe40ff3d90d # gitsafe:ignore +jerboa_commit=827fdca88b92fe51dcc04dca3c09a245a7d03f4e # gitsafe:ignore +jerboa_tree=00f6aa18dac4f12834f49bc6bd3d70a5114e37ad # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -3411,7 +3411,7 @@ (typed-kotlin-file "com/sfb/ssdreview/DetectLogFields.kt" (kotlin-imports (org json JSONObject)) (typed-library (com sfb ssdreview) - (export detectResultLogFields) + (export detectResultLogFields detectFailedLogFields) (type JSONObject) (type Int32) (type String) @@ -3442,12 +3442,26 @@ (json-object-put-bool! out "ssd_area" (not (nullable-null? (SsdSession-ssdArea session)))) (json-object-put-bool! out "native_available" nativeAvailable) (json-object-put-string! out "native_error" nativeError) + out))) + (def (detectFailedLogFields (sourceKey : String) + (forceDetect : Bool) + (nativeAvailable : Bool) + (nativeError : String) + (error : JSONObject)) : JSONObject + (let ((out (json-object-empty))) + (begin + (json-object-put-string! out "source_key" sourceKey) + (json-object-put-bool! out "force" forceDetect) + (json-object-put-bool! out "native_available" nativeAvailable) + (json-object-put-string! out "native_error" nativeError) + (json-object-put-json-object! out "error" error) out))))) (typed-kotlin-file "com/sfb/ssdreview/EventJson.kt" (kotlin-imports (org json JSONObject)) (typed-library (com sfb ssdreview) - (export groundTruthPathDetails snapshotEventJson sessionEventJson) + (export groundTruthPathDetails snapshotEventJson sessionEventJson + ssdAreaSetDetails) (type JSONObject) (type Int32) (type String) @@ -3484,7 +3498,16 @@ eventType (SsdSession-sessionId session) (SsdSession-sourceKey session) - details)))) + details)) + (def (ssdAreaSetDetails (removedGroups : Int32) + (beforeGroups : Int32) + (outsideGroups : Int32)) : JSONObject + (let ((out (json-object-empty))) + (begin + (json-object-put-int32! out "removed_groups" removedGroups) + (json-object-put-int32! out "before_groups" beforeGroups) + (json-object-put-int32! out "outside_groups" outsideGroups) + out))))) (typed-kotlin-file "com/sfb/ssdreview/TruthStoreJson.kt" (kotlin-imports (org json JSONArray) (org json JSONObject)) @@ -4558,10 +4581,7 @@ " selectedGroupId = ssdSessionSelectedGroupId(session, selectedGroupId)" " reviewView.ssdArea = session.ssdArea" " reviewView.selectedGroupId = selectedGroupId" - " truthStore.appendEvent(\"ssd_area_set\", session, JSONObject()" - " .put(\"removed_groups\", removed)" - " .put(\"before_groups\", beforeGroups)" - " .put(\"outside_groups\", outsideCount))" + " truthStore.appendEvent(\"ssd_area_set\", session, ssdAreaSetDetails(removed, beforeGroups, outsideCount))" " reviewView.performHapticFeedback(HapticFeedbackConstants.CONFIRM)" " reviewView.invalidate()" " saveSessionAsync(" @@ -4768,12 +4788,16 @@ " runOnUiThread {" " if (isCurrentLoad(expectedGeneration, uri, expectedPageIndex)) {" " setStatus(\"Detect failed: ${error.message}\")" - " logClientEvent(\"ssd-detect-failed\", JSONObject()" - " .put(\"source_key\", sourceKey(expectedPdfSha1, expectedPageIndex + 1, DPI))" - " .put(\"force\", forceDetect)" - " .put(\"native_available\", SsdVisionBridge.isAvailable())" - " .put(\"native_error\", SsdVisionBridge.loadErrorMessage())" - " .put(\"error\", throwableLog(error)))" + " logClientEvent(" + " \"ssd-detect-failed\"," + " detectFailedLogFields(" + " sourceKey(expectedPdfSha1, expectedPageIndex + 1, DPI)," + " forceDetect," + " SsdVisionBridge.isAvailable()," + " SsdVisionBridge.loadErrorMessage()," + " throwableLog(error)" + " )" + " )" " }" " }" " }"