mirrors/utils
1
0
Fork 0
mirror of https://github.com/vbatts/utils.git synced 2024-12-04 22:45:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: have threading available

Browse source 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2016-11-29 11:52:07 -05:00
parent 1f5cbec677
commit 37f4637216
1 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cmd/slackware-sync/main.go
View file

@ -7,10 +7,18 @@ import (
"os" "os"
"os/exec" "os/exec"
"path" "path"
"sync"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
) )
var (
flSyncDir = flag.String("dir", "", "directory to sync to (this flag overrides the sync_dir in the configuration file)")
flConfigFile = flag.String("c", path.Join(os.Getenv("HOME"), ".slackware-sync.toml"), "config file for the sync")
flThreads = flag.Int("t", 1, "threads to fetch with")
flQuiet = flag.Bool("q", false, "less output")
)
func main() { func main() {
flag.Parse() flag.Parse()
var config GeneralConfig var config GeneralConfig
@ -23,6 +31,9 @@ func main() {
if len(*flSyncDir) > 0 { if len(*flSyncDir) > 0 {
config.SyncDir = *flSyncDir config.SyncDir = *flSyncDir
} }
if *flThreads > 1 {
config.Threads = *flThreads
}
_, err = EnsureDirExists(config.SyncDir) _, err = EnsureDirExists(config.SyncDir)
if err != nil { if err != nil {
@ -30,7 +41,9 @@ func main() {
os.Exit(1) os.Exit(1)
} }
for _, mirror := range config.Mirrors { workers := make(chan int, config.Threads)
wg := sync.WaitGroup{}
for name, mirror := range config.Mirrors {
if !mirror.Enabled { if !mirror.Enabled {
continue continue
} }
@ -46,17 +59,35 @@ func main() {
continue continue
} }
cmd := exec.Command("rsync", "-avPHS", "--delete", uri.String(), dest+"/") wg.Add(1)
cmd.Stderr = os.Stderr // we'll want to see errors, regardless rsyncFunc := func() {
if !*flQuiet { if *flThreads > 1 {
cmd.Stdout = os.Stdout workers <- 1
} }
defer func() {
if *flThreads > 1 {
<-workers
}
wg.Done()
}()
cmd := exec.Command("rsync", "-avPHS", "--delete", uri.String(), dest+"/")
cmd.Stderr = os.Stderr // we'll want to see errors, regardless
if !*flQuiet {
cmd.Stdout = os.Stdout
}
err = cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintf(os.Stderr, "%q: %s", name, err)
}
}
if *flThreads > 1 {
go rsyncFunc()
} else {
rsyncFunc()
} }
} }
wg.Wait()
} }
func EnsureDirExists(path string) (os.FileInfo, error) { func EnsureDirExists(path string) (os.FileInfo, error) {
@ -76,6 +107,7 @@ func EnsureDirExists(path string) (os.FileInfo, error) {
} }
type GeneralConfig struct { type GeneralConfig struct {
Threads int `toml:"threads"`
SyncDir string `toml:"sync_dir"` SyncDir string `toml:"sync_dir"`
Mirrors map[string]Mirror Mirrors map[string]Mirror
} }
@ -85,9 +117,3 @@ type Mirror struct {
URL string `toml:"url"` URL string `toml:"url"`
Enabled bool `toml:"enabled"` Enabled bool `toml:"enabled"`
} }
var (
flSyncDir = flag.String("dir", "", "directory to sync to (this flag overrides the sync_dir in the configuration file)")
flConfigFile = flag.String("c", path.Join(os.Getenv("HOME"), ".slackware-sync.toml"), "config file for the sync")
flQuiet = flag.Bool("q", false, "less output")
)