feat: v0.6.3

Author: MrEliasen

internal/cmd/cast.go

@@ -100,8 +100,12 @@ func castInline(s *library.Scroll) error {
 }
 
 func castFile(s *library.Scroll, path string) error {
-	args := []string{s.Library().ConfigDir()}
 	ex := s.Exec()
+	args := []string{}
+
+	if len(ex.Args) > 0 {
+		args = append(args, ex.Args...)
+	}
 
 	if ex.AlwaysUseArgs {
 		args = append(ex.Args, path)

internal/cmd/list.go

@@ -38,6 +38,11 @@ var listCmd = &cobra.Command{
 			return
 		}
 
+		if len(list) == 0 {
+			fmt.Println("No scrolls found.")
+			return
+		}
+
 		action := ""
 		form := huh.NewSelect[string]().
 			Title(fmt.Sprintf("Selected Scroll: %s", selection.Name())).

internal/library/library.go

@@ -65,9 +65,9 @@ func (l *Library) Migrate() error {
 
 		// do we have a db connection still?
 		fmt.Printf("\n\nFailed to run migrations: failed to backup sqlite db.\n")
-		fmt.Printf("You can force the migration without backing up using --skip-backup, however please manually backup your scrolls db first.\n")
+		fmt.Printf("Please manually backup your scrolls db.\n")
 		fmt.Printf("DB location: %s\n", l.dbLocation)
-		fmt.Printf("Then run: scrolls --skip-backup\n\n")
+		fmt.Printf("Then run: scrolls to attempt another migration.\n\n")
 		return nil
 	}
 

internal/library/migrations/migrate.go

@@ -103,9 +103,8 @@ func rollback(db *sql.DB) func(shared.MigrationInterface) error {
 		DELETE FROM
 			migrations
 		WHERE
-			name = ?
-		LIMIT 1
-	`, m.Name())
+			migration = ?`,
+			m.Name())
 
 		return err
 	}

internal/library/migrations/shared/migration.go

@@ -27,9 +27,8 @@ func (m *Migration) DownSQL() string {
 }
 
 func (m *Migration) Up(db *sql.DB, migrate func(MigrationInterface) error) error {
-	err := migrate(m)
-	if err != nil {
-		return nil
+	if err := migrate(m); err != nil {
+		return err
 	}
 
 	if m.up != nil {

internal/scrolls/client.go

@@ -66,12 +66,14 @@ func (c *Client) newRequest(method, endpoint string, body io.Reader) (*http.Requ
 		return nil, err
 	}
 
-	url, err = url.Parse(endpoint)
+	rel, err := url.Parse(endpoint)
 	if err != nil {
 		return nil, err
 	}
 
-	req, err := http.NewRequest(method, url.String(), body)
+	full := url.ResolveReference(rel)
+
+	req, err := http.NewRequest(method, full.String(), body)
 	if err != nil {
 		return nil, err
 	}

internal/scrolls/storage.go

@@ -3,7 +3,6 @@ package scrolls
 import (
 	"bufio"
 	"bytes"
-	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -69,7 +68,7 @@ func (c *StorageClient) New(name string, useTemplate bool, fromFile string) (*li
 	if fromFile != "" {
 		ffbyte, err := os.ReadFile(fromFile)
 		if err != nil {
-			return nil, errors.New("failed to read the content of \"%s\"; is the path correct?")
+			return nil, fmt.Errorf("failed to read the content of %q; is the path correct?", fromFile)
 		}
 
 		templateContent = ffbyte
@@ -166,7 +165,7 @@ func (c *StorageClient) editFile(f *FileHandler, scroll *library.Scroll) (*FileH
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	log.Printf("opening in: %s, waiting to editor to close before proceeding..\n", bin)
+	log.Printf("opening in: %s, waiting for editor to close before proceeding..\n", bin)
 
 	now := time.Now().Add(time.Second * time.Duration(2)).Unix()
 	err := cmd.Run()
@@ -176,27 +175,28 @@ func (c *StorageClient) editFile(f *FileHandler, scroll *library.Scroll) (*FileH
 	}
 
 	end := time.Now().Unix()
-
+	isQuick := end <= now
 	if flags.Debug() {
-		fmt.Printf("opening in external editor \"%s\": %t\n", bin, now > end)
+		fmt.Printf("editor %q exited quickly: %t\n", bin, isQuick)
 	}
 
-	if now > end {
+	if isQuick {
 		fmt.Println("When you are done, Press Enter to continue..")
-		bufio.NewReader(os.Stdin).ReadString('\n')
+		_, _ = bufio.NewReader(os.Stdin).ReadString('\n')
 	}
 
 	_, err = f.Read()
 	if err != nil {
 		return f, err
 	}
 
+	defer f.Delete()
+
 	if scroll != nil {
 		if bytes.Equal(f.Body(), scroll.Body()) {
 			return f, nil
 		}
 	}
 
-	f.Delete()
 	return f, nil
 }

internal/settings/settings.go

@@ -76,8 +76,7 @@ func LoadSettings() (*Settings, error) {
 			}
 
 			fmt.Printf("Warning: could not parse JSON config from file %s\n", configFile)
-			fmt.Printf("Fix the syntax errors on the file, or use the --reset-config flag to replace it with a fresh one.\n")
-			fmt.Printf("E.g. scrolls config init --reset-config\n")
+			fmt.Printf("Fix the syntax errors in the file and try again..\n")
 
 			return nil, err
 		default:
@@ -104,25 +103,32 @@ func (s *Settings) GetEditor() string {
 		return e
 	}
 
-	// defaults
-	_, err := exec.LookPath("vim")
-	if err == nil {
-		return "vim"
+	candidates := []string{
+		"nvim",
+		"vim",
+		"vi",
+		"nano",
+		"emacs",
+		"micro",
+		"hx",
+		"code",
+		"zed",
+		"subl",
+		"sublime_text",
+		"notepad++",
+		"notepad",
+		"gedit",
+		"kate",
 	}
 
-	_, err = exec.LookPath("vi")
-	if err == nil {
-		return "vi"
-	}
-
-	_, err = exec.LookPath("zed")
-	if err == nil {
-		return "zed"
+	for _, c := range candidates {
+		if _, err := exec.LookPath(c); err == nil {
+			return c
+		}
 	}
 
-	_, err = exec.LookPath("notepad")
-	if err == nil {
-		return "notepad"
+	if e == "" {
+		fmt.Fprintln(os.Stderr, "No editor configured and no default editor found on PATH")
 	}
 
 	return ""

internal/tui/exec_selector.go

@@ -42,7 +42,9 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 
 		case "ctrl+c":
-			m.selection.cancel = true
+			if m.selection != nil {
+				m.selection.cancel = true
+			}
 			return m, tea.Quit
 
 		case "enter":
@@ -65,12 +67,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.table, cmd = m.table.Update(msg)
 	} else {
 		m.input, cmd = m.input.Update(msg)
-
 		m.table.SetRows(filterRows(m.rows, m.input.Value()))
-		tModel, tCmd := m.table.Update(msg)
-		m.table = tModel
-
-		tea.Batch(cmd, tCmd)
 	}
 
 	return m, cmd

internal/tui/scroll_list.go

@@ -56,6 +56,11 @@ func (m listModel) View() string {
 }
 
 func NewScrollList(scrolls []*library.Scroll) (*library.Scroll, bool) {
+	if len(scrolls) == 0 {
+		fmt.Println("No scrolls found.")
+		return nil, true
+	}
+
 	columns := []table.Column{
 		{Title: "Name", Width: 20},
 		{Title: "Type", Width: 10},