|
|
@ -306,8 +306,11 @@ public class Book implements Serializable, RuleDataInterface { |
|
|
|
if (this == o) return true; |
|
|
|
if (this == o) return true; |
|
|
|
if (o == null || getClass() != o.getClass()) return false; |
|
|
|
if (o == null || getClass() != o.getClass()) return false; |
|
|
|
Book book = (Book) o; |
|
|
|
Book book = (Book) o; |
|
|
|
|
|
|
|
boolean flag = chapterUrl == null ? |
|
|
|
|
|
|
|
(infoUrl == null || infoUrl.equals(book.infoUrl)) : |
|
|
|
|
|
|
|
chapterUrl.equals(book.chapterUrl); |
|
|
|
return name.equals(book.name) && |
|
|
|
return name.equals(book.name) && |
|
|
|
chapterUrl.equals(book.chapterUrl) && |
|
|
|
flag && author != null && |
|
|
|
author.equals(book.author) && |
|
|
|
author.equals(book.author) && |
|
|
|
source.equals(book.source); |
|
|
|
source.equals(book.source); |
|
|
|
} |
|
|
|
} |
|
|
@ -396,6 +399,9 @@ public class Book implements Serializable, RuleDataInterface { |
|
|
|
if (variableMap == null && !TextUtils.isEmpty(variable)) { |
|
|
|
if (variableMap == null && !TextUtils.isEmpty(variable)) { |
|
|
|
variableMap = GsonExtensionsKt.getGSON().fromJson(variable, MAP_STRING); |
|
|
|
variableMap = GsonExtensionsKt.getGSON().fromJson(variable, MAP_STRING); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (variableMap == null) { |
|
|
|
|
|
|
|
variableMap = new HashMap<>(); |
|
|
|
|
|
|
|
} |
|
|
|
return variableMap; |
|
|
|
return variableMap; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -423,8 +429,8 @@ public class Book implements Serializable, RuleDataInterface { |
|
|
|
catheMap.put(key, value); |
|
|
|
catheMap.put(key, value); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getCathe(String key){ |
|
|
|
public String getCathe(String key) { |
|
|
|
if (catheMap == null){ |
|
|
|
if (catheMap == null) { |
|
|
|
return ""; |
|
|
|
return ""; |
|
|
|
} |
|
|
|
} |
|
|
|
return catheMap.get(key); |
|
|
|
return catheMap.get(key); |
|
|
@ -434,7 +440,7 @@ public class Book implements Serializable, RuleDataInterface { |
|
|
|
this.catheMap = catheMap; |
|
|
|
this.catheMap = catheMap; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void clearCathe(){ |
|
|
|
public void clearCathe() { |
|
|
|
if (catheMap != null) { |
|
|
|
if (catheMap != null) { |
|
|
|
catheMap.clear(); |
|
|
|
catheMap.clear(); |
|
|
|
} |
|
|
|
} |
|
|
@ -454,7 +460,7 @@ public class Book implements Serializable, RuleDataInterface { |
|
|
|
return getVariableMap().get(key); |
|
|
|
return getVariableMap().get(key); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public Book changeSource(Book newBook){ |
|
|
|
public Book changeSource(Book newBook) { |
|
|
|
Book bookTem = (Book) clone(); |
|
|
|
Book bookTem = (Book) clone(); |
|
|
|
bookTem.clearCathe(); |
|
|
|
bookTem.clearCathe(); |
|
|
|
bookTem.setChapterUrl(newBook.getChapterUrl()); |
|
|
|
bookTem.setChapterUrl(newBook.getChapterUrl()); |
|
|
@ -482,9 +488,11 @@ public class Book implements Serializable, RuleDataInterface { |
|
|
|
bookTem.setVariable(newBook.getVariable()); |
|
|
|
bookTem.setVariable(newBook.getVariable()); |
|
|
|
bookTem.setVariableMap(newBook.getVariableMap()); |
|
|
|
bookTem.setVariableMap(newBook.getVariableMap()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (newBook.getCatheMap() != null){ |
|
|
|
if (newBook.getCatheMap() != null) { |
|
|
|
bookTem.setCatheMap(newBook.getCatheMap()); |
|
|
|
bookTem.setCatheMap(newBook.getCatheMap()); |
|
|
|
} |
|
|
|
} |
|
|
|
return bookTem; |
|
|
|
return bookTem; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setReverseToc(boolean reverseToc){} |
|
|
|
} |
|
|
|
} |
|
|
|