Merge pull request #19 from jrswab/0.7.0

v0.7.0

Author: jrswab

.github/workflows/go.yml

@@ -1,15 +1,14 @@
 
-name: Test
+name: Check
 
 on:
   push:
     branches: [ "master" ]
   pull_request:
-    branches: [ "master" ]
 
 jobs:
 
-  build:
+  lint:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -19,8 +18,31 @@ jobs:
       with:
         go-version: '1.23'
 
-    - name: Build
-      run: go build -v ./...
+    - name: Lint
+      uses: golangci/[email protected]
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.23'
 
     - name: Test
       run: go test -v ./...
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.23'
+
+    - name: Build
+      run: go build -v ./...

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Added "-a" flag to append text directly to the current journal page.
 
 ## [0.6.0]
 ### Added

main.go

@@ -25,6 +25,7 @@ func main() {
 	lsqCfgFileName := flag.String("c", "config.edn", "The config.edn file to use.")
 	editorType := flag.String("e", "EDITOR", "The editor to use.")
 	specDate := flag.String("s", "", "Open a specific journal. Use yyyy-MM-dd after the flag.")
+	apnd := flag.String("a", "", "Append text to the current journal page. This will not open $EDITOR or the TUI.")
 
 	// Parse flags
 	flag.Parse()
@@ -75,6 +76,18 @@ func main() {
 		date = parsedDate.Format(config.ConvertDateFormat(cfg.FileNameFmt))
 	}
 
+	if *apnd != "" {
+		path := system.CreateFilePath(cfg, journalsDir, date)
+		err := system.AppendToFile(path, *apnd)
+		if err != nil {
+			log.Printf("Error appending data to file: %v\n", err)
+			os.Exit(1)
+		}
+
+		// Don't open $EDITOR or TUI when append flag is used.
+		return
+	}
+
 	journalPath, err := system.GetJournal(cfg, journalsDir, date)
 	if err != nil {
 		log.Printf("Error setting journal path: %v\n", err)
@@ -124,3 +137,4 @@ func loadEditor(editor, path string) {
 		os.Exit(1)
 	}
 }
+

system/journal.go

@@ -10,15 +10,20 @@ import (
 	"github.com/jrswab/lsq/config"
 )
 
-func GetJournal(cfg *config.Config, journalsDir, date string) (string, error) {
+func CreateFilePath(cfg *config.Config, journalsDir, date string) string {
+
 	// Construct today's journal file path
 	var extension = ".md"
 	if cfg.PreferredFmt == "Org" {
 		extension = ".org"
 	}
 
 	// Create the path for the specified date.
-	path := filepath.Join(journalsDir, fmt.Sprintf("%s%s", date, extension))
+	return filepath.Join(journalsDir, fmt.Sprintf("%s%s", date, extension))
+}
+
+func GetJournal(cfg *config.Config, journalsDir, date string) (string, error) {
+	path := CreateFilePath(cfg, journalsDir, date)
 
 	// Create file if it doesn't exist
 	_, err := os.Stat(path)
@@ -32,3 +37,31 @@ func GetJournal(cfg *config.Config, journalsDir, date string) (string, error) {
 
 	return path, nil
 }
+
+func AppendToFile(path, content string) error {
+	bc := fmt.Sprintf("- %s", content)
+
+    // Try to create new file with O_EXCL
+    file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0644)
+    if err == nil {
+        // Successfully created new file
+        defer file.Close()
+        return os.WriteFile(path, []byte(bc), 0644)
+    }
+    
+    // If error is not "file exists", return the error
+	// (it should have been created at this point)
+    if !os.IsExist(err) {
+        return err
+    }
+    
+    // File exists, append to it
+    file, err = os.OpenFile(path, os.O_WRONLY|os.O_APPEND, 0644)
+    if err != nil {
+        return err
+    }
+    defer file.Close()
+    
+    _, err = file.WriteString(fmt.Sprintf("\n%s", bc))
+    return err
+}

system/journal_test.go

@@ -1,4 +1,4 @@
-package system
+package system_test
 
 import (
 	"os"
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/jrswab/lsq/config"
+	"github.com/jrswab/lsq/system"
 	i "github.com/jrswab/lsq/tests/integration"
 )
 
@@ -93,7 +94,7 @@ func TestBasicJournalCreation(t *testing.T) {
 				}
 			}
 
-			cfg, err := LoadConfig(tc.helper.ConfigPath)
+			cfg, err := system.LoadConfig(tc.helper.ConfigPath)
 			if err != nil {
 				t.Fatalf("Failed to load config file: %v", err)
 			}
@@ -114,7 +115,7 @@ func TestBasicJournalCreation(t *testing.T) {
 			}
 
 			// Get journal path and create the journal entry if needed
-			expectedPath, err := GetJournal(cfg, helper.JournalsDir, date)
+			expectedPath, err := system.GetJournal(cfg, helper.JournalsDir, date)
 			if err != nil {
 				t.Fatalf("Failed to get journal file: %v", err)
 			}
@@ -135,3 +136,60 @@ func TestBasicJournalCreation(t *testing.T) {
 		})
 	}
 }
+
+func TestAppendToFile(t *testing.T) {
+    tmpDir, err := os.MkdirTemp("", "test")
+    if err != nil {
+        t.Fatal(err)
+    }
+    defer os.RemoveAll(tmpDir)
+
+    t.Run("new file creation", func(t *testing.T) {
+        testFile := filepath.Join(tmpDir, "new.md")
+        if err := system.AppendToFile(testFile, "new content"); err != nil {
+            t.Errorf("Failed to create new file: %v", err)
+        }
+
+        content, err := os.ReadFile(testFile)
+        if err != nil {
+            t.Fatal(err)
+        }
+        expected := "- new content"
+        if string(content) != expected {
+            t.Errorf("Expected %q, got %q", expected, string(content))
+        }
+    })
+
+    t.Run("append to existing", func(t *testing.T) {
+        testFile := filepath.Join(tmpDir, "existing.md")
+        if err := system.AppendToFile(testFile, "first"); err != nil {
+            t.Fatal(err)
+        }
+        if err := system.AppendToFile(testFile, "second"); err != nil {
+            t.Errorf("Failed to append: %v", err)
+        }
+
+        content, err := os.ReadFile(testFile)
+        if err != nil {
+            t.Fatal(err)
+        }
+        expected := "- first\n- second"
+        if string(content) != expected {
+            t.Errorf("Expected %q, got %q", expected, string(content))
+        }
+    })
+
+    t.Run("permission denied", func(t *testing.T) {
+        readOnlyDir := filepath.Join(tmpDir, "readonly")
+        if err := os.Mkdir(readOnlyDir, 0500); err != nil {
+            t.Fatal(err)
+        }
+        
+        testFile := filepath.Join(readOnlyDir, "test.md")
+        err := system.AppendToFile(testFile, "content")
+        if err == nil {
+            t.Error("Expected error for read-only directory")
+        }
+    })
+}
+

trie/trie.go

@@ -128,8 +128,6 @@ func (t *Trie) InsertFileName(fileName string) {
 	// Mark this as end of the word to help avoid false positives.
 	current.IsEndOfWord = true
 	current.FileName = fileName
-
-	return
 }
 
 func (t *Trie) InsertAlias(alias, fileName string) {
@@ -158,8 +156,6 @@ func (t *Trie) InsertAlias(alias, fileName string) {
 	current.IsEndOfWord = true
 	current.FileName = fileName
 	current.IsAlias = true
-
-	return
 }
 
 func removeNonAlpha(fileName string) string {

tui/tui.go

@@ -21,15 +21,6 @@ type searchState struct {
 	selectedIndex int
 }
 
-// Message types for search operations
-type searchToggleMsg struct{}
-type searchUpdateMsg struct {
-	query string
-}
-type searchSelectMsg struct {
-	index int
-}
-
 type tuiModel struct {
 	textarea  textarea.Model
 	config    *config.Config