Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Error handling: Output errors via bubbletea and not via fmt.Println #97

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Error handling: Output errors via bubbletea and not via fmt.Println #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions cmd/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cmd
import (
"fmt"
"log/slog"
"os"
"strings"
"time"

Expand Down Expand Up @@ -146,9 +145,12 @@ func runRecipes(p *tea.Program, logger *slog.Logger, supplier, localOICDBChecksu

err := documentArchive.BuildArchiveIndex()
if err != nil {
// TODO Implement better error handling
logger.Error("Error building document archive index", "error", err)
fmt.Println(err)
p.Send(viewMsgStatusUpdate{
title: "Building document archive index",
hasError: true,
shouldQuit: false,
})
}

// Check for OICDB schema updates
Expand All @@ -160,9 +162,12 @@ func runRecipes(p *tea.Program, logger *slog.Logger, supplier, localOICDBChecksu

err = buchhalterAPIClient.UpdateOpenInvoiceCollectorDBSchemaIfAvailable(localOICDBSchemaChecksum)
if err != nil {
// TODO Implement better error handling
logger.Error("Error checking for OICDB schema updates", "error", err)
fmt.Println(err)
p.Send(viewMsgStatusUpdate{
title: "Checking for OICDB schema updates",
hasError: true,
shouldQuit: false,
})
}

developmentMode := viper.GetBool("dev")
Expand All @@ -176,19 +181,25 @@ func runRecipes(p *tea.Program, logger *slog.Logger, supplier, localOICDBChecksu

err = buchhalterAPIClient.UpdateOpenInvoiceCollectorDBIfAvailable(localOICDBChecksum)
if err != nil {
// TODO Implement better error handling
logger.Error("Error checking for OICDB repository updates", "error", err)
fmt.Println(err)
p.Send(viewMsgStatusUpdate{
title: "Checking for OICDB repository updates",
hasError: true,
shouldQuit: false,
})
}
}

recipesToExecute := prepareRecipes(logger, supplier, vaultProvider, recipeParser)
recipesToExecute, err := prepareRecipes(logger, supplier, vaultProvider, recipeParser)
// No credentials found for supplier/recipes
if len(recipesToExecute) == 0 {
// TODO Implement better error handling
logger.Error("No recipes found for suppliers", "supplier", supplier)
fmt.Println("No recipes found for suppliers")
os.Exit(1)
if len(recipesToExecute) == 0 || err != nil {
logger.Error("No recipes found for suppliers", "supplier", supplier, "error", err)
p.Send(viewMsgStatusUpdate{
title: "No recipes found for suppliers",
hasError: true,
shouldQuit: true,
})
return
}

var t string
Expand Down Expand Up @@ -287,9 +298,12 @@ func runRecipes(p *tea.Program, logger *slog.Logger, supplier, localOICDBChecksu
logger.Info("Checking if we have a premium subscription to Buchhalter API ...")
user, err := buchhalterAPIClient.GetAuthenticatedUser()
if err != nil {
// TODO Implement better error handling
logger.Error("Error retrieving authenticated user", "error", err)
fmt.Println(err)
p.Send(viewMsgStatusUpdate{
title: "Retrieving authenticated user",
hasError: true,
shouldQuit: false,
})
}
if user != nil && len(user.User.ID) > 0 {
uiDocumentUploadMessage := "Uploading documents to Buchhalter API ..."
Expand Down Expand Up @@ -338,9 +352,12 @@ func runRecipes(p *tea.Program, logger *slog.Logger, supplier, localOICDBChecksu
logger.Info("Sending usage metrics to Buchhalter API", "always_send_metrics", alwaysSendMetrics, "development_mode", developmentMode)
err = buchhalterAPIClient.SendMetrics(RunData, cliVersion, ChromeVersion, vaultProvider.Version, recipeParser.OicdbVersion)
if err != nil {
// TODO Implement better error handling
logger.Error("Error sending usage metrics to Buchhalter API", "error", err)
fmt.Println(err)
p.Send(viewMsgStatusUpdate{
title: "Sending usage metrics to Buchhalter API",
hasError: true,
shouldQuit: false,
})
}

p.Send(viewMsgQuit{})
Expand All @@ -357,18 +374,18 @@ func runRecipes(p *tea.Program, logger *slog.Logger, supplier, localOICDBChecksu
}
}

func prepareRecipes(logger *slog.Logger, supplier string, vaultProvider *vault.Provider1Password, recipeParser *parser.RecipeParser) []recipeToExecute {
func prepareRecipes(logger *slog.Logger, supplier string, vaultProvider *vault.Provider1Password, recipeParser *parser.RecipeParser) ([]recipeToExecute, error) {
var r []recipeToExecute

developmentMode := viper.GetBool("dev")
logger.Info("Loading recipes for suppliers ...", "development_mode", developmentMode)
loadRecipeResult, err := recipeParser.LoadRecipes(developmentMode)
if err != nil {
// TODO Implement better error handling
logger.Error("Error loading recipes for suppliers", "error", err, "load_recipe_result", loadRecipeResult)
fmt.Println(err)
return r, err
}

// Run single supplier recipe
var r []recipeToExecute
stepCount := 0
vaultItems := vaultProvider.VaultItems
if supplier != "" {
Expand Down Expand Up @@ -397,7 +414,7 @@ func prepareRecipes(logger *slog.Logger, supplier string, vaultProvider *vault.P
}
}

return r
return r, nil
}

func sendMetrics(buchhalterAPIClient *repository.BuchhalterAPIClient, a bool, vaultVersion, oicdbVersion string) {
Expand Down Expand Up @@ -498,8 +515,9 @@ type viewMsgModeUpdate struct {
//
// Examples: Building index, Executing recipe, etc.
type viewMsgStatusUpdate struct {
title string
hasError bool
title string
hasError bool
shouldQuit bool
}

// viewMsgProgressUpdate updates the progress bar in the bubbletea application.
Expand Down Expand Up @@ -621,6 +639,10 @@ func (m viewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if msg.hasError {
m.hasError = true
}

if msg.shouldQuit {
return m, tea.Quit
}
return m, nil

case viewMsgModeUpdate:
Expand Down
Loading