Skip to content

Commit 7786fc7

Browse files
committed
delete notification template file when blank template is provided
1 parent 322e159 commit 7786fc7

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

komf-notifications/src/commonMain/kotlin/snd/komf/notifications/apprise/AppriseVelocityTemplates.kt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,16 @@ class AppriseVelocityTemplates(
112112
suspend fun updateTemplates(templates: AppriseStringTemplates) {
113113
templateWriteMutex.withLock {
114114
appriseDirectory.createDirectories()
115-
val titleTemplate = templates.titleTemplate?.let { template ->
116-
velocityEngine.templateWriteAndGet(
117-
template,
118-
appriseDirectory.resolve(titleFileName)
119-
)
120-
} ?: velocityEngine.loadTemplateByName(titleFileName)
121-
122-
val bodyTemplate = templates.bodyTemplate?.let { template ->
123-
velocityEngine.templateWriteAndGet(
124-
template,
125-
appriseDirectory.resolve(bodyFileName)
126-
)
127-
} ?: velocityEngine.loadTemplateByName(bodyFileName)
115+
116+
val titleTemplate = velocityEngine.templateWriteAndGet(
117+
templates.titleTemplate,
118+
appriseDirectory.resolve(titleFileName)
119+
) ?: velocityEngine.loadTemplateByName(titleFileName)
120+
121+
val bodyTemplate = velocityEngine.templateWriteAndGet(
122+
templates.bodyTemplate,
123+
appriseDirectory.resolve(bodyFileName)
124+
) ?: velocityEngine.loadTemplateByName(bodyFileName)
128125

129126
this.titleTemplate.value = titleTemplate
130127
this.bodyTemplate.value = bodyTemplate

komf-notifications/src/commonMain/kotlin/snd/komf/notifications/discord/DiscordVelocityTemplates.kt

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,18 +212,25 @@ class DiscordVelocityTemplates(templateDirectory: String) {
212212
templateWriteMutex.withLock {
213213
discordDirectory.createDirectories()
214214

215-
val titleTemplate = templates.titleTemplate
216-
?.let { velocityEngine.templateWriteAndGet(it, discordDirectory.resolve(titleFileName)) }
217-
?: velocityEngine.loadTemplateByName(titleFileName)
218-
219-
val titleUrlTemplate = templates.titleUrlTemplate
220-
?.let { velocityEngine.templateWriteAndGet(it, discordDirectory.resolve(titleUrlFileName)) }
221-
?: velocityEngine.loadTemplateByName(descriptionFileName)
222-
val descriptionTemplate = templates.descriptionTemplate
223-
?.let { velocityEngine.templateWriteAndGet(it, discordDirectory.resolve(descriptionFileName)) }
224-
?: velocityEngine.loadTemplateByName(descriptionFileName)
225-
val footerTemplate = templates.footerTemplate
226-
?.let { velocityEngine.templateWriteAndGet(it, discordDirectory.resolve(footerFileName)) }
215+
val titleTemplate = velocityEngine.templateWriteAndGet(
216+
templates.titleTemplate,
217+
discordDirectory.resolve(titleFileName)
218+
) ?: velocityEngine.loadTemplateByName(titleFileName)
219+
220+
val titleUrlTemplate = velocityEngine.templateWriteAndGet(
221+
templates.titleUrlTemplate,
222+
discordDirectory.resolve(titleUrlFileName)
223+
) ?: velocityEngine.loadTemplateByName(descriptionFileName)
224+
225+
val descriptionTemplate = velocityEngine.templateWriteAndGet(
226+
templates.descriptionTemplate,
227+
discordDirectory.resolve(descriptionFileName)
228+
) ?: velocityEngine.loadTemplateByName(descriptionFileName)
229+
230+
val footerTemplate = velocityEngine.templateWriteAndGet(
231+
templates.footerTemplate,
232+
discordDirectory.resolve(footerFileName)
233+
)
227234

228235
val fieldTemplates = templates.fieldTemplates.let { fieldTemplates ->
229236
discordDirectory.listDirectoryEntries()

0 commit comments

Comments
 (0)