sashakoshka/gomp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c95f194a90
gomp/config/config.go

89 lines
2.2 KiB
Go
Raw Normal View History

Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
package config
import (
"fmt"
"io/ioutil"
"os"
"strings"
RENAME : goMP -> gomp Renaming goMP to gomp as it feels kind of awkward to have two upper case letters in a name of cli program.
2021-12-16 12:36:18 -07:00
"github.com/aditya-K2/gomp/utils"
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
"github.com/spf13/viper"
)
var (
Setting up Defaults
2021-12-08 13:58:42 -07:00
HOME_DIR, _ = os.UserHomeDir()
USER_CACHE_DIR, _ = os.UserCacheDir()
defaults = map[string]interface{}{
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
"ADDITIONAL_PADDING_X": 12,
"ADDITIONAL_PADDING_Y": 16,
"IMAGE_WIDTH_EXTRA_X": -1.5,
"IMAGE_WIDTH_EXTRA_Y": -3.75,
Added Functionality to Specify Different Type of Connections e.g a Unix Socket
2022-08-30 23:58:02 -06:00
"NETWORK_TYPE": "tcp",
"NETWORK_ADDRESS": "localhost",
Moving utils.go to utils package
2021-12-12 13:05:40 -07:00
"MUSIC_DIRECTORY": utils.CheckDirectoryFmt(getMusicDirectory()),
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
"PORT": "6600",
"DEFAULT_IMAGE_PATH": "default.jpg",
Moving utils.go to utils package
2021-12-12 13:05:40 -07:00
"CACHE_DIR": utils.CheckDirectoryFmt(USER_CACHE_DIR),
Seek Forward only when playback has been stopped.
2022-09-08 14:18:05 -06:00
"SEEK_OFFSET": 1,
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
}
)
func ReadConfig() {
Fixes #33 Also mentioned at (https://github.com/aditya-K2/gomp/issues/1#issuecomment-1205090265) `~` is not expanded to home directory, Hence adding an internal check for the same.
2022-09-12 11:46:24 -06:00
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
for k, v := range defaults {
viper.SetDefault(k, v)
}
Fixes #33 Also mentioned at (https://github.com/aditya-K2/gomp/issues/1#issuecomment-1205090265) `~` is not expanded to home directory, Hence adding an internal check for the same.
2022-09-12 11:46:24 -06:00
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
viper.SetConfigName("config")
minor changes
2021-12-18 10:55:47 -07:00
viper.AddConfigPath(HOME_DIR + "/.config/gomp")
Fixes #33 Also mentioned at (https://github.com/aditya-K2/gomp/issues/1#issuecomment-1205090265) `~` is not expanded to home directory, Hence adding an internal check for the same.
2022-09-12 11:46:24 -06:00
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
err := viper.ReadInConfig()
if err != nil {
fmt.Println("Could Not Read Config file.")
}
Fixes #33 Also mentioned at (https://github.com/aditya-K2/gomp/issues/1#issuecomment-1205090265) `~` is not expanded to home directory, Hence adding an internal check for the same.
2022-09-12 11:46:24 -06:00
// Expanding ~ to the User's Home Directory
viper.Set("MUSIC_DIRECTORY", utils.ExpandHomeDir(viper.GetString("MUSIC_DIRECTORY")))
viper.Set("DEFAULT_IMAGE_PATH", utils.ExpandHomeDir(viper.GetString("DEFAULT_IMAGE_PATH")))
viper.Set("CACHE_DIR", utils.ExpandHomeDir(viper.GetString("CACHE_DIR")))
Expanding Home Directory for NETWORK_ADRESS
2022-09-14 12:36:18 -06:00
viper.Set("NETWORK_ADDRESS", utils.ExpandHomeDir(viper.GetString("NETWORK_ADDRESS")))
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
}
RENAME ReadMappings -> GenerateKeyMap
2021-11-11 10:54:04 -07:00
func GenerateKeyMap(funcMap map[string]func()) {
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
for k := range funcMap {
GenerateKeyMap() now changes KEY_MAP according to the config file
2021-11-11 11:28:57 -07:00
mappingsForFunctionK := viper.GetStringSlice(k)
if len(mappingsForFunctionK) != 0 {
for _, i := range mappingsForFunctionK {
aV, err := GetAsciiValue(i)
if err == nil {
KEY_MAP[aV] = k
}
}
}
Reading Mappings from config file Following Changes have been made in addition to `https://github.com/aditya-K2/goMP/pull/5/commits/1572a460b042c25c93d4d5ed27b1a75432a53464` 1. config.go : ReadMappings Reads Array for each function Basically we are going to define mappings like this : ```yml Function : - first mapping - second mapping - third mapping ````` 2. kMap.go : GetAsciiValues will help us to get e.Rune() for the event for the handler function. So basically we will have a keymappings map generated which will help us to handle events. for e.g if an user has defined following mappings ````yml togglePlayBack : - P - p - B ```` then the keymappings map will look like this []keymappings = { GetAsciiValues("P") : togglePlayBack(), GetAsciiValues("p") : togglePlayBack(), GetAsciiValues("B") : togglePlayBack(), } so when the handler function will get an event e we will just pass it to this keymappings map i.e keymappings[e] which will return the function
2021-11-11 09:33:35 -07:00
}
}
func getMusicDirectory() string {
content, err := ioutil.ReadFile(HOME_DIR + "/.config/mpd/mpd.conf")
if err != nil {
fmt.Println("No Config File for mpd Found")
panic(err)
}
ab := string(content)
maps := strings.Split(ab, "\n")
for _, j := range maps {
if strings.Contains(j, "music_directory") {
s := strings.SplitAfter(strings.ReplaceAll(j, " ", ""), "y")[1]
s = strings.ReplaceAll(s, "\t", "")
d := ""
for z, m := range s {
if (z != 0) && (z != (len(s) - 1)) {
d += string(m)
}
}
return d
}
}
return ""
}
Reference in New Issue Copy Permalink