mirror of
https://github.com/simon987/imhashdb.git
synced 2025-04-04 02:22:58 +00:00
Handle string _id, remove zstd, remove triggers
This commit is contained in:
parent
46081a8355
commit
ed1972ca54
13
core.go
13
core.go
@ -7,7 +7,6 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
"github.com/simon987/fastimagehash-go"
|
||||
"github.com/valyala/fasthttp"
|
||||
"github.com/valyala/gozstd"
|
||||
"go.uber.org/zap"
|
||||
"strings"
|
||||
)
|
||||
@ -46,8 +45,6 @@ var ImageBlackList = []string{}
|
||||
|
||||
var Rdb *redis.Client
|
||||
var Pgdb *pgx.ConnPool
|
||||
var CDict *gozstd.CDict
|
||||
var DDict *gozstd.DDict
|
||||
var Logger *zap.Logger
|
||||
var Conf Config
|
||||
|
||||
@ -72,16 +69,6 @@ func Init() {
|
||||
Conf.PgDb,
|
||||
)
|
||||
DbInit(Pgdb)
|
||||
|
||||
CDict, err = gozstd.NewCDictLevel(DictBytes, 19)
|
||||
if err != nil {
|
||||
Logger.Fatal("Could not initialize zstd cdict")
|
||||
}
|
||||
|
||||
DDict, err = gozstd.NewDDict(DictBytes)
|
||||
if err != nil {
|
||||
Logger.Fatal("Could not initialize zstd ddict")
|
||||
}
|
||||
}
|
||||
|
||||
func ComputeHash(data []byte) (*Hashes, error) {
|
||||
|
||||
22
db.go
22
db.go
@ -10,7 +10,6 @@ import (
|
||||
"github.com/jackc/pgx"
|
||||
"github.com/jackc/pgx/pgtype"
|
||||
"github.com/mailru/easyjson"
|
||||
"github.com/valyala/gozstd"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
@ -35,21 +34,11 @@ type MatchTrigger struct {
|
||||
}
|
||||
|
||||
var MatchTriggers = []MatchTrigger{
|
||||
{
|
||||
HashType: DHash16,
|
||||
MinDistance: 25,
|
||||
Id: 1,
|
||||
},
|
||||
{
|
||||
HashType: PHash16,
|
||||
MinDistance: 25,
|
||||
Id: 2,
|
||||
},
|
||||
{
|
||||
HashType: WHash16Haar,
|
||||
MinDistance: 6,
|
||||
Id: 3,
|
||||
},
|
||||
}
|
||||
|
||||
func Store(entry *Entry) {
|
||||
@ -93,13 +82,11 @@ func Store(entry *Entry) {
|
||||
_, _ = Pgdb.Exec("INSERT INTO hash_whash32haar VALUES ($1, $2) ON CONFLICT DO NOTHING", id, entry.H.WHash32.Bytes)
|
||||
}
|
||||
|
||||
var buf []byte
|
||||
for _, meta := range entry.Meta {
|
||||
compressedMeta := gozstd.CompressDict(buf[:0], meta.Meta, CDict)
|
||||
|
||||
_, err = Pgdb.Exec(
|
||||
"INSERT INTO image_meta (id, retrieved_at, meta) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
|
||||
meta.Id, meta.RetrievedAt, compressedMeta,
|
||||
meta.Id, meta.RetrievedAt, meta.Meta,
|
||||
)
|
||||
if err != nil {
|
||||
Logger.Error("Could not insert meta", zap.Error(err))
|
||||
@ -228,10 +215,7 @@ func FindImagesByHash(ctx context.Context, hash []byte, hashType HashType, dista
|
||||
for rows.Next() {
|
||||
var ihm ImageHasMeta
|
||||
|
||||
var compressedMeta []byte
|
||||
err := rows.Scan(&ihm.Url, &ihm.Meta.Id, &ihm.Meta.RetrievedAt, &compressedMeta)
|
||||
|
||||
ihm.Meta.Meta, err = gozstd.DecompressDict(nil, compressedMeta, DDict)
|
||||
err := rows.Scan(&ihm.Url, &ihm.Meta.Id, &ihm.Meta.RetrievedAt, &ihm.Meta.Meta)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -259,7 +243,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS idx_image_sha1 ON image(sha1);
|
||||
CREATE TABLE IF NOT EXISTS image_meta (
|
||||
retrieved_at bigint NOT NULL,
|
||||
id TEXT PRIMARY KEY,
|
||||
meta bytea NOT NULL
|
||||
meta JSONB NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS image_has_meta (
|
||||
|
||||
BIN
dictionary
BIN
dictionary
Binary file not shown.
2
go.mod
2
go.mod
@ -14,7 +14,7 @@ require (
|
||||
github.com/klauspost/compress v1.10.4 // indirect
|
||||
github.com/kr/text v0.2.0 // indirect
|
||||
github.com/lib/pq v1.3.0 // indirect
|
||||
github.com/mailru/easyjson v0.7.1
|
||||
github.com/mailru/easyjson v0.7.7
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.1 // indirect
|
||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
|
||||
|
||||
26
go.sum
26
go.sum
@ -32,9 +32,6 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
|
||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
||||
github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
|
||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
||||
github.com/google/brotli v1.0.7 h1:fxwwohNEPaVS6qvtnjwgzRR62Upa70pkw0f9qarjrQs=
|
||||
github.com/google/brotli/go/cbrotli v0.0.0-20200331123801-f83aa5169e3c h1:ar2QDaYlLo8sO8Lto330cewxK1KSDGhXhAbDPdDGqBs=
|
||||
github.com/google/brotli/go/cbrotli v0.0.0-20200331123801-f83aa5169e3c/go.mod h1:nOPhAkwVliJdNTkj3gXpljmWhjc4wCaVqbMJcPKWP4s=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||
@ -43,6 +40,8 @@ github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGU
|
||||
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
|
||||
github.com/jackc/pgx v3.6.2+incompatible h1:2zP5OD7kiyR3xzRYMhOcXVvkDZsImVXfj+yIyTQf3/o=
|
||||
github.com/jackc/pgx v3.6.2+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
|
||||
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
|
||||
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
|
||||
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
|
||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
@ -61,10 +60,10 @@ github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
|
||||
github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
|
||||
github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
|
||||
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
|
||||
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
|
||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
|
||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||
github.com/mjibson/esc v0.2.0 h1:k96hdaR9Z+nMcnDwNrOvhdBqtjyMrbVyxLpsRCdP2mA=
|
||||
github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
@ -86,8 +85,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
|
||||
github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
|
||||
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
@ -95,16 +92,6 @@ github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoM
|
||||
github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200411005122-1886a7c50720 h1:0VrGo7jKQqv5cmuD/7Yd2O+o98/eyLi2wl4wWNsKfh0=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200411005122-1886a7c50720/go.mod h1:MbqNG+6OaprdElEIes1aYF7qmLlaTop4j5X6pgNiaaw=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200411154912-569fe641b1a7 h1:4XD2rCg4hJRcCZErDLp8lfMsHw5Zinr5e2t2C18GdzU=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200411154912-569fe641b1a7/go.mod h1:fmgaZptm6M5Kn3Ctu/R5p2fncGYPpGi/raZCZUrkRsY=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200412153922-bcfdf954b464 h1:5p3TX77zQoyrAJqrczYLmAo4F8U+dsyHylzZ3MH4sps=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200412153922-bcfdf954b464/go.mod h1:fmgaZptm6M5Kn3Ctu/R5p2fncGYPpGi/raZCZUrkRsY=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200412154506-b0e9d9b3a73e h1:8+cH+kriBBb9OqtKh/wNsr+PvV8e73yNjEly5wAjFQk=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200412154506-b0e9d9b3a73e/go.mod h1:fmgaZptm6M5Kn3Ctu/R5p2fncGYPpGi/raZCZUrkRsY=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200412174912-bee8c91bb52e h1:86MhzPgOTM6dmzNF4qAOGY4zaZ9BgQFHLwwilMZla8I=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200412174912-bee8c91bb52e/go.mod h1:fmgaZptm6M5Kn3Ctu/R5p2fncGYPpGi/raZCZUrkRsY=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200426185525-dad3269c77a9 h1:9Ttq0K7AU1F20LK3n/tiPWq0yPVWOlQRjXOmU5Eh7fs=
|
||||
github.com/simon987/fastimagehash-go v0.0.0-20200426185525-dad3269c77a9/go.mod h1:fmgaZptm6M5Kn3Ctu/R5p2fncGYPpGi/raZCZUrkRsY=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
@ -116,9 +103,6 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
|
||||
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
|
||||
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
|
||||
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
|
||||
github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4=
|
||||
github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
||||
github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
|
||||
github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4=
|
||||
github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
|
||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||
@ -182,8 +166,6 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef h1:RHORRhs540cYZYrzgU2CPUyykkwZM78hGdzocOo9P8A=
|
||||
golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||
golang.org/x/tools v0.0.0-20200425043458-8463f397d07c h1:iHhCR0b26amDCiiO+kBguKZom9aMF+NrFxh9zeKR/XU=
|
||||
golang.org/x/tools v0.0.0-20200425043458-8463f397d07c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
|
||||
@ -24,6 +24,11 @@ type Task struct {
|
||||
Id int64 `json:"_id"`
|
||||
}
|
||||
|
||||
type TaskStringId struct {
|
||||
Urls []string `json:"_urls"`
|
||||
Id string `json:"_id"`
|
||||
}
|
||||
|
||||
func dispatchFromQueue(pattern string, queue chan []string) error {
|
||||
|
||||
for {
|
||||
@ -80,20 +85,33 @@ func storeData(data []byte, sha1 [20]byte, link string) {
|
||||
}
|
||||
|
||||
func computeAndStore(rawTask []string) {
|
||||
var urls []string
|
||||
var taskId string
|
||||
|
||||
var task Task
|
||||
err := json.Unmarshal([]byte(rawTask[1]), &task)
|
||||
if err != nil {
|
||||
Logger.Error("Corrupt task body", zap.String("body", rawTask[1]))
|
||||
return
|
||||
if err == nil {
|
||||
urls = task.Urls
|
||||
taskId = rawTask[0][len(Pattern)-1:] + "." + strconv.FormatInt(task.Id, 10)
|
||||
} else {
|
||||
var taskStringId TaskStringId
|
||||
err := json.Unmarshal([]byte(rawTask[1]), &taskStringId)
|
||||
if err != nil {
|
||||
Logger.Error("Corrupt task body", zap.String("body", rawTask[1]), zap.Error(err))
|
||||
return
|
||||
}
|
||||
|
||||
urls = task.Urls
|
||||
taskId = rawTask[0][len(Pattern)-1:] + "." + taskStringId.Id
|
||||
}
|
||||
|
||||
meta := []Meta{{
|
||||
RetrievedAt: time.Now().Unix(),
|
||||
Id: rawTask[0][len(Pattern)-1:] + "." + strconv.FormatInt(task.Id, 10),
|
||||
Id: taskId,
|
||||
Meta: []byte(rawTask[1]),
|
||||
}}
|
||||
|
||||
for _, link := range task.Urls {
|
||||
for _, link := range urls {
|
||||
for _, turl := range TransformLink(link, &meta) {
|
||||
if !IsImageLink(turl) {
|
||||
Logger.Debug("Ignoring non-image URL", zap.String("link", link))
|
||||
|
||||
@ -100,9 +100,9 @@ type QueryResp struct {
|
||||
}
|
||||
|
||||
type Meta struct {
|
||||
RetrievedAt int64 `json:"retrieved_at"`
|
||||
Id string `json:"id"`
|
||||
Meta []byte `json:"meta"`
|
||||
RetrievedAt int64 `json:"retrieved_at"`
|
||||
Id string `json:"id"`
|
||||
Meta interface{} `json:"meta"`
|
||||
}
|
||||
|
||||
type ImageHasMeta struct {
|
||||
|
||||
@ -29,7 +29,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb(in *jlexer.Lexer, out *Quer
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -96,7 +96,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb1(in *jlexer.Lexer, out *Que
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -195,7 +195,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb2(in *jlexer.Lexer, out *Met
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -208,11 +208,12 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb2(in *jlexer.Lexer, out *Met
|
||||
case "id":
|
||||
out.Id = string(in.String())
|
||||
case "meta":
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
out.Meta = nil
|
||||
if m, ok := out.Meta.(easyjson.Unmarshaler); ok {
|
||||
m.UnmarshalEasyJSON(in)
|
||||
} else if m, ok := out.Meta.(json.Unmarshaler); ok {
|
||||
_ = m.UnmarshalJSON(in.Raw())
|
||||
} else {
|
||||
out.Meta = in.Bytes()
|
||||
out.Meta = in.Interface()
|
||||
}
|
||||
default:
|
||||
in.SkipRecursive()
|
||||
@ -241,7 +242,13 @@ func easyjsonD2b7633eEncodeGithubComSimon987Imhashdb2(out *jwriter.Writer, in Me
|
||||
{
|
||||
const prefix string = ",\"meta\":"
|
||||
out.RawString(prefix)
|
||||
out.Base64Bytes(in.Meta)
|
||||
if m, ok := in.Meta.(easyjson.Marshaler); ok {
|
||||
m.MarshalEasyJSON(out)
|
||||
} else if m, ok := in.Meta.(json.Marshaler); ok {
|
||||
out.Raw(m.MarshalJSON())
|
||||
} else {
|
||||
out.Raw(json.Marshal(in.Meta))
|
||||
}
|
||||
}
|
||||
out.RawByte('}')
|
||||
}
|
||||
@ -280,7 +287,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb3(in *jlexer.Lexer, out *Ima
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -304,17 +311,17 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb3(in *jlexer.Lexer, out *Ima
|
||||
out.Images = (out.Images)[:0]
|
||||
}
|
||||
for !in.IsDelim(']') {
|
||||
var v7 *Image
|
||||
var v4 *Image
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
v7 = nil
|
||||
v4 = nil
|
||||
} else {
|
||||
if v7 == nil {
|
||||
v7 = new(Image)
|
||||
if v4 == nil {
|
||||
v4 = new(Image)
|
||||
}
|
||||
(*v7).UnmarshalEasyJSON(in)
|
||||
(*v4).UnmarshalEasyJSON(in)
|
||||
}
|
||||
out.Images = append(out.Images, v7)
|
||||
out.Images = append(out.Images, v4)
|
||||
in.WantComma()
|
||||
}
|
||||
in.Delim(']')
|
||||
@ -340,14 +347,14 @@ func easyjsonD2b7633eEncodeGithubComSimon987Imhashdb3(out *jwriter.Writer, in Im
|
||||
out.RawString("null")
|
||||
} else {
|
||||
out.RawByte('[')
|
||||
for v8, v9 := range in.Images {
|
||||
if v8 > 0 {
|
||||
for v5, v6 := range in.Images {
|
||||
if v5 > 0 {
|
||||
out.RawByte(',')
|
||||
}
|
||||
if v9 == nil {
|
||||
if v6 == nil {
|
||||
out.RawString("null")
|
||||
} else {
|
||||
(*v9).MarshalEasyJSON(out)
|
||||
(*v6).MarshalEasyJSON(out)
|
||||
}
|
||||
}
|
||||
out.RawByte(']')
|
||||
@ -390,7 +397,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb4(in *jlexer.Lexer, out *Ima
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -463,7 +470,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb5(in *jlexer.Lexer, out *Ima
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -512,9 +519,9 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb5(in *jlexer.Lexer, out *Ima
|
||||
out.Meta = (out.Meta)[:0]
|
||||
}
|
||||
for !in.IsDelim(']') {
|
||||
var v13 ImageHasMeta
|
||||
(v13).UnmarshalEasyJSON(in)
|
||||
out.Meta = append(out.Meta, v13)
|
||||
var v10 ImageHasMeta
|
||||
(v10).UnmarshalEasyJSON(in)
|
||||
out.Meta = append(out.Meta, v10)
|
||||
in.WantComma()
|
||||
}
|
||||
in.Delim(']')
|
||||
@ -565,11 +572,11 @@ func easyjsonD2b7633eEncodeGithubComSimon987Imhashdb5(out *jwriter.Writer, in Im
|
||||
out.RawString("null")
|
||||
} else {
|
||||
out.RawByte('[')
|
||||
for v20, v21 := range in.Meta {
|
||||
if v20 > 0 {
|
||||
for v17, v18 := range in.Meta {
|
||||
if v17 > 0 {
|
||||
out.RawByte(',')
|
||||
}
|
||||
(v21).MarshalEasyJSON(out)
|
||||
(v18).MarshalEasyJSON(out)
|
||||
}
|
||||
out.RawByte(']')
|
||||
}
|
||||
@ -611,7 +618,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb6(in *jlexer.Lexer, out *Has
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -898,7 +905,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987FastimagehashGo(in *jlexer.Lexer, ou
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
@ -952,7 +959,7 @@ func easyjsonD2b7633eDecodeGithubComSimon987Imhashdb7(in *jlexer.Lexer, out *Has
|
||||
}
|
||||
in.Delim('{')
|
||||
for !in.IsDelim('}') {
|
||||
key := in.UnsafeString()
|
||||
key := in.UnsafeFieldName(false)
|
||||
in.WantColon()
|
||||
if in.IsNull() {
|
||||
in.Skip()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user