Compare commits

..

No commits in common. "7bdfcf977691144b32da456129c6bd5162fb8cac" and "4156c7dc6d0a87415a267ee501734c3ca7d2e522" have entirely different histories.

6 changed files with 48 additions and 51 deletions

View File

@ -12,9 +12,6 @@ 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
@ -53,7 +50,7 @@ uninstall:
test:
$(GO) test -count=1 -v $(EXE)/extractor
.PHONY: all debug fmt install uninstall clean
.PHONY: all debug install uninstall clean
clean:
rm -f $(EXE)

View File

@ -10,7 +10,6 @@ import (
"git.nobrain.org/r4/dischord/player"
"git.nobrain.org/r4/dischord/util"
_ "embed"
"errors"
"flag"
"fmt"
@ -22,6 +21,7 @@ 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.")

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) {
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 {
@ -163,7 +163,7 @@ func Autoconf(filename string) (*Config, error) {
if err != nil {
return nil, err
}
youtubeDlPath = "./" + filename
youtubeDlPath = "./"+filename
macosEnableExecutable(youtubeDlPath)
if python3IsPython {
// Replace first line with `replacement`
@ -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)

View File

@ -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

View File

@ -8,7 +8,7 @@ import (
)
var (
ErrNoSearchResults = errors.New("no search results")
ErrNoSearchResults = errors.New("no search provider available")
ErrNoSearchProvider = errors.New("no search provider available")
ErrNoSuggestionProvider = errors.New("no search suggestion provider available")
)
@ -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