优化

gedoor · Mar 10, 2019 · a86a1d9 · a86a1d9
1 parent 8162119
commit a86a1d9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
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
@@ -109,9 +109,9 @@ private AnalyzeByJSoup getAnalyzeByJSoup() {
     private AnalyzeByJSonPath getAnalyzeByJSonPath(Object o) {
         if (o != null) {
             if (o instanceof String) {
-                return new AnalyzeByJSonPath().parse(_object.toString());
+                return new AnalyzeByJSonPath().parse(o.toString());
             }
-            return new AnalyzeByJSonPath().parse(_object);
+            return new AnalyzeByJSonPath().parse(o);
         }
         return getAnalyzeByJSonPath();
     }
@@ -129,12 +129,12 @@ private AnalyzeByJSonPath getAnalyzeByJSonPath() {
         return analyzeByJSonPath;
     }
 
-    public List<String> getStringList(String rule) {
+    public List<String> getStringList(String rule) throws ScriptException {
         return getStringList(rule, null);
     }
 
     @SuppressWarnings("unchecked")
-    public List<String> getStringList(String ruleStr, String baseUrl) {
+    public List<String> getStringList(String ruleStr, String baseUrl) throws ScriptException {
         Object result = null;
         List<SourceRule> ruleList = splitSourceRule(ruleStr);
         for (SourceRule rule : ruleList) {
@@ -167,11 +167,11 @@ public List<String> getStringList(String ruleStr, String baseUrl) {
         return (List<String>) result;
     }
 
-    public String getString(String rule) {
+    public String getString(String rule) throws ScriptException {
         return getString(rule, null);
     }
 
-    public String getString(String ruleStr, String _baseUrl) {
+    public String getString(String ruleStr, String _baseUrl) throws ScriptException {
         if (StringUtils.isTrimEmpty(ruleStr)) {
             return null;
         }
@@ -205,7 +205,7 @@ public String getString(String ruleStr, String _baseUrl) {
         return result;
     }
 
-    public AnalyzeCollection getElements(String ruleStr) {
+    public AnalyzeCollection getElements(String ruleStr) throws ScriptException {
         Object result = null;
         AnalyzeCollection collection = null;
         List<SourceRule> ruleList = splitSourceRule(ruleStr);
@@ -228,7 +228,7 @@ public AnalyzeCollection getElements(String ruleStr) {
         return collection;
     }
 
-    private void analyzeVariable(Map<String, String> putVariable) {
+    private void analyzeVariable(Map<String, String> putVariable) throws ScriptException {
         for (Map.Entry<String, String> entry : putVariable.entrySet()) {
             if (book != null) {
                 book.putVariable(entry.getKey(), getString(entry.getValue()));
@@ -329,17 +329,12 @@ private static class EngineHelper {
         private static final ScriptEngine INSTANCE = new ScriptEngineManager().getEngineByName("rhino");
     }
 
-    private Object evalJS(String jsStr, Object result, String baseUrl) {
+    private Object evalJS(String jsStr, Object result, String baseUrl) throws ScriptException {
         SimpleBindings bindings = new SimpleBindings();
         bindings.put("java", this);
         bindings.put("result", result);
         bindings.put("baseUrl", baseUrl);
-        try {
-            result = EngineHelper.INSTANCE.eval(jsStr, bindings);
-        } catch (ScriptException e) {
-            return e.getLocalizedMessage();
-        }
-        return result;
+        return EngineHelper.INSTANCE.eval(jsStr, bindings);
     }
 
     /**

diff --git a/app/src/main/java/com/kunfei/bookshelf/model/content/BookChapter.java b/app/src/main/java/com/kunfei/bookshelf/model/content/BookChapter.java
@@ -16,6 +16,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.script.ScriptException;
+
 import io.reactivex.Observable;
 import retrofit2.Response;
 
@@ -97,7 +99,7 @@ Observable<List<ChapterListBean>> analyzeChapterList(final String s, final BookS
         });
     }
 
-    private WebChapterBean<List<ChapterListBean>> analyzeChapterList(String s, String chapterUrl, String ruleChapterList) {
+    private WebChapterBean<List<ChapterListBean>> analyzeChapterList(String s, String chapterUrl, String ruleChapterList) throws ScriptException {
         List<ChapterListBean> chapterBeans = new ArrayList<>();
         List<String> nextUrlList = new ArrayList<>();
 

diff --git a/app/src/main/java/com/kunfei/bookshelf/model/content/BookContent.java b/app/src/main/java/com/kunfei/bookshelf/model/content/BookContent.java
@@ -19,6 +19,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.script.ScriptException;
+
 import io.reactivex.Observable;
 import retrofit2.Response;
 
@@ -96,7 +98,7 @@ Observable<BookContentBean> analyzeBookContent(final String s, final BaseChapter
         });
     }
 
-    private WebContentBean analyzeBookContent(final String s, final String chapterUrl) {
+    private WebContentBean analyzeBookContent(final String s, final String chapterUrl) throws ScriptException {
         WebContentBean webContentBean = new WebContentBean();
 
         AnalyzeRule analyzer = new AnalyzeRule(null);

diff --git a/app/src/main/java/com/kunfei/bookshelf/model/content/BookList.java b/app/src/main/java/com/kunfei/bookshelf/model/content/BookList.java
@@ -13,6 +13,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.script.ScriptException;
+
 import io.reactivex.Observable;
 import retrofit2.Response;
 
@@ -98,7 +100,7 @@ Observable<List<SearchBookBean>> analyzeSearchBook(final Response<String> respon
         });
     }
 
-    private SearchBookBean getItem(AnalyzeRule analyzer, String baseUrl) {
+    private SearchBookBean getItem(AnalyzeRule analyzer, String baseUrl) throws ScriptException {
         SearchBookBean item = new SearchBookBean();
         analyzer.setBook(item);
         String bookName = analyzer.getString(bookSourceBean.getRuleBookName());
@@ -116,7 +118,7 @@ private SearchBookBean getItem(AnalyzeRule analyzer, String baseUrl) {
         return null;
     }
 
-    private SearchBookBean getItemInList(AnalyzeRule analyzer, String baseUrl) {
+    private SearchBookBean getItemInList(AnalyzeRule analyzer, String baseUrl) throws ScriptException {
         SearchBookBean item = new SearchBookBean();
         analyzer.setBook(item);
         String bookName = analyzer.getString(bookSourceBean.getRuleSearchName());