Refactored the Startup Setup into A new Struct
- Added A new Struct Application which has all the other components as its fields -- the `newApplication()` Function returns a pointer to the newly created Application from which other fields can be accessed. The fields are as follows | App *tview.Application | expandedView *tview.Table | Navbar *tview.Table | searchBar *tview.Table | pBar *progressBar - Minor changes to main.go
This commit is contained in:
parent
c6d2e8d8af
commit
e84e317079
55
App.go
Normal file
55
App.go
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/fhs/gompd/mpd"
|
||||||
|
"github.com/rivo/tview"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Application struct {
|
||||||
|
App *tview.Application
|
||||||
|
expandedView *tview.Table
|
||||||
|
Navbar *tview.Table
|
||||||
|
searchBar *tview.Table
|
||||||
|
pBar *progressBar
|
||||||
|
}
|
||||||
|
|
||||||
|
func newApplication(conn mpd.Client) *Application {
|
||||||
|
|
||||||
|
var pBar *progressBar = newProgressBar(conn)
|
||||||
|
expandedView := tview.NewTable()
|
||||||
|
Navbar := tview.NewTable()
|
||||||
|
searchBar := tview.NewTable()
|
||||||
|
|
||||||
|
searchBar.SetBorder(true).SetTitle("Search").SetTitleAlign(tview.AlignLeft)
|
||||||
|
Navbar.SetBorder(true)
|
||||||
|
Navbar.SetSelectable(true, false)
|
||||||
|
Navbar.SetCell(0, 0, tview.NewTableCell("PlayList"))
|
||||||
|
Navbar.SetCell(1, 0, tview.NewTableCell("Files"))
|
||||||
|
Navbar.SetCell(2, 0, tview.NewTableCell("Most Played"))
|
||||||
|
|
||||||
|
searchNavFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(searchBar, 0, 1, false).
|
||||||
|
AddItem(Navbar, 0, 7, false)
|
||||||
|
|
||||||
|
sNavExpViewFlex := tview.NewFlex().
|
||||||
|
AddItem(searchNavFlex, 0, 1, false).
|
||||||
|
AddItem(expandedView, 0, 4, false)
|
||||||
|
|
||||||
|
mainFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(sNavExpViewFlex, 0, 8, false).
|
||||||
|
AddItem(pBar.t, 0, 1, false)
|
||||||
|
|
||||||
|
expandedView.SetBorderPadding(1, 1, 1, 1).SetBorder(true)
|
||||||
|
expandedView.SetSelectable(true, false)
|
||||||
|
|
||||||
|
App := tview.NewApplication()
|
||||||
|
App.SetRoot(mainFlex, true).SetFocus(expandedView)
|
||||||
|
|
||||||
|
return &Application{
|
||||||
|
App: App,
|
||||||
|
expandedView: expandedView,
|
||||||
|
Navbar: Navbar,
|
||||||
|
searchBar: searchBar,
|
||||||
|
pBar: pBar,
|
||||||
|
}
|
||||||
|
}
|
58
main.go
58
main.go
@ -8,7 +8,6 @@ import (
|
|||||||
|
|
||||||
"github.com/fhs/gompd/mpd"
|
"github.com/fhs/gompd/mpd"
|
||||||
"github.com/gdamore/tcell/v2"
|
"github.com/gdamore/tcell/v2"
|
||||||
"github.com/rivo/tview"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var Volume int64
|
var Volume int64
|
||||||
@ -25,56 +24,29 @@ func main() {
|
|||||||
}
|
}
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
|
|
||||||
var pBar *progressBar = newProgressBar(*conn)
|
UI := newApplication(*conn)
|
||||||
expandedView := tview.NewTable()
|
|
||||||
Navbar := tview.NewTable()
|
|
||||||
searchBar := tview.NewTable()
|
|
||||||
|
|
||||||
searchBar.SetBorder(true).SetTitle("Search").SetTitleAlign(tview.AlignLeft)
|
|
||||||
Navbar.SetBorder(true)
|
|
||||||
Navbar.SetSelectable(true, false)
|
|
||||||
Navbar.SetCell(0, 0, tview.NewTableCell("PlayList"))
|
|
||||||
Navbar.SetCell(1, 0, tview.NewTableCell("Files"))
|
|
||||||
Navbar.SetCell(2, 0, tview.NewTableCell("Most Played"))
|
|
||||||
|
|
||||||
searchNavFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
|
||||||
AddItem(searchBar, 0, 1, false).
|
|
||||||
AddItem(Navbar, 0, 7, false)
|
|
||||||
|
|
||||||
sNavExpViewFlex := tview.NewFlex().
|
|
||||||
AddItem(searchNavFlex, 0, 1, false).
|
|
||||||
AddItem(expandedView, 0, 4, false)
|
|
||||||
|
|
||||||
mainFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
|
||||||
AddItem(sNavExpViewFlex, 0, 8, false).
|
|
||||||
AddItem(pBar.t, 0, 1, false)
|
|
||||||
|
|
||||||
App := tview.NewApplication().SetRoot(mainFlex, true).SetFocus(expandedView)
|
|
||||||
|
|
||||||
expandedView.SetBorderPadding(1, 1, 1, 1).SetBorder(true)
|
|
||||||
expandedView.SetSelectable(true, false)
|
|
||||||
|
|
||||||
fileMap, err := conn.GetFiles()
|
fileMap, err := conn.GetFiles()
|
||||||
dirTree := generateDirectoryTree(fileMap)
|
dirTree := generateDirectoryTree(fileMap)
|
||||||
|
|
||||||
UpdatePlaylist(*conn, expandedView)
|
UpdatePlaylist(*conn, UI.expandedView)
|
||||||
|
|
||||||
_v, _ := conn.Status()
|
_v, _ := conn.Status()
|
||||||
Volume, _ = strconv.ParseInt(_v["volume"], 10, 64)
|
Volume, _ = strconv.ParseInt(_v["volume"], 10, 64)
|
||||||
Random, _ = strconv.ParseBool(_v["random"])
|
Random, _ = strconv.ParseBool(_v["random"])
|
||||||
Repeat, _ = strconv.ParseBool(_v["repeat"])
|
Repeat, _ = strconv.ParseBool(_v["repeat"])
|
||||||
|
|
||||||
expandedView.SetInputCapture(func(e *tcell.EventKey) *tcell.EventKey {
|
UI.expandedView.SetInputCapture(func(e *tcell.EventKey) *tcell.EventKey {
|
||||||
switch e.Rune() {
|
switch e.Rune() {
|
||||||
case 108: // L : Key
|
case 108: // L : Key
|
||||||
{
|
{
|
||||||
r, _ := expandedView.GetSelection()
|
r, _ := UI.expandedView.GetSelection()
|
||||||
if !InsidePlaylist {
|
if !InsidePlaylist {
|
||||||
if len(dirTree.children[r].children) == 0 {
|
if len(dirTree.children[r].children) == 0 {
|
||||||
id, _ := conn.AddId(dirTree.children[r].absolutePath, -1)
|
id, _ := conn.AddId(dirTree.children[r].absolutePath, -1)
|
||||||
conn.PlayId(id)
|
conn.PlayId(id)
|
||||||
} else {
|
} else {
|
||||||
Update(*conn, dirTree.children[r].children, expandedView)
|
Update(*conn, dirTree.children[r].children, UI.expandedView)
|
||||||
dirTree = &dirTree.children[r]
|
dirTree = &dirTree.children[r]
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -91,7 +63,7 @@ func main() {
|
|||||||
{
|
{
|
||||||
if !InsidePlaylist {
|
if !InsidePlaylist {
|
||||||
if dirTree.parent != nil {
|
if dirTree.parent != nil {
|
||||||
Update(*conn, dirTree.parent.children, expandedView)
|
Update(*conn, dirTree.parent.children, UI.expandedView)
|
||||||
dirTree = dirTree.parent
|
dirTree = dirTree.parent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -106,7 +78,7 @@ func main() {
|
|||||||
{
|
{
|
||||||
conn.Clear()
|
conn.Clear()
|
||||||
if InsidePlaylist {
|
if InsidePlaylist {
|
||||||
UpdatePlaylist(*conn, expandedView)
|
UpdatePlaylist(*conn, UI.expandedView)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -118,7 +90,7 @@ func main() {
|
|||||||
case 97: // A : Key
|
case 97: // A : Key
|
||||||
{
|
{
|
||||||
if !InsidePlaylist {
|
if !InsidePlaylist {
|
||||||
r, _ := expandedView.GetSelection()
|
r, _ := UI.expandedView.GetSelection()
|
||||||
conn.Add(dirTree.children[r].absolutePath)
|
conn.Add(dirTree.children[r].absolutePath)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@ -162,21 +134,21 @@ func main() {
|
|||||||
case 50: // 2 : Key
|
case 50: // 2 : Key
|
||||||
{
|
{
|
||||||
InsidePlaylist = false
|
InsidePlaylist = false
|
||||||
Navbar.Select(1, 0)
|
UI.Navbar.Select(1, 0)
|
||||||
Update(*conn, dirTree.children, expandedView)
|
Update(*conn, dirTree.children, UI.expandedView)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
case 49: // 1 : Key
|
case 49: // 1 : Key
|
||||||
{
|
{
|
||||||
InsidePlaylist = true
|
InsidePlaylist = true
|
||||||
Navbar.Select(0, 0)
|
UI.Navbar.Select(0, 0)
|
||||||
UpdatePlaylist(*conn, expandedView)
|
UpdatePlaylist(*conn, UI.expandedView)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
case 51: // 3 : Key
|
case 51: // 3 : Key
|
||||||
{
|
{
|
||||||
InsidePlaylist = false
|
InsidePlaylist = false
|
||||||
Navbar.Select(2, 0)
|
UI.Navbar.Select(2, 0)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -188,12 +160,12 @@ func main() {
|
|||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
for {
|
for {
|
||||||
App.Draw()
|
UI.App.Draw()
|
||||||
time.Sleep(time.Second)
|
time.Sleep(time.Second)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if err := App.Run(); err != nil {
|
if err := UI.App.Run(); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user