From d1da0dc948cf0dc814f804d8b50f0f75bc7db184 Mon Sep 17 00:00:00 2001 From: nyne Date: Mon, 8 Sep 2025 18:15:43 +0800 Subject: [PATCH] Refactor search --- go.mod | 19 +++ go.sum | 107 +++++++++++++++++ server/dao/db.go | 24 +++- server/dao/resource.go | 230 +++++++++---------------------------- server/dao/tag.go | 11 +- server/search/resource.go | 106 +++++++++++++++++ server/service/resource.go | 190 +++++++++++++++++++++++++++++- 7 files changed, 504 insertions(+), 183 deletions(-) create mode 100644 server/search/resource.go diff --git a/go.mod b/go.mod index 9616ecf..9e2c843 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,27 @@ require ( ) require ( + github.com/RoaringBitmap/roaring v0.4.23 // indirect + github.com/blevesearch/bleve v1.0.14 // indirect + github.com/blevesearch/go-porterstemmer v1.0.3 // indirect + github.com/blevesearch/mmap-go v1.0.2 // indirect + github.com/blevesearch/segment v0.9.0 // indirect + github.com/blevesearch/snowballstem v0.9.0 // indirect + github.com/blevesearch/zap/v11 v11.0.14 // indirect + github.com/blevesearch/zap/v12 v12.0.14 // indirect + github.com/blevesearch/zap/v13 v13.0.6 // indirect + github.com/blevesearch/zap/v14 v14.0.5 // indirect + github.com/blevesearch/zap/v15 v15.0.3 // indirect + github.com/couchbase/vellum v1.0.2 // indirect github.com/disintegration/imaging v1.6.2 // indirect + github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect + github.com/golang/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/mschoch/smat v0.2.0 // indirect + github.com/steveyen/gtreap v0.1.0 // indirect + github.com/willf/bitset v1.1.10 // indirect + go.etcd.io/bbolt v1.3.5 // indirect ) require ( diff --git a/go.sum b/go.sum index a577aba..a7ceaf7 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,60 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/RoaringBitmap/roaring v0.4.23 h1:gpyfd12QohbqhFO4NVDUdoPOCXsyahYRQhINmlHxKeo= +github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/blevesearch/bleve v1.0.14 h1:Q8r+fHTt35jtGXJUM0ULwM3Tzg+MRfyai4ZkWDy2xO4= +github.com/blevesearch/bleve v1.0.14/go.mod h1:e/LJTr+E7EaoVdkQZTfoz7dt4KoDNvDbLb8MSKuNTLQ= +github.com/blevesearch/blevex v1.0.0/go.mod h1:2rNVqoG2BZI8t1/P1awgTKnGlx5MP9ZbtEciQaNhswc= +github.com/blevesearch/cld2 v0.0.0-20200327141045-8b5f551d37f5/go.mod h1:PN0QNTLs9+j1bKy3d/GB/59wsNBFC4sWLWG3k69lWbc= +github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo= +github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M= +github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= +github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= +github.com/blevesearch/segment v0.9.0 h1:5lG7yBCx98or7gK2cHMKPukPZ/31Kag7nONpoBt22Ac= +github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ= +github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s= +github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs= +github.com/blevesearch/zap/v11 v11.0.14 h1:IrDAvtlzDylh6H2QCmS0OGcN9Hpf6mISJlfKjcwJs7k= +github.com/blevesearch/zap/v11 v11.0.14/go.mod h1:MUEZh6VHGXv1PKx3WnCbdP404LGG2IZVa/L66pyFwnY= +github.com/blevesearch/zap/v12 v12.0.14 h1:2o9iRtl1xaRjsJ1xcqTyLX414qPAwykHNV7wNVmbp3w= +github.com/blevesearch/zap/v12 v12.0.14/go.mod h1:rOnuZOiMKPQj18AEKEHJxuI14236tTQ1ZJz4PAnWlUg= +github.com/blevesearch/zap/v13 v13.0.6 h1:r+VNSVImi9cBhTNNR+Kfl5uiGy8kIbb0JMz/h8r6+O4= +github.com/blevesearch/zap/v13 v13.0.6/go.mod h1:L89gsjdRKGyGrRN6nCpIScCvvkyxvmeDCwZRcjjPCrw= +github.com/blevesearch/zap/v14 v14.0.5 h1:NdcT+81Nvmp2zL+NhwSvGSLh7xNgGL8QRVZ67njR0NU= +github.com/blevesearch/zap/v14 v14.0.5/go.mod h1:bWe8S7tRrSBTIaZ6cLRbgNH4TUDaC9LZSpRGs85AsGY= +github.com/blevesearch/zap/v15 v15.0.3 h1:Ylj8Oe+mo0P25tr9iLPp33lN6d4qcztGjaIsP51UxaY= +github.com/blevesearch/zap/v15 v15.0.3/go.mod h1:iuwQrImsh1WjWJ0Ue2kBqY83a0rFtJTqfa9fp1rbVVU= github.com/chai2010/webp v1.4.0 h1:6DA2pkkRUPnbOHvvsmGI3He1hBKf/bkRlniAiSGuEko= github.com/chai2010/webp v1.4.0/go.mod h1:0XVwvZWdjjdxpUEIf7b9g9VkHFnInUSYujwqTLEuldU= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k= +github.com/couchbase/moss v0.1.0/go.mod h1:9MaHIaRuy9pvLPUJxB8sh8OrLfyDczECVL37grCIubs= +github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= +github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= +github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= +github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= +github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU= github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4= +github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= +github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= @@ -24,16 +69,29 @@ github.com/gofiber/utils/v2 v2.0.0-beta.8 h1:ZifwbHZqZO3YJsx1ZhDsWnPjaQ7C0YD20LH github.com/gofiber/utils/v2 v2.0.0-beta.8/go.mod h1:1lCBo9vEF4RFEtTgWntipnaScJZQiM8rrsYycLZ4n9c= github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomarkdown/markdown v0.0.0-20250311123330-531bef5e742b h1:EY/KpStFl60qA17CptGXhwfZ+k1sFNJIUNR8DdbcuUk= github.com/gomarkdown/markdown v0.0.0-20250311123330-531bef5e742b/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= +github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ikawaha/kagome.ipadic v1.1.2/go.mod h1:DPSBbU0czaJhAb/5uKQZHMc9MTVRpDugJfX+HddPHHg= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/k3a/html2text v1.2.1 h1:nvnKgBvBR/myqrwfLuiqecUtaK1lB9hGziIJKatNFVY= @@ -43,6 +101,8 @@ github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYW github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/kljensen/snowball v0.6.0/go.mod h1:27N7E8fVU5H68RlUmnWwZCfxgt4POBJfENGMvNRhldw= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= @@ -55,28 +115,63 @@ github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.91 h1:tWLZnEfo3OZl5PoXQwcwTAPNNrjyWwOh6cbZitW5JQc= github.com/minio/minio-go/v7 v7.0.91/go.mod h1:uvMUcGrpgeSAAI6+sD3818508nUyMULw94j2Nxku/Go= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= +github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= +github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY= github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= 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/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/steveyen/gtreap v0.1.0 h1:CjhzTa274PyJLJuMZwIzCO1PfC00oRa8d1Kc78bFXJM= +github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/tebeka/snowball v0.4.2/go.mod h1:4IfL14h1lvwZcp1sfXuuc7/7yCsvVffTWxWxCLfFpYg= +github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= +github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.2.5 h1:WeQg1whrXRFiZusidTQqzETkRpGjFjcIhW6uqWH09po= github.com/tinylib/msgp v1.2.5/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.61.0 h1:VV08V0AfoRaFurP1EWKvQQdPTZHiUzaVoulX1aBDgzU= github.com/valyala/fasthttp v1.61.0/go.mod h1:wRIV/4cMwUPWnRcDno9hGnYZGh78QzODFfo1LTUhBog= +github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc= +github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= @@ -85,10 +180,17 @@ golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w= golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g= golang.org/x/image v0.28.0 h1:gdem5JW1OLS4FbkWgLO+7ZeFzYtL3xClb97GaUzYMFE= golang.org/x/image v0.28.0/go.mod h1:GUJYXtnGKEUgggyzh+Vxt+AviiCcyiwpsl8iQ8MvwGY= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= @@ -98,6 +200,11 @@ golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo= diff --git a/server/dao/db.go b/server/dao/db.go index 947e60e..7ed17a0 100644 --- a/server/dao/db.go +++ b/server/dao/db.go @@ -12,6 +12,10 @@ import ( var db *gorm.DB +var ( + ready = false +) + func init() { if os.Getenv("DB_PORT") != "" { host := os.Getenv("DB_HOST") @@ -22,10 +26,18 @@ func init() { dsn := user + ":" + password + "@tcp(" + host + ":" + port + ")/" + dbName + "?charset=utf8mb4&parseTime=True&loc=Local" var err error // wait for mysql to be ready - time.Sleep(5 * time.Second) - db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{}) - if err != nil { - panic("failed to connect database") + retrys := 5 + for { + db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{}) + if err == nil { + ready = true + break + } + retrys-- + if retrys < 0 { + panic("failed to connect database: " + err.Error()) + } + time.Sleep(1 * time.Second) } } else { var err error @@ -54,3 +66,7 @@ func init() { func GetDB() *gorm.DB { return db } + +func IsReady() bool { + return ready +} diff --git a/server/dao/resource.go b/server/dao/resource.go index f014c1c..1bbb797 100644 --- a/server/dao/resource.go +++ b/server/dao/resource.go @@ -4,7 +4,6 @@ import ( "errors" "math/rand" "nysoure/server/model" - "strings" "sync" "sync/atomic" "time" @@ -143,180 +142,6 @@ func DeleteResource(id uint) error { }) } -func splitQuery(query string) []string { - var keywords []string - - query = strings.TrimSpace(query) - if query == "" { - return keywords - } - - l, r := 0, 0 - inQuote := false - quoteChar := byte(0) - - for r < len(query) { - if (query[r] == '"' || query[r] == '\'') && (r == 0 || query[r-1] != '\\') { - if !inQuote { - inQuote = true - quoteChar = query[r] - l = r + 1 - } else if query[r] == quoteChar { - if r > l { - keywords = append(keywords, strings.TrimSpace(query[l:r])) - } - inQuote = false - r++ - l = r - continue - } - } else if !inQuote && query[r] == ' ' { - if r > l { - keywords = append(keywords, strings.TrimSpace(query[l:r])) - } - for r < len(query) && query[r] == ' ' { - r++ - } - l = r - continue - } - - r++ - } - - if l < len(query) { - keywords = append(keywords, strings.TrimSpace(query[l:r])) - } - - return keywords -} - -func Search(query string, page, pageSize int) ([]model.Resource, int, error) { - query = strings.TrimSpace(query) - - keywords := splitQuery(query) - if len(keywords) == 0 { - return nil, 0, nil - } - resource, err := searchWithKeyword(keywords[0]) - if err != nil { - return nil, 0, err - } - if len(keywords) > 1 { - for _, keyword := range keywords[1:] { - r := make([]model.Resource, 0, len(resource)) - for _, res := range resource { - if strings.Contains(res.Title, keyword) { - r = append(r, res) - continue - } - ok := false - for _, at := range res.AlternativeTitles { - if strings.Contains(at, keyword) { - r = append(r, res) - ok = true - break - } - } - if ok { - continue - } - for _, tag := range res.Tags { - if tag.Name == keyword { - r = append(r, res) - ok = true - break - } - } - } - resource = r - } - } - - startIndex := (page - 1) * pageSize - endIndex := startIndex + pageSize - if startIndex > len(resource) { - return nil, 0, nil - } - if endIndex > len(resource) { - endIndex = len(resource) - } - totalPages := (len(resource) + pageSize - 1) / pageSize - - result := make([]model.Resource, 0, endIndex-startIndex) - for i := startIndex; i < endIndex; i++ { - var r model.Resource - if err := db.Model(&r).Preload("User").Preload("Images").Preload("Tags").Where("id=?", resource[i].ID).First(&r).Error; err != nil { - return nil, 0, err - } - result = append(result, r) - } - - return result, totalPages, nil -} - -func searchWithKeyword(keyword string) ([]model.Resource, error) { - if len(keyword) == 0 { - return nil, nil - } else if len([]rune(keyword)) > 100 { - return nil, model.NewRequestError("Keyword is too long") - } - - var resources []model.Resource - - if len([]rune(keyword)) < 20 { - var tag model.Tag - var err error - if tag, err = GetTagByName(keyword); err != nil { - if !model.IsNotFoundError(err) { - return nil, err - } - } else { - if tag.AliasOf != nil { - tag, err = GetTagByID(*tag.AliasOf) - if err != nil { - return nil, err - } - } - var tagIds []uint - tagIds = append(tagIds, tag.ID) - for _, alias := range tag.Aliases { - tagIds = append(tagIds, alias.ID) - } - subQuery := db.Table("resource_tags"). - Select("resource_id"). - Where("tag_id IN ?", tagIds). - Group("resource_id") - if err := db.Where("id IN (?)", subQuery).Select("id", "title", "alternative_titles").Preload("Tags").Find(&resources).Error; err != nil { - return nil, err - } - } - } - - var titleResult []model.Resource - if err := db.Where("title LIKE ?", "%"+keyword+"%").Or("alternative_titles LIKE ?", "%"+keyword+"%").Select("id", "title", "alternative_titles").Preload("Tags").Find(&titleResult).Error; err != nil { - return nil, err - } - - if len(titleResult) > 0 { - if len(resources) == 0 { - resources = titleResult - } else { - resourceMap := make(map[uint]model.Resource) - for _, res := range resources { - resourceMap[res.ID] = res - } - for _, res := range titleResult { - if _, exists := resourceMap[res.ID]; !exists { - resources = append(resources, res) - } - } - } - } - - return resources, nil -} - func GetResourceByTag(tagID uint, page int, pageSize int) ([]model.Resource, int, error) { tag, err := GetTagByID(tagID) if err != nil { @@ -565,3 +390,58 @@ func RandomResource() (model.Resource, error) { return resource, nil // Return the found resource } } + +func GetResourcesIdWithTag(tagID uint) (map[uint]time.Time, error) { + tag, err := GetTagByID(tagID) + if err != nil { + return nil, err + } + if tag.AliasOf != nil { + tag, err = GetTagByID(*tag.AliasOf) + if err != nil { + return nil, err + } + } + var tagIds []uint + tagIds = append(tagIds, tag.ID) + for _, alias := range tag.Aliases { + tagIds = append(tagIds, alias.ID) + } + var result []model.Resource + subQuery := db.Table("resource_tags"). + Select("resource_id"). + Where("tag_id IN ?", tagIds). + Group("resource_id") + if err := db.Model(&model.Resource{}). + Where("id IN (?)", subQuery). + Order("created_at DESC"). + Limit(10000). + Select("id", "created_at"). + Find(&result). + Error; err != nil { + return nil, err + } + + resMap := make(map[uint]time.Time) + for _, r := range result { + resMap[r.ID] = r.CreatedAt + } + return resMap, nil +} + +func BatchGetResources(ids []uint) ([]model.Resource, error) { + idMap := make(map[uint]struct{}) + uniqueIds := make([]uint, 0, len(ids)) + for _, id := range ids { + if _, exists := idMap[id]; !exists { + idMap[id] = struct{}{} + uniqueIds = append(uniqueIds, id) + } + } + + var resources []model.Resource + if err := db.Where("id IN ?", uniqueIds).Find(&resources).Error; err != nil { + return nil, err + } + return resources, nil +} diff --git a/server/dao/tag.go b/server/dao/tag.go index 43a3740..398e6e8 100644 --- a/server/dao/tag.go +++ b/server/dao/tag.go @@ -2,10 +2,11 @@ package dao import ( "errors" - "github.com/gofiber/fiber/v3/log" "nysoure/server/model" "strings" + "github.com/gofiber/fiber/v3/log" + "gorm.io/gorm" ) @@ -171,3 +172,11 @@ func ClearUnusedTags() error { } return nil } + +func ExistsTag(name string) (bool, error) { + var count int64 + if err := db.Model(&model.Tag{}).Where("name = ?", name).Count(&count).Error; err != nil { + return false, err + } + return count > 0, nil +} diff --git a/server/search/resource.go b/server/search/resource.go new file mode 100644 index 0000000..9444338 --- /dev/null +++ b/server/search/resource.go @@ -0,0 +1,106 @@ +package search + +import ( + "fmt" + "nysoure/server/dao" + "nysoure/server/model" + "nysoure/server/utils" + "regexp" + "strconv" + "time" + + "github.com/blevesearch/bleve" +) + +type ResourceParams struct { + Id uint + Title string + Subtitles []string + Time time.Time +} + +var index bleve.Index + +func removeSpaces(s string) string { + reg := regexp.MustCompile(`\s+`) + return reg.ReplaceAllString(s, " ") +} + +func createIndex() error { + for !dao.IsReady() { + time.Sleep(1 * time.Second) + } + page := 1 + total := 1 + for page <= total { + res, totalPages, err := dao.GetResourceList(page, 100, model.RSortTimeAsc) + if err != nil { + return err + } + for _, r := range res { + title := r.Title + title = removeSpaces(title) + altTitles := make([]string, len(r.AlternativeTitles)) + for i, t := range r.AlternativeTitles { + altTitles[i] = removeSpaces(t) + } + err := index.Index(fmt.Sprintf("%d", r.ID), ResourceParams{ + Id: r.ID, + Title: title, + Subtitles: altTitles, + Time: r.CreatedAt, + }) + if err != nil { + return err + } + } + page++ + total = totalPages + } + return nil +} + +func init() { + indexPath := utils.GetStoragePath() + "/search_index.bleve" + + var err error + index, err = bleve.Open(indexPath) + if err == bleve.ErrorIndexPathDoesNotExist { + mapping := bleve.NewIndexMapping() + index, err = bleve.New(indexPath, mapping) + if err != nil { + panic("Failed to create search index: " + err.Error()) + } + go createIndex() + } else if err != nil { + panic("Failed to open search index: " + err.Error()) + } +} + +func SearchResource(keyword string) (map[uint]time.Time, error) { + keyword = removeSpaces(keyword) + + query := bleve.NewMatchQuery(keyword) + searchRequest := bleve.NewSearchRequest(query) + searchRequest.Size = 10000 + searchRequest.Fields = []string{"Time"} + searchResults, err := index.Search(searchRequest) + if err != nil { + return nil, err + } + + results := make(map[uint]time.Time) + for _, hit := range searchResults.Hits { + id, err := strconv.ParseUint(hit.ID, 10, 32) + if err != nil { + continue + } + t, err := time.Parse(time.RFC3339Nano, hit.Fields["Time"].(string)) + if err != nil { + continue + } + results[uint(id)] = t + } + + return results, nil +} diff --git a/server/service/resource.go b/server/service/resource.go index 6913d5e..87d9991 100644 --- a/server/service/resource.go +++ b/server/service/resource.go @@ -5,8 +5,11 @@ import ( "nysoure/server/config" "nysoure/server/dao" "nysoure/server/model" + "nysoure/server/search" + "sort" "strconv" "strings" + "time" "github.com/gofiber/fiber/v3" "github.com/gofiber/fiber/v3/log" @@ -154,13 +157,194 @@ func GetResourceList(page int, sort model.RSort) ([]model.ResourceView, int, err return views, totalPages, nil } -func SearchResource(keyword string, page int) ([]model.ResourceView, int, error) { - resources, totalPages, err := dao.Search(keyword, page, pageSize) +// splitQuery splits the input query string into keywords, treating quoted substrings (single or double quotes) +// as single keywords and supporting escape characters for quotes. Spaces outside quotes are used as separators. +func splitQuery(query string) []string { + var keywords []string + + query = strings.TrimSpace(query) + if query == "" { + return keywords + } + + l, r := 0, 0 + inQuote := false + quoteChar := byte(0) + + for r < len(query) { + if (query[r] == '"' || query[r] == '\'') && (r == 0 || query[r-1] != '\\') { + if !inQuote { + inQuote = true + quoteChar = query[r] + l = r + 1 + } else if query[r] == quoteChar { + if r > l { + keywords = append(keywords, strings.TrimSpace(query[l:r])) + } + inQuote = false + r++ + l = r + continue + } + } else if !inQuote && query[r] == ' ' { + if r > l { + keywords = append(keywords, strings.TrimSpace(query[l:r])) + } + for r < len(query) && query[r] == ' ' { + r++ + } + l = r + continue + } + + r++ + } + + if l < len(query) { + keywords = append(keywords, strings.TrimSpace(query[l:r])) + } + + return keywords +} + +func searchWithKeyword(keyword string) (map[uint]time.Time, error) { + resources := make(map[uint]time.Time) + + exists, err := dao.ExistsTag(keyword) + if err != nil { + return nil, err + } + if exists { + t, err := dao.GetTagByName(keyword) + if err != nil { + return nil, err + } + res, err := dao.GetResourcesIdWithTag(t.ID) + if err != nil { + return nil, err + } + for id, createdAt := range res { + resources[id] = createdAt + } + } + + searchResult, err := search.SearchResource(keyword) + if err != nil { + return nil, err + } + + for id, createdAt := range searchResult { + resources[id] = createdAt + } + + return resources, nil +} + +func SearchResource(query string, page int) ([]model.ResourceView, int, error) { + start := (page - 1) * pageSize + end := start + pageSize + resources := make(map[uint]time.Time) + + checkTag := func(tag string) error { + exists, err := dao.ExistsTag(tag) + if err != nil { + return err + } + if exists { + t, err := dao.GetTagByName(tag) + if err != nil { + return err + } + res, err := dao.GetResourcesIdWithTag(t.ID) + if err != nil { + return err + } + for id, createdAt := range res { + resources[id] = createdAt + } + } + return nil + } + + // check tag + if err := checkTag(query); err != nil { + return nil, 0, err + } + + // check tag after removing spaces + trimmed := strings.ReplaceAll(query, " ", "") + if trimmed != query { + if err := checkTag(trimmed); err != nil { + return nil, 0, err + } + } + + // split query to search + keywords := splitQuery(query) + temp := make(map[uint]time.Time) + first := true + for _, keyword := range keywords { + res, err := searchWithKeyword(keyword) + if err != nil { + return nil, 0, err + } + if first { + for id, createdAt := range res { + temp[id] = createdAt + } + first = false + } else { + for id := range temp { + if _, ok := res[id]; !ok { + delete(temp, id) + } + } + } + } + for id, createdAt := range temp { + resources[id] = createdAt + } + + if start >= len(resources) { + return []model.ResourceView{}, 0, nil + } + + type IDWithTime struct { + ID uint + CreatedAt time.Time + } + var idsWithTime []IDWithTime + for id, createdAt := range resources { + idsWithTime = append(idsWithTime, IDWithTime{ + ID: id, + CreatedAt: createdAt, + }) + } + // sort by createdAt desc + sort.Slice(idsWithTime, func(i, j int) bool { + return idsWithTime[i].CreatedAt.After(idsWithTime[j].CreatedAt) + }) + + total := len(idsWithTime) + totalPages := (total + pageSize - 1) / pageSize + if start >= total { + return []model.ResourceView{}, totalPages, nil + } + if end > total { + end = total + } + idsPage := idsWithTime[start:end] + var ids []uint + for _, item := range idsPage { + ids = append(ids, item.ID) + } + + resourcesPage, err := dao.BatchGetResources(ids) if err != nil { return nil, 0, err } var views []model.ResourceView - for _, r := range resources { + for _, r := range resourcesPage { views = append(views, r.ToView()) } return views, totalPages, nil