From 3c2da603ae0cc639b97ada2af51199963d39a84f Mon Sep 17 00:00:00 2001 From: shaoying Date: Sat, 31 Aug 2019 00:40:17 +0800 Subject: [PATCH] add cli.project.stats --- src/contexts/cli/cli.go | 6 +- src/contexts/cli/version.go | 2 +- src/plugin/context/index.shy | 2 +- usr/librarys/plugin/initFlashList.js | 15 ---- usr/librarys/plugin/initQRCode.js | 9 --- .../packaging/image/Dockerfile.engine | 79 ------------------- usr/local/wiki/src/vim | 1 - 7 files changed, 7 insertions(+), 107 deletions(-) delete mode 100644 usr/librarys/plugin/initFlashList.js delete mode 100644 usr/librarys/plugin/initQRCode.js delete mode 100644 usr/local/wiki/src/debian/docker-ce-master/components/packaging/image/Dockerfile.engine delete mode 160000 usr/local/wiki/src/vim diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go index 54b89fcb..48d78428 100644 --- a/src/contexts/cli/cli.go +++ b/src/contexts/cli/cli.go @@ -776,7 +776,11 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心", case "stat": // 代码统计 - m.Cmdy("nfs.dir", "src", "dir_deep", "dir_type", "file", "dir_sort", "line", "int_r") + m.Cmdy("nfs.dir", kit.Select("src", arg, 1), "dir_deep", "dir_type", "file", "dir_sort", "line", "int_r") + + case "stats": + // 代码统计 + m.Cmdy("nfs.dir", kit.Select("src", arg, 1), "dir_deep", "dir_type", "file", "dir_sort", "line", "int_r", "dir_select", "group", "") case "trend": // 提交记录 diff --git a/src/contexts/cli/version.go b/src/contexts/cli/version.go index 917fb645..092422fb 100644 --- a/src/contexts/cli/version.go +++ b/src/contexts/cli/version.go @@ -4,5 +4,5 @@ var version = struct { host string self int }{ - "2019-08-31 00:24:43", "mac", 493, + "2019-08-31 00:31:59", "mac", 495, } diff --git a/src/plugin/context/index.shy b/src/plugin/context/index.shy index 5336981e..2d1b6d22 100644 --- a/src/plugin/context/index.shy +++ b/src/plugin/context/index.shy @@ -1,6 +1,6 @@ kit project "项目" private \ - select "" values plugin values review values submit values trend values stat values init action auto \ + select "" values plugin values review values submit values trend values stats values stat values init action auto \ text "" name see imports plugin_see action auto \ button "执行" \ exports see name see diff --git a/usr/librarys/plugin/initFlashList.js b/usr/librarys/plugin/initFlashList.js deleted file mode 100644 index a074569d..00000000 --- a/usr/librarys/plugin/initFlashList.js +++ /dev/null @@ -1,15 +0,0 @@ -{ - show: function(event, item, option, plugin) { - var args = item.value == "所有"? ["all"]: [] - option.Run(event, args, function(msg) { - option.ondaemon(msg) - }) - }, - init: function(page, pane, plugin, option, output) { - option.ondaemon = function(msg) { - output.innerHTML = "" - kit.AppendChild(output, [{type: "code", list: [{text: [msg.result.join(""), "pre"]}]}]) - } - output.innerHTML = "hello" - } -} diff --git a/usr/librarys/plugin/initQRCode.js b/usr/librarys/plugin/initQRCode.js deleted file mode 100644 index 688125dd..00000000 --- a/usr/librarys/plugin/initQRCode.js +++ /dev/null @@ -1,9 +0,0 @@ -{init: function(page, pane, field, option, output) { - this.Runs = function(event) { - var value = option.txt.value - var url = page.login.Pane.Share({cmds: ["qrcode", value]}) - kit.AppendChilds(output, [{img: [url]}]) - event.ctrlKey && page.target.Pane.Send("icon", url) - event.shiftKey && page.target.Pane.Send("field", this.Format(value)) - } -}} diff --git a/usr/local/wiki/src/debian/docker-ce-master/components/packaging/image/Dockerfile.engine b/usr/local/wiki/src/debian/docker-ce-master/components/packaging/image/Dockerfile.engine deleted file mode 100644 index 9242dcdc..00000000 --- a/usr/local/wiki/src/debian/docker-ce-master/components/packaging/image/Dockerfile.engine +++ /dev/null @@ -1,79 +0,0 @@ -# Common builder -ARG GO_IMAGE -FROM ${GO_IMAGE} as builder - -COPY hack/dockerfile/install/tini.installer / -COPY hack/dockerfile/install/proxy.installer / -RUN apt-get update && apt-get install -y \ - bash \ - btrfs-tools \ - ca-certificates \ - cmake \ - gcc \ - git \ - libc-dev \ - libgcc-6-dev \ - libltdl-dev \ - libtool \ - make -RUN grep "_COMMIT=" /*.installer |cut -f2- -d: > /binaries-commits - -# dockerd -FROM builder as dockerd-builder -WORKDIR /go/src/github.com/docker/docker -COPY . /go/src/github.com/docker/docker -ARG VERSION -ARG GITCOMMIT -ARG BUILDTIME -ARG PLATFORM -ARG PRODUCT -ARG DEFAULT_PRODUCT_LICENSE -ENV VERSION ${VERSION} -ENV GITCOMMIT ${GITCOMMIT} -ENV BUILDTIME ${BUILDTIME} -ENV PLATFORM ${PLATFORM} -ENV PRODUCT ${PRODUCT} -ENV DEFAULT_PRODUCT_LICENSE ${DEFAULT_PRODUCT_LICENSE} -# TODO The way we set the version could easily be simplified not to depend on hack/... -RUN bash ./hack/make/.go-autogen -RUN go build -o /sbin/dockerd \ - -tags 'autogen netgo static_build selinux journald' \ - -installsuffix netgo -a -buildmode=pie -ldflags '-w -extldflags "-static" ' \ - github.com/docker/docker/cmd/dockerd - -# docker-proxy -# TODO if libnetwork folds into the docker tree this can be combined above -FROM builder as proxy-builder -RUN git clone https://github.com/docker/libnetwork.git /go/src/github.com/docker/libnetwork -WORKDIR /go/src/github.com/docker/libnetwork -RUN . /binaries-commits && \ - git checkout -q "$LIBNETWORK_COMMIT" && \ - CGO_ENABLED=0 go build -buildmode=pie -ldflags="$PROXY_LDFLAGS" \ - -o /sbin/docker-proxy \ - github.com/docker/libnetwork/cmd/proxy - -# docker-init - TODO move this out, last time we bumped was 2016! -FROM builder as init-builder -RUN git clone https://github.com/krallin/tini.git /tini -WORKDIR /tini -RUN . /binaries-commits && \ - git checkout -q "$TINI_COMMIT" && \ - cmake . && make tini-static && \ - cp tini-static /sbin/docker-init - -# runc -FROM builder as runc-builder -RUN apt-get install -y libseccomp-dev -RUN git clone https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc -WORKDIR /go/src/github.com/opencontainers/runc -RUN . /binaries-commits && \ - git checkout -q "$RUNC_COMMIT" && \ - make BUILDTAGS='seccomp apparmor' static && make install - -# Final docker image -FROM scratch -COPY --from=dockerd-builder /sbin/dockerd /sbin/ -COPY --from=proxy-builder /sbin/docker-proxy /sbin/ -COPY --from=init-builder /sbin/docker-init /sbin/ -COPY --from=runc-builder /usr/local/sbin/runc /sbin/ -ENTRYPOINT ["/sbin/dockerd"] diff --git a/usr/local/wiki/src/vim b/usr/local/wiki/src/vim deleted file mode 160000 index 00792161..00000000 --- a/usr/local/wiki/src/vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 007921611b04d8fca5ad0b1d4e7b0461b47cd435