make getContent non blocking

Author: acrobatstick

list.go

@@ -112,7 +112,7 @@ func (f file) Title() string       { return f.title }
 func (f file) Description() string { return f.desc }
 func (f file) FilterValue() string { return f.title }
 
-func (f file) getContent() (string, error) {
+func (f file) getContent(q map[file]string) (string, error) {
 	if f.draft {
 		return f.content, nil
 	}
@@ -140,30 +140,32 @@ func (f file) getContent() (string, error) {
 	}
 
 	if shouldFetch {
-		client := &http.Client{Timeout: 5 * time.Second}
-		resp, err := client.Get(f.rawUrl)
-		if err != nil {
-			log.Errorf("Could not fetch file with raw url: %s", f.rawUrl)
-			return "", err
-		}
-		defer resp.Body.Close()
-
-		contentBytes, err := io.ReadAll(resp.Body)
-		if err != nil {
-			log.Errorf(err.Error())
-			return "", err
-		}
-
-		content := string(contentBytes)
-
-		existing.Set("content", content)
-
-		if err := storage.db.Save(string(collectionGistContent), existing); err != nil {
-			log.Errorf(err.Error())
-			return "", err
-		}
-
-		return content, nil
+		go func() {
+			client := &http.Client{Timeout: 5 * time.Second}
+			resp, err := client.Get(f.rawUrl)
+			if err != nil {
+				log.Errorf("Could not fetch file with raw url: %s", f.rawUrl)
+				return
+			}
+			defer resp.Body.Close()
+
+			contentBytes, err := io.ReadAll(resp.Body)
+			if err != nil {
+				log.Errorf(err.Error())
+				return
+			}
+
+			content := string(contentBytes)
+
+			existing.Set("content", content)
+
+			if err := storage.db.Save(string(collectionGistContent), existing); err != nil {
+				log.Errorf(err.Error())
+				return
+			}
+			q[f] = content
+		}()
+		return "Loading...", nil
 	} else {
 		if cachedContent, ok := existing.Get("content").(string); ok {
 			return cachedContent, nil
@@ -173,7 +175,8 @@ func (f file) getContent() (string, error) {
 }
 
 type filesDelegate struct {
-	styles FilesBaseStyle
+	styles       FilesBaseStyle
+	contentQueue map[file]string
 }
 
 func (d filesDelegate) Height() int {
@@ -193,7 +196,7 @@ func (d filesDelegate) Update(msg tea.Msg, m *list.Model) tea.Cmd {
 	}
 
 	f, _ := m.SelectedItem().(file)
-	content, err := f.getContent()
+	content, err := f.getContent(d.contentQueue)
 	if err != nil {
 		return func() tea.Msg {
 			return showInfo(err.Error(), info_error)
@@ -243,14 +246,20 @@ func (d filesDelegate) Render(w io.Writer, m list.Model, index int, item list.It
 	fmt.Fprintln(w, "  "+title)
 }
 
-func newFileList(items []list.Item, styles FilesBaseStyle) list.Model {
-	l := list.New(items, filesDelegate{styles: styles}, 25, 0)
+func newFileList(items []list.Item, styles FilesBaseStyle) (list.Model, *filesDelegate) {
+	delegate := filesDelegate{
+		styles:       styles,
+		contentQueue: map[file]string{},
+	}
+
+	l := list.New(items, delegate, 25, 0)
 	l.Title = "Files"
 	l.SetShowStatusBar(false)
 	l.SetShowHelp(false)
 	l.Styles.Title = styles.Title
 	l.Styles.TitleBar = styles.TitleBar
 	l.Styles.NoItems = styles.NoItems
 	l.InfiniteScrolling = true
-	return l
+
+	return l, &delegate
 }

main.go

@@ -178,7 +178,7 @@ func main() {
 						UsageText: " [FILE NAME]",
 					},
 				},
-				Action: delete,
+				Action: deleteG,
 			},
 			{
 				Name:  "drop",
@@ -381,7 +381,7 @@ func create(ctx context.Context, c *cli.Command) error {
 	return nil
 }
 
-func delete(ctx context.Context, c *cli.Command) error {
+func deleteG(ctx context.Context, c *cli.Command) error {
 	if !cfg.hasAccessToken() {
 		return err_unauthorized
 	}

main_model.go

@@ -45,18 +45,23 @@ type mainModel struct {
 	styles     Styles
 	filesStyle FilesBaseStyle
 	gistsStyle GistsBaseStyle
+
+	filesDelegate *filesDelegate
 }
 
+type tickMsg time.Time
+
 func newMainModel() mainModel {
 	defaultStyle := DefaultStyles(cfg)
 	m := mainModel{
-		keymap:      DefaultKeymap,
-		help:        help.New(),
-		currentPane: PANE_GISTS,
-		infoMsg:     nil,
-		styles:      defaultStyle,
-		gistsStyle:  defaultStyle.Gists.Focused,
-		filesStyle:  defaultStyle.Files.Blurred,
+		keymap:        DefaultKeymap,
+		help:          help.New(),
+		currentPane:   PANE_GISTS,
+		infoMsg:       nil,
+		styles:        defaultStyle,
+		gistsStyle:    defaultStyle.Gists.Focused,
+		filesStyle:    defaultStyle.Files.Blurred,
+		filesDelegate: nil,
 	}
 
 	// populate gist list
@@ -77,7 +82,7 @@ func newMainModel() mainModel {
 	}
 
 	m.gistList = newGistList(gistList, m.gistsStyle)
-	m.fileList = newFileList(gists[firstgist], m.filesStyle)
+	m.fileList, m.filesDelegate = newFileList(gists[firstgist], m.filesStyle)
 
 	// dont care about the width and height because we set it inside the tea.WindowSizeMsg
 	textEditor := editor.New(0, 0)
@@ -228,9 +233,15 @@ type updateEditorContent struct {
 	language string
 }
 
+func tick() tea.Cmd {
+	return tea.Tick(time.Second, func(t time.Time) tea.Msg {
+		return tickMsg(t)
+	})
+}
+
 func (m mainModel) Init() tea.Cmd {
 	_, initFileList := m.fileList.Update(nil)
-	return tea.Batch(initFileList, m.editor.CursorBlink())
+	return tea.Batch(tick(), initFileList, m.editor.CursorBlink())
 }
 
 func (m *mainModel) resetListHeight() {
@@ -248,7 +259,21 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 
 	switch msg := msg.(type) {
-
+	case tickMsg:
+		// deque requested gist file content and update
+		// the fileList that triggers update to the editor with the content from request
+		q := m.filesDelegate.contentQueue
+		if len(q) > 0 {
+			item, _ := m.fileList.SelectedItem().(file)
+			_, ok := q[item]
+			if !ok {
+				return m, tick()
+			}
+			delete(q, item)
+			_, cmd := m.fileList.Update(msg) // <-- calls f.getContent() again to reload the editor content
+			return m, tea.Batch(tick(), cmd)
+		}
+		return m, tick()
 	case editor.SaveMsg:
 		if m.currentPane == PANE_EDITOR {
 			m.editor.Blur()