Skip to content

Commit 07a2ffc

Browse files
authored
ADFA-3576 error details on no templates.json and no warnings lack of language mindsk (#1154)
Show error on absence of templates.json in cgt and suppress warnings on absence of language and minsdk
1 parent c85bf67 commit 07a2ffc

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

templates-impl/src/main/java/com/itsaky/androidide/templates/impl/zip/ZipRecipeExecutor.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ class ZipRecipeExecutor(
7575
.build()
7676

7777
val className = data.name.replace(CLASS_NAME_PATTERN, "")
78-
val (baseIdentifiers, warnings) = metaJson.pebbleParams(data, defModule, params)
79-
val identifiers = baseIdentifiers + (KEY_CLASS_NAME to className)
78+
val (baseIdentifiers, warnings) = metaJson.pebbleParams(data, defModule, params)
79+
val identifiers = baseIdentifiers + (KEY_CLASS_NAME to className)
80+
8081
if (warnings.isNotEmpty()) {
8182
warn("Identifier warnings: ${warnings.joinToString(System.lineSeparator())}")
8283
}
@@ -227,10 +228,8 @@ class ZipRecipeExecutor(
227228
if (saveLocation.usedDefault) warnings += "Missing 'saveLocation', defaulted to $KEY_SAVE_LOCATION"
228229

229230
val language = resolveString(parameters?.optional?.language?.identifier, KEY_LANGUAGE)
230-
if (language.usedDefault) warnings += "Missing 'language', defaulted to $KEY_LANGUAGE"
231231

232232
val minSdk = resolveString(parameters?.optional?.minsdk?.identifier, KEY_MIN_SDK)
233-
if (minSdk.usedDefault) warnings += "Missing 'minsdk', defaulted to $KEY_MIN_SDK"
234233

235234
val agpVersion = resolveString(system?.agpVersion?.identifier, KEY_AGP_VERSION)
236235
if (agpVersion.usedDefault) warnings += "Missing 'agpVersion', defaulted to $KEY_AGP_VERSION"

templates-impl/src/main/java/com/itsaky/androidide/templates/impl/zip/ZipTemplateReader.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ object ZipTemplateReader {
3636
try {
3737
ZipFile(zipFile).use { zip ->
3838

39-
val indexEntry = zip.getEntry(ARCHIVE_JSON) ?: return emptyList()
39+
val indexEntry = requireNotNull(zip.getEntry(ARCHIVE_JSON)) {
40+
"${zip.name} does not contain $ARCHIVE_JSON"
41+
}
42+
4043
val indexJson = zip.getInputStream(indexEntry).bufferedReader().use {
4144
gson.fromJson(it, TemplatesIndex::class.java)
4245
}

0 commit comments

Comments
 (0)