harden TextPlugin functions (save, delete), cleanups

NeoApplications · Aug 25, 2024 · eb921e4 · eb921e4
1 parent c5d5a5b
commit eb921e4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/src/main/java/com/machiav3lli/backup/plugins/InternalRegexPlugin.kt b/src/main/java/com/machiav3lli/backup/plugins/InternalRegexPlugin.kt
@@ -6,7 +6,7 @@ import java.io.File
 class InternalRegexPlugin(file: File) : TextPlugin(file) {
 
     init {
-        tracePlugin { ("${this.javaClass.simpleName} $name <- ${file.name}") } //TODO hg42
+        tracePlugin { "${this.javaClass.simpleName} $name <- ${file.name}" } //TODO hg42
     }
 
     fun getExtendedLineRegex(replacements: Map<String, String> = mapOf()) = Regex(

diff --git a/src/main/java/com/machiav3lli/backup/plugins/InternalShellScriptPlugin.kt b/src/main/java/com/machiav3lli/backup/plugins/InternalShellScriptPlugin.kt
@@ -6,7 +6,7 @@ import java.io.File
 class InternalShellScriptPlugin(file: File) : TextPlugin(file) {
 
     init {
-        tracePlugin { ("${this::class.simpleName} $name <- ${file.name}") } //TODO hg42
+        tracePlugin { "${this::class.simpleName} $name <- ${file.name}" } //TODO hg42
     }
 
     companion object : PluginCompanion {

diff --git a/src/main/java/com/machiav3lli/backup/plugins/Plugin.kt b/src/main/java/com/machiav3lli/backup/plugins/Plugin.kt
@@ -83,7 +83,7 @@ abstract class Plugin(val name: String, var file: File) {
             pluginCompanion: PluginCompanion,
             extensions: List<String>,
         ): Boolean {
-            tracePlugin { ("register ${pluginCompanion.name()} type: $type, extensions: $extensions") }
+            tracePlugin { "register ${pluginCompanion.name()} type: $type, extensions: $extensions" }
             pluginTypes[type] = pluginCompanion
             pluginExtension[type] = extensions.first()
             extensions.forEach {

diff --git a/src/main/java/com/machiav3lli/backup/plugins/TextPlugin.kt b/src/main/java/com/machiav3lli/backup/plugins/TextPlugin.kt
@@ -28,7 +28,14 @@ fun TextEditor(
     placeholder: String = "",
     onChanged: (String) -> Unit = {},
 ) {
-    var input by remember { mutableStateOf(TextFieldValue(text = text, selection = TextRange(text.length))) }
+    var input by remember {
+        mutableStateOf(
+            TextFieldValue(
+                text = text,
+                selection = TextRange(text.length)
+            )
+        )
+    }
     val textFieldFocusRequester = remember { FocusRequester() }
 
     LaunchedEffect(Unit) {
@@ -60,22 +67,30 @@ open class TextPlugin(file: File) : Plugin(name = file.nameWithoutExtension, fil
     init {
         try {
             text = file.readText()
-            tracePlugin { ("${this.javaClass.simpleName} $name loaded <- ${file.name}") }
+            tracePlugin { "${this.javaClass.simpleName} $name loaded <- ${file.name}" }
         } catch (e: Throwable) {
             text = ""
-            tracePlugin { ("${this.javaClass.simpleName} $name created -> ${file.name}") }
+            tracePlugin { "${this.javaClass.simpleName} $name created -> ${file.name}" }
         }
     }
 
     override fun save() {
-        file.parentFile?.mkdirs()
-        file.writeText(text)
-        tracePlugin { ("${this.javaClass.simpleName} $name saved -> ${file.name}") }
+        try {
+            file.parentFile?.mkdirs()
+            file.writeText(text)
+            tracePlugin { "${this.javaClass.simpleName} $name saved -> ${file.name}" }
+        } catch (e: Throwable) {
+            tracePlugin { "${this.javaClass.simpleName} $name failed to save -> ${file.name}" }
+        }
     }
 
     override fun delete() {
-        file.delete()
-        tracePlugin { ("${this.javaClass.simpleName} $name deleted -> ${file.name}") }
+        try {
+            file.delete()
+            tracePlugin { "${this.javaClass.simpleName} $name deleted -> ${file.name}" }
+        } catch (e: Throwable) {
+            tracePlugin { "${this.javaClass.simpleName} $name failed to delete -> ${file.name}" }
+        }
     }
 
     @Composable