LamGC/ContentGrabbingJi
1
0
Fork 0
mirror of https://github.com/LamGC/ContentGrabbingJi.git synced 2025-04-30 06:37:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Change] BotCommandProcess 优化Tag过滤表达式;

Browse Source 
[Change] ImageCacheHandler 调整日志输出级别;
This commit is contained in:
LamGC 2020-06-11 09:08:58 +08:00
parent 97d06c4fc3
commit 87f2535b48
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.regex.Pattern;
@SuppressWarnings({"SameParameterValue"}) @SuppressWarnings({"SameParameterValue"})
public class BotCommandProcess { public class BotCommandProcess {
@ -522,6 +523,10 @@ public class BotCommandProcess {
return reportStore.exists(String.valueOf(illustId)); return reportStore.exists(String.valueOf(illustId));
} }
/**
* Tag过滤表达式
*/
private final static Pattern tagPattern = Pattern.compile(".*R-*18.*");
/** /**
* 检查指定作品是否为r18 * 检查指定作品是否为r18
* @param illustId 作品Id * @param illustId 作品Id
@ -538,7 +543,7 @@ public class BotCommandProcess {
boolean rawValue = illustInfo.get("xRestrict").getAsInt() != 0; boolean rawValue = illustInfo.get("xRestrict").getAsInt() != 0;
if(!rawValue) { if(!rawValue) {
for(JsonElement tag : tags) { for(JsonElement tag : tags) {
boolean current = tag.getAsString().matches("R-*18") || tag.getAsString().contains("R18"); boolean current = tagPattern.matcher(tag.getAsString()).matches();
if (current) { if (current) {
rawValue = true; rawValue = true;
break; break;

4
src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java vendored
View File

@ -38,7 +38,7 @@ public class ImageCacheHandler implements EventHandler {
} }
try { try {
log.info("图片 {} Event正在进行...({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode())); log.debug("图片 {} Event正在进行...({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
File storeFile = event.getStoreFile(); File storeFile = event.getStoreFile();
log.debug("正在缓存图片 {} (Path: {})", storeFile.getName(), storeFile.getAbsolutePath()); log.debug("正在缓存图片 {} (Path: {})", storeFile.getName(), storeFile.getAbsolutePath());
try { try {
@ -87,7 +87,7 @@ public class ImageCacheHandler implements EventHandler {
} }
event.getImageCache().put(URLs.getResourceName(event.getDownloadLink()), storeFile); event.getImageCache().put(URLs.getResourceName(event.getDownloadLink()), storeFile);
} finally { } finally {
log.info("图片 {} Event结束({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode())); log.debug("图片 {} Event结束({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
cacheQueue.remove(event); cacheQueue.remove(event);
} }
} }