From ff4fc43c36362d53c87b212b8899445a21dec7e5 Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 14 Mar 2024 12:05:58 +0800 Subject: [PATCH] add some --- base/web/dream.go | 13 ++++++++----- base/web/spide.go | 3 +-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 5e3e25ab..9d6f221c 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -138,7 +138,6 @@ func _dream_start(m *ice.Message, name string) { return } if !m.IsCliUA() { - // defer m.ProcessOpen(m.MergePod(name)) defer m.ProcessOpenAndRefresh(m.MergePod(name)) defer ToastProcess(m, mdb.CREATE, name)() } @@ -147,15 +146,19 @@ func _dream_start(m *ice.Message, name string) { if p == "" { return } - gdb.Event(m, DREAM_CREATE, m.OptionSimple(mdb.NAME)) + if !nfs.Exists(m, p) { + gdb.Event(m, DREAM_CREATE, m.OptionSimple(mdb.NAME)) + } defer m.Options(cli.CMD_DIR, "", cli.CMD_ENV, "", cli.CMD_OUTPUT, "") m.Options(cli.CMD_DIR, kit.Path(p), cli.CMD_ENV, kit.EnvList(kit.Simple(m.OptionSimple(ice.TCP_DOMAIN), cli.CTX_OPS, HostPort(m, tcp.LOCALHOST, m.Cmdv(SERVE, tcp.PORT)), cli.CTX_LOG, ice.VAR_LOG_BOOT_LOG, cli.CTX_PID, ice.VAR_LOG_ICE_PID, cli.CTX_ROOT, kit.Path(""), cli.PATH, cli.BinPath(p, ""), cli.USER, ice.Info.Username, )...), cli.CMD_OUTPUT, path.Join(p, ice.VAR_LOG_BOOT_LOG), mdb.CACHE_CLEAR_ONEXIT, ice.TRUE) - kit.If(m.Option(nfs.BINARY) == "" && !cli.SystemFindGo(m), func(p string) { m.Option(nfs.BINARY, S(name)) }) - kit.If(m.Option(nfs.BINARY), func(p string) { _dream_binary(m, p) }) - kit.If(m.Option(nfs.TEMPLATE), func(p string) { _dream_template(m, p) }) + if !nfs.Exists(m, p) { + kit.If(m.Option(nfs.BINARY) == "" && !cli.SystemFindGo(m), func(p string) { m.Option(nfs.BINARY, S(name)) }) + kit.If(m.Option(nfs.BINARY), func(p string) { _dream_binary(m, p) }) + kit.If(m.Option(nfs.TEMPLATE), func(p string) { _dream_template(m, p) }) + } bin := kit.Select(kit.Path(os.Args[0]), cli.SystemFind(m, ice.ICE_BIN, nfs.PWD+path.Join(p, ice.BIN), nfs.PWD+ice.BIN)) if cli.IsSuccess(m.Cmd(cli.DAEMON, bin, SPACE, tcp.DIAL, ice.DEV, ice.OPS, mdb.TYPE, WORKER, m.OptionSimple(mdb.NAME), cli.DAEMON, ice.OPS)) { gdb.WaitEvent(m, DREAM_OPEN, func(m *ice.Message, arg ...string) bool { return m.Option(mdb.NAME) == name }) diff --git a/base/web/spide.go b/base/web/spide.go index e458d777..060e7ffa 100644 --- a/base/web/spide.go +++ b/base/web/spide.go @@ -337,8 +337,7 @@ func init() { } }}, mdb.CREATE: {Name: "create name origin* type icons token", Hand: func(m *ice.Message, arg ...string) { - u := kit.ParseURL(m.Option(ORIGIN)) - _spide_create(m, m.OptionDefault(mdb.NAME, u.Hostname()), m.Option(ORIGIN), m.Option(mdb.TYPE), m.OptionDefault(mdb.ICONS, nfs.USR_ICONS_VOLCANOS), m.OptionDefault(TOKEN, u.Query().Get(TOKEN))) + _spide_create(m, m.Option(mdb.NAME), m.Option(ORIGIN), m.Option(mdb.TYPE), m.OptionDefault(mdb.ICONS, nfs.USR_ICONS_VOLCANOS), m.Option(TOKEN)) }}, COOKIE: {Name: "cookie key* value", Help: "ηŠΆζ€ι‡", Hand: func(m *ice.Message, arg ...string) { mdb.HashModify(m, m.OptionSimple(CLIENT_NAME), kit.Keys(COOKIE, m.Option(mdb.KEY)), m.Option(mdb.VALUE))