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

Merge branch 'add-MultiProperties'

Browse Source
This commit is contained in:
LamGC 2020-05-06 11:08:16 +08:00
commit f452c1c128
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java
View File

@ -64,9 +64,10 @@ public class BotAdminCommandProcess {
@Command @Command
public static String saveProperties() { public static String saveProperties() {
log.info("正在保存全局配置文件..."); log.info("正在保存配置文件...");
SettingProperties.saveProperties(); SettingProperties.saveProperties();
return "保存全局配置文件 - 操作已完成."; log.info("配置文件保存操作已完成.");
return "保存配置 - 操作已完成.";
} }
@Command @Command

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

@ -218,7 +218,7 @@ public class BotCommandProcess {
try { try {
int index = 0; int index = 0;
int itemLimit = 10; int itemLimit = 10;
String itemLimitPropertyKey = "ranking.ItemCountLimit"; String itemLimitPropertyKey = "ranking.itemCountLimit";
try { try {
itemLimit = Integer.parseInt(SettingProperties itemLimit = Integer.parseInt(SettingProperties
.getProperty(SettingProperties.GLOBAL, itemLimitPropertyKey, "10")); .getProperty(SettingProperties.GLOBAL, itemLimitPropertyKey, "10"));
@ -379,7 +379,7 @@ public class BotCommandProcess {
int limit = 8; int limit = 8;
try { try {
limit = Integer.parseInt(SettingProperties. limit = Integer.parseInt(SettingProperties.
getProperty(SettingProperties.GLOBAL, "search.ItemCountLimit", "8")); getProperty(SettingProperties.GLOBAL, "search.itemCountLimit", "8"));
} catch (Exception e) { } catch (Exception e) {
log.warn("参数转换异常!将使用默认值(" + limit + ")", e); log.warn("参数转换异常!将使用默认值(" + limit + ")", e);
} }
@ -424,7 +424,7 @@ public class BotCommandProcess {
//pageCount //pageCount
String imageMsg = getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1); String imageMsg = getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
if (isNoSafe(illustId, SettingProperties.getProperties(SettingProperties.GLOBAL), true)) { if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), true)) {
log.warn("作品Id {} 为R-18作品, 跳过.", illustId); log.warn("作品Id {} 为R-18作品, 跳过.", illustId);
continue; continue;
} else if(isReported(illustId)) { } else if(isReported(illustId)) {

11
src/main/java/net/lamgc/cgj/bot/SettingProperties.java
View File

@ -186,7 +186,13 @@ public final class SettingProperties {
*/ */
public static String setProperty(long groupId, String key, String value) { public static String setProperty(long groupId, String key, String value) {
Objects.requireNonNull(key); Objects.requireNonNull(key);
Properties targetProperties = groupId <= 0 ? globalProp : getGroupProperties(groupId); Properties targetProperties;
if(groupId <= 0) {
changeList.add(groupId);
targetProperties = getGroupProperties(groupId);
} else {
targetProperties = globalProp;
}
String lastValue = targetProperties.getProperty(key); String lastValue = targetProperties.getProperty(key);
if(value != null) { if(value != null) {
targetProperties.setProperty(key, value); targetProperties.setProperty(key, value);
@ -214,6 +220,9 @@ public final class SettingProperties {
if (groupId <= 0) { if (groupId <= 0) {
throw new IllegalArgumentException("Group number cannot be 0 or negative: " + groupId); throw new IllegalArgumentException("Group number cannot be 0 or negative: " + groupId);
} }
if(!groupPropMap.containsKey(groupId)) {
groupPropMap.put(groupId, new Properties(globalProp));
}
return groupPropMap.get(groupId); return groupPropMap.get(groupId);
} }