From 27ede0fe92a1a9e1f43ca5b04ff29f6de108a058 Mon Sep 17 00:00:00 2001 From: LamGC Date: Wed, 12 Aug 2020 14:46:05 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E5=B0=86RankingMode=E5=92=8CRanking?= =?UTF-8?q?ContentType=E4=BB=8EPixivURL=E5=88=86=E7=A6=BB,=20=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0Parser,=20=E9=A1=BA=E4=BE=BF=E6=95=B4?= =?UTF-8?q?=E7=90=86=E5=8D=95=E8=A1=8C=E8=BF=87=E9=95=BF=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Add] RankingMode, RankingModeParser 从PixivURL分离并增加对应Parser; [Add] RankingContentType, RankingContentTypeParser 从PixivURL分离并增加对应Parser; [Delete] PixivURL 分离RankingMode和RankingContentType两个枚举类; [Add] BotEventHandler 注册两个新的Parser; [Change] BotCommandProcess 适配更改, 调整`ranking`命令的"type"和"mode"参数数据类型; [Change] DateParser, PagesQualityParser 调整包路径; [Change] BotAdminCommandProcess, CacheStoreCentral, Main, PixivDownload, PixivDownloadTest, RandomRankingArtworksSender, RankingUpdateTimer 适配更改; --- src/main/java/net/lamgc/cgj/Main.java | 73 +++++----- .../lamgc/cgj/bot/BotAdminCommandProcess.java | 34 +++-- .../net/lamgc/cgj/bot/BotCommandProcess.java | 47 ++---- .../cgj/bot/RandomRankingArtworksSender.java | 18 +-- .../net/lamgc/cgj/bot/RankingUpdateTimer.java | 10 +- .../cgj/bot/cache/CacheStoreCentral.java | 19 +-- .../lamgc/cgj/bot/event/BotEventHandler.java | 37 +++-- .../{util => bot/util/parser}/DateParser.java | 2 +- .../util/parser}/PagesQualityParser.java | 2 +- .../util/parser/RankingContentTypeParser.java | 29 ++++ .../bot/util/parser/RankingModeParser.java | 29 ++++ .../net/lamgc/cgj/pixiv/PixivDownload.java | 83 ++++++++--- .../java/net/lamgc/cgj/pixiv/PixivURL.java | 134 +----------------- .../lamgc/cgj/pixiv/RankingContentType.java | 75 ++++++++++ .../java/net/lamgc/cgj/pixiv/RankingMode.java | 58 ++++++++ .../lamgc/cgj/pixiv/PixivDownloadTest.java | 2 +- 16 files changed, 385 insertions(+), 267 deletions(-) rename src/main/java/net/lamgc/cgj/{util => bot/util/parser}/DateParser.java (92%) rename src/main/java/net/lamgc/cgj/{util => bot/util/parser}/PagesQualityParser.java (92%) create mode 100644 src/main/java/net/lamgc/cgj/bot/util/parser/RankingContentTypeParser.java create mode 100644 src/main/java/net/lamgc/cgj/bot/util/parser/RankingModeParser.java create mode 100644 src/main/java/net/lamgc/cgj/pixiv/RankingContentType.java create mode 100644 src/main/java/net/lamgc/cgj/pixiv/RankingMode.java diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java index e501d3a..f4eefb4 100644 --- a/src/main/java/net/lamgc/cgj/Main.java +++ b/src/main/java/net/lamgc/cgj/Main.java @@ -10,9 +10,7 @@ import net.lamgc.cgj.bot.boot.BotGlobal; import net.lamgc.cgj.bot.framework.cli.ConsoleMain; import net.lamgc.cgj.bot.framework.coolq.SpringCQApplication; import net.lamgc.cgj.bot.framework.mirai.MiraiMain; -import net.lamgc.cgj.pixiv.PixivDownload; -import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder; -import net.lamgc.cgj.pixiv.PixivURL; +import net.lamgc.cgj.pixiv.*; import net.lamgc.utils.base.runner.Argument; import net.lamgc.utils.base.runner.ArgumentsRunner; import net.lamgc.utils.base.runner.Command; @@ -182,18 +180,18 @@ public class Main { date = format.format(queryDate); log.info("查询时间: {}", date); - PixivURL.RankingMode rankingMode = PixivURL.RankingMode.MODE_DAILY; - PixivURL.RankingContentType contentType = null; + RankingMode rankingMode = RankingMode.MODE_DAILY; + RankingContentType contentType = null; if(mode != null) { try { - rankingMode = PixivURL.RankingMode.valueOf(mode); + rankingMode = RankingMode.valueOf(mode); } catch (IllegalArgumentException e) { log.warn("不支持的RankingMode: {}", mode); } } if(content != null) { try { - contentType = PixivURL.RankingContentType.valueOf(content); + contentType = RankingContentType.valueOf(content); } catch (IllegalArgumentException e) { log.warn("不支持的RankingContentType: {}", content); } @@ -215,7 +213,8 @@ public class Main { log.info("正在调用方法..."); try { - pixivDownload.getRankingAsInputStream(contentType, rankingMode, queryDate, range, PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> { + pixivDownload.getRankingAsInputStream(contentType, rankingMode, queryDate, range, + PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> { try { ZipEntry entry = new ZipEntry("Rank" + rank + "-" + link.substring(link.lastIndexOf("/") + 1)); entry.setComment(rankInfo.toString()); @@ -301,35 +300,39 @@ public class Main { JsonObject resultBody = jsonObject.getAsJsonObject("body"); - for(PixivSearchLinkBuilder.SearchArea searchArea : PixivSearchLinkBuilder.SearchArea.values()) { - if(!resultBody.has(searchArea.jsonKey) || resultBody.getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data").size() == 0) { - //log.info("返回数据不包含 {}", searchArea.jsonKey); - continue; - } - JsonArray illustsArray = resultBody - .getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data"); - log.info("已找到与 {} 相关插图信息({})：", content, searchArea.name().toLowerCase()); - int count = 1; - for (JsonElement jsonElement : illustsArray) { - JsonObject illustObj = jsonElement.getAsJsonObject(); - if(!illustObj.has("illustId")) { + for(PixivSearchAttribute attribute : PixivSearchAttribute.values()) { + for(String attrName : attribute.attributeNames) { + if(!resultBody.has(attrName) || + resultBody.getAsJsonObject(attrName).getAsJsonArray("data").size() == 0) { + //log.info("返回数据不包含 {}", attrName); continue; } - int illustId = illustObj.get("illustId").getAsInt(); - StringBuilder builder = new StringBuilder("["); - illustObj.get("tags").getAsJsonArray().forEach(el -> builder.append(el.getAsString()).append(", ")); - builder.replace(builder.length() - 2, builder.length(), "]"); - log.info("{} ({} / {})\n\t作品id: {}, \n\t作者名(作者id): {} ({}), \n\t作品标题: {}, \n\t作品Tags: {}, \n\t作品链接: {}", - searchArea.name(), - count++, - illustsArray.size(), - illustId, - illustObj.get("userName").getAsString(), - illustObj.get("userId").getAsInt(), - illustObj.get("illustTitle").getAsString(), - builder, - PixivURL.getPixivRefererLink(illustId) - ); + JsonArray illustsArray = resultBody + .getAsJsonObject(attrName).getAsJsonArray("data"); + log.info("已找到与 {} 相关插图信息({})：", content, attribute.name().toLowerCase()); + int count = 1; + for (JsonElement jsonElement : illustsArray) { + JsonObject illustObj = jsonElement.getAsJsonObject(); + if(!illustObj.has("illustId")) { + continue; + } + int illustId = illustObj.get("illustId").getAsInt(); + StringBuilder builder = new StringBuilder("["); + illustObj.get("tags").getAsJsonArray().forEach(el -> builder.append(el.getAsString()).append(", ")); + builder.replace(builder.length() - 2, builder.length(), "]"); + log.info("{} ({} / {})\n\t作品id: {}, \n\t作者名(作者id): {} ({}), " + + "\n\t作品标题: {}, \n\t作品Tags: {}, \n\t作品链接: {}", + attribute.name(), + count++, + illustsArray.size(), + illustId, + illustObj.get("userName").getAsString(), + illustObj.get("userId").getAsInt(), + illustObj.get("illustTitle").getAsString(), + builder, + PixivURL.getPixivRefererLink(illustId) + ); + } } } } diff --git a/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java b/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java index 68b95e3..fb1f112 100644 --- a/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java +++ b/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java @@ -9,7 +9,8 @@ import net.lamgc.cgj.bot.boot.BotGlobal; import net.lamgc.cgj.bot.message.MessageSenderBuilder; import net.lamgc.cgj.bot.message.MessageSource; import net.lamgc.cgj.pixiv.PixivDownload; -import net.lamgc.cgj.pixiv.PixivURL; +import net.lamgc.cgj.pixiv.RankingContentType; +import net.lamgc.cgj.pixiv.RankingMode; import net.lamgc.utils.base.runner.Argument; import net.lamgc.utils.base.runner.Command; import org.slf4j.Logger; @@ -118,16 +119,16 @@ public class BotAdminCommandProcess { return "排行榜范围选取错误！"; } - PixivURL.RankingContentType type; - PixivURL.RankingMode mode; + RankingContentType type; + RankingMode mode; try { - type = PixivURL.RankingContentType.valueOf("TYPE_" + rankingContentType.toUpperCase()); + type = RankingContentType.valueOf("TYPE_" + rankingContentType.toUpperCase()); } catch(IllegalArgumentException e) { return "无效的排行榜类型参数！"; } try { - mode = PixivURL.RankingMode.valueOf("MODE_" + rankingMode.toUpperCase()); + mode = RankingMode.valueOf("MODE_" + rankingMode.toUpperCase()); } catch(IllegalArgumentException e) { return "无效的排行榜模式参数！"; } @@ -225,10 +226,13 @@ public class BotAdminCommandProcess { } catch(NoSuchElementException ignored) { } - int rankingStart = setting.has(RANKING_SETTING_RANKING_START) ? setting.get(RANKING_SETTING_RANKING_START).getAsInt() : 1; - int rankingEnd = setting.has(RANKING_SETTING_RANKING_END) ? setting.get(RANKING_SETTING_RANKING_END).getAsInt() : 150; - PixivURL.RankingMode rankingMode = PixivURL.RankingMode.MODE_DAILY; - PixivURL.RankingContentType rankingContentType = PixivURL.RankingContentType.TYPE_ILLUST; + int rankingStart = setting.has(RANKING_SETTING_RANKING_START) ? + setting.get(RANKING_SETTING_RANKING_START).getAsInt() : 1; + int rankingEnd = setting.has(RANKING_SETTING_RANKING_END) ? + setting.get(RANKING_SETTING_RANKING_END).getAsInt() : 150; + + RankingMode rankingMode = RankingMode.MODE_DAILY; + RankingContentType rankingContentType = RankingContentType.TYPE_ILLUST; PixivDownload.PageQuality pageQuality = PixivDownload.PageQuality.REGULAR; if(rankingStart <= 0 || rankingStart > 500) { @@ -246,7 +250,7 @@ public class BotAdminCommandProcess { if(setting.has(RANKING_SETTING_RANKING_MODE)) { String value = setting.get(RANKING_SETTING_RANKING_MODE).getAsString().trim().toUpperCase(); try { - rankingMode = PixivURL.RankingMode.valueOf(value.startsWith("MODE_") ? value : "MODE_" + value); + rankingMode = RankingMode.valueOf(value.startsWith("MODE_") ? value : "MODE_" + value); } catch(IllegalArgumentException e) { log.warn("群组ID [{}] - 无效的RankingMode设定值, 将重置为默认值: {}", id, value); } @@ -254,7 +258,7 @@ public class BotAdminCommandProcess { if(setting.has(RANKING_SETTING_RANKING_CONTENT_TYPE)) { String value = setting.get(RANKING_SETTING_RANKING_CONTENT_TYPE).getAsString().trim().toUpperCase(); try { - rankingContentType = PixivURL.RankingContentType.valueOf(value.startsWith("TYPE_") ? value : "TYPE_" + value); + rankingContentType = RankingContentType.valueOf(value.startsWith("TYPE_") ? value : "TYPE_" + value); } catch(IllegalArgumentException e) { log.warn("群组ID [{}] - 无效的RankingContentType设定值: {}", id, value); } @@ -293,7 +297,10 @@ public class BotAdminCommandProcess { * @throws NoSuchElementException 当这个群号没有定时器的时候抛出异常 */ @Command - public static String removePushGroup(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "group", force = false) long id) { + public static String removePushGroup( + @Argument(name = "$fromGroup") long fromGroup, + @Argument(name = "group", force = false) long id + ) { long group = id <= 0 ? fromGroup : id; RandomIntervalSendTimer.getTimerById(group).destroy(); pushInfoMap.remove(group); @@ -324,7 +331,8 @@ public class BotAdminCommandProcess { log.debug("{} - Report: {}", illustIdStr, report); String reason = report.get("reason").isJsonNull() ? "" : report.get("reason").getAsString(); msgBuilder.append(count).append(". 作品Id: ").append(illustIdStr) - .append("(").append(dateFormat.format(new Date(report.get("reportTime").getAsLong()))).append(")：\n") + .append("(").append( + dateFormat.format(new Date(report.get("reportTime").getAsLong()))).append(")：\n") .append("报告者QQ：").append(report.get("fromQQ").getAsLong()).append("\n") .append("报告所在群：").append(report.get("fromGroup").getAsLong()).append("\n") .append("报告原因：\n").append(reason).append("\n"); diff --git a/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java b/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java index a2b1544..65f81bb 100644 --- a/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java +++ b/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java @@ -11,11 +11,8 @@ import net.lamgc.cgj.bot.cache.JsonRedisCacheStore; import net.lamgc.cgj.bot.event.BufferedMessageSender; import net.lamgc.cgj.bot.sort.PreLoadDataAttribute; import net.lamgc.cgj.bot.sort.PreLoadDataAttributeComparator; -import net.lamgc.cgj.pixiv.PixivDownload; +import net.lamgc.cgj.pixiv.*; import net.lamgc.cgj.pixiv.PixivDownload.PageQuality; -import net.lamgc.cgj.pixiv.PixivSearchAttribute; -import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder; -import net.lamgc.cgj.pixiv.PixivURL; import net.lamgc.cgj.util.PixivUtils; import net.lamgc.utils.base.runner.Argument; import net.lamgc.utils.base.runner.Command; @@ -146,8 +143,8 @@ public class BotCommandProcess { @Argument(name = "$fromGroup") long fromGroup, @Argument(force = false, name = "date") Date queryTime, @Argument(force = false, name = "force") boolean force, - @Argument(force = false, name = "mode", defaultValue = "DAILY") String contentMode, - @Argument(force = false, name = "type", defaultValue = "ALL") String contentType, + @Argument(force = false, name = "mode", defaultValue = "DAILY") RankingMode contentMode, + @Argument(force = false, name = "type", defaultValue = "ALL") RankingContentType contentType, @Argument(force = false, name = "p", defaultValue = "1") int pageIndex ) throws InterruptedException { if(pageIndex <= 0) { @@ -173,33 +170,13 @@ public class BotCommandProcess { } } - PixivURL.RankingMode mode; - try { - String rankingModeValue = contentMode.toUpperCase(); - mode = PixivURL.RankingMode.valueOf(rankingModeValue.startsWith("MODE_") ? - rankingModeValue : "MODE_" + rankingModeValue); - } catch (IllegalArgumentException e) { - log.warn("无效的RankingMode值: {}", contentMode); - return "参数无效, 请查看帮助信息"; - } - - PixivURL.RankingContentType type; - try { - String contentTypeValue = contentType.toUpperCase(); - type = PixivURL.RankingContentType.valueOf( - contentTypeValue.startsWith("TYPE_") ? contentTypeValue : "TYPE_" + contentTypeValue); - } catch (IllegalArgumentException e) { - log.warn("无效的RankingContentType值: {}", contentType); - return "参数无效, 请查看帮助信息"; - } - - if(!type.isSupportedMode(mode)) { + if(!contentType.isSupportedMode(contentMode)) { log.warn("RankingContentType不支持指定的RankingMode.(ContentType: {}, RankingMode: {})", - type.name(), mode.name()); + contentType.name(), contentMode.name()); return "不支持的内容类型或模式!"; } - StringBuilder resultBuilder = new StringBuilder(mode.name() + " - 以下是 ") + StringBuilder resultBuilder = new StringBuilder(contentMode.name() + " - 以下是 ") .append(new SimpleDateFormat("yyyy-MM-dd").format(queryDate)).append(" 的Pixiv插画排名榜前十名：\n"); try { int index = 0; @@ -223,7 +200,7 @@ public class BotCommandProcess { int startsIndex = itemLimit * pageIndex - (itemLimit - 1); List rankingInfoList = CacheStoreCentral.getCentral() - .getRankingInfoByCache(type, mode, queryDate, + .getRankingInfoByCache(contentType, contentMode, queryDate, Math.max(1, startsIndex), Math.max(0, itemLimit), false); if(rankingInfoList.isEmpty()) { return "无法查询排行榜，可能排行榜尚未更新。"; @@ -243,7 +220,7 @@ public class BotCommandProcess { if (index <= imageLimit) { resultBuilder .append(CacheStoreCentral.getCentral() - .getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1)) + .getImageById(fromGroup, illustId, PageQuality.REGULAR, 1)) .append("\n"); } } @@ -273,20 +250,20 @@ public class BotCommandProcess { @Argument(name = "$fromGroup") long fromGroup, @Argument(force = false, name = "mode", defaultValue = "DAILY") String contentMode, @Argument(force = false, name = "type", defaultValue = "ILLUST") String contentType) { - PixivURL.RankingMode mode; + RankingMode mode; try { String rankingModeValue = contentMode.toUpperCase(); - mode = PixivURL.RankingMode.valueOf(rankingModeValue.startsWith("MODE_") ? + mode = RankingMode.valueOf(rankingModeValue.startsWith("MODE_") ? rankingModeValue : "MODE_" + rankingModeValue); } catch (IllegalArgumentException e) { log.warn("无效的RankingMode值: {}", contentMode); return "参数无效, 请查看帮助信息"; } - PixivURL.RankingContentType type; + RankingContentType type; try { String contentTypeValue = contentType.toUpperCase(); - type = PixivURL.RankingContentType.valueOf( + type = RankingContentType.valueOf( contentTypeValue.startsWith("TYPE_") ? contentTypeValue : "TYPE_" + contentTypeValue); } catch (IllegalArgumentException e) { log.warn("无效的RankingContentType值: {}", contentType); diff --git a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java index 93af1f9..afa1599 100644 --- a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java +++ b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java @@ -4,7 +4,8 @@ import com.google.gson.JsonObject; import net.lamgc.cgj.bot.cache.CacheStoreCentral; import net.lamgc.cgj.bot.message.MessageSender; import net.lamgc.cgj.pixiv.PixivDownload; -import net.lamgc.cgj.pixiv.PixivURL; +import net.lamgc.cgj.pixiv.RankingContentType; +import net.lamgc.cgj.pixiv.RankingMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,8 +23,8 @@ public class RandomRankingArtworksSender extends AutoSender { private final long groupId; private final int rankingStart; private final int rankingStop; - private final PixivURL.RankingMode mode; - private final PixivURL.RankingContentType contentType; + private final RankingMode mode; + private final RankingContentType contentType; private final PixivDownload.PageQuality quality; /** @@ -40,8 +41,8 @@ public class RandomRankingArtworksSender extends AutoSender { MessageSender messageSender, int rankingStart, int rankingStop, - PixivURL.RankingMode mode, - PixivURL.RankingContentType contentType, + RankingMode mode, + RankingContentType contentType, PixivDownload.PageQuality quality) { this(messageSender, 0, rankingStart, rankingStop, mode, contentType, quality); } @@ -62,8 +63,8 @@ public class RandomRankingArtworksSender extends AutoSender { long groupId, int rankingStart, int rankingStop, - PixivURL.RankingMode mode, - PixivURL.RankingContentType contentType, + RankingMode mode, + RankingContentType contentType, PixivDownload.PageQuality quality) { super(messageSender); this.groupId = groupId; @@ -73,7 +74,8 @@ public class RandomRankingArtworksSender extends AutoSender { this.rankingStart = rankingStart > 0 ? rankingStart : 1; this.rankingStop = rankingStop > 0 ? rankingStop : 150; if(this.rankingStart > this.rankingStop) { - throw new IndexOutOfBoundsException("rankingStart=" + this.rankingStart + ", rankingStop=" + this.rankingStop); + throw new IndexOutOfBoundsException( + "rankingStart=" + this.rankingStart + ", rankingStop=" + this.rankingStop); } this.quality = quality == null ? PixivDownload.PageQuality.REGULAR : quality; } diff --git a/src/main/java/net/lamgc/cgj/bot/RankingUpdateTimer.java b/src/main/java/net/lamgc/cgj/bot/RankingUpdateTimer.java index 1f02550..e465b4c 100644 --- a/src/main/java/net/lamgc/cgj/bot/RankingUpdateTimer.java +++ b/src/main/java/net/lamgc/cgj/bot/RankingUpdateTimer.java @@ -2,7 +2,8 @@ package net.lamgc.cgj.bot; import net.lamgc.cgj.bot.event.BotEventHandler; import net.lamgc.cgj.bot.event.VirtualLoadMessageEvent; -import net.lamgc.cgj.pixiv.PixivURL; +import net.lamgc.cgj.pixiv.RankingContentType; +import net.lamgc.cgj.pixiv.RankingMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,14 +65,15 @@ public class RankingUpdateTimer { String dateStr = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()); log.info("正在获取 {} 期排行榜数据...", calendar.getTime()); - for (PixivURL.RankingMode rankingMode : PixivURL.RankingMode.values()) { - for (PixivURL.RankingContentType contentType : PixivURL.RankingContentType.values()) { + for (RankingMode rankingMode : RankingMode.values()) { + for (RankingContentType contentType : RankingContentType.values()) { if(!contentType.isSupportedMode(rankingMode)) { log.debug("不支持的类型, 填空值跳过...(类型: {}.{})", rankingMode.name(), contentType.name()); } log.info("当前排行榜类型: {}.{}, 正在更新...", rankingMode.name(), contentType.name()); BotEventHandler.executeMessageEvent(new VirtualLoadMessageEvent(0,0, - ".cgj ranking -type=" + contentType.name() + " -mode=" + rankingMode.name() + " -force -date " + dateStr)); + ".cgj ranking -type=" + contentType.name() + + " -mode=" + rankingMode.name() + " -force -date " + dateStr)); log.info("排行榜 {}.{} 负载指令已投递.", rankingMode.name(), contentType.name()); } } diff --git a/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java b/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java index 85a2f75..f59cc80 100644 --- a/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java +++ b/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java @@ -11,7 +11,8 @@ import net.lamgc.cgj.bot.boot.BotGlobal; import net.lamgc.cgj.exception.HttpRequestException; import net.lamgc.cgj.pixiv.PixivDownload; import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder; -import net.lamgc.cgj.pixiv.PixivURL; +import net.lamgc.cgj.pixiv.RankingContentType; +import net.lamgc.cgj.pixiv.RankingMode; import net.lamgc.cgj.util.Locker; import net.lamgc.cgj.util.LockerMap; import net.lamgc.cgj.util.URLs; @@ -124,7 +125,8 @@ public final class CacheStoreCentral { * @param pageIndex 指定页面索引, 从1开始 * @return 如果成功, 返回BotCode, 否则返回错误信息. */ - public String getImageById(long fromGroup, int illustId, PixivDownload.PageQuality quality, int pageIndex) throws InterruptedException { + public String getImageById(long fromGroup, int illustId, PixivDownload.PageQuality quality, int pageIndex) + throws InterruptedException { log.debug("IllustId: {}, Quality: {}, PageIndex: {}", illustId, quality.name(), pageIndex); if(pageIndex <= 0) { log.warn("指定的页数不能小于或等于0: {}", pageIndex); @@ -354,9 +356,9 @@ public final class CacheStoreCentral { * @return 成功返回有值List, 失败且无异常返回空 * @throws IOException 获取异常时抛出 */ - public List getRankingInfoByCache(PixivURL.RankingContentType contentType, - PixivURL.RankingMode mode, - Date queryDate, int start, int range, boolean flushCache) + public List getRankingInfoByCache(RankingContentType contentType, + RankingMode mode, + Date queryDate, int start, int range, boolean flushCache) throws IOException { if(!contentType.isSupportedMode(mode)) { log.warn("试图获取不支持的排行榜类型已拒绝.(ContentType: {}, RankingMode: {})", contentType.name(), mode.name()); @@ -414,9 +416,10 @@ public final class CacheStoreCentral { public JsonObject getSearchBody(PixivSearchLinkBuilder searchBuilder) throws IOException { log.debug("正在搜索作品, 条件: {}", searchBuilder.getSearchCondition()); String requestUrl = searchBuilder.buildURL(); - String searchIdentify = requestUrl.substring(requestUrl.lastIndexOf("/", requestUrl.lastIndexOf("/") - 1) + 1); - Locker locker - = buildSyncKey(searchIdentify); + String searchIdentify = + requestUrl.substring(requestUrl.lastIndexOf("/", requestUrl.lastIndexOf("/") - 1) + 1); + Locker locker = + buildSyncKey(searchIdentify); log.debug("RequestUrl: {}", requestUrl); JsonObject resultBody = null; if(!searchBodyCache.exists(searchIdentify)) { diff --git a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java index cfca657..9e4aff1 100644 --- a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java +++ b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java @@ -7,17 +7,18 @@ import net.lamgc.cgj.bot.BotAdminCommandProcess; import net.lamgc.cgj.bot.BotCommandProcess; import net.lamgc.cgj.bot.MessageEventExecutionDebugger; import net.lamgc.cgj.bot.SettingProperties; -import net.lamgc.cgj.util.DateParser; -import net.lamgc.cgj.util.PagesQualityParser; +import net.lamgc.cgj.bot.util.parser.DateParser; +import net.lamgc.cgj.bot.util.parser.PagesQualityParser; +import net.lamgc.cgj.bot.util.parser.RankingContentTypeParser; +import net.lamgc.cgj.bot.util.parser.RankingModeParser; import net.lamgc.cgj.util.TimeLimitThreadPoolExecutor; import net.lamgc.utils.base.runner.ArgumentsRunner; import net.lamgc.utils.base.runner.ArgumentsRunnerConfig; import net.lamgc.utils.base.runner.exception.DeveloperRunnerException; import net.lamgc.utils.base.runner.exception.NoSuchCommandException; import net.lamgc.utils.base.runner.exception.ParameterNoFoundException; -import net.lamgc.utils.event.*; import net.lamgc.utils.event.EventObject; - +import net.lamgc.utils.event.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +71,13 @@ public class BotEventHandler implements EventHandler { executor.setEventUncaughtExceptionHandler(new EventUncaughtExceptionHandler() { private final Logger log = LoggerFactory.getLogger(this.getClass()); @Override - public void exceptionHandler(Thread executeThread, EventHandler handler, Method handlerMethod, EventObject event, Throwable cause) { + public void exceptionHandler( + Thread executeThread, + EventHandler handler, + Method handlerMethod, + EventObject event, + Throwable cause + ) { log.error("EventExecutor@{} 发生未捕获异常:\n\t" + "Thread:{}\n\tEventHandler: {}\n\tHandlerMethod: {}\n\tEventObject: {}\n" + "------------------ Stack Trace ------------------\n{}", @@ -103,8 +110,11 @@ public class BotEventHandler implements EventHandler { ArgumentsRunnerConfig runnerConfig = new ArgumentsRunnerConfig(); runnerConfig.setUseDefaultValueInsteadOfException(true); runnerConfig.setCommandIgnoreCase(true); + runnerConfig.addStringParameterParser(new DateParser(new SimpleDateFormat("yyyy-MM-dd"))); runnerConfig.addStringParameterParser(new PagesQualityParser()); + runnerConfig.addStringParameterParser(new RankingModeParser()); + runnerConfig.addStringParameterParser(new RankingContentTypeParser()); processRunner = new ArgumentsRunner(BotCommandProcess.class, runnerConfig); adminRunner = new ArgumentsRunner(BotAdminCommandProcess.class, runnerConfig); @@ -137,7 +147,8 @@ public class BotEventHandler implements EventHandler { if(!event.getMessage().startsWith(ADMIN_COMMAND_PREFIX) && !Strings.isNullOrEmpty(debuggerName)) { try { - MessageEventExecutionDebugger debugger = MessageEventExecutionDebugger.valueOf(debuggerName.toUpperCase()); + MessageEventExecutionDebugger debugger = + MessageEventExecutionDebugger.valueOf(debuggerName.toUpperCase()); debugger.debugger.accept(executor, event, SettingProperties.getProperties(SettingProperties.GLOBAL), MessageEventExecutionDebugger.getDebuggerLogger(debugger)); } catch(IllegalArgumentException e) { @@ -154,6 +165,9 @@ public class BotEventHandler implements EventHandler { } } + private final static Pattern MESSAGE_PATTERN = + Pattern.compile("/\\s*(\".+?\"|[^:\\s])+((\\s*:\\s*(\".+?\"|[^\\s])+)|)|(\".+?\"|[^\"\\s])+"); + /** * 以事件形式处理消息事件 * @param event 消息事件对象 @@ -166,8 +180,7 @@ public class BotEventHandler implements EventHandler { return; } - Pattern pattern = Pattern.compile("/\\s*(\".+?\"|[^:\\s])+((\\s*:\\s*(\".+?\"|[^\\s])+)|)|(\".+?\"|[^\"\\s])+"); - Matcher matcher = pattern.matcher(Strings.nullToEmpty(msg)); + Matcher matcher = MESSAGE_PATTERN.matcher(Strings.nullToEmpty(msg)); List argsList = new ArrayList<>(); while (matcher.find()) { String arg = matcher.group(); @@ -197,6 +210,7 @@ public class BotEventHandler implements EventHandler { args = Arrays.copyOf(args, args.length + 4); argsList.toArray(args); + String[] runnerArguments = args.length <= 1 ? new String[0] : Arrays.copyOfRange(args, 1, args.length); log.info("正在处理命令..."); long time = System.currentTimeMillis(); Object result; @@ -206,10 +220,10 @@ public class BotEventHandler implements EventHandler { .equals(SettingProperties.getProperty(0, "admin.adminId"))) { result = "你没有执行该命令的权限！"; } else { - result = adminRunner.run(args.length <= 1 ? new String[0] : Arrays.copyOfRange(args, 1, args.length)); + result = adminRunner.run(runnerArguments); } } else { - result = processRunner.run(args.length <= 1 ? new String[0] : Arrays.copyOfRange(args, 1, args.length)); + result = processRunner.run(runnerArguments); } } catch(NoSuchCommandException e) { result = "没有这个命令！请使用“.cgj”查看帮助说明！"; @@ -246,7 +260,8 @@ public class BotEventHandler implements EventHandler { long totalTime = System.currentTimeMillis() - time; log.info("命令反馈完成.(事件耗时: {}ms, P: {}%({}ms), R: {}%({}ms))", totalTime, String.format("%.3f", ((double) processTime / (double)totalTime) * 100F), processTime, - String.format("%.3f", ((double) (totalTime - processTime) / (double)totalTime) * 100F), totalTime - processTime); + String.format("%.3f", ((double) (totalTime - processTime) / (double)totalTime) * 100F), + totalTime - processTime); } /** diff --git a/src/main/java/net/lamgc/cgj/util/DateParser.java b/src/main/java/net/lamgc/cgj/bot/util/parser/DateParser.java similarity index 92% rename from src/main/java/net/lamgc/cgj/util/DateParser.java rename to src/main/java/net/lamgc/cgj/bot/util/parser/DateParser.java index bd4269e..67d4675 100644 --- a/src/main/java/net/lamgc/cgj/util/DateParser.java +++ b/src/main/java/net/lamgc/cgj/bot/util/parser/DateParser.java @@ -1,4 +1,4 @@ -package net.lamgc.cgj.util; +package net.lamgc.cgj.bot.util.parser; import net.lamgc.utils.base.runner.StringParameterParser; diff --git a/src/main/java/net/lamgc/cgj/util/PagesQualityParser.java b/src/main/java/net/lamgc/cgj/bot/util/parser/PagesQualityParser.java similarity index 92% rename from src/main/java/net/lamgc/cgj/util/PagesQualityParser.java rename to src/main/java/net/lamgc/cgj/bot/util/parser/PagesQualityParser.java index 478255f..03b28bb 100644 --- a/src/main/java/net/lamgc/cgj/util/PagesQualityParser.java +++ b/src/main/java/net/lamgc/cgj/bot/util/parser/PagesQualityParser.java @@ -1,4 +1,4 @@ -package net.lamgc.cgj.util; +package net.lamgc.cgj.bot.util.parser; import net.lamgc.cgj.pixiv.PixivDownload; import net.lamgc.utils.base.runner.StringParameterParser; diff --git a/src/main/java/net/lamgc/cgj/bot/util/parser/RankingContentTypeParser.java b/src/main/java/net/lamgc/cgj/bot/util/parser/RankingContentTypeParser.java new file mode 100644 index 0000000..3f90da8 --- /dev/null +++ b/src/main/java/net/lamgc/cgj/bot/util/parser/RankingContentTypeParser.java @@ -0,0 +1,29 @@ +package net.lamgc.cgj.bot.util.parser; + +import net.lamgc.cgj.pixiv.RankingContentType; +import net.lamgc.utils.base.runner.StringParameterParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RankingContentTypeParser implements StringParameterParser { + + private final static Logger log = LoggerFactory.getLogger(RankingContentTypeParser.class); + + @Override + public RankingContentType parse(String strValue) { + try { + if(strValue.toUpperCase().startsWith("TYPE_")) { + return RankingContentType.valueOf(strValue.toUpperCase()); + } + return RankingContentType.valueOf("TYPE_" + strValue.toUpperCase()); + } catch(IllegalArgumentException e) { + log.warn("无效的RankingContentType值: {}", strValue); + throw e; + } + } + + @Override + public RankingContentType defaultValue() { + return RankingContentType.TYPE_ALL; + } +} diff --git a/src/main/java/net/lamgc/cgj/bot/util/parser/RankingModeParser.java b/src/main/java/net/lamgc/cgj/bot/util/parser/RankingModeParser.java new file mode 100644 index 0000000..b2de652 --- /dev/null +++ b/src/main/java/net/lamgc/cgj/bot/util/parser/RankingModeParser.java @@ -0,0 +1,29 @@ +package net.lamgc.cgj.bot.util.parser; + +import net.lamgc.cgj.pixiv.RankingMode; +import net.lamgc.utils.base.runner.StringParameterParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RankingModeParser implements StringParameterParser { + + private final static Logger log = LoggerFactory.getLogger(RankingModeParser.class); + + @Override + public RankingMode parse(String strValue) { + try { + if(strValue.toUpperCase().startsWith("MODE_")) { + return RankingMode.valueOf(strValue.toUpperCase()); + } + return RankingMode.valueOf("MODE_" + strValue.toUpperCase()); + } catch(IllegalArgumentException e) { + log.warn("无效的RankingMode值: {}", strValue); + throw e; + } + } + + @Override + public RankingMode defaultValue() { + return RankingMode.MODE_DAILY; + } +} diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java index 45ba669..4a76aa7 100644 --- a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java +++ b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java @@ -56,10 +56,10 @@ public class PixivDownload { this.cookieStore = cookieStore; HttpClientBuilder builder = HttpClientBuilder.create(); builder.setDefaultCookieStore(cookieStore); - // UA: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36 ArrayList
defaultHeaders = new ArrayList<>(2); defaultHeaders.add(new BasicHeader("User-Agent", - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36")); + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " + + "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36")); builder.setDefaultHeaders(defaultHeaders); builder.setProxy(proxy); httpClient = builder.build(); @@ -84,7 +84,8 @@ public class PixivDownload { Document document; ArrayList linkList = new ArrayList<>(); do { - request = new HttpGet(PixivURL.PIXIV_USER_COLLECTION_PAGE.replace("{pageIndex}", Integer.toString(++pageIndex))); + request = new HttpGet(PixivURL.PIXIV_USER_COLLECTION_PAGE + .replace("{pageIndex}", Integer.toString(++pageIndex))); setCookieInRequest(request, cookieStore); log.debug("Request Link: " + request.getURI().toString()); HttpResponse response = httpClient.execute(request); @@ -99,10 +100,13 @@ public class PixivDownload { Gson gson = new Gson(); for (String href : hrefList) { - HttpGet linkApiRequest = createHttpGetRequest(PixivURL.PIXIV_ILLUST_API_URL.replace("{illustId}", href.substring(href.lastIndexOf("/") + 1))); + HttpGet linkApiRequest = createHttpGetRequest(PixivURL.PIXIV_ILLUST_API_URL + .replace("{illustId}", href.substring(href.lastIndexOf("/") + 1))); log.debug(linkApiRequest.getURI().toString()); HttpResponse httpResponse = httpClient.execute(linkApiRequest); - JsonObject linkResult = gson.fromJson(EntityUtils.toString(httpResponse.getEntity()), JsonObject.class); + JsonObject linkResult = + gson.fromJson(EntityUtils.toString(httpResponse.getEntity()), JsonObject.class); + if(linkResult.get("error").getAsBoolean()) { log.error("接口返回错误信息: {}", linkResult.get("message").getAsString()); continue; @@ -111,7 +115,10 @@ public class PixivDownload { JsonArray linkArray = linkResult.get("body").getAsJsonArray(); for (int i = 0; i < linkArray.size(); i++) { JsonObject linkObject = linkArray.get(i).getAsJsonObject().get("urls").getAsJsonObject(); - linkList.add(linkObject.get((quality == null ? PageQuality.ORIGINAL : quality).toString().toLowerCase()).getAsString()); + linkList.add( + linkObject.get((quality == null ? PageQuality.ORIGINAL : quality).toString().toLowerCase()) + .getAsString() + ); } } } while(!document.select(".pager-container>.next").isEmpty()); @@ -153,7 +160,8 @@ public class PixivDownload { Document document = Jsoup.parse(EntityUtils.toString(response.getEntity())); HttpClient imageClient = HttpClientBuilder.create().build(); - Elements elements = document.select(".gtm-illust-recommend-zone>.image-item>.gtm-illust-recommend-thumbnail-link"); + Elements elements = document + .select(".gtm-illust-recommend-zone>.image-item>.gtm-illust-recommend-thumbnail-link"); for(int illustIndex = 0; illustIndex < elements.size(); illustIndex++){ String href = elements.get(illustIndex).attr("href"); int illustId = Integer.parseInt(href.substring(href.lastIndexOf("/") + 1)); @@ -195,8 +203,14 @@ public class PixivDownload { * @param fn 回调函数 * @throws IOException 当请求发生异常时抛出 */ - public void getRankingAsInputStream(PixivURL.RankingContentType contentType, PixivURL.RankingMode mode, - Date time, int range, PageQuality quality, RankingDownloadFunction fn) throws IOException { + public void getRankingAsInputStream( + RankingContentType contentType, + RankingMode mode, + Date time, + int range, + PageQuality quality, + RankingDownloadFunction fn + ) throws IOException { getRankingAsInputStream(contentType, mode, time, 1, range, quality, fn); } @@ -211,15 +225,23 @@ public class PixivDownload { * @param fn 回调函数 * @throws IOException 当请求发生异常时抛出 */ - public void getRankingAsInputStream(PixivURL.RankingContentType contentType, PixivURL.RankingMode mode, - Date time, int rankStart, int range, PageQuality quality, RankingDownloadFunction fn) throws IOException { + public void getRankingAsInputStream( + RankingContentType contentType, + RankingMode mode, + Date time, + int rankStart, + int range, + PageQuality quality, + RankingDownloadFunction fn + ) throws IOException { getRanking(contentType, mode, time, rankStart, range).forEach(rankInfo -> { int rank = rankInfo.get("rank").getAsInt(); int illustId = rankInfo.get("illust_id").getAsInt(); int authorId = rankInfo.get("user_id").getAsInt(); String authorName = rankInfo.get("user_name").getAsString(); String title = rankInfo.get("title").getAsString(); - log.trace("当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range - 1, range, illustId, authorId, authorName, title); + log.trace("当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", + rank, rankStart + range - 1, range, illustId, authorId, authorName, title); log.trace("正在获取PagesLink..."); List linkList; try { @@ -236,7 +258,11 @@ public class PixivDownload { for (int pageIndex = 0; pageIndex < linkList.size(); pageIndex++) { String downloadLink = linkList.get(pageIndex); log.trace("当前Page: {}/{}", pageIndex + 1, linkList.size()); - try(InputStream imageInputStream = new BufferedInputStream(getImageAsInputStream(HttpClientBuilder.create().build(), downloadLink), 256 * 1024)) { + try(InputStream imageInputStream = + new BufferedInputStream( + getImageAsInputStream(HttpClientBuilder.create().build(), downloadLink), + 256 * 1024) + ) { fn.download(rank, downloadLink, rankInfo.deepCopy(), imageInputStream); } catch(IOException e) { log.error("下载插画时发生异常", e); @@ -256,22 +282,24 @@ public class PixivDownload { * @param rankStart 开始排名, 从1开始 * @param range 取范围 * @return 成功返回有值List, 失败且无异常返回空 - * @throws IllegalArgumentException 当{@linkplain net.lamgc.cgj.pixiv.PixivURL.RankingContentType RankingContentType} - * 与{@linkplain net.lamgc.cgj.pixiv.PixivURL.RankingMode RankingMode}互不兼容时抛出 + * @throws IllegalArgumentException 当{@linkplain net.lamgc.cgj.pixiv.RankingContentType RankingContentType} + * 与{@linkplain net.lamgc.cgj.pixiv.RankingMode RankingMode}互不兼容时抛出 * @throws IndexOutOfBoundsException 当排行榜选取范围超出排行榜范围时抛出(排行榜范围为 1 ~ 500 名) * @throws IOException 当Http请求发生异常时抛出, 或Http请求响应码非200时抛出 */ - public List getRanking(PixivURL.RankingContentType contentType, PixivURL.RankingMode mode, + public List getRanking(RankingContentType contentType, RankingMode mode, Date time, int rankStart, int range) throws IOException { Objects.requireNonNull(time); if(!Objects.requireNonNull(contentType).isSupportedMode(Objects.requireNonNull(mode))) { - throw new IllegalArgumentException("ContentType不支持指定的RankingMode: ContentType: " + contentType.name() + ", Mode: " + mode.name()); + throw new IllegalArgumentException("ContentType不支持指定的RankingMode: ContentType: " + + contentType.name() + ", Mode: " + mode.name()); } else if(rankStart <= 0) { throw new IndexOutOfBoundsException("rankStart cannot be less than or equal to zero: " + rankStart); } else if(range <= 0) { throw new IndexOutOfBoundsException("range cannot be less than or equal to zero:" + range); } else if(rankStart + range - 1 > 500) { - throw new IndexOutOfBoundsException("排名选取范围超出了排行榜范围: rankStart=" + rankStart + ", range=" + range + ", length:" + (rankStart + range - 1)); + throw new IndexOutOfBoundsException("排名选取范围超出了排行榜范围: rankStart=" + + rankStart + ", range=" + range + ", length:" + (rankStart + range - 1)); } int startPages = (int) Math.max(1, Math.floor(rankStart / 50F)); @@ -294,7 +322,8 @@ public class PixivDownload { JsonObject resultObject = gson.fromJson(responseBody, JsonObject.class); canNext = resultObject.get("next").getAsJsonPrimitive().isNumber(); JsonArray resultArray = resultObject.getAsJsonArray("contents"); - for (int resultIndex = startIndex; resultIndex < resultArray.size() && count < range; resultIndex++, count++) { + for (int resultIndex = startIndex; + resultIndex < resultArray.size() && count < range; resultIndex++, count++) { results.add(resultArray.get(resultIndex).getAsJsonObject()); } @@ -354,8 +383,14 @@ public class PixivDownload { * @return 返回该illust所有Page的下载链接 * @throws IOException 当HttpClient在请求时发生异常, 或接口报错时抛出, 注意{@link IOException#getMessage()} */ - public static List getIllustAllPageDownload(HttpClient httpClient, CookieStore cookieStore, int illustId, PageQuality quality) throws IOException { - HttpGet linkApiRequest = new HttpGet(PixivURL.PIXIV_ILLUST_API_URL.replace("{illustId}", Integer.toString(illustId))); + public static List getIllustAllPageDownload( + HttpClient httpClient, + CookieStore cookieStore, + int illustId, + PageQuality quality + ) throws IOException { + HttpGet linkApiRequest = new HttpGet(PixivURL.PIXIV_ILLUST_API_URL + .replace("{illustId}", Integer.toString(illustId))); setCookieInRequest(linkApiRequest, cookieStore); HttpResponse response = httpClient.execute(linkApiRequest); JsonObject resultObject = new Gson().fromJson(EntityUtils.toString(response.getEntity()), JsonObject.class); @@ -412,7 +447,8 @@ public class PixivDownload { @Deprecated public Set> getCollectionAsInputStream(PageQuality quality) throws IOException { HashSet> illustInputStreamSet = new HashSet<>(); - getCollectionAsInputStream(quality, (link, inputStream) -> illustInputStreamSet.add(new AbstractMap.SimpleEntry<>(link, inputStream))); + getCollectionAsInputStream(quality, (link, inputStream) -> + illustInputStreamSet.add(new AbstractMap.SimpleEntry<>(link, inputStream))); return illustInputStreamSet; } @@ -493,7 +529,8 @@ public class PixivDownload { public static void setCookieInRequest(HttpRequest request, CookieStore cookieStore) { StringBuilder builder = new StringBuilder(); - cookieStore.getCookies().forEach(cookie -> builder.append(cookie.getName()).append("=").append(cookie.getValue()).append("; ")); + cookieStore.getCookies().forEach(cookie -> + builder.append(cookie.getName()).append("=").append(cookie.getValue()).append("; ")); request.setHeader(HttpHeaderNames.COOKIE.toString(), builder.toString()); } diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java b/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java index 7cc0768..03379a3 100644 --- a/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java +++ b/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java @@ -1,7 +1,6 @@ package net.lamgc.cgj.pixiv; import java.text.SimpleDateFormat; -import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -209,7 +208,13 @@ public final class PixivURL { * @param pageIndex 页数，一页50位，总共10页 * @return 返回构建好的链接 */ - public static String getRankingLink(RankingContentType contentType, RankingMode mode, Date time, int pageIndex, boolean json){ + public static String getRankingLink( + RankingContentType contentType, + RankingMode mode, + Date time, + int pageIndex, + boolean json + ){ StringBuilder linkBuilder = new StringBuilder(PIXIV_RANKING_LINK); linkBuilder.append("mode=").append(mode == null ? RankingMode.MODE_DAILY.modeParam : mode.modeParam); if(contentType != null && !contentType.equals(RankingContentType.TYPE_ALL)){ @@ -235,63 +240,6 @@ public final class PixivURL { return linkBuilder.toString(); } - /** - * 排名榜模式 - */ - public enum RankingMode{ - /** - * 每天 - */ - MODE_DAILY("daily"), - /** - * 每周 - */ - MODE_WEEKLY("weekly"), - /** - * 每月 - */ - MODE_MONTHLY("monthly"), - /** - * 新人 - */ - MODE_ROOKIE("rookie"), - /** - * 原创 - */ - MODE_ORIGINAL("original"), - /** - * 受男性喜欢 - */ - MODE_MALE("male"), - /** - * 受女性喜欢 - */ - MODE_FEMALE("female"), - - /** - * 每天 - R18 - */ - MODE_DAILY_R18("daily_r18"), - /** - * 每周 - R18 - */ - MODE_WEEKLY_R18("weekly_r18"), - /** - * 受男性喜欢 - R18 - */ - MODE_MALE_R18("male_r18"), - /** - * 受女性喜欢 - R18 - */ - MODE_FEMALE_R18("female_r18"), - ; - public String modeParam; - - RankingMode(String modeParamName){ - this.modeParam = modeParamName; - } - } - /** * Pixiv搜索接口.
* 要使用该链接请使用{@link PixivSearchLinkBuilder}构造链接.
@@ -300,72 +248,4 @@ public final class PixivURL { */ final static String PIXIV_SEARCH_CONTENT_URL = "https://www.pixiv.net/ajax/search/{area}/{content}?word={content}"; - /** - * 排名榜类型 - */ - public enum RankingContentType{ - TYPE_ALL("", RankingMode.values()), - /** - * 插画 - * 支持的时间类型: 每天, 每周, 每月, 新人 - */ - TYPE_ILLUST("illust", - new RankingMode[]{ - RankingMode.MODE_DAILY, - RankingMode.MODE_MONTHLY, - RankingMode.MODE_WEEKLY, - RankingMode.MODE_ROOKIE, - RankingMode.MODE_DAILY_R18, - RankingMode.MODE_WEEKLY_R18, - } - ), - /** - * 动图 - * 支持的时间类型:每天, 每周 - */ - TYPE_UGOIRA("ugoira", - new RankingMode[]{ - RankingMode.MODE_DAILY, - RankingMode.MODE_WEEKLY, - RankingMode.MODE_DAILY_R18, - RankingMode.MODE_WEEKLY_R18 - } - ), - /** - * 漫画 - * 支持的时间类型: 每天, 每周, 每月, 新人 - */ - TYPE_MANGA("manga", - new RankingMode[]{ - RankingMode.MODE_DAILY, - RankingMode.MODE_MONTHLY, - RankingMode.MODE_WEEKLY, - RankingMode.MODE_ROOKIE, - RankingMode.MODE_DAILY_R18, - RankingMode.MODE_WEEKLY_R18, - } - ) - ; - - String typeName; - - private final RankingMode[] supportedMode; - - RankingContentType(String typeName, RankingMode[] supportedMode){ - this.typeName = typeName; - this.supportedMode = supportedMode; - } - - /** - * 检查指定RankingMode是否支持 - * @param mode 要检查的RankingMode项 - * @return 如果支持返回true - */ - @SuppressWarnings("BooleanMethodIsAlwaysInverted") - public boolean isSupportedMode(RankingMode mode) { - return Arrays.binarySearch(supportedMode, mode) >= 0; - } - - } - } diff --git a/src/main/java/net/lamgc/cgj/pixiv/RankingContentType.java b/src/main/java/net/lamgc/cgj/pixiv/RankingContentType.java new file mode 100644 index 0000000..a6978f0 --- /dev/null +++ b/src/main/java/net/lamgc/cgj/pixiv/RankingContentType.java @@ -0,0 +1,75 @@ +package net.lamgc.cgj.pixiv; + +import java.util.Arrays; + +/** + * 排名榜类型 + */ +public enum RankingContentType{ + /** + * 所有类型. + * 支持所有Mode. + */ + TYPE_ALL("", RankingMode.values()), + /** + * 插画 + * 支持的时间类型: 每天, 每周, 每月, 新人 + */ + TYPE_ILLUST("illust", + new RankingMode[]{ + RankingMode.MODE_DAILY, + RankingMode.MODE_MONTHLY, + RankingMode.MODE_WEEKLY, + RankingMode.MODE_ROOKIE, + RankingMode.MODE_DAILY_R18, + RankingMode.MODE_WEEKLY_R18, + } + ), + /** + * 动图 + * 支持的时间类型:每天, 每周 + */ + TYPE_UGOIRA("ugoira", + new RankingMode[]{ + RankingMode.MODE_DAILY, + RankingMode.MODE_WEEKLY, + RankingMode.MODE_DAILY_R18, + RankingMode.MODE_WEEKLY_R18 + } + ), + /** + * 漫画 + * 支持的时间类型: 每天, 每周, 每月, 新人 + */ + TYPE_MANGA("manga", + new RankingMode[]{ + RankingMode.MODE_DAILY, + RankingMode.MODE_MONTHLY, + RankingMode.MODE_WEEKLY, + RankingMode.MODE_ROOKIE, + RankingMode.MODE_DAILY_R18, + RankingMode.MODE_WEEKLY_R18, + } + ) + ; + + String typeName; + + private final RankingMode[] supportedMode; + + RankingContentType(String typeName, RankingMode[] supportedMode){ + this.typeName = typeName; + this.supportedMode = supportedMode; + } + + /** + * 检查指定RankingMode是否支持 + * @param mode 要检查的RankingMode项 + * @return 如果支持返回true + */ + @SuppressWarnings("BooleanMethodIsAlwaysInverted") + public boolean isSupportedMode(RankingMode mode) { + return Arrays.binarySearch(supportedMode, mode) >= 0; + } + +} \ No newline at end of file diff --git a/src/main/java/net/lamgc/cgj/pixiv/RankingMode.java b/src/main/java/net/lamgc/cgj/pixiv/RankingMode.java new file mode 100644 index 0000000..9a3076f --- /dev/null +++ b/src/main/java/net/lamgc/cgj/pixiv/RankingMode.java @@ -0,0 +1,58 @@ +package net.lamgc.cgj.pixiv; + +/** + * 排名榜模式 + */ +public enum RankingMode{ + /** + * 每天 + */ + MODE_DAILY("daily"), + /** + * 每周 + */ + MODE_WEEKLY("weekly"), + /** + * 每月 + */ + MODE_MONTHLY("monthly"), + /** + * 新人 + */ + MODE_ROOKIE("rookie"), + /** + * 原创 + */ + MODE_ORIGINAL("original"), + /** + * 受男性喜欢 + */ + MODE_MALE("male"), + /** + * 受女性喜欢 + */ + MODE_FEMALE("female"), + + /** + * 每天 - R18 + */ + MODE_DAILY_R18("daily_r18"), + /** + * 每周 - R18 + */ + MODE_WEEKLY_R18("weekly_r18"), + /** + * 受男性喜欢 - R18 + */ + MODE_MALE_R18("male_r18"), + /** + * 受女性喜欢 - R18 + */ + MODE_FEMALE_R18("female_r18"), + ; + public String modeParam; + + RankingMode(String modeParamName){ + this.modeParam = modeParamName; + } +} \ No newline at end of file diff --git a/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java b/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java index cf5d29a..68d03d6 100644 --- a/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java +++ b/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java @@ -133,7 +133,7 @@ public class PixivDownloadTest { zos.setLevel(9); log.info("正在调用方法..."); try { - pixivDownload.getRankingAsInputStream(null, PixivURL.RankingMode.MODE_DAILY_R18, queryDate, 500, PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> { + pixivDownload.getRankingAsInputStream(null, RankingMode.MODE_DAILY_R18, queryDate, 500, PixivDownload.PageQuality.ORIGINAL, (rank, link, rankInfo, inputStream) -> { try { ZipEntry entry = new ZipEntry("Rank" + rank + "-" + link.substring(link.lastIndexOf("/") + 1)); entry.setComment(rankInfo.toString());