From 7bdfcf977691144b32da456129c6bd5162fb8cac Mon Sep 17 00:00:00 2001 From: r4 Date: Tue, 20 Sep 2022 17:43:47 +0200 Subject: [PATCH] Add fmt target to makefile and run it --- Makefile | 5 +++- cmd/dischord/dischord.go | 4 +-- config/config.go | 56 ++++++++++++++++++++-------------------- config/util.go | 6 ++--- extractor/extractor.go | 18 ++++++------- player/player.go | 8 +++--- 6 files changed, 50 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index ab71592..ef04a06 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,9 @@ debug: $(GO) build -o $(EXE) -gcflags=all="-N -l" cmd/$(EXE)/*.go dlv exec ./dischord +fmt: + find . -type f -name '*.go' -exec gofmt -w '{}' ';' + install: all mkdir -p $(DESTDIR)$(PREFIX)/bin cp -f $(EXE) $(DESTDIR)$(PREFIX)/bin @@ -50,7 +53,7 @@ uninstall: test: $(GO) test -count=1 -v $(EXE)/extractor -.PHONY: all debug install uninstall clean +.PHONY: all debug fmt install uninstall clean clean: rm -f $(EXE) diff --git a/cmd/dischord/dischord.go b/cmd/dischord/dischord.go index e599104..eeefca3 100644 --- a/cmd/dischord/dischord.go +++ b/cmd/dischord/dischord.go @@ -10,6 +10,7 @@ import ( "git.nobrain.org/r4/dischord/player" "git.nobrain.org/r4/dischord/util" + _ "embed" "errors" "flag" "fmt" @@ -21,7 +22,6 @@ import ( "strings" "sync" "syscall" - _ "embed" ) var copyright bool @@ -147,7 +147,7 @@ func main() { cfgfile := "config.toml" var cfg *config.Config 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 os.IsNotExist(err) { fmt.Println("Configuration file not found, launching automatic configurator.") diff --git a/config/config.go b/config/config.go index 3871e51..24cead0 100644 --- a/config/config.go +++ b/config/config.go @@ -22,8 +22,8 @@ var ( ) type Config struct { - Token string `toml:"bot-token"` - FfmpegPath string `toml:"ffmpeg-path"` + Token string `toml:"bot-token"` + FfmpegPath string `toml:"ffmpeg-path"` Extractors extractor.Config `toml:"extractors"` } @@ -125,7 +125,7 @@ func Autoconf(filename string) (*Config, 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) }) if err != nil { @@ -152,18 +152,18 @@ func Autoconf(filename string) (*Config, error) { if youtubeDlPath == "" { fmt.Println("Downloading youtube-dl") filename, err := download(true, map[string]map[string]string{ - "windows": { - "amd64": "https://yt-dl.org/downloads/latest/youtube-dl.exe", - "386": "https://yt-dl.org/downloads/latest/youtube-dl.exe", - }, - "any": { - "any": "https://yt-dl.org/downloads/latest/youtube-dl", - }, - }) + "windows": { + "amd64": "https://yt-dl.org/downloads/latest/youtube-dl.exe", + "386": "https://yt-dl.org/downloads/latest/youtube-dl.exe", + }, + "any": { + "any": "https://yt-dl.org/downloads/latest/youtube-dl", + }, + }) if err != nil { return nil, err } - youtubeDlPath = "./"+filename + youtubeDlPath = "./" + filename macosEnableExecutable(youtubeDlPath) if python3IsPython { // Replace first line with `replacement` @@ -195,21 +195,21 @@ func Autoconf(filename string) (*Config, error) { } fmt.Println("Downloading FFmpeg") filename, err := download(false, map[string]map[string]string{ - "linux": { - "amd64": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz", - "386": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-i686-static.tar.xz", - "arm64": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz", - "arm": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-armhf-static.tar.xz", - }, - "windows": { - "amd64": "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip", - "386": "https://github.com/sudo-nautilus/FFmpeg-Builds-Win32/releases/download/latest/ffmpeg-n5.1-latest-win32-gpl-5.1.zip", - }, - "darwin": { - "amd64": "https://evermeet.cx/ffmpeg/getrelease/zip", - "arm64": "https://www.osxexperts.net/FFmpeg511ARM.zip", - }, - }) + "linux": { + "amd64": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz", + "386": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-i686-static.tar.xz", + "arm64": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz", + "arm": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-armhf-static.tar.xz", + }, + "windows": { + "amd64": "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip", + "386": "https://github.com/sudo-nautilus/FFmpeg-Builds-Win32/releases/download/latest/ffmpeg-n5.1-latest-win32-gpl-5.1.zip", + }, + "darwin": { + "amd64": "https://evermeet.cx/ffmpeg/getrelease/zip", + "arm64": "https://www.osxexperts.net/FFmpeg511ARM.zip", + }, + }) if err != nil { return nil, err } @@ -220,7 +220,7 @@ func Autoconf(filename string) (*Config, error) { if err := os.Remove(filename); err != nil { return nil, err } - cfg.FfmpegPath = "./"+targetFile + cfg.FfmpegPath = "./" + targetFile macosEnableExecutable(cfg.FfmpegPath) } else { fmt.Println("Using FFmpeg executable found at", cfg.FfmpegPath) diff --git a/config/util.go b/config/util.go index 55e8861..d756d5b 100644 --- a/config/util.go +++ b/config/util.go @@ -19,9 +19,9 @@ import ( ) var ( - ErrUnsupportedOSAndArch = errors.New("no download available for your operating system and hardware architecture") + ErrUnsupportedOSAndArch = errors.New("no download available for your operating system and hardware architecture") ErrFileNotFoundInArchive = errors.New("file not found in archive") - ErrUnsupportedArchive = errors.New("unsupported archive format (supported are .tar, .tar.gz, .tar.xz and .zip") + ErrUnsupportedArchive = errors.New("unsupported archive format (supported are .tar, .tar.gz, .tar.xz and .zip") ) func download(executable bool, urlsByOS map[string]map[string]string, progCallback func(progress float32)) (filename string, err error) { @@ -85,7 +85,7 @@ func download(executable bool, urlsByOS map[string]map[string]string, progCallba } } if progCallback != nil && size != 0 { - progCallback(float32(i)/float32(size)) + progCallback(float32(i) / float32(size)) } } return savePath, nil diff --git a/extractor/extractor.go b/extractor/extractor.go index ec8710b..75b85e5 100644 --- a/extractor/extractor.go +++ b/extractor/extractor.go @@ -14,10 +14,10 @@ var ( ) var ( - providers []provider - extractors []extractor - searchers []searcher - suggestors []suggestor + providers []provider + extractors []extractor + searchers []searcher + suggestors []suggestor defaultConfig Config ) @@ -125,9 +125,9 @@ func (cfg Config) CheckTypes() error { if got != expected { return &ConfigTypeError{ Provider: provider, - Key: k, + Key: k, Expected: expected, - Got: got, + Got: got, } } } @@ -137,9 +137,9 @@ func (cfg Config) CheckTypes() error { type ConfigTypeError struct { Provider string - Key string + Key string Expected reflect.Type - Got reflect.Type + Got reflect.Type } func (e *ConfigTypeError) Error() string { @@ -151,7 +151,7 @@ func (e *ConfigTypeError) Error() string { if e.Got != nil { 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 diff --git a/player/player.go b/player/player.go index 6ac666f..1cf136c 100644 --- a/player/player.go +++ b/player/player.go @@ -82,8 +82,8 @@ type CmdAddBack []extractor.Data type CmdSeek float64 // seconds type CmdSpeed float64 // speed factor type CmdPlayFileAndStop struct { - DoneCh chan<- struct{} - Data []byte + DoneCh chan<- struct{} + Data []byte } type CmdGetTime chan<- float64 type CmdGetQueue chan<- *Queue @@ -522,8 +522,8 @@ func NewClient(excfg extractor.Config, ffmpegPath string, outCh chan<- []byte, c refreshStream(getPlaybackTime(), float64(v)) case CmdPlayFileAndStop: cmd := struct { - DoneCh chan<- struct{} - Data []byte + DoneCh chan<- struct{} + Data []byte }(v) audioch, errch, killch = audio.StreamToDiscordOpus(ffmpegPath, "pipe:", bytes.NewReader(cmd.Data), 0, 1.0, false)