Add a method to convert bookmark to options

We will use client.NewFromURL to create a client
from stored bookmark in next commit. Since
client.NewFromURL takes in a command.Options, lets
add a method on Bookmark to get corresponding Option.
This commit is contained in:
akarki15
2016-11-10 01:22:16 -05:00
parent 038cb620c6
commit 61dfe67ca8
2 changed files with 41 additions and 0 deletions

View File

@@ -9,6 +9,7 @@ import (
"github.com/BurntSushi/toml"
"github.com/mitchellh/go-homedir"
"github.com/sosedoff/pgweb/pkg/command"
"github.com/sosedoff/pgweb/pkg/shared"
)
@@ -26,6 +27,19 @@ type Bookmark struct {
func (b Bookmark) SSHInfoIsEmpty() bool {
return b.Ssh.User == "" && b.Ssh.Host == "" && b.Ssh.Port == ""
}
func (b Bookmark) ConvertToOptions() (command.Options, error) {
return command.Options{
Url: b.Url,
Host: b.Host,
Port: b.Port,
User: b.User,
Pass: b.Password,
DbName: b.Database,
Ssl: b.Ssl,
}, nil
}
func readServerConfig(path string) (Bookmark, error) {
bookmark := Bookmark{}