x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-04-28 18:22:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

add value

Browse Source
This commit is contained in:
shaoying 2020-06-01 08:39:04 +08:00
parent c322721957
commit 35e6b6d411
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/web/share.go
View File

@ -109,6 +109,7 @@ func _share_action_redirect(m *ice.Message, value map[string]interface{}, share
"title", kit.Format(value["name"]), "title", kit.Format(value["name"]),
"river", kit.Value(value, "extra.river"), "river", kit.Value(value, "extra.river"),
"storm", kit.Value(value, "extra.storm"), "storm", kit.Value(value, "extra.storm"),
kit.UnMarshal(kit.Format(kit.Value(value, "extra.tool.0.value"))),
) )
return true return true
} }
@ -127,6 +128,7 @@ func _share_action_list(m *ice.Message, value map[string]interface{}, river, sto
m.Push("group", value["ctx"]) m.Push("group", value["ctx"])
m.Push("index", value["cmd"]) m.Push("index", value["cmd"])
m.Push("args", value["args"]) m.Push("args", value["args"])
m.Push("value", value["value"])
msg := m.Cmd(m.Space(value["pod"]), ice.CTX_COMMAND, value["ctx"], value["cmd"]) msg := m.Cmd(m.Space(value["pod"]), ice.CTX_COMMAND, value["ctx"], value["cmd"])
m.Push("name", value["cmd"]) m.Push("name", value["cmd"])

1
core/chat/action.go
View File

@ -11,6 +11,7 @@ func _action_share_create(m *ice.Message, arg ...string) {
arg = append(arg, "tool.0.ctx", m.Option("group")) arg = append(arg, "tool.0.ctx", m.Option("group"))
arg = append(arg, "tool.0.cmd", m.Option("index")) arg = append(arg, "tool.0.cmd", m.Option("index"))
arg = append(arg, "tool.0.args", m.Option("args")) arg = append(arg, "tool.0.args", m.Option("args"))
arg = append(arg, "tool.0.value", m.Option("value"))
arg = append(arg, "tool.0.single", "yes") arg = append(arg, "tool.0.single", "yes")
} else { } else {
m.Option(ice.MSG_RIVER, arg[5]) m.Option(ice.MSG_RIVER, arg[5])

2
core/wiki/inner.go
View File

@ -24,7 +24,7 @@ func _inner_list(m *ice.Message, name string) {
return return
} }
m.Cmdy("nfs.dir", name, "file") m.Cmdy("nfs.dir", name, "file size time")
} }
func _inner_save(m *ice.Message, name, text string) { func _inner_save(m *ice.Message, name, text string) {
if m.Cmdy(kit.Keys(strings.TrimPrefix(path.Ext(name), "."), "save"), name, text); len(m.Resultv()) > 0 { if m.Cmdy(kit.Keys(strings.TrimPrefix(path.Ext(name), "."), "save"), name, text); len(m.Resultv()) > 0 {

2
core/wiki/video
View File

@ -1,2 +0,0 @@
package wiki

7
core/wiki/video.go
View File

@ -6,7 +6,7 @@ import (
"github.com/nareix/joy4/av" "github.com/nareix/joy4/av"
"github.com/nareix/joy4/av/avutil" "github.com/nareix/joy4/av/avutil"
"github.com/nareix/joy4/codec/h264parser" "github.com/nareix/joy4/format"
) )
func init() { func init() {
@ -28,13 +28,8 @@ func init() {
if streams, e := file.Streams(); m.Assert(e) { if streams, e := file.Streams(); m.Assert(e) {
for _, stream := range streams { for _, stream := range streams {
m.Info("what %v", kit.Formats(stream)) m.Info("what %v", kit.Formats(stream))
if stream.Type().IsAudio() { if stream.Type().IsAudio() {
} else if stream.Type().IsVideo() { } else if stream.Type().IsVideo() {
m.Info("what %v", kit.Formats(stream))
h264parser.ParseSPS(stream.RecordInfo.SPS)
vstream := stream.(av.VideoCodecData) vstream := stream.(av.VideoCodecData)
m.Push("type", vstream.Type().String()) m.Push("type", vstream.Type().String())
m.Push("width", vstream.Width()) m.Push("width", vstream.Width())

2
go.mod
View File

@ -4,7 +4,7 @@ go 1.13
require ( require (
github.com/gorilla/websocket v1.4.1 github.com/gorilla/websocket v1.4.1
github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369 // indirect github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369
github.com/shylinux/toolkits v0.1.5 github.com/shylinux/toolkits v0.1.5
github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086 github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086
github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2