优化

gedoor · Jan 1, 2019 · 60899b2 · 60899b2
1 parent 48010f4
commit 60899b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md
@@ -4,6 +4,7 @@
 **2019/01/01**
 * 祝大家元旦快乐
 * 修复不显示再按一次退出程序的BUG
+* 支持不写规则用js直接处理网页内容
 
 **2018/12/30**
 * 目录和书签可以滑动切换

diff --git a/app/src/main/java/com/kunfei/bookshelf/model/analyzeRule/AnalyzeRule.java b/app/src/main/java/com/kunfei/bookshelf/model/analyzeRule/AnalyzeRule.java
@@ -147,7 +147,7 @@ public AnalyzeCollection getElements(String rule) {
         if (!StringUtils.isTrimEmpty(source.rule)) {
             switch (source.mode) {
                 case JSon:
-                    collection = new AnalyzeCollection(getAnalyzeByJSonPath().readList(source.rule), _isJSON);
+                    collection = new AnalyzeCollection(getAnalyzeByJSonPath().readList(source.rule), true);
                     break;
                 case XPath:
                     collection = new AnalyzeCollection(getAnalyzeByXPath().getElements(source.rule));
@@ -171,8 +171,6 @@ class SourceRule {
         String js;
 
         SourceRule(String ruleStr) {
-            if (_isJSON && !StringUtils.startWithIgnoreCase(ruleStr, "@JSON:"))
-                throw new AssertionError("Content analyze");
             String str[] = ruleStr.split("@js:");
             if (StringUtils.startWithIgnoreCase(str[0], "@XPath:")) {
                 mode = Mode.XPath;
@@ -181,7 +179,11 @@ class SourceRule {
                 mode = Mode.JSon;
                 rule = str[0].substring(6);
             } else {
-                mode = Mode.Default;
+                if (_isJSON) {
+                    mode = Mode.JSon;
+                } else {
+                    mode = Mode.Default;
+                }
                 rule = str[0];
             }
             if (str.length > 1) {