From 6b8e6e11f9f46490bbd584a95a04d12a414c8dd0 Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 18 Feb 2024 18:48:08 +0800 Subject: [PATCH] add some --- base/web/cache.go | 3 +-- misc/git/repos.go | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/base/web/cache.go b/base/web/cache.go index 966ca959..45832e4f 100644 --- a/base/web/cache.go +++ b/base/web/cache.go @@ -7,7 +7,6 @@ import ( "path" ice "shylinux.com/x/icebergs" - "shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/nfs" "shylinux.com/x/icebergs/base/tcp" @@ -152,7 +151,7 @@ func init() { }, func() { m.RenderResult(msg.Append(mdb.TEXT)) }) } }}, - }, mdb.HashAction(mdb.SHORT, mdb.TEXT, mdb.FIELD, "time,hash,size,type,name,text,file", ctx.ACTION, WATCH), ice.RenderAction(ice.RENDER_DOWNLOAD)), Hand: func(m *ice.Message, arg ...string) { + }, mdb.HashAction(mdb.SHORT, mdb.TEXT, mdb.FIELD, "time,hash,size,type,name,text,file"), ice.RenderAction(ice.RENDER_DOWNLOAD)), Hand: func(m *ice.Message, arg ...string) { if mdb.HashSelect(m, arg...); len(arg) == 0 || m.R != nil && m.R.Method == http.MethodGet { m.Option(ice.MSG_ACTION, "") } else if m.Length() == 0 { diff --git a/misc/git/repos.go b/misc/git/repos.go index 00016f41..1f4141fe 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -229,12 +229,9 @@ func _repos_status(m *ice.Message, p string, repos *git.Repository) error { if err != nil { return err } + ignore := kit.Split(m.Cmdx(nfs.CAT, ".gitignore"), lex.NL) for k, v := range status { - if kit.IsIn(k, ice.SRC_VERSION_GO, ice.SRC_BINPACK_GO, ice.SRC_BINPACK_USR_GO, ice.ETC_LOCAL_SHY) { - continue - } else if kit.IsIn(kit.Ext(k), "swp", "swo") || kit.HasPrefix(k, nfs.BIN, nfs.VAR, nfs.USR) && !strings.HasPrefix(k, ice.USR_LOCAL_EXPORT) { - continue - } else if kit.HasPrefix(k, "etc/conf/cert/") { + if kit.HasPrefix(k, nfs.PT) || (kit.HasPrefix(k, ignore...) && !strings.HasPrefix(k, ice.USR_LOCAL_EXPORT)) { continue } switch m.Push(REPOS, p).Push(STATUS, string(v.Worktree)+string(v.Staging)).Push(nfs.FILE, k); v.Worktree {