feat: implement new configuration provider and enhance response body handling

Author: tbxark

Makefile

@@ -1,5 +1,6 @@
 BIN_NAME=github-backup
 BUILD_DIR=./build
+MODULE := $(shell go list -m)
 BUILD=$(shell git rev-parse --short HEAD)@$(shell date +%s)
 CURRENT_OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 CURRENT_ARCH := $(shell uname -m | tr '[:upper:]' '[:lower:]')
@@ -56,3 +57,14 @@ compressAll: buildAll
 .PHONY: buildImage
 buildImage:
 	docker buildx build --platform=linux/amd64,linux/arm64 -t ghcr.io/tbxark/github-backup:latest . --push --provenance=false
+
+.PHONY: lint
+lint:
+	go fmt ./...
+	go vet ./...
+	go get ./...
+	go test ./...
+	go mod tidy
+	golangci-lint fmt --no-config --enable gofmt,goimports
+	golangci-lint run --no-config --fix
+	nilaway -include-pkgs="$(MODULE)" ./...

config/config.go

@@ -1,7 +1,15 @@
 package config
 
 import (
+	"context"
 	"encoding/json"
+	"errors"
+
+	"github.com/go-sphere/confstore"
+	"github.com/go-sphere/confstore/codec"
+	"github.com/go-sphere/confstore/provider"
+	"github.com/go-sphere/confstore/provider/file"
+	"github.com/go-sphere/confstore/provider/http"
 )
 
 type BackupProviderConfigType string
@@ -111,3 +119,25 @@ func ToRaw[T any](conf T) json.RawMessage {
 	}
 	return raw
 }
+
+func newConfProvider(path string) (provider.Provider, error) {
+	if http.IsRemoteURL(path) {
+		return http.New(path, http.WithTimeout(10)), nil
+	}
+	if file.IsLocalPath(path) {
+		return file.New(path, file.WithExpandEnv()), nil
+	}
+	return nil, errors.New("unsupported config path")
+}
+
+func NewConfig(path string) (*SyncConfig, error) {
+	pro, err := newConfProvider(path)
+	if err != nil {
+		return nil, err
+	}
+	config, err := confstore.Load[SyncConfig](context.Background(), pro, codec.JsonCodec())
+	if err != nil {
+		return nil, err
+	}
+	return config, nil
+}

config/config_test.go

@@ -3,8 +3,9 @@ package config
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/TBXark/github-backup/provider/gitea"
 	"testing"
+
+	"github.com/TBXark/github-backup/provider/gitea"
 )
 
 func TestSyncConfig(t *testing.T) {

go.mod

@@ -1,10 +1,10 @@
 module github.com/TBXark/github-backup
 
-go 1.23
+go 1.23.0
 
 toolchain go1.23.5
 
 require (
+	github.com/go-sphere/confstore v0.0.2
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/TBXark/confstore v0.0.0-20250123065822-f224518502e3
 )

go.sum

@@ -1,4 +1,4 @@
-github.com/TBXark/confstore v0.0.0-20250123065822-f224518502e3 h1:ZjqHMo5/qClZzMRj5F39tJ2lFcar1sXNv0T9HzsiAME=
-github.com/TBXark/confstore v0.0.0-20250123065822-f224518502e3/go.mod h1:TOxM19Snt9wT02PJzyz66sgq7sWhr4AFzPEZIKvVnTE=
+github.com/go-sphere/confstore v0.0.2 h1:9nuPS86wlv5Rpi+fnnFNq9tDVxgfAOK6uOPiASsgubo=
+github.com/go-sphere/confstore v0.0.2/go.mod h1:rvp2oSOW4x3E8JU0efD9JtHpBM2M3VIqM4rohoSMr34=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=

main.go

@@ -3,38 +3,38 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/TBXark/confstore"
+	"log"
+
 	"github.com/TBXark/github-backup/config"
 	"github.com/robfig/cron/v3"
-	"log"
 )
 
 var (
 	BuildVersion = "dev"
 )
 
 func main() {
-	c := flag.String("config", "config.json", "config file")
-	v := flag.Bool("version", false, "show version")
-	h := flag.Bool("help", false, "show help")
+	conf := flag.String("config", "config.json", "config file")
+	version := flag.Bool("version", false, "show version")
+	help := flag.Bool("help", false, "show help")
 	flag.Parse()
-	if *v {
+	if *version {
 		fmt.Println(BuildVersion)
 		return
 	}
-	if *h {
+	if *help {
 		flag.Usage()
 		return
 	}
-	conf, err := confstore.Load[config.SyncConfig](*c)
+	data, err := config.NewConfig(*conf)
 	if err != nil {
 		log.Fatalf("load config error: %s", err.Error())
 	}
 
-	syncTask := NewTask(conf)
-	if conf.Cron != "" {
+	syncTask := NewTask(data)
+	if data.Cron != "" {
 		task := cron.New()
-		_, e := task.AddJob(conf.Cron, syncTask)
+		_, e := task.AddJob(data.Cron, syncTask)
 		if e != nil {
 			log.Fatalf("add cron task error: %s", e.Error())
 		}

provider/gitea/gitea.go

@@ -2,9 +2,10 @@ package gitea
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/TBXark/github-backup/provider/provider"
 	"github.com/TBXark/github-backup/utils/request"
-	"strings"
 )
 
 type Config struct {

provider/github/github.go

@@ -2,8 +2,9 @@ package github
 
 import (
 	"fmt"
-	"github.com/TBXark/github-backup/utils/request"
 	"strings"
+
+	"github.com/TBXark/github-backup/utils/request"
 )
 
 type Repo struct {

provider/local/local.go

@@ -2,11 +2,12 @@ package local
 
 import (
 	"fmt"
-	"github.com/TBXark/github-backup/provider/provider"
 	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
+
+	"github.com/TBXark/github-backup/provider/provider"
 )
 
 type UpdateAction string

task.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/TBXark/github-backup/config"
 	"github.com/TBXark/github-backup/provider/gitea"
 	"github.com/TBXark/github-backup/provider/github"
 	"github.com/TBXark/github-backup/provider/local"
 	"github.com/TBXark/github-backup/provider/provider"
 	"github.com/TBXark/github-backup/utils/matcher"
-	"log"
 )
 
 func BuildBackupProvider(conf *config.BackupProviderConfig) (provider.Provider, error) {