From f915c408874594820dc1c25aeb651487f8f4e6c4 Mon Sep 17 00:00:00 2001 From: qydysky Date: Sun, 4 Oct 2020 18:26:38 +0800 Subject: [PATCH] 30 --- .github/workflows/go.yml | 44 ++++++++++++++++++++++++++++++++++++++++ .gitignore | 1 + CV/Var.go | 1 + F/api.go | 4 ++++ Reply/F.go | 9 ++++++-- Reply/Reply.go | 1 + Reply/qt.go | 1 + bili_danmu.go | 1 + demo/go.mod | 9 +++++--- demo/go.sum | 12 +++++++++++ go.mod | 2 +- 11 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/go.yml diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml new file mode 100644 index 0000000..d6874ed --- /dev/null +++ b/.github/workflows/go.yml @@ -0,0 +1,44 @@ +name: Go + +on: + release: + types: [released,prereleased] + branches: + - master + +jobs: + + build: + name: Build + runs-on: ubuntu-latest + steps: + + - name: Set up Go 1.x + uses: actions/setup-go@v2 + with: + go-version: ^1.15.2 + id: go + + - name: Check out code into the Go module directory + uses: actions/checkout@v2 + + - name: Get dependencies + run: | + go get -v -t -d ./... + if [ -f Gopkg.toml ]; then + curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh + dep ensure + fi + - name: cd demo + run: cd demo + + - name: Build + run: go build -v . + + - name: Upload a Build Artifact + uses: actions/upload-artifact@v2.2.0 + with: + # Artifact name + # A file, directory or wildcard pattern that describes what to upload + path: ./ + # The desired behavior if no files are found using the provided path. diff --git a/.gitignore b/.gitignore index be08c90..074e800 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ demo/*.dtmp demo/*.ass demo/*.mkv demo/qtbox +demo/main diff --git a/CV/Var.go b/CV/Var.go index f492b48..2dafe1f 100644 --- a/CV/Var.go +++ b/CV/Var.go @@ -4,6 +4,7 @@ var ( Live string//直播链接 Roomid int Cookie string + Title string ) //from player-loader-2.0.11.min.js diff --git a/F/api.go b/F/api.go index bf0bf59..4031022 100644 --- a/F/api.go +++ b/F/api.go @@ -53,6 +53,10 @@ func (i *api) Get_info() (o *api) { } else { o.Uid = i } + //Title + if e := r.S(`"title":"`, `",`, 0, 0).Err;e == nil { + c.Title = r.RS + } //VERSION if e := r.S(`player-loader-`, `.min`, 0, 0).Err;e == nil { c.VERSION = r.RS diff --git a/Reply/F.go b/Reply/F.go index 11c75f9..da2367b 100644 --- a/Reply/F.go +++ b/Reply/F.go @@ -282,10 +282,15 @@ func Saveflvf(){ Timeout:-1, JustResponseCode:true, }); e != nil{l.W(e)} - p.Sys().Timeoutf(5) + p.Sys().Timeoutf(2) retry -= 1 } - if retry == 0 {continue} + if retry == 0 { + p.Sys().Timeoutf(5) + saveflv.wait.Done() + saveflv.cancel.Done() + continue + } } Ass_f(saveflv.path, time.Now()) diff --git a/Reply/Reply.go b/Reply/Reply.go index 9277a25..98a2c61 100644 --- a/Reply/Reply.go +++ b/Reply/Reply.go @@ -242,6 +242,7 @@ func (replyF) room_change(s string){ if title != nil { sh = append(sh, title) + c.Title = title.(string) } if area_name != nil { sh = append(sh, area_name) diff --git a/Reply/qt.go b/Reply/qt.go index d79213c..2c79d57 100644 --- a/Reply/qt.go +++ b/Reply/qt.go @@ -67,6 +67,7 @@ func Qtdanmu() { QtOn = true // var list []string t.TextCursor().InsertText("房间：" + strconv.Itoa(c.Roomid)) + text(c.Title, t) for QtOn { select{ case i :=<-QtDanmuChan: diff --git a/bili_danmu.go b/bili_danmu.go index 074d945..f1e2670 100644 --- a/bili_danmu.go +++ b/bili_danmu.go @@ -62,6 +62,7 @@ func Demo() { ws.SendChan <- F.HelloGen(api.Roomid, api.Token) if F.HelloChe(<- ws.RecvChan) { danmulog.I("已连接到房间", room) + danmulog.I(c.Title) //30s获取一次人气 go func(){ diff --git a/demo/go.mod b/demo/go.mod index 76378c6..ce4e3d8 100644 --- a/demo/go.mod +++ b/demo/go.mod @@ -4,9 +4,12 @@ go 1.14 require ( github.com/christopher-dG/go-obs-websocket v0.0.0-20200720193653-c4fed10356a5 // indirect + github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect + github.com/klauspost/compress v1.11.1 // indirect github.com/mitchellh/mapstructure v1.3.3 // indirect - github.com/qydysky/bili_danmu v0.0.0-20200927122850-634963f75e5b + github.com/qydysky/bili_danmu v0.0.0 github.com/qydysky/part v0.0.4 // indirect + github.com/shirou/gopsutil v2.20.9+incompatible // indirect github.com/therecipe/env_darwin_amd64_513 v0.0.0-20190626001412-d8e92e8db4d0 // indirect github.com/therecipe/env_linux_amd64_513 v0.0.0-20190626000307-e137a3934da6 // indirect github.com/therecipe/env_windows_amd64_513 v0.0.0-20190626000028-79ec8bd06fb2 // indirect @@ -14,8 +17,8 @@ require ( github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d // indirect github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d // indirect github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d // indirect - golang.org/x/net v0.0.0-20200927032502-5d4f70055728 // indirect - golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c // indirect + golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect + golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c // indirect ) replace github.com/qydysky/bili_danmu => ../ diff --git a/demo/go.sum b/demo/go.sum index c930769..7306bf3 100644 --- a/demo/go.sum +++ b/demo/go.sum @@ -8,12 +8,16 @@ github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA= github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.0 h1:wJbzvpYMVGG9iTI9VxpnNZfd4DzMPoCWze3GgSqz8yg= github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.1 h1:bPb7nMRdOZYDrpPMTA3EInUQrdgoBinqUuSwlGdKDdE= +github.com/klauspost/compress v1.11.1/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -77,6 +81,8 @@ github.com/qydysky/part v0.0.4/go.mod h1:+8N3UgJBVyJj8ar31eZtucwrKpLpay854Y5qq0x github.com/shirou/gopsutil v2.20.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v2.20.8+incompatible h1:8c7Atn0FAUZJo+f4wYbN0iVpdWniCQk7IYwGtgdh1mY= github.com/shirou/gopsutil v2.20.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil v2.20.9+incompatible h1:msXs2frUV+O/JLva9EDLpuJ84PrFsdCTCQex8PUdtkQ= +github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -110,6 +116,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -123,6 +131,8 @@ golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321 h1:lleNcKRbcaC8MqgLwghIkzZ2J golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200927032502-5d4f70055728 h1:5wtQIAulKU5AbLQOkjxl32UufnIOqgBX72pS0AV14H0= golang.org/x/net v0.0.0-20200927032502-5d4f70055728/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c h1:dk0ukUIHmGHqASjP0iue2261isepFCC6XRCSd1nHgDw= +golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod h1:iQL9McJNjoIa5mjH6nYTCTZXUN6RP+XW3eib7Ya3XcI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -146,6 +156,8 @@ golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73Ih golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c h1:38q6VNPWR010vN82/SB121GujZNIfAUb4YttE2rhGuc= golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA= diff --git a/go.mod b/go.mod index 9ab481c..cd694f8 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/christopher-dG/go-obs-websocket v0.0.0-20200720193653-c4fed10356a5 github.com/gorilla/websocket v1.4.2 github.com/klauspost/compress v1.11.0 // indirect - github.com/qydysky/part v0.0.0-20200917071511-9f829642b501 + github.com/qydysky/part v0.0.4 github.com/shirou/gopsutil v2.20.8+incompatible // indirect golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect -- 2.39.2