r4/dischord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add fmt target to makefile and run it

Browse Source
This commit is contained in:
r4
2022-09-20 17:43:47 +02:00
parent a5757c3079
commit 7bdfcf9776
6 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -12,6 +12,9 @@ debug:
$(GO) build -o $(EXE) -gcflags=all="-N -l" cmd/$(EXE)/*.go $(GO) build -o $(EXE) -gcflags=all="-N -l" cmd/$(EXE)/*.go
dlv exec ./dischord dlv exec ./dischord
fmt:
find . -type f -name '*.go' -exec gofmt -w '{}' ';'
install: all install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/bin
cp -f $(EXE) $(DESTDIR)$(PREFIX)/bin cp -f $(EXE) $(DESTDIR)$(PREFIX)/bin
@@ -50,7 +53,7 @@ uninstall:
test: test:
$(GO) test -count=1 -v $(EXE)/extractor $(GO) test -count=1 -v $(EXE)/extractor
.PHONY: all debug install uninstall clean .PHONY: all debug fmt install uninstall clean
clean: clean:
rm -f $(EXE) rm -f $(EXE)

4
cmd/dischord/dischord.go
View File

@@ -10,6 +10,7 @@ import (
"git.nobrain.org/r4/dischord/player" "git.nobrain.org/r4/dischord/player"
"git.nobrain.org/r4/dischord/util" "git.nobrain.org/r4/dischord/util"
_ "embed"
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
@@ -21,7 +22,6 @@ import (
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
_ "embed"
) )
var copyright bool var copyright bool
@@ -147,7 +147,7 @@ func main() {
cfgfile := "config.toml" cfgfile := "config.toml"
var cfg *config.Config var cfg *config.Config
var err error var err error
if autoconf || func() bool {cfg, err = config.Load(cfgfile); return err != nil}() { if autoconf || func() bool { cfg, err = config.Load(cfgfile); return err != nil }() {
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
fmt.Println("Configuration file not found, launching automatic configurator.") fmt.Println("Configuration file not found, launching automatic configurator.")

6
config/config.go
View File

@@ -125,7 +125,7 @@ func Autoconf(filename string) (*Config, error) {
} }
download := func(executable bool, urlsByOS map[string]map[string]string) (filename string, err error) { download := func(executable bool, urlsByOS map[string]map[string]string) (filename string, err error) {
filename, err = download(executable, urlsByOS, func(progress float32){ filename, err = download(executable, urlsByOS, func(progress float32) {
fmt.Printf("Progress: %.1f%%\r", progress*100.0) fmt.Printf("Progress: %.1f%%\r", progress*100.0)
}) })
if err != nil { if err != nil {
@@ -163,7 +163,7 @@ func Autoconf(filename string) (*Config, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
youtubeDlPath = "./"+filename youtubeDlPath = "./" + filename
macosEnableExecutable(youtubeDlPath) macosEnableExecutable(youtubeDlPath)
if python3IsPython { if python3IsPython {
// Replace first line with `replacement` // Replace first line with `replacement`
@@ -220,7 +220,7 @@ func Autoconf(filename string) (*Config, error) {
if err := os.Remove(filename); err != nil { if err := os.Remove(filename); err != nil {
return nil, err return nil, err
} }
cfg.FfmpegPath = "./"+targetFile cfg.FfmpegPath = "./" + targetFile
macosEnableExecutable(cfg.FfmpegPath) macosEnableExecutable(cfg.FfmpegPath)
} else { } else {
fmt.Println("Using FFmpeg executable found at", cfg.FfmpegPath) fmt.Println("Using FFmpeg executable found at", cfg.FfmpegPath)

2
config/util.go
View File

@@ -85,7 +85,7 @@ func download(executable bool, urlsByOS map[string]map[string]string, progCallba
} }
} }
if progCallback != nil && size != 0 { if progCallback != nil && size != 0 {
progCallback(float32(i)/float32(size)) progCallback(float32(i) / float32(size))
} }
} }
return savePath, nil return savePath, nil

2
extractor/extractor.go
View File

@@ -151,7 +151,7 @@ func (e *ConfigTypeError) Error() string {
if e.Got != nil { if e.Got != nil {
gotName = e.Got.Name() gotName = e.Got.Name()
} }
return "extractor config type error: "+e.Provider+"."+e.Key+": expected "+expectedName+" but got "+gotName return "extractor config type error: " + e.Provider + "." + e.Key + ": expected " + expectedName + " but got " + gotName
} }
type ProviderConfig map[string]any type ProviderConfig map[string]any