Compare commits
No commits in common. "main" and "v1.0.0" have entirely different histories.
12 changed files with 12 additions and 95 deletions
|
@ -4,9 +4,3 @@ steps:
|
|||
commands:
|
||||
- go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
|
||||
- golangci-lint run
|
||||
when:
|
||||
- event: pull_request
|
||||
repo: ada/spiegel
|
||||
- event: push
|
||||
branch: main
|
||||
repo: ada/spiegel
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
steps:
|
||||
- name: Release
|
||||
image: golang:1.22.5
|
||||
image: golang:1.22.3
|
||||
commands:
|
||||
- go install github.com/goreleaser/goreleaser@latest
|
||||
- goreleaser release
|
||||
|
|
|
@ -3,10 +3,3 @@ steps:
|
|||
image: golang:1.22
|
||||
commands:
|
||||
- go test ./...
|
||||
|
||||
when:
|
||||
- event: pull_request
|
||||
repo: ada/spiegel
|
||||
- event: push
|
||||
branch: main
|
||||
repo: ada/spiegel
|
||||
|
|
2
go.mod
2
go.mod
|
@ -6,7 +6,7 @@ require (
|
|||
github.com/go-git/go-git/v5 v5.12.0
|
||||
github.com/pelletier/go-toml/v2 v2.2.2
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
golang.org/x/sys v0.22.0
|
||||
golang.org/x/sys v0.20.0
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
4
go.sum
4
go.sum
|
@ -117,10 +117,6 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
|
||||
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
||||
|
|
|
@ -9,5 +9,5 @@ type Config struct {
|
|||
CloneDirectory string // Repository where gir-mirror keep repository
|
||||
Log log.Config
|
||||
Interval int // Update interval in minute
|
||||
RepoList []git.Config
|
||||
RepoList []git.RepoConfig
|
||||
}
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
package constant
|
||||
|
||||
import "time"
|
||||
|
||||
const (
|
||||
HTTPTimeout = 3 * time.Second
|
||||
)
|
|
@ -18,7 +18,7 @@ func start(duration time.Duration, fn func(), name string) {
|
|||
}
|
||||
|
||||
// Launch all repo update background tasks.
|
||||
func Launch(duration time.Duration, config []git.Config) {
|
||||
func Launch(duration time.Duration, config []git.RepoConfig) {
|
||||
var counter int
|
||||
for _, content := range config {
|
||||
counter++
|
||||
|
|
|
@ -8,13 +8,11 @@ import (
|
|||
|
||||
"git.gnous.eu/ada/spiegel/internal/utils"
|
||||
goGit "github.com/go-git/go-git/v5"
|
||||
"github.com/go-git/go-git/v5/plumbing/serverinfo"
|
||||
"github.com/go-git/go-git/v5/plumbing/transport/ssh"
|
||||
"github.com/go-git/go-git/v5/storage/filesystem"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
func StartClone(repoList []Config) {
|
||||
func StartClone(repoList []RepoConfig) {
|
||||
logrus.Debug("Start first repository clone")
|
||||
for _, content := range repoList {
|
||||
_, err := os.Stat(content.FullPath)
|
||||
|
@ -24,7 +22,7 @@ func StartClone(repoList []Config) {
|
|||
}
|
||||
}
|
||||
|
||||
func (c Config) fullClone() {
|
||||
func (c RepoConfig) fullClone() {
|
||||
logrus.Debug("Clone ", c.Name, "...")
|
||||
logger := logrus.New()
|
||||
w := logger.Writer()
|
||||
|
@ -68,14 +66,9 @@ func (c Config) fullClone() {
|
|||
if err != nil {
|
||||
logrus.Error(err)
|
||||
}
|
||||
|
||||
err = c.UpdateInfo()
|
||||
if err != nil {
|
||||
logrus.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
func (c Config) Update() {
|
||||
func (c RepoConfig) Update() {
|
||||
repo, err := goGit.PlainOpen(c.FullPath)
|
||||
if err != nil {
|
||||
logrus.Error(err)
|
||||
|
@ -124,23 +117,4 @@ func (c Config) Update() {
|
|||
logrus.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
err = c.UpdateInfo()
|
||||
if err != nil {
|
||||
logrus.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
func (c Config) UpdateInfo() error {
|
||||
r, err := goGit.PlainOpen(c.FullPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = serverinfo.UpdateServerInfo(r.Storer, r.Storer.(*filesystem.Storage).Filesystem()) //nolint: forcetypeassert
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package git
|
||||
|
||||
type Config struct {
|
||||
type RepoConfig struct {
|
||||
URL string // Source url
|
||||
FullPath string // Full clone directory
|
||||
Name string // Name of clone (directory name)
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
package router
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"git.gnous.eu/ada/spiegel/internal/constant"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
Listen string
|
||||
Archive string
|
||||
}
|
||||
|
||||
func (c Config) Router() {
|
||||
mux := http.NewServeMux()
|
||||
fs := http.FileServer(http.Dir(c.Archive))
|
||||
mux.Handle("/git/", http.StripPrefix("/git/", fs))
|
||||
|
||||
server := &http.Server{
|
||||
Addr: c.Listen,
|
||||
Handler: mux,
|
||||
ReadHeaderTimeout: constant.HTTPTimeout,
|
||||
}
|
||||
|
||||
logrus.Info("HTTP listen on :5000")
|
||||
|
||||
logrus.Fatal(server.ListenAndServe())
|
||||
}
|
4
main.go
4
main.go
|
@ -9,7 +9,6 @@ import (
|
|||
"git.gnous.eu/ada/spiegel/internal/config"
|
||||
"git.gnous.eu/ada/spiegel/internal/cron"
|
||||
"git.gnous.eu/ada/spiegel/internal/git"
|
||||
"git.gnous.eu/ada/spiegel/internal/router"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
|
@ -39,9 +38,6 @@ func main() {
|
|||
logrus.Info("Config loaded")
|
||||
logrus.Debug("Config: ", initConfig)
|
||||
|
||||
routerConfig := router.Config{Listen: ":3000", Archive: initConfig.CloneDirectory}
|
||||
go routerConfig.Router()
|
||||
|
||||
git.StartClone(initConfig.RepoList)
|
||||
|
||||
duration := time.Duration(initConfig.Interval) * time.Minute
|
||||
|
|
Loading…
Reference in a new issue