OrgGo/gomu
1
0
Fork 0
mirror of https://github.com/issadarkthing/gomu.git synced 2025-04-26 13:49:21 +08:00
Code Issues Projects Releases Wiki Activity

fix build error

Browse Source
This commit is contained in:
raziman 2021-02-13 22:49:26 +08:00
parent 8ffac20916
commit 60cc4fab39
11 changed files with 64 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
colors.go
View File

@ -1,8 +1,6 @@
package main
import (
"log"
"github.com/gdamore/tcell/v2"
)
@ -31,11 +29,7 @@ func newColor() *Colors {
for k, v := range defaultColors {
// color from the config file
cfgColor, err := getString(gomu.env, k)
if err != nil {
log.Fatal(err)
}
cfgColor := getString(gomu.env, k)
if validHexColor(cfgColor) {
continue
}
@ -46,10 +40,7 @@ func newColor() *Colors {
// handle none background color
var bgColor tcell.Color
bg, err := getString(gomu.env, "color_background")
if err != nil {
log.Fatal(err)
}
bg := getString(gomu.env, "color_background")
if bg == "none" {
bgColor = tcell.ColorDefault
@ -57,30 +48,11 @@ func newColor() *Colors {
bgColor = tcell.GetColor(bg)
}
accent, err := getString(gomu.env, "color_accent")
if err != nil {
log.Fatal(err)
}
foreground, err := getString(gomu.env, "color_foreground")
if err != nil {
log.Fatal(err)
}
popup, err := getString(gomu.env, "color_popup")
if err != nil {
log.Fatal(err)
}
title, err := getString(gomu.env, "color_now_playing_title")
if err != nil {
log.Fatal(err)
}
playlist, err := getString(gomu.env, "color_playlist")
if err != nil {
log.Fatal(err)
}
accent := getString(gomu.env, "color_accent")
foreground := getString(gomu.env, "color_foreground")
popup := getString(gomu.env, "color_popup")
title := getString(gomu.env, "color_now_playing_title")
playlist := getString(gomu.env, "color_playlist")
color := &Colors{
accent: tcell.GetColor(accent),

10
command.go
View File

@ -204,10 +204,7 @@ func (c Command) defineCommands() {
c.define("bulk_add", func() {
currNode := gomu.playlist.GetCurrentNode()
bulkAdd, err := getBool(gomu.env, "confirm_bulk_add")
if err != nil {
log.Fatal(err)
}
bulkAdd := getBool(gomu.env, "confirm_bulk_add")
if !bulkAdd {
gomu.playlist.addAllToQueue(currNode)
@ -323,10 +320,7 @@ func (c Command) defineCommands() {
/* Global */
c.define("quit", func() {
confirmOnExit, err := getBool(gomu.env, "confirm_on_exit")
if err != nil {
log.Fatal(err)
}
confirmOnExit := getBool(gomu.env, "confirm_on_exit")
if !confirmOnExit {
err := gomu.quit(gomu.args)

6
player.go
View File

@ -4,7 +4,6 @@ package main
import (
"fmt"
"log"
"os"
"time"
@ -38,10 +37,7 @@ type Player struct {
func newPlayer() *Player {
volume, err := getInt(gomu.env, "volume")
if err != nil {
log.Fatal(err)
}
volume := getInt(gomu.env, "volume")
// Read initial volume from config
initVol := absVolume(volume)

7
playingbar_test.go
View File

@ -7,6 +7,13 @@ import (
func Test_NewPlayingBar(t *testing.T) {
gomu = newGomu()
err := execConfig(expandFilePath("./test/config"))
if err != nil {
t.Error(err)
}
gomu.colors = newColor()
p := newPlayingBar()
if p.progress == nil {

12
playlist.go
View File

@ -742,20 +742,12 @@ func (p *Playlist) paste() error {
}
func setDisplayText(songName string) string {
useEmoji, err := getBool(gomu.env, "use_emoji")
if err != nil {
log.Fatal(err)
}
useEmoji := getBool(gomu.env, "use_emoji")
if !useEmoji {
return songName
}
emojiFile, err := getString(gomu.env, "emoji_file")
if err != nil {
log.Fatal(err)
}
emojiFile := getString(gomu.env, "emoji_file")
return fmt.Sprintf(" %s %s", emojiFile, songName)
}

18
playlist_test.go
View File

@ -20,6 +20,13 @@ func prepareTest() *Gomu {
}
gomu.app = tview.NewApplication()
err := execConfig(expandFilePath("./test/config"))
if err != nil {
panic(err)
}
gomu.colors = newColor()
rootDir, err := filepath.Abs("./test")
if err != nil {
panic(err)
@ -41,6 +48,12 @@ func prepareTest() *Gomu {
func TestPopulate(t *testing.T) {
gomu = newGomu()
err := execConfig(expandFilePath("./test/config"))
if err != nil {
t.Error(err)
}
gomu.colors = newColor()
rootDir, err := filepath.Abs("./test")
if err != nil {
@ -78,12 +91,15 @@ func TestPopulate(t *testing.T) {
})
populate(root, rootDir)
gotItems := 1
gotItems := 0
root.Walk(func(node, _ *tview.TreeNode) bool {
gotItems++
return true
})
// ignore config and arbitrary_file.txt
gotItems += 2
if gotItems != expected {
t.Errorf("Invalid amount of file; expected %d got %d", expected, gotItems)
}

9
popup.go
View File

@ -68,10 +68,7 @@ func (s *Stack) pop() tview.Primitive {
// Gets popup timeout from config file
func getPopupTimeout() time.Duration {
dur, err := getString(gomu.env, "popup_timeout")
if err != nil {
log.Fatal(err)
}
dur := getString(gomu.env, "popup_timeout")
m, err := time.ParseDuration(dur)
@ -542,7 +539,7 @@ func debugPopup(message string) {
func inputPopup(prompt string) string {
popupID := "general-input-popup"
input := newInputPopup(popupID, "", prompt + ": ", "")
input := newInputPopup(popupID, "", prompt+": ", "")
result := make(chan string)
input.SetInputCapture(func(e *tcell.EventKey) *tcell.EventKey {
@ -552,7 +549,7 @@ func inputPopup(prompt string) string {
if newName == "" {
return e
}
result <-newName
result <- newName
gomu.pages.RemovePage(popupID)
gomu.popups.pop()

14
queue.go
View File

@ -8,7 +8,6 @@ import (
"encoding/hex"
"fmt"
"io/ioutil"
"log"
"math/rand"
"os"
"path"
@ -98,29 +97,22 @@ func (q *Queue) updateTitle() string {
var loop string
isEmoji, err := getBool(gomu.env, "use_emoji")
if err != nil {
log.Fatal(err)
}
isEmoji := getBool(gomu.env, "use_emoji")
if q.isLoop {
if isEmoji {
loop, err = getString(gomu.env, "emoji_loop")
loop = getString(gomu.env, "emoji_loop")
} else {
loop = "Loop"
}
} else {
if isEmoji {
loop, err = getString(gomu.env, "emoji_noloop")
loop = getString(gomu.env, "emoji_noloop")
} else {
loop = "No loop"
}
}
if err != nil {
log.Fatal(err)
}
title := fmt.Sprintf("─ Queue ───┤ %d %s | %s | %s ├",
len(q.items), count, fmtTime, loop)

7
search.go
View File

@ -86,15 +86,12 @@ func getRequest(url string, v interface{}) error {
func getSearchResult(query string) ([]YoutubeVideo, error) {
query = url.QueryEscape(query)
domain, err := getString(gomu.env, "invidious_instance")
if err != nil {
return nil, err
}
domain := getString(gomu.env, "invidious_instance")
targetUrl := domain + `/api/v1/search?q=` + query
yt := []YoutubeVideo{}
err = getRequest(targetUrl, &yt)
err := getRequest(targetUrl, &yt)
if err != nil {
return nil, err
}

27
start.go
View File

@ -32,11 +32,11 @@ type Panel interface {
}
const (
configPath = "~/.config/gomu/config"
musicPath = "~/music"
configPath = "~/.config/gomu/config"
musicPath = "~/music"
)
func execConfig() error {
func execConfig(config string) error {
const defaultConfig = `
@ -82,7 +82,7 @@ color_popup = "#0A0F14"
gomu.env.DefineGlobal("debug_popup", debugPopup)
gomu.env.DefineGlobal("input_popup", inputPopup)
cfg := expandTilde(configPath)
cfg := expandTilde(config)
_, err := os.Stat(cfg)
if os.IsNotExist(err) {
@ -112,8 +112,6 @@ color_popup = "#0A0F14"
return nil
}
type Args struct {
config *string
empty *bool
@ -154,7 +152,7 @@ func start(application *tview.Application, args Args) {
// Assigning to global variable gomu
gomu = newGomu()
err := execConfig()
err := execConfig(expandFilePath(*args.config))
if err != nil {
panic(err)
}
@ -184,20 +182,12 @@ func start(application *tview.Application, args Args) {
gomu.playingBar.setDefault()
isQueueLoop, err := getBool(gomu.env, "queue_loop")
if err != nil {
logError(err)
return
}
isQueueLoop := getBool(gomu.env, "queue_loop")
gomu.player.isLoop = isQueueLoop
gomu.queue.isLoop = gomu.player.isLoop
loadQueue, err := getBool(gomu.env, "load_prev_queue")
if err != nil {
logError(err)
return
}
loadQueue := getBool(gomu.env, "load_prev_queue")
if !*args.empty && loadQueue {
// load saved queue from previous session
@ -238,7 +228,7 @@ func start(application *tview.Application, args Args) {
}
// check for user defined keybindings
kb, err := gomu.env.Get("keybinds")
kb, err := gomu.env.Get("keybinds")
if err == nil {
keybinds, ok := kb.(map[interface{}]interface{})
if !ok {
@ -268,7 +258,6 @@ func start(application *tview.Application, args Args) {
}
}
cmds := map[rune]string{
'q': "quit",
' ': "toggle_pause",

24
utils.go
View File

@ -202,44 +202,44 @@ func appendFile(path string, content string) error {
return nil
}
func getInt(e *env.Env, symbol string) (int, error) {
func getInt(e *env.Env, symbol string) int {
v, err := e.Get(symbol)
if err != nil {
return 0, err
return 0
}
val, ok := v.(int64)
if !ok {
return 0, tracerr.New("expected int")
return 0
}
return int(val), nil
return int(val)
}
func getString(e *env.Env, symbol string) (string, error) {
func getString(e *env.Env, symbol string) string {
v, err := e.Get(symbol)
if err != nil {
return "", err
return ""
}
val, ok := v.(string)
if !ok {
return "", tracerr.New("expected string")
return ""
}
return val, nil
return val
}
func getBool(e *env.Env, symbol string) (bool, error) {
func getBool(e *env.Env, symbol string) bool {
v, err := e.Get(symbol)
if err != nil {
return false, err
return false
}
val, ok := v.(bool)
if !ok {
return false, tracerr.New("expected bool")
return false
}
return val, nil
return val
}