From 259648f6997fca14981f78e5bc8b24ac12b93d09 Mon Sep 17 00:00:00 2001
From: Matt Low <matt@mlow.ca>
Date: Wed, 25 Jun 2025 07:18:57 +0000
Subject: [PATCH] Slight lmcli package refactor

- Moved utility functions from lmcli.go to tools.go

This is preparing for `lmcli` package API refactoring
---
 pkg/lmcli/lmcli.go | 65 +++++-----------------------------------------
 pkg/lmcli/tools.go | 55 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 59 deletions(-)
 create mode 100644 pkg/lmcli/tools.go

diff --git a/pkg/lmcli/lmcli.go b/pkg/lmcli/lmcli.go
index 1522419..10e3402 100644
--- a/pkg/lmcli/lmcli.go
+++ b/pkg/lmcli/lmcli.go
@@ -1,9 +1,7 @@
 package lmcli
 
 import (
-	"errors"
 	"fmt"
-	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
@@ -45,32 +43,6 @@ func NewContext() (*Context, error) {
 		return nil, err
 	}
 
-	store, err := getConversationService()
-	if err != nil {
-		return nil, err
-	}
-
-	chroma := tty.NewChromaHighlighter("markdown", *config.Chroma.Formatter, *config.Chroma.Style)
-	return &Context{*config, store, *chroma}, nil
-}
-
-func createOrOpenAppend(path string) (*os.File, error) {
-	var file *os.File
-	if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
-		file, err = os.Create(path)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		file, err = os.OpenFile(path, os.O_APPEND, fs.ModeAppend)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return file, nil
-}
-
-func getConversationService() (conversation.Repo, error) {
 	databaseFile := filepath.Join(dataDir(), "conversations.db")
 	gormLogFile, err := createOrOpenAppend(filepath.Join(dataDir(), "database.log"))
 	if err != nil {
@@ -87,13 +59,18 @@ func getConversationService() (conversation.Repo, error) {
 	if err != nil {
 		return nil, fmt.Errorf("Error establishing connection to store: %v", err)
 	}
+
 	repo, err := conversation.NewRepo(db)
 	if err != nil {
 		return nil, err
 	}
-	return repo, nil
+
+	// Initialize chroma
+	chroma := tty.NewChromaHighlighter("markdown", *config.Chroma.Formatter, *config.Chroma.Style)
+	return &Context{*config, repo, *chroma}, nil
 }
 
+
 func (c *Context) GetModels() (models []string) {
 	modelCounts := make(map[string]int)
 	for _, p := range c.Config.Providers {
@@ -228,36 +205,6 @@ func (c *Context) GetModelProvider(model string, provider string) (string, strin
 	return "", "", nil, fmt.Errorf("unknown model: %s", model)
 }
 
-func configDir() string {
-	var configDir string
-
-	xdgConfigHome := os.Getenv("XDG_CONFIG_HOME")
-	if xdgConfigHome != "" {
-		configDir = filepath.Join(xdgConfigHome, "lmcli")
-	} else {
-		userHomeDir, _ := os.UserHomeDir()
-		configDir = filepath.Join(userHomeDir, ".config/lmcli")
-	}
-
-	os.MkdirAll(configDir, 0755)
-	return configDir
-}
-
-func dataDir() string {
-	var dataDir string
-
-	xdgDataHome := os.Getenv("XDG_DATA_HOME")
-	if xdgDataHome != "" {
-		dataDir = filepath.Join(xdgDataHome, "lmcli")
-	} else {
-		userHomeDir, _ := os.UserHomeDir()
-		dataDir = filepath.Join(userHomeDir, ".local/share/lmcli")
-	}
-
-	os.MkdirAll(dataDir, 0755)
-	return dataDir
-}
-
 func Fatal(format string, args ...any) {
 	fmt.Fprintf(os.Stderr, format, args...)
 	os.Exit(1)
diff --git a/pkg/lmcli/tools.go b/pkg/lmcli/tools.go
new file mode 100644
index 0000000..513419a
--- /dev/null
+++ b/pkg/lmcli/tools.go
@@ -0,0 +1,55 @@
+package lmcli
+
+import (
+	"errors"
+	"io/fs"
+	"os"
+	"path/filepath"
+)
+
+func createOrOpenAppend(path string) (*os.File, error) {
+	var file *os.File
+	if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+		file, err = os.Create(path)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		file, err = os.OpenFile(path, os.O_APPEND, fs.ModeAppend)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return file, nil
+}
+
+func configDir() string {
+	var configDir string
+
+	xdgConfigHome := os.Getenv("XDG_CONFIG_HOME")
+	if xdgConfigHome != "" {
+		configDir = filepath.Join(xdgConfigHome, "lmcli")
+	} else {
+		userHomeDir, _ := os.UserHomeDir()
+		configDir = filepath.Join(userHomeDir, ".config/lmcli")
+	}
+
+	os.MkdirAll(configDir, 0755)
+	return configDir
+}
+
+func dataDir() string {
+	var dataDir string
+
+	xdgDataHome := os.Getenv("XDG_DATA_HOME")
+	if xdgDataHome != "" {
+		dataDir = filepath.Join(xdgDataHome, "lmcli")
+	} else {
+		userHomeDir, _ := os.UserHomeDir()
+		dataDir = filepath.Join(userHomeDir, ".local/share/lmcli")
+	}
+
+	os.MkdirAll(dataDir, 0755)
+	return dataDir
+}
+