diff --git a/README.md b/README.md index 4e36dd9d..652961fe 100644 --- a/README.md +++ b/README.md @@ -55,14 +55,18 @@ - [ ] 警告[@xxx] - [x] run[xxx] - 涩图 `import _ "github.com/Yiwen-Chan/ZeroBot-Plugin/setutime"` - - [x] 搜索图片[P站图片ID] - - [x] 搜索图片[图片] - [x] 来份[涩图/二次元/风景/车万] - [x] 添加[涩图/二次元/风景/车万][P站图片ID] - [x] 删除[涩图/二次元/风景/车万][P站图片ID] - [x] >setu status - [x] >setu xml - [x] >setu pic +- 搜图 `import _ "github.com/Yiwen-Chan/ZeroBot-Plugin/picsearcher"` + - [x] 以图搜图|搜索图片|以图识图[图片] + - [x] 搜图[P站图片ID] +- 简易随机图片(调用url) `import _ "github.com/Yiwen-Chan/ZeroBot-Plugin/randimg"` + - [x] 随机图片 + - [x] 设置随机图片网址[url] - 点歌 `import _ "github.com/Yiwen-Chan/ZeroBot-Plugin/music"` - [x] 点歌[xxx] - [x] 网易点歌[xxx] diff --git a/api/pixiv/download.go b/api/pixiv/download.go index 3640e86b..68abb1c8 100644 --- a/api/pixiv/download.go +++ b/api/pixiv/download.go @@ -71,3 +71,20 @@ func PicHash(path string) string { } return strings.ToUpper(fmt.Sprintf("%x", md5.Sum(data))) } + +// urlCache 缓存并返回缓存路径 +func (this *Illust) RmPic(path string) (err error) { + url := this.ImageUrls + pid := this.Pid + url = strings.ReplaceAll(url, "img-original", "img-master") + url = strings.ReplaceAll(url, "_p0", "_p0_master1200") + url = strings.ReplaceAll(url, ".png", ".jpg") + // 文件名为url的hash值 + savePath := path + Int2Str(pid) + ".jpg" + // 文件存在或文件大小大于10kb + if PathExists(savePath) { + return os.Remove(savePath) + } else { + return nil + } +} diff --git a/main.go b/main.go index a431de5f..e6fbb5ae 100644 --- a/main.go +++ b/main.go @@ -26,8 +26,9 @@ import ( _ "github.com/Yiwen-Chan/ZeroBot-Plugin/music" // 点歌 _ "github.com/Yiwen-Chan/ZeroBot-Plugin/picsearcher" // 搜图 _ "github.com/Yiwen-Chan/ZeroBot-Plugin/randimg" //简易随机图片 - _ "github.com/Yiwen-Chan/ZeroBot-Plugin/setutime" // 涩图 - _ "github.com/Yiwen-Chan/ZeroBot-Plugin/shindan" // 测定 + + _ "github.com/Yiwen-Chan/ZeroBot-Plugin/setutime" // 涩图 + _ "github.com/Yiwen-Chan/ZeroBot-Plugin/shindan" // 测定 ) func init() { diff --git a/picsearcher/pic_searcher.go b/picsearcher/pic_searcher.go index 09904be3..287e3548 100644 --- a/picsearcher/pic_searcher.go +++ b/picsearcher/pic_searcher.go @@ -13,13 +13,10 @@ import ( utils "github.com/Yiwen-Chan/ZeroBot-Plugin/picsearcher/utils" ) -var ( - BOTPATH = pixiv.PathExecute() // 当前bot运行目录 - DATAPATH = BOTPATH + "data/SetuTime/" // 数据目录 - CACHEPATH = DATAPATH + "cache/" // 缓冲图片路径 -) +var CACHEPATH = "/tmp/picsch/" // 缓冲图片路径 func init() { // 插件主体 + pixiv.CreatePath(CACHEPATH) // 根据PID搜图 zero.OnRegex(`^搜图(\d+)$`).SetBlock(true).SetPriority(30). Handle(func(ctx *zero.Ctx) { @@ -32,12 +29,14 @@ func init() { // 插件主体 return } // 下载P站插图 - if _, err := illust.PixivPicDown(CACHEPATH); err != nil { + savePath, err := illust.PixivPicDown(CACHEPATH) + if err != nil { ctx.Send(fmt.Sprintf("ERROR: %v", err)) return } // 发送搜索结果 - ctx.Send(illust.DetailPic) + ctx.Send(illust.DetailPic(savePath)) + illust.RmPic(CACHEPATH) return }) // 以图搜图