args: add --gen-config-force + tell the user to put = in optional args

Author: Toni500github

app/src/main/java/org/toni/customfetch_android/widget/CustomfetchConfigureActivity.kt

@@ -31,8 +31,6 @@ import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.text.Editable
 import android.text.SpannableStringBuilder
 import android.text.TextPaint
@@ -42,7 +40,6 @@ import android.text.TextWatcher
 import android.util.TypedValue
 import android.view.View
 import android.widget.LinearLayout
-import android.widget.Toast
 import androidx.core.graphics.toColorInt
 import androidx.core.text.toSpanned
 import com.skydoves.colorpickerview.listeners.ColorEnvelopeListener
@@ -54,9 +51,6 @@ import org.toni.customfetch_android.getAppSettingsPrefInt
 import org.toni.customfetch_android.getAppSettingsPrefString
 import org.toni.customfetch_android_lib.mainRender
 import org.toni.customfetch_android_lib.mainRenderStr
-import java.io.File
-import java.nio.file.Files
-import kotlin.io.path.Path
 
 /**
  * The configuration screen for the [Customfetch] AppWidget.

app/src/main/java/org/toni/customfetch_android_lib/Config.kt

@@ -82,16 +82,21 @@ data class Config(
     @SerialName("gui") val gui: GuiConfig = GuiConfig(),
 )
 
-fun generateConfig(file: File) {
-    //if (file.exists())
+fun generateConfig(file: File, context: Context?, force: Boolean = false) {
+    if (file.exists() && !force) {
+        if (context != null) {
+            die(context, "Config file already exists. Use --gen-config-force instead for overwriting")
+        }
+        return
+    }
     file.writeText(AUTOCONFIG)
 }
 
 fun addAliasColor(context: Context, str: String, config: Config) {
     val pos = str.indexOf('=')
     if (pos == -1)
         die(context, "alias color '{}' does NOT have an equal sign '=' for separating config name and value\n" +
-                "For more check with --help")
+                "For more check the help section")
     val name = str.substring(0, pos)
     val value = str.substring(pos + 1)
 
@@ -103,7 +108,7 @@ fun overrideOption(context: Context, opt: String, config: Config) {
     val pos = opt.indexOf('=')
     if (pos == -1)
         die(context, "override option '{}' does NOT have an equal sign '=' for separating config name and value\n" +
-                "For more check with --help")
+                "For more check the help section")
     var name = opt.substring(0, pos)
     val value = opt.substring(pos + 1)
     // usually the user finds inconvenient to write "config.foo"

app/src/main/java/org/toni/customfetch_android_lib/LongFile.kt

@@ -6,12 +6,12 @@ A command-line, GUI app, android widget system information tool (or neofetch lik
 
 NOTE: Arguments that takes [<bool>] values, the values can be either: "true", 1, "enable" or leave it empty. Any other value will be treated as false.
 
-    -n, --no-logo [<bool>]      Do not display the logo
-    -N, --no-color [<bool>]     Do not output and parse colors. Useful for stdout or pipe operations
-    -L, --logo-only [<bool>]    Print only the logo
+    -n, --no-logo=[<bool>]      Do not display the logo
+    -N, --no-color=[<bool>]     Do not output and parse colors. Useful for stdout or pipe operations
+    -L, --logo-only=[<bool>]    Print only the logo
     -s, --source-path <path>    Path to the ascii art or image file to display
     -C, --config <path>         Path to the config file to use
-    -a, --ascii-logo-type [<type>]
+    -a, --ascii-logo-type=[<type>]
                                 The type of ASCII art to apply ("small" or "old").
                                 Basically will add "_<type>" to the logo filename.
                                 It will return the regular linux ascii art if it doesn't exist.
@@ -45,14 +45,14 @@ NOTE: Arguments that takes [<bool>] values, the values can be either: "true", 1,
                                 Not availabile in the android widget app.
 
     --bg-image <path>           Path to image to be used in the background in the GUI app (put "disable" for disabling in the config)
-    --wrap-lines [<bool>]       Wrap lines when printing in terminal
+    --wrap-lines=[<bool>]       Wrap lines when printing in terminal
     --logo-padding-top  <num>   Padding of the logo from the top
     --logo-padding-left <num>   Padding of the logo from the left
     --layout-padding-top <num>  Padding of the layout from the top
     --title-sep <string>        A character (or string) to use in ${'$'}<builtin.title_sep>
     --sep-reset <string>        A character (or string) that when encountered, will automatically reset color
-    --sep-reset-after [<bool>]  Reset color either before or after 'sep-reset'
-    --gen-config [<path>]       Generate default config file to config folder (if path, it will generate to the path)
+    --sep-reset-after=[<bool>]  Reset color either before or after 'sep-reset'
+    --gen-config=[<path>]       Generate default config file to config folder (if path, it will generate to the path)
                                 Will ask for confirmation if file exists already
 
     --color <string>            Replace instances of a color with another value.
@@ -481,7 +481,7 @@ fmt = "${'$'}{auto}Disk (%1): ${'$'}<disk(%1)>"
 # removable = External disks (USB, SATA, ...)
 # read-only = Disks with read-only filesystems
 # hidden    = Disks that are not really mounted by the user
-display-types = ["regular", "removable", "read-only"]
+display-types = ["regular", "external", "read-only"]
 
 # In some OSes such as NixOS or Android, there might be some directories that are bind mounted.
 # Bind mounted directories create an additional view of an existing directory,

app/src/main/java/org/toni/customfetch_android_lib/Main.kt

@@ -94,6 +94,7 @@ private fun parseArgs(context: Context, args: Array<String>, config: Config): St
         //LongOpt("loop-ms", LongOpt.REQUIRED_ARGUMENT, null, 1009),
         //LongOpt("bg-image", LongOpt.REQUIRED_ARGUMENT, null, 1010),
         LongOpt("color", LongOpt.REQUIRED_ARGUMENT, null, 1011),
+        LongOpt("gen-config-force", LongOpt.OPTIONAL_ARGUMENT, null, 1012),
 
         LongOpt(null, 0, null, 0)
     )
@@ -125,13 +126,14 @@ private fun parseArgs(context: Context, args: Array<String>, config: Config): St
                 1000 -> return listLogos(config.t.dataDir)
                 1001 -> config.t.sepResetAfter = strToBool(handleOptional(g.optarg, "true"))
                 1002 -> config.t.wrapLines = strToBool(handleOptional(g.optarg, "true"))
-                1003 -> generateConfig(File(g.optarg))
+                1003 -> generateConfig(File(g.optarg), context)
                 1004 -> config.t.sepReset = g.optarg
                 1005 -> config.t.titleSep = g.optarg
                 1006 -> config.t.logoPaddingTop = g.optarg.toInt()
                 1007 -> config.t.logoPaddingLeft = g.optarg.toInt()
                 1008 -> config.t.layoutPaddingTop = g.optarg.toInt()
                 1011 -> config.t.aliasColors.add(g.optarg)
+                1012 -> generateConfig(File(g.optarg), context, true)
             }
         }
     } catch (e: RuntimeException) {
@@ -144,7 +146,7 @@ private fun parseArgs(context: Context, args: Array<String>, config: Config): St
 private fun createConfig() {
     File(CONFIG_DIR).mkdirs()
     if (!File("$CONFIG_DIR/config.toml").exists())
-        generateConfig(File("$CONFIG_DIR/config.toml"))
+        generateConfig(File("$CONFIG_DIR/config.toml"), null, true)
 }
 
 private fun manageConfigStuff(context: Context, config: Config) {