Merge pull request #203 from jovandeginste/fix-update-non-gpx

Skip updates for non-GPX based workouts

pkg/app/background.go

@@ -22,17 +22,27 @@ const (
 )
 
 func (a *App) BackgroundWorker() {
+	for {
+		a.bgLoop()
+		time.Sleep(WorkerDelay)
+	}
+}
+
+func (a *App) bgLoop() {
 	l := a.logger.With("module", "worker")
 
-	for {
-		l.Info("Worker started...")
+	defer func() {
+		if r := recover(); r != nil {
+			l.Error(fmt.Sprintf("Panic in bgLoop: %#v", r))
+		}
+	}()
 
-		a.updateWorkout(l)
-		a.autoImports(l)
+	l.Info("Worker started...")
 
-		l.Info("Worker finished...")
-		time.Sleep(WorkerDelay)
-	}
+	a.updateWorkout(l)
+	a.autoImports(l)
+
+	l.Info("Worker finished...")
 }
 
 func (a *App) autoImports(l *slog.Logger) {

pkg/database/workouts.go

@@ -232,6 +232,10 @@ func (w *Workout) Save(db *gorm.DB) error {
 }
 
 func (w *Workout) AsGPX() (*gpx.GPX, error) {
+	if w.GPX == nil {
+		return nil, errors.New("workout has no GPX")
+	}
+
 	return converters.Parse(w.GPX.Filename, w.GPX.Content)
 }
 
@@ -250,6 +254,11 @@ func (w *Workout) setData(data *MapData) {
 }
 
 func (w *Workout) UpdateData(db *gorm.DB) error {
+	if w.GPX == nil {
+		// We only update data from (stored) GPX data
+		return nil
+	}
+
 	gpxContent, err := w.AsGPX()
 	if err != nil {
 		return err