Compare commits
24 Commits
| Author | SHA1 | Date |
|---|---|---|
bel
|
cdabce7a56 | |
|
bel
|
0ab534624a | |
|
bel
|
b3ce49788b | |
|
bel
|
bbe839bb88 | |
|
bel
|
60f19968e3 | |
|
bel
|
c62d84b40a | |
|
bel
|
1a072fee59 | |
|
bel
|
c4213e697d | |
|
bel
|
934a306bc9 | |
Bel LaPointe
|
82bdbb1f3b | |
|
Bel LaPointe
|
b090cb86a5 | |
|
Bel LaPointe
|
e42df54632 | |
|
Bel LaPointe
|
0120fdd0e2 | |
|
Bel LaPointe
|
eab73aec04 | |
|
Bel LaPointe
|
bd9dca9766 | |
|
Bel LaPointe
|
56f7d093ef | |
|
Bel LaPointe
|
62b413c033 | |
|
Bel LaPointe
|
3adcee2fbe | |
|
Bel LaPointe
|
e916b5abfc | |
|
Bel LaPointe
|
211ef64261 | |
|
Bel LaPointe
|
bb8e2a18ef | |
|
Bel LaPointe
|
d2cf8c74a2 | |
|
Bel LaPointe
|
db289cb5c8 | |
|
Bel LaPointe
|
128c98dfbd |
|
|
@ -3,9 +3,9 @@ package broker
|
|||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"gogs.inhome.blapointe.com/local/storage"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/storage"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/logtr"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ package broker
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"gogs.inhome.blapointe.com/local/storage"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/storage"
|
||||
"local/truckstop/logtr"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strconv"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ import (
|
|||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/storage"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/storage"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/logtr"
|
||||
"net/http"
|
||||
"sort"
|
||||
"strconv"
|
||||
|
|
@ -87,7 +87,7 @@ func (fe FastExact) _login(username, password string, db storage.DB) error {
|
|||
return err
|
||||
}
|
||||
b, _ := ioutil.ReadAll(resp.Body)
|
||||
defer resp.Body.Close()
|
||||
resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return fmt.Errorf("bad status logging into fast exact: %d: %s", resp.StatusCode, b)
|
||||
|
|
@ -152,7 +152,6 @@ func (fe FastExact) searchOneZip(zip string) ([]Job, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
return fe.parse(resp)
|
||||
}
|
||||
|
||||
|
|
@ -166,7 +165,6 @@ func (fe FastExact) searchOneState(state config.State) ([]Job, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
return fe.parse(resp)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
package broker
|
||||
|
||||
import (
|
||||
"gogs.inhome.blapointe.com/local/storage"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/storage"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/logtr"
|
||||
"os"
|
||||
"path"
|
||||
"testing"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ package broker
|
|||
import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/zip"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/zip"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ import (
|
|||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/zip"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/logtr"
|
||||
"local/truckstop/zip"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
|
@ -374,9 +374,6 @@ func (ntg NTGVision) _searchStates(states []config.State) (io.ReadCloser, error)
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
b, _ := ioutil.ReadAll(resp.Body)
|
||||
resp.Body = io.NopCloser(bytes.NewReader(b))
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
b, _ := ioutil.ReadAll(resp.Body)
|
||||
resp.Body.Close()
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"bytes"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"local/truckstop/config"
|
||||
"os"
|
||||
"path"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package broker
|
||||
|
||||
import (
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"local/truckstop/config"
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ package config
|
|||
import (
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/storage"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/storage"
|
||||
"local/truckstop/logtr"
|
||||
"os"
|
||||
"sync"
|
||||
"time"
|
||||
|
|
|
|||
27
go.mod
27
go.mod
|
|
@ -1,26 +1,38 @@
|
|||
module gogs.inhome.blapointe.com/local/truckstop
|
||||
module local/truckstop
|
||||
|
||||
go 1.17
|
||||
|
||||
replace local/storage => ../storage
|
||||
|
||||
replace local/logb => ../logb
|
||||
|
||||
replace local/sandbox/contact/contact => ../sandbox/contact/contact
|
||||
|
||||
require (
|
||||
github.com/PuerkitoBio/goquery v1.8.0
|
||||
github.com/google/uuid v1.3.0
|
||||
github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16
|
||||
gogs.inhome.blapointe.com/local/storage v0.0.0-20230410162102-db39d7b02e29
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
|
||||
local/sandbox/contact/contact v0.0.0-00010101000000-000000000000
|
||||
local/storage v0.0.0-00010101000000-000000000000
|
||||
)
|
||||
|
||||
require (
|
||||
cloud.google.com/go v0.33.1 // indirect
|
||||
github.com/PuerkitoBio/goquery v1.8.0 // indirect
|
||||
github.com/Unknwon/goconfig v0.0.0-20181105214110-56bd8ab18619 // indirect
|
||||
github.com/abbot/go-http-auth v0.4.0 // indirect
|
||||
github.com/andybalholm/cascadia v1.3.1 // indirect
|
||||
github.com/aws/aws-sdk-go v1.15.81 // indirect
|
||||
github.com/boltdb/bolt v1.3.1 // indirect
|
||||
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
|
||||
github.com/buraksezer/consistent v0.9.0 // indirect
|
||||
github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e // indirect
|
||||
github.com/cespare/xxhash v1.1.0 // indirect
|
||||
github.com/emersion/go-imap v1.2.0 // indirect
|
||||
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 // indirect
|
||||
github.com/go-stack/stack v1.8.0 // indirect
|
||||
github.com/golang/protobuf v1.2.0 // indirect
|
||||
github.com/golang/snappy v0.0.1 // indirect
|
||||
github.com/gomodule/redigo v1.8.5 // indirect
|
||||
github.com/google/uuid v1.3.0 // indirect
|
||||
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
|
||||
github.com/json-iterator/go v1.1.9 // indirect
|
||||
github.com/klauspost/compress v1.9.5 // indirect
|
||||
|
|
@ -45,16 +57,17 @@ require (
|
|||
github.com/xdg-go/stringprep v1.0.2 // indirect
|
||||
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
|
||||
go.mongodb.org/mongo-driver v1.7.2 // indirect
|
||||
gogs.inhome.blapointe.com/local/logb v0.0.0-20230410154319-880efa39d871 // indirect
|
||||
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
|
||||
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
|
||||
golang.org/x/oauth2 v0.0.0-20181120190819-8f65e3013eba // indirect
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
|
||||
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
|
||||
golang.org/x/text v0.3.7 // indirect
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
|
||||
google.golang.org/api v0.0.0-20181120235003-faade3cbb06a // indirect
|
||||
google.golang.org/appengine v1.3.0 // indirect
|
||||
gopkg.in/ini.v1 v1.42.0 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
local/logb v0.0.0-00010101000000-000000000000 // indirect
|
||||
)
|
||||
|
|
|
|||
25
go.sum
25
go.sum
|
|
@ -5,6 +5,8 @@ github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9a
|
|||
github.com/Azure/azure-storage-blob-go v0.0.0-20181023070848-cf01652132cc/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
|
||||
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||
github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U=
|
||||
github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
|
||||
github.com/Unknwon/goconfig v0.0.0-20181105214110-56bd8ab18619 h1:6X8iB881g299aNEv6KXrcjL31iLOH7yA6NXoQX+MbDg=
|
||||
|
|
@ -20,6 +22,14 @@ github.com/aws/aws-sdk-go v1.15.81/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3A
|
|||
github.com/billziss-gh/cgofuse v1.1.0/go.mod h1:LJjoaUojlVjgo5GQoEJTcJNqZJeRU0nCR84CyxKt2YM=
|
||||
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
|
||||
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
|
||||
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
|
||||
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
|
||||
github.com/buraksezer/consistent v0.9.0 h1:Zfs6bX62wbP3QlbPGKUhqDw7SmNkOzY5bHZIYXYpR5g=
|
||||
github.com/buraksezer/consistent v0.9.0/go.mod h1:6BrVajWq7wbKZlTOUPs/XVfR8c0maujuPowduSpZqmw=
|
||||
github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e h1:mQTN05gz0rDZSABqKMzAPMb5ATWcvvdMljRzEh0LjBo=
|
||||
github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e/go.mod h1:alXX+s7a4cKaIprgjeEboqi4Tm7XR/HXEwUTxUV/ywU=
|
||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
github.com/coreos/bbolt v0.0.0-20180318001526-af9db2027c98/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
|
||||
github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
|
|
@ -28,6 +38,12 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
|||
github.com/djherbis/times v1.1.0/go.mod h1:CGMZlo255K5r4Yw0b9RRfFQpM2y7uOmxg4jm9HsaVf8=
|
||||
github.com/dropbox/dropbox-sdk-go-unofficial v5.4.0+incompatible/go.mod h1:lr+LhMM3F6Y3lW1T9j2U5l7QeuWm87N9+PPXo3yH4qY=
|
||||
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||
github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA=
|
||||
github.com/emersion/go-imap v1.2.0/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
|
||||
github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
|
||||
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
|
||||
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
|
|
@ -162,6 +178,8 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
|
|||
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
|
||||
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
|
||||
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
|
||||
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
|
|
@ -191,10 +209,6 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul
|
|||
github.com/yunify/qingstor-sdk-go v2.2.15+incompatible/go.mod h1:w6wqLDQ5bBTzxGJ55581UrSwLrsTAsdo9N6yX/8d9RY=
|
||||
go.mongodb.org/mongo-driver v1.7.2 h1:pFttQyIiJUHEn50YfZgC9ECjITMT44oiN36uArf/OFg=
|
||||
go.mongodb.org/mongo-driver v1.7.2/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
|
||||
gogs.inhome.blapointe.com/local/logb v0.0.0-20230410154319-880efa39d871 h1:cMGPiwvK/QGg4TfW8VasO6SsS/O7UQmwyKDErV/ozoA=
|
||||
gogs.inhome.blapointe.com/local/logb v0.0.0-20230410154319-880efa39d871/go.mod h1:E0pLNvMLzY0Kth1W078y+06z1AUyVMWnChMpRFf4w2Q=
|
||||
gogs.inhome.blapointe.com/local/storage v0.0.0-20230410162102-db39d7b02e29 h1:SPSz7yQsEfScqyLlBS5uNSOGeT203BkIkFCL8jrm/FA=
|
||||
gogs.inhome.blapointe.com/local/storage v0.0.0-20230410162102-db39d7b02e29/go.mod h1:zk8Fe2Ezc2f6oOe2yllsbEhXqssUU1K2faoS0eQ9alY=
|
||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
|
|
@ -233,9 +247,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||
golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
|
||||
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
|
|
|
|||
17
main.go
17
main.go
|
|
@ -4,11 +4,11 @@ import (
|
|||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"gogs.inhome.blapointe.com/local/storage"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/broker"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/message"
|
||||
"local/storage"
|
||||
"local/truckstop/broker"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/logtr"
|
||||
"local/truckstop/message"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"regexp"
|
||||
|
|
@ -526,12 +526,15 @@ func updateDeadJobs(jobs []broker.Job) error {
|
|||
return err
|
||||
}
|
||||
*/
|
||||
if err := message.NewMatrix().Remove(recorded.MatrixID); err != nil {
|
||||
logtr.Debugf("failed to remove matrix: %v: %v", recorded.MatrixID, err)
|
||||
}
|
||||
if err := db.Set(listEntry, nil); err != nil {
|
||||
logtr.Debugf("failed to remove db: %v: %v", listEntry, err)
|
||||
}
|
||||
for _, imageid := range recorded.MatrixImageIDs {
|
||||
if err := message.NewMatrix().Update(imageid, "<job no longer available>"); err != nil {
|
||||
logtr.Debugf("failed to update matrix image: %v: %v", imageid, err)
|
||||
if err := message.NewMatrix().Remove(imageid); err != nil {
|
||||
logtr.Debugf("failed to remove matrix image: %v: %v", imageid, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package main
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"local/truckstop/config"
|
||||
"os"
|
||||
"testing"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/logtr"
|
||||
"mime/multipart"
|
||||
"net/http"
|
||||
"net/url"
|
||||
|
|
@ -64,7 +64,7 @@ func uploadImage(b []byte) (string, error) {
|
|||
request.Header.Set("Authorization", "Bearer "+images.AccessToken)
|
||||
request.Header.Set("Content-Type", writer.FormDataContentType())
|
||||
|
||||
c := &http.Client{Timeout: time.Minute * 5}
|
||||
c := &http.Client{Timeout: time.Minute}
|
||||
response, err := c.Do(request)
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package message
|
|||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"local/truckstop/config"
|
||||
"os"
|
||||
"testing"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@ package message
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/truckstop/config"
|
||||
"local/truckstop/logtr"
|
||||
"net/http"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
|
@ -45,28 +44,8 @@ func newMatrix(conf config.Matrix, cont string) Matrix {
|
|||
}
|
||||
}
|
||||
|
||||
func (m Matrix) closeclient(client *gomatrix.Client) {
|
||||
go func() {
|
||||
client.Client.CloseIdleConnections()
|
||||
client.StopSync()
|
||||
client.Logout()
|
||||
}()
|
||||
}
|
||||
|
||||
func (m Matrix) getclient() (*gomatrix.Client, error) {
|
||||
client, err := gomatrix.NewClient(m.homeserver, m.username, m.token)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
client.Client = &http.Client{
|
||||
Timeout: time.Minute * 5,
|
||||
Transport: &http.Transport{
|
||||
TLSClientConfig: &tls.Config{
|
||||
InsecureSkipVerify: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
return client, nil
|
||||
return gomatrix.NewClient(m.homeserver, m.username, m.token)
|
||||
}
|
||||
|
||||
func (m Matrix) Continuation() string {
|
||||
|
|
@ -100,7 +79,6 @@ func (m *Matrix) Receive() ([]Message, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer m.closeclient(c)
|
||||
messages := make([]Message, 0)
|
||||
result, err := c.Messages(m.room, "999999999999999999", m.Continuation(), 'b', 50)
|
||||
if err != nil {
|
||||
|
|
@ -156,7 +134,6 @@ func (m Matrix) Remove(id string) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer m.closeclient(c)
|
||||
_, err = c.RedactEvent(m.room, id, &gomatrix.ReqRedact{Reason: "stale"})
|
||||
return err
|
||||
}
|
||||
|
|
@ -170,7 +147,6 @@ func (m Matrix) Update(id, text string) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer m.closeclient(c)
|
||||
type MRelatesTo struct {
|
||||
EventID string `json:"event_id"`
|
||||
RelType string `json:"rel_type"`
|
||||
|
|
@ -214,7 +190,6 @@ func (m Matrix) SendTracked(text string) (string, error) {
|
|||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer m.closeclient(c)
|
||||
resp, err := c.SendText(m.room, text)
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
|
@ -250,7 +225,6 @@ func (m Matrix) SendImageTracked(uri string) (string, error) {
|
|||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer m.closeclient(c)
|
||||
mediaUpload, err := c.UploadToContentRepo(bytes.NewReader(b), "image/jpeg", int64(len(b)))
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package message
|
|||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/config"
|
||||
"local/truckstop/config"
|
||||
"os"
|
||||
"path"
|
||||
"testing"
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ done:
|
|||
- pause until => !busy until
|
||||
- todo: maps of to+from to get location within state via api
|
||||
details: |
|
||||
curl 'https://maps.googleapis.com/maps/api/staticmap?center=Advance,NC&markers=label=A|Advance,NC&zoom=5&size=250x250&scale=2&format=jpeg&maptype=roadmap&key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg' -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' -H 'Accept: image/avif,image/webp,*/*' -H 'Accept-Language: en-US,en;q=0.5' -H 'Accept-Encoding: gzip, deflate, br' -H 'DNT: 1' -H 'Alt-Used: maps.googleapis.com' -H 'Connection: keep-alive' -H 'Sec-Fetch-Dest: image' -H 'Sec-Fetch-Mode: no-cors' -H 'Sec-Fetch-Site: cross-site' -H 'Pragma: no-cache' -H 'Cache-Control: no-cache' -H 'TE: trailers' > whatever.jpg; open whatever.jpg~/Go/src/gogs.inhome.blapointe.com/local/truckstop
|
||||
curl 'https://maps.googleapis.com/maps/api/staticmap?center=Advance,NC&markers=label=A|Advance,NC&zoom=5&size=250x250&scale=2&format=jpeg&maptype=roadmap&key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg' -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' -H 'Accept: image/avif,image/webp,*/*' -H 'Accept-Language: en-US,en;q=0.5' -H 'Accept-Encoding: gzip, deflate, br' -H 'DNT: 1' -H 'Alt-Used: maps.googleapis.com' -H 'Connection: keep-alive' -H 'Sec-Fetch-Dest: image' -H 'Sec-Fetch-Mode: no-cors' -H 'Sec-Fetch-Site: cross-site' -H 'Pragma: no-cache' -H 'Cache-Control: no-cache' -H 'TE: trailers' > whatever.jpg; open whatever.jpg~/Go/src/local/truckstop
|
||||
subtasks:
|
||||
- DONE; yandex; key 9baa3e42-c6e5-4eb5-a891-05ffcede6a25 yandex maps
|
||||
- google; key AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg
|
||||
|
|
@ -75,4 +75,4 @@ done:
|
|||
- parse jobs
|
||||
- gather jobs
|
||||
- read states
|
||||
- read email to state file from gogs.inhome.blapointe.com/local/sandbox/contact/contact
|
||||
- read email to state file from local/sandbox/contact/contact
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -2,7 +2,7 @@ package zip
|
|||
|
||||
import (
|
||||
_ "embed"
|
||||
"gogs.inhome.blapointe.com/local/truckstop/logtr"
|
||||
"local/truckstop/logtr"
|
||||
"math"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
|
|
|||
Loading…
Reference in New Issue