Merge branch 'AppendHashtag'

Author: wsw70

README.md

@@ -90,8 +90,11 @@ The configuration file located in `.config/dly/dly.yml` in your home directory i
 | `DailyNotesPath` | yes | string | Path to the LogSeq daily notes (typically the `journal` folder in Logseq data directory)
 | `FilenameFormat` | yes | string | Format of your daily note, without the `.md` extension. The format follows (weird) Go formatting rules, see the [documentation](https://pkg.go.dev/time) or an [article](https://www.geeksforgeeks.org/time-formatting-in-golang/) for details. As a general rule, when you want to say "the current year" and expected something like `YYYY`, you use `2006` (yes, exactly this string). The "current month" is `01` and the "current day" is `02`. Yes this is insane. The default format (in the auto-generated file) is `2006_01_02` - this corresponds today to `2023_01_13` which in turns points to the file `2023_01_13.md`, which **Logseq** interprets as the date 2023-01-13.|
 | `AddTimestamp` | no | bool | Should your line be prefixed with a bolded timestamp? |
-| `AddHashtag` | no | bool | Should a tag be added at the end of your line? (usually to mark lines that were added though `dly`) |
-| `HashtagToAdd` | no | string | The hashtag to add, without `#` |
+| `AppendHashtag` | no | string | add the string as hashtag (example: `from-cli`, note the absence of `#` which will be automatically added) |
+| `AddHashtag`<br>(DEPRECATED) | no | bool | Should a tag be added at the end of your line? (usually to mark lines that were added though `dly`) |
+| `HashtagToAdd`<br>(DEPRECATED) | no | string | The hashtag to add, without `#` |
+
+`AddHashtag` and `HashtagToAdd` are deprecated and will be removed in the next major version. having two parameters for a singe, simple feature does not make much sense.
 
 ## What next?
 

dly.go

@@ -18,7 +18,8 @@ import (
 type Configuration struct {
 	DailyNotesPath string `yaml:"DailyNotesPath"`
 	FilenameFormat string `yaml:"FilenameFormat"`
-	AddTimestamp   bool   `yaml:"AddTimestamp,omitempty"`
+	AddTimestamp   bool   `yaml:"AddTimestamp"`
+	AppendHashtag  string `yaml:"AppendHashtag"`
 	AddHashtag     bool   `yaml:"AddHashtag,omitempty"`
 	HashtagToAdd   string `yaml:"HashtagToAdd,omitempty"`
 }
@@ -85,8 +86,14 @@ func addToTodayNote(note []byte, newText string, conf Configuration) (content []
 		newText = fmt.Sprintf("**%s** %s", time.Now().Format("15:04"), newText)
 	}
 	// should we postfix it with an hashtag?
-	if conf.AddHashtag {
+	// check for the new parameter AppendHashtag
+	if conf.AppendHashtag != "" {
+		// new parameter
+		newText = fmt.Sprintf("%s #%s", newText, conf.AppendHashtag)
+	} else if conf.AddHashtag {
+		// legacy, deprecated parameter
 		newText = fmt.Sprintf("%s #%s", newText, conf.HashtagToAdd)
+		log.Warn().Msgf("the configuration parameter AddHashtag is deprecated and will be removed in a future version. Use AppendHashtag instead")
 	}
 	// check if the note does not exist
 	if len(note) == 0 {
@@ -219,8 +226,7 @@ func getConfiguration() (conf Configuration) {
 				DailyNotesPath: "YOU MUST SET THIS to your journal folder",
 				FilenameFormat: "2006_01_02",
 				AddTimestamp:   true,
-				AddHashtag:     true,
-				HashtagToAdd:   "from-cli",
+				AppendHashtag:  "from-cli",
 			}
 			defaultValuesB, _ := yaml.Marshal(defaultValues)
 			_, err = f.Write(defaultValuesB)