tyler.durden/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-07-21 04:54:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the code, autocomplete function part of the Server struct(??)

Browse Source
This commit is contained in:
Akshay Shekher 2014-12-13 16:03:06 +05:30
parent d517e9a530
commit 6a53c8f7e2
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
client.go
View File

@ -29,9 +29,6 @@ const ABOUT_TEXT string = `-> ssh-chat is made by @shazow.
For more, visit shazow.net or follow at twitter.com/shazow For more, visit shazow.net or follow at twitter.com/shazow
` `
var autoCompleteFunc func(line string, pos int, key rune) (newLine string, newPos int, ok bool) = nil
type Client struct { type Client struct {
Server *Server Server *Server
Conn *ssh.ServerConn Conn *ssh.ServerConn
@ -47,9 +44,6 @@ type Client struct {
} }
func NewClient(server *Server, conn *ssh.ServerConn) *Client { func NewClient(server *Server, conn *ssh.ServerConn) *Client {
if autoCompleteFunc == nil {
autoCompleteFunc = createAutoCompleteFunc(server)
}
return &Client{ return &Client{
Server: server, Server: server,
Conn: conn, Conn: conn,
@ -262,7 +256,7 @@ func (c *Client) handleChannels(channels <-chan ssh.NewChannel) {
defer channel.Close() defer channel.Close()
c.term = terminal.NewTerminal(channel, prompt) c.term = terminal.NewTerminal(channel, prompt)
c.term.AutoCompleteCallback = autoCompleteFunc c.term.AutoCompleteCallback = c.Server.AutoCompleteFunction
for req := range requests { for req := range requests {
var width, height int var width, height int
@ -295,28 +289,3 @@ func (c *Client) handleChannels(channels <-chan ssh.NewChannel) {
} }
} }
} }
func createAutoCompleteFunc(server *Server) func(string, int, rune) (string, int, bool) {
return func(line string, pos int, key rune) (newLine string, newPos int, ok bool) {
if key == 9 {
shortLine := strings.Split(line[:pos], " ")
partialNick := shortLine[len(shortLine)-1]
nicks := server.List(&partialNick)
if len(nicks) > 0 {
nick := nicks[len(nicks)-1]
posPartialNick := pos - len(partialNick)
newLine = strings.Replace(line[posPartialNick:],
partialNick, nick, 1)
newLine = line[:posPartialNick] + newLine
newPos = pos + (len(nick) - len(partialNick))
ok = true
fmt.Println(newLine)
}
} else {
ok = false
}
return
}
}

22
server.go
View File

@ -273,6 +273,28 @@ func (s *Server) Start(laddr string) error {
return nil return nil
} }
func (s *Server) AutoCompleteFunction(line string, pos int, key rune) (newLine string, newPos int, ok bool) {
if key == 9 {
shortLine := strings.Split(line[:pos], " ")
partialNick := shortLine[len(shortLine) - 1]
nicks := s.List(&partialNick)
if len(nicks) > 0 {
nick := nicks[len(nicks) - 1]
posPartialNick := pos - len(partialNick)
newLine = strings.Replace(line[posPartialNick:],
partialNick, nick, 1)
newLine = line[:posPartialNick] + newLine
newPos = pos + (len(nick) - len(partialNick))
ok = true
}
} else {
ok = false
}
return
}
func (s *Server) Stop() { func (s *Server) Stop() {
for _, client := range s.clients { for _, client := range s.clients {
client.Conn.Close() client.Conn.Close()