LamGC/ContentGrabbingJi
1
0
Fork 0
mirror of https://github.com/LamGC/ContentGrabbingJi.git synced 2025-07-01 04:47:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Update] 优化搜索命令中的去重方法;

Browse Source 
[Update] BotCommandProcess 调整搜索命令, 使用HashSet对artworkList进行去重;
This commit is contained in:
LamGC
2020-07-29 03:02:29 +08:00
parent 2f3417705d
commit a6ac8a6b2b
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java
View File

@ -401,9 +401,6 @@ public class BotCommandProcess {
PixivSearchAttribute areaAttribute = PixivSearchAttribute.valueOf(searchLinkBuilder.getSearchArea().toString()); PixivSearchAttribute areaAttribute = PixivSearchAttribute.valueOf(searchLinkBuilder.getSearchArea().toString());
Properties properties = SettingProperties.getProperties(groupId); Properties properties = SettingProperties.getProperties(groupId);
int expectedQuantity = pageRange * SEARCH_PAGE_MAX_ITEM; int expectedQuantity = pageRange * SEARCH_PAGE_MAX_ITEM;
// 一个可能不算最好的去重方法?我已经对Pixiv搜索结果完全重复的情况感到无语了 :(
Set<Integer> artworkIdSet = new HashSet<>();
int addItemCount = 0;
for(int pageIndex = startPageIndex; for(int pageIndex = startPageIndex;
pageIndex <= startPageIndex + pageRange - 1 || artworkList.size() < length || artworkList.size() < expectedQuantity; pageIndex <= startPageIndex + pageRange - 1 || artworkList.size() < length || artworkList.size() < expectedQuantity;
pageIndex++) { pageIndex++) {
@ -431,22 +428,16 @@ public class BotCommandProcess {
log.warn("作品 {} 被报告, 跳过.", illustId); log.warn("作品 {} 被报告, 跳过.", illustId);
continue; continue;
} }
if(artworkIdSet.contains(illustId)) {
continue;
}
artworkIdSet.add(illustId);
artworkList.add(artworkInfo); artworkList.add(artworkInfo);
addItemCount++;
} }
} }
if(addItemCount == 0) {
log.warn("已无法获取更多作品, 停止搜索.");
break;
}
addItemCount = 0;
} }
// 去重
Set<JsonObject> hashSet = new HashSet<>(artworkList.size());
hashSet.addAll(artworkList);
artworkList.clear();
artworkList.addAll(hashSet);
return artworkList; return artworkList;
} }