working build - no ui

This commit is contained in:
2025-08-25 16:34:45 -07:00
parent 8fb9028cf8
commit b370173873
6 changed files with 51 additions and 36 deletions

View File

@@ -20,15 +20,15 @@ func NewSQLiteDB(dbPath string) (*SQLiteDB, error) {
sqlite := &SQLiteDB{db: db}
// Create tables
if err := sqlite.createTables(); err != nil {
return nil, err
}
// Create tables
if err := sqlite.CreateTables(); err != nil {
return nil, err
}
return sqlite, nil
}
func (s *SQLiteDB) createTables() error {
func (s *SQLiteDB) CreateTables() error {
schema := `
CREATE TABLE IF NOT EXISTS activities (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -134,6 +134,10 @@ func (s *SQLiteDB) ActivityExists(activityID int) (bool, error) {
return count > 0, nil
}
func (s *SQLiteDB) DB() *sql.DB {
return s.db
}
func (s *SQLiteDB) GetActivity(activityID int) (*Activity, error) {
query := `
SELECT id, activity_id, start_time, activity_type, duration, distance,

View File

@@ -156,15 +156,20 @@ func (c *Client) GetActivities(start, limit int) ([]GarminActivity, error) {
return nil, fmt.Errorf("failed to get activities: status %d", resp.StatusCode)
}
var activities []GarminActivity
if err := json.NewDecoder(resp.Body).Decode(&activities); err != nil {
// Garmin API returns an object containing the activity list
type responseStruct struct {
ActivityList []GarminActivity `json:"activityList"`
}
var response responseStruct
if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
return nil, err
}
// Rate limiting
time.Sleep(2 * time.Second)
return activities, nil
return response.ActivityList, nil
}
func (c *Client) DownloadActivity(activityID int, format string) ([]byte, error) {

View File

@@ -12,21 +12,21 @@ import (
"github.com/sstent/garminsync-go/internal/parser"
)
type Syncer struct {
type SyncService struct {
garminClient *garmin.Client
db *database.SQLiteDB
dataDir string
}
func NewSyncer(garminClient *garmin.Client, db *database.SQLiteDB, dataDir string) *Syncer {
return &Syncer{
func NewSyncService(garminClient *garmin.Client, db *database.SQLiteDB, dataDir string) *SyncService {
return &SyncService{
garminClient: garminClient,
db: db,
dataDir: dataDir,
}
}
func (s *Syncer) FullSync(ctx context.Context) error {
func (s *SyncService) FullSync(ctx context.Context) error {
fmt.Println("Starting full sync...")
defer fmt.Println("Sync completed")
@@ -53,7 +53,7 @@ func (s *Syncer) FullSync(ctx context.Context) error {
return nil
}
func (s *Syncer) syncActivity(activity *garmin.GarminActivity) error {
func (s *SyncService) syncActivity(activity *garmin.GarminActivity) error {
// Skip if already downloaded
if exists, _ := s.db.ActivityExists(activity.ActivityID); exists {
return nil
@@ -111,6 +111,11 @@ func (s *Syncer) syncActivity(activity *garmin.GarminActivity) error {
return nil
}
// Add missing Sync method
func (s *SyncService) Sync(ctx context.Context) error {
return s.FullSync(ctx)
}
func getActivityType(activity *garmin.GarminActivity) string {
if activityType, ok := activity.ActivityType["typeKey"]; ok {
return activityType.(string)

View File

@@ -13,12 +13,12 @@ import (
type WebHandler struct {
db *database.SQLiteDB
syncer *sync.Syncer
syncer *sync.SyncService
garmin *garmin.Client
templates map[string]interface{} // Placeholder for template handling
}
func NewWebHandler(db *database.SQLiteDB, syncer *sync.Syncer, garmin *garmin.Client) *WebHandler {
func NewWebHandler(db *database.SQLiteDB, syncer *sync.SyncService, garmin *garmin.Client) *WebHandler {
return &WebHandler{
db: db,
syncer: syncer,
@@ -27,6 +27,11 @@ func NewWebHandler(db *database.SQLiteDB, syncer *sync.Syncer, garmin *garmin.Cl
}
}
func (h *WebHandler) LoadTemplates(templateDir string) error {
// For now, just return nil - templates will be handled later
return nil
}
func (h *WebHandler) RegisterRoutes(router *gin.Engine) {
router.GET("/", h.Index)
router.GET("/activities", h.ActivityList)
@@ -79,7 +84,7 @@ func (h *WebHandler) ActivityDetail(c *gin.Context) {
}
func (h *WebHandler) Sync(c *gin.Context) {
err := h.syncer.FullSync(context.Background())
err := h.syncer.Sync(context.Background())
if err != nil {
c.AbortWithStatus(http.StatusInternalServerError)
return