From ddfac6f6353feaa9ea4a67ad4d07f304c2ed536a Mon Sep 17 00:00:00 2001 From: shylinux Date: Sun, 16 Apr 2023 23:34:52 +0800 Subject: [PATCH] opt some --- go.mod | 3 +-- go.sum | 7 ++----- misc/git/status.go | 12 +++--------- misc/ssh/connect.go | 2 +- misc/ssh/service.go | 4 ++-- misc/xterm/pty_darwin.go | 2 +- misc/xterm/pty_linux.go | 2 +- misc/xterm/winsize_unsupported.go | 2 +- misc/xterm/xterm.go | 2 +- 9 files changed, 13 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index b68731cb..f2a6a9a5 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,8 @@ module shylinux.com/x/icebergs go 1.11 require ( - shylinux.com/x/go-git/v5 v5.6.2 + shylinux.com/x/go-git/v5 v5.6.3 shylinux.com/x/go-qrcode v0.0.2 - shylinux.com/x/ice v1.3.0 shylinux.com/x/toolkits v0.7.5 shylinux.com/x/websocket v0.0.2 ) diff --git a/go.sum b/go.sum index 96014a51..a225fd6a 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,7 @@ +shylinux.com/x/go-git/v5 v5.6.3 h1:TgxQSryjeDVOA33eYF8s+URzC3xdXsfJQaJAyq1liz0= +shylinux.com/x/go-git/v5 v5.6.3/go.mod h1:FiJKLqM5ppFERgywelAfywwxc7UxpaYN5YH3Lhc2gys= shylinux.com/x/go-qrcode v0.0.2 h1:/c0PLj+1RT+kUPfnZVXwgbgH5m1SxBUjM2MIKXbDk+E= shylinux.com/x/go-qrcode v0.0.2/go.mod h1:TlzGBENHXy19xC3AsC6h4Vs5fx2ZuDA4TZ0U3C2OeK4= -shylinux.com/x/gogit v0.0.7 h1:2ep5QpXWLs0UBCywJuUHda/aagskYvFmn0nj3vpEdY4= -shylinux.com/x/gogit v0.0.7/go.mod h1:wYfHxpQT1C8yNV+yC1jStIy0I12bfUCyJARhn0sNn1M= -shylinux.com/x/ice v1.3.0/go.mod h1:sgSlRKoEKnZbmHZ8QuQ3VrFOlW/imi12GX2Z9drkngY= -shylinux.com/x/icebergs v1.5.4/go.mod h1:njja7CnbJD39p4OGDvIxmh7p8206nAlDiAiTh34CNiw= -shylinux.com/x/toolkits v0.7.4/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/toolkits v0.7.5 h1:OHk2zLWubFion4cJBo+lSTyzBp3buzV7Xu/Q91Hvf7M= shylinux.com/x/toolkits v0.7.5/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.2 h1:aeeZyAsh6QN7+l5oMXlO9/rlQgx6CHvDtpZyAqMCSlU= diff --git a/misc/git/status.go b/misc/git/status.go index f3ee3799..91a27c32 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -4,7 +4,6 @@ import ( "strings" "time" - "shylinux.com/x/gogit" ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/cli" @@ -52,11 +51,6 @@ func _status_list(m *ice.Message) (files, adds, dels int, last time.Time) { ReposList(m).Table(func(value ice.Maps) { m.Option(cli.CMD_DIR, value[nfs.PATH]) files, adds, dels = _status_stat(m, files, adds, dels) - if repos, e := gogit.OpenRepository(_git_dir(value[nfs.PATH])); e == nil { - if ci, e := repos.GetCommit(); e == nil && ci.Author.When.After(last) { - last = ci.Author.When - } - } tags := _git_tags(m) kit.SplitKV(ice.SP, ice.NL, _git_status(m), func(text string, ls []string) { switch kit.Ext(ls[1]) { @@ -146,6 +140,9 @@ func init() { OAUTH: {Help: "授权", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(kit.MergeURL2(kit.Select(ice.Info.Make.Remote, _git_remote(m)), "/chat/cmd/web.code.git.token", aaa.USERNAME, m.Option(ice.MSG_USERNAME), tcp.HOST, web.UserHost(m))) }}, + COMMIT: {Name: "commit actions=add,opt,fix comment*=some", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(REPOS, COMMIT, arg) + }}, web.DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { if m.Option(mdb.TYPE) != web.WORKER { return @@ -170,9 +167,6 @@ func init() { if _configs_get(m, USER_EMAIL) == "" { m.Echo("please config user.email").Action(CONFIGS) } else if len(arg) == 0 { - m.Cmdy(REPOS, STATUS) - m.Action(PULL, PUSH, "insteadof", "oauth").Sort("repos,status,file") - return files, adds, dels, last := _status_list(m) m.StatusTimeCount("files", files, "adds", adds, "dels", dels, "last", last.Format(ice.MOD_TIME), nfs.ORIGIN, _git_remote(m)) m.Action(PULL, PUSH, "insteadof", "oauth").Sort("repos,type,file") diff --git a/misc/ssh/connect.go b/misc/ssh/connect.go index b425199a..8ca457b3 100644 --- a/misc/ssh/connect.go +++ b/misc/ssh/connect.go @@ -40,7 +40,7 @@ func _ssh_open(m *ice.Message, arg ...string) { } func _ssh_dial(m *ice.Message, cb func(net.Conn), arg ...string) { p := kit.HomePath(".ssh", fmt.Sprintf("%s@%s:%s", m.Option(aaa.USERNAME), m.Option(tcp.HOST), m.Option(tcp.PORT))) - if nfs.ExistsFile(m, p) { + if nfs.Exists(m, p) { if c, e := net.Dial("unix", p); e == nil { cb(c) return diff --git a/misc/ssh/service.go b/misc/ssh/service.go index 335e0797..215508ce 100644 --- a/misc/ssh/service.go +++ b/misc/ssh/service.go @@ -12,7 +12,6 @@ import ( "strings" "golang.org/x/crypto/ssh" - pty "shylinux.com/x/creackpty" ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/cli" @@ -22,6 +21,7 @@ import ( psh "shylinux.com/x/icebergs/base/ssh" "shylinux.com/x/icebergs/base/tcp" "shylinux.com/x/icebergs/base/web" + "shylinux.com/x/icebergs/misc/xterm" kit "shylinux.com/x/toolkits" ) @@ -87,7 +87,7 @@ func _ssh_accept(m *ice.Message, h string, c net.Conn) { } } func _ssh_prepare(m *ice.Message, channel ssh.Channel, requests <-chan *ssh.Request) { - pty, tty, err := pty.Open() + pty, tty, err := xterm.Open() if m.Warn(err) { return } diff --git a/misc/xterm/pty_darwin.go b/misc/xterm/pty_darwin.go index 84e64d8e..1278e34a 100644 --- a/misc/xterm/pty_darwin.go +++ b/misc/xterm/pty_darwin.go @@ -12,7 +12,7 @@ import ( kit "shylinux.com/x/toolkits" ) -func open() (pty, tty *os.File, err error) { +func Open() (pty, tty *os.File, err error) { pFD, err := syscall.Open("/dev/ptmx", syscall.O_RDWR|syscall.O_CLOEXEC, 0) if err != nil { return nil, nil, err diff --git a/misc/xterm/pty_linux.go b/misc/xterm/pty_linux.go index cc8915b0..72b6536d 100644 --- a/misc/xterm/pty_linux.go +++ b/misc/xterm/pty_linux.go @@ -12,7 +12,7 @@ import ( kit "shylinux.com/x/toolkits" ) -func open() (*os.File, *os.File, error) { +func Open() (*os.File, *os.File, error) { p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0) if err != nil { return nil, nil, err diff --git a/misc/xterm/winsize_unsupported.go b/misc/xterm/winsize_unsupported.go index 73395840..99cece06 100644 --- a/misc/xterm/winsize_unsupported.go +++ b/misc/xterm/winsize_unsupported.go @@ -9,4 +9,4 @@ import ( ) func Setsize(*os.File, *Winsize) error { return errors.New("unsupported") } -func open() (pty, tty *os.File, err error) { return nil, nil, errors.New("unsuported") } +func Open() (pty, tty *os.File, err error) { return nil, nil, errors.New("unsuported") } diff --git a/misc/xterm/xterm.go b/misc/xterm/xterm.go index 9f884edd..3c62a5bd 100644 --- a/misc/xterm/xterm.go +++ b/misc/xterm/xterm.go @@ -40,7 +40,7 @@ func Command(m *ice.Message, dir string, cli string, arg ...string) (*XTerm, err cmd.Env = append(cmd.Env, os.Environ()...) cmd.Env = append(cmd.Env, "TERM=xterm") cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true, Setctty: true} - pty, tty, err := open() + pty, tty, err := Open() if err != nil { return nil, err }