]> 127.0.0.1 Git - part/.git/commitdiff
projects / part / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f36e49c)
94 v0.3.4
authorqydysky <qydysky@foxmail.com>
Sat, 19 Dec 2020 02:19:39 +0000 (10:19 +0800)
committerqydysky <qydysky@foxmail.com>
Sat, 19 Dec 2020 02:19:39 +0000 (10:19 +0800)
get/Get.go patch | blob | history
get/Get_test.go patch | blob | history
msgq/go.mod [deleted file] patch | blob | history
msgq/go.sum [deleted file] patch | blob | history

diff --git a/get/Get.go b/get/Get.go
index c552d1bc5a6a7a9e632124fc64e6f13535503e1e..e9d1b1653fe78b7418987b9808347e8875ef5fa7 100644 (file)
--- a/get/Get.go
+++ b/get/Get.go
@@ -11,7 +11,7 @@ type get struct {
        body []byte
        
        Response *http.Response
-       RS string
+       RS []string
        Err error
 }
 
@@ -30,7 +30,32 @@ func Get(r p.Rval) (o *get){
 
 func (i *get) S(stratS,endS string, startI,lenI int) (o *get) {
        o = i
-       o.RS,o.Err = SS(string(o.body), stratS, endS, startI, lenI)
+       var tmp string
+       tmp,o.Err = SS(string(o.body), stratS, endS, startI, lenI)
+       if o.Err != nil {return}
+       o.RS = []string{tmp}
+       return
+}
+
+func (i *get) S2(stratS,endS string) (o *get) {
+       o = i
+       o.RS,o.Err = SS2(string(o.body), stratS, endS)
+       if o.Err != nil {return}
+       return
+}
+
+func SS2(source,stratS,endS string) (return_val []string,last_err error) {
+       if source == `` {last_err = errors.New("ss2:no source");return}
+       if stratS == `` {last_err = errors.New("ss2:no stratS");return}
+
+       return_val = strings.Split(source,stratS)[1:]
+       if len(return_val) == 0 {last_err = errors.New("ss2:no found");return}
+       if endS == `` {return}
+       for k,v := range return_val {
+               first_index := strings.Index(v,endS)
+               if first_index == -1 {continue}
+               return_val[k] = string([]rune(v)[:first_index])
+       }
        return
 }
 
diff --git a/get/Get_test.go b/get/Get_test.go
index e1a5a389c887f98b46521bc442eadbcd89322df4..84655d50e579e871f165e3f3acc982d74c4fe16b 100644 (file)
--- a/get/Get_test.go
+++ b/get/Get_test.go
@@ -10,8 +10,18 @@ func Test_get(t *testing.T) {
                Url:"https://www.baidu.com/",
        })
        g.S(`<head><meta http-equiv="`, `"`, 0, 0)
-       if g.Err != nil || g.RS != `Content-Type` {return}
+       if g.Err != nil || g.RS[0] != `Content-Type` {return}
        g.S(`<head><meta http-equiv="`, `<meta content="`, 0, 0)
        if g.Err != nil {return}
-       if s,e := SS(g.RS, `content="`, `"`, 0, 0);e != nil || s != `text/html;charset=utf-8` {return}
+       if s,e := SS(g.RS[0], `content="`, `"`, 0, 0);e != nil || s != `text/html;charset=utf-8` {return}
 }
+
+func Test_getArray(t *testing.T) {
+       g := Get(p.Rval{
+               Url:"https://www.baidu.com/",
+       })
+       g.S2(`<script src="`, `"></script>`)
+       for _,v := range g.RS {
+               t.Log(v)
+       }
+}
\ No newline at end of file
diff --git a/msgq/go.mod b/msgq/go.mod
deleted file mode 100644 (file)
index 4fa99f7..0000000
--- a/msgq/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/qydysky/part/msgq
-
-go 1.15
-
-require github.com/qydysky/part v0.3.1
-
-replace github.com/qydysky/part => ../
diff --git a/msgq/go.sum b/msgq/go.sum
deleted file mode 100644 (file)
index 2dee042..0000000
--- a/msgq/go.sum
+++ /dev/null
@@ -1,39 +0,0 @@
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc=
-github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
-github.com/klauspost/compress v1.10.10 h1:a/y8CglcM7gLGYmlbP/stPE5sR3hbhFRUjCBfd/0B3I=
-github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
-github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
-github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/qydysky/part v0.3.1 h1:pyRSZQCWPsMSmn3XcEGFdwfhTdMczDomHi2+pfoiBdU=
-github.com/qydysky/part v0.3.1/go.mod h1:93s9ohLtzULet5ZPEUUWrT9BELC30oDZgRpgGSiDye4=
-github.com/shirou/gopsutil v2.20.7+incompatible h1:Ymv4OD12d6zm+2yONe39VSmp2XooJe8za7ngOLW/o/w=
-github.com/shirou/gopsutil v2.20.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/thedevsaddam/gojsonq v2.3.0+incompatible h1:i2lFTvGY4LvoZ2VUzedsFlRiyaWcJm3Uh6cQ9+HyQA8=
-github.com/thedevsaddam/gojsonq v2.3.0+incompatible/go.mod h1:RBcQaITThgJAAYKH7FNp2onYodRz8URfsuEGpAch0NA=
-github.com/thedevsaddam/gojsonq/v2 v2.5.2 h1:CoMVaYyKFsVj6TjU6APqAhAvC07hTI6IQen8PHzHYY0=
-github.com/thedevsaddam/gojsonq/v2 v2.5.2/go.mod h1:bv6Xa7kWy82uT0LnXPE2SzGqTj33TAEeR560MdJkiXs=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
-golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed h1:WBkVNH1zd9jg/dK4HCM4lNANnmd12EHC9z+LmcCG4ns=
-golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
part