diff --git a/app/src/main/java/xyz/fycz/myreader/model/SearchEngine.java b/app/src/main/java/xyz/fycz/myreader/model/SearchEngine.java index c282310..6f52800 100644 --- a/app/src/main/java/xyz/fycz/myreader/model/SearchEngine.java +++ b/app/src/main/java/xyz/fycz/myreader/model/SearchEngine.java @@ -13,15 +13,13 @@ import xyz.fycz.myreader.application.App; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.SharedPreUtils; import xyz.fycz.myreader.util.ToastUtils; import xyz.fycz.myreader.webapi.CommonApi; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; @@ -140,14 +138,14 @@ public class SearchEngine { CommonApi.search(keyword, crawler) .subscribeOn(scheduler) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { + .subscribe(new Observer>() { @Override public void onSubscribe(Disposable d) { compositeDisposable.add(d); } @Override - public void onNext(ConcurrentMultiValueMap bookSearchBeans) { + public void onNext(ConMVMap bookSearchBeans) { searchFinishNum++; if (bookSearchBeans != null) { searchSuccessNum++; @@ -183,17 +181,18 @@ public class SearchEngine { searchSiteIndex++; if (searchSiteIndex < mSourceList.size()) { ReadCrawler crawler = mSourceList.get(searchSiteIndex); - CommonApi.search(title, crawler) + String searchKey = title; + CommonApi.search(searchKey, crawler) .subscribeOn(scheduler) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { + .subscribe(new Observer>() { @Override public void onSubscribe(Disposable d) { compositeDisposable.add(d); } @Override - public void onNext(ConcurrentMultiValueMap bookSearchBeans) { + public void onNext(ConMVMap bookSearchBeans) { searchFinishNum++; if (bookSearchBeans != null) { List books = bookSearchBeans.getValues(new SearchBookBean(title, author)); @@ -262,7 +261,7 @@ public class SearchEngine { void loadMoreFinish(Boolean isAll); - void loadMoreSearchBook(ConcurrentMultiValueMap items); + void loadMoreSearchBook(ConMVMap items); void loadMoreSearchBook(List items); diff --git a/app/src/main/java/xyz/fycz/myreader/model/mulvalmap/ConcurrentMultiValueMap.java b/app/src/main/java/xyz/fycz/myreader/model/mulvalmap/ConMVMap.java similarity index 95% rename from app/src/main/java/xyz/fycz/myreader/model/mulvalmap/ConcurrentMultiValueMap.java rename to app/src/main/java/xyz/fycz/myreader/model/mulvalmap/ConMVMap.java index e42625e..85e1a74 100644 --- a/app/src/main/java/xyz/fycz/myreader/model/mulvalmap/ConcurrentMultiValueMap.java +++ b/app/src/main/java/xyz/fycz/myreader/model/mulvalmap/ConMVMap.java @@ -7,17 +7,17 @@ import java.util.concurrent.ConcurrentHashMap; * @author fengyue * @date 2020/5/19 7:36 */ - -public class ConcurrentMultiValueMap implements MultiValueSetMap { +public class ConMVMap implements MultiValueSetMap { protected Map> mSource = new ConcurrentHashMap<>(); - public ConcurrentMultiValueMap() { + public ConMVMap() { } @Override public void add(K key, V value) { if (key != null) { + if (value == null) return; // 如果有这个Key就继续添加Value，没有就创建一个List并添加Value if (!mSource.containsKey(key)) mSource.put(key, new LinkedHashSet(2)); diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java index b8e6fc1..96073ef 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java @@ -210,7 +210,7 @@ public class BookDetailedActivity extends BaseActivity { binding.ic.bookDetailRvCatalog.setLayoutManager(new LinearLayoutManager(this)); binding.ic.bookDetailRvCatalog.setAdapter(mCatalogAdapter); - if (!thirdSource) initChapters(false); + if (!thirdSource || isCollected) initChapters(false); mCatalogAdapter.setOnItemClickListener((view, pos) -> { mBook.setHisttoryChapterNum(mChapters.size() - pos - 1); @@ -399,11 +399,12 @@ public class BookDetailedActivity extends BaseActivity { mBook.setImgUrl(""); } initTagList(); - binding.ic.bookDetailTvDesc.setText(""); + if (StringHelper.isEmpty(mBook.getDesc())) + binding.ic.bookDetailTvDesc.setText(""); BookSource source = BookSourceManager.getBookSourceByStr(mBook.getSource()); binding.ih.bookDetailSource.setText(String.format("书源：%s", source.getSourceName())); ReadCrawler rc = ReadCrawlerUtil.getReadCrawler(source); - if ((rc instanceof BookInfoCrawler && StringHelper.isEmpty(mBook.getImgUrl())) || thirdSource) { + if ((rc instanceof BookInfoCrawler && StringHelper.isEmpty(mBook.getImgUrl())) || (thirdSource && !isCollected)) { binding.pbLoading.setVisibility(View.VISIBLE); BookInfoCrawler bic = (BookInfoCrawler) rc; CommonApi.getBookInfo(mBook, bic).compose(RxUtils::toSimpleSingle).subscribe(new MyObserver() { @@ -420,6 +421,9 @@ public class BookDetailedActivity extends BaseActivity { @Override public void onError(Throwable e) { ToastUtils.showError("书籍详情加载失败！"); + if (thirdSource){ + initChapters(false); + } if (App.isDebug()) e.printStackTrace(); } }); diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/SearchBookActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/SearchBookActivity.java index d1c809c..bf0cc99 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/SearchBookActivity.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/SearchBookActivity.java @@ -48,7 +48,7 @@ import xyz.fycz.myreader.greendao.entity.SearchHistory; import xyz.fycz.myreader.greendao.entity.rule.BookSource; import xyz.fycz.myreader.greendao.service.SearchHistoryService; import xyz.fycz.myreader.model.SearchEngine; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.model.sourceAnalyzer.BookSourceManager; import xyz.fycz.myreader.ui.adapter.SearchBookAdapter; import xyz.fycz.myreader.ui.adapter.SearchHistoryAdapter; @@ -73,7 +73,7 @@ public class SearchBookActivity extends BaseActivity { private SearchBookAdapter mSearchBookAdapter; private String searchKey;//搜索关键字 private ArrayList mBooksBean = new ArrayList<>(); - private ConcurrentMultiValueMap mBooks = new ConcurrentMultiValueMap<>(); + private ConMVMap mBooks = new ConMVMap<>(); private ArrayList mSearchHistories = new ArrayList<>(); private ArrayList mSuggestions = new ArrayList<>(); @@ -147,7 +147,7 @@ public class SearchBookActivity extends BaseActivity { } @Override - public void loadMoreSearchBook(ConcurrentMultiValueMap items) { + public void loadMoreSearchBook(ConMVMap items) { mBooks.addAll(items); mSearchBookAdapter.addAll(new ArrayList<>(items.keySet()), searchKey); mHandler.sendMessage(mHandler.obtainMessage(2)); @@ -543,6 +543,7 @@ public class SearchBookActivity extends BaseActivity { mSearchBookAdapter.setOnItemClickListener((view, pos) -> { SearchBookBean data = mSearchBookAdapter.getItem(pos); ArrayList books = (ArrayList) mBooks.getValues(data); + if (books == null || books.size() == 0) return; searchBookBean2Book(data, books.get(0)); Intent intent = new Intent(this, BookDetailedActivity.class); intent.putExtra(APPCONST.SEARCH_BOOK_BEAN, books); diff --git a/app/src/main/java/xyz/fycz/myreader/ui/adapter/SearchBookAdapter.java b/app/src/main/java/xyz/fycz/myreader/ui/adapter/SearchBookAdapter.java index a8b067d..940a575 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/adapter/SearchBookAdapter.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/adapter/SearchBookAdapter.java @@ -10,7 +10,7 @@ import xyz.fycz.myreader.base.adapter.IViewHolder; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.model.SearchEngine; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.ui.adapter.holder.SearchBookHolder; import xyz.fycz.myreader.util.utils.StringUtils; @@ -24,11 +24,11 @@ import java.util.List; */ public class SearchBookAdapter extends BaseListAdapter { private Activity activity; - private ConcurrentMultiValueMap mBooks; + private ConMVMap mBooks; private SearchEngine searchEngine; private String keyWord; - public SearchBookAdapter(Activity activity, ConcurrentMultiValueMap mBooks, SearchEngine searchEngine, String keyWord) { + public SearchBookAdapter(Activity activity, ConMVMap mBooks, SearchEngine searchEngine, String keyWord) { this.activity = activity; this.mBooks = mBooks; this.searchEngine = searchEngine; @@ -37,7 +37,7 @@ public class SearchBookAdapter extends BaseListAdapter { @Override protected IViewHolder createViewHolder(int viewType) { - return new SearchBookHolder(activity, mBooks, searchEngine, keyWord); + return new SearchBookHolder(activity, mBooks, searchEngine, keyWord, this); } public void addAll(List newDataS, String keyWord) { @@ -110,7 +110,6 @@ public class SearchBookAdapter extends BaseListAdapter { } } } - synchronized (this) { App.runOnUiThread(() -> { mList = copyDataS; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/adapter/holder/SearchBookHolder.java b/app/src/main/java/xyz/fycz/myreader/ui/adapter/holder/SearchBookHolder.java index 2773cb4..8ce448b 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/adapter/holder/SearchBookHolder.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/adapter/holder/SearchBookHolder.java @@ -17,9 +17,10 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.rule.BookSource; import xyz.fycz.myreader.model.SearchEngine; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.model.sourceAnalyzer.BookSourceManager; import xyz.fycz.myreader.ui.adapter.BookTagAdapter; +import xyz.fycz.myreader.ui.adapter.SearchBookAdapter; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.util.utils.KeyWordUtils; import xyz.fycz.myreader.util.utils.NetworkUtils; @@ -34,12 +35,12 @@ import xyz.fycz.myreader.widget.CoverImageView; */ public class SearchBookHolder extends ViewHolderImpl { private Activity activity; - private ConcurrentMultiValueMap mBooks; + private ConMVMap mBooks; private SearchEngine searchEngine; private String keyWord; private List tagList = new ArrayList<>(); - public SearchBookHolder(Activity activity, ConcurrentMultiValueMap mBooks, SearchEngine searchEngine, String keyWord) { + public SearchBookHolder(Activity activity, ConMVMap mBooks, SearchEngine searchEngine, String keyWord, SearchBookAdapter adapter) { this.activity = activity; this.mBooks = mBooks; this.searchEngine = searchEngine; @@ -76,6 +77,9 @@ public class SearchBookHolder extends ViewHolderImpl { @Override public void onBind(SearchBookBean data, int pos) { List aBooks = mBooks.getValues(data); + if (aBooks == null || aBooks.size() == 0){ + return; + } int bookCount = aBooks.size(); Book book = aBooks.get(0); BookSource source = BookSourceManager.getBookSourceByStr(book.getSource()); diff --git a/app/src/main/java/xyz/fycz/myreader/ui/dialog/SourceExchangeDialog.java b/app/src/main/java/xyz/fycz/myreader/ui/dialog/SourceExchangeDialog.java index 0e06454..5cab1f3 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/dialog/SourceExchangeDialog.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/dialog/SourceExchangeDialog.java @@ -19,7 +19,7 @@ import xyz.fycz.myreader.databinding.DialogBookSourceBinding; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.model.SearchEngine; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.ui.adapter.SourceExchangeAdapter; import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil; import xyz.fycz.myreader.widget.RefreshProgressBar; @@ -140,7 +140,7 @@ public class SourceExchangeDialog extends Dialog { } @Override - public void loadMoreSearchBook(ConcurrentMultiValueMap items) { + public void loadMoreSearchBook(ConMVMap items) { } diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java b/app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java index eb823eb..d006181 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java @@ -1,11 +1,8 @@ package xyz.fycz.myreader.webapi; -import android.text.TextUtils; - import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.List; -import java.util.Objects; import java.util.regex.Matcher; import io.reactivex.Observable; @@ -15,17 +12,15 @@ import io.reactivex.functions.Function; import okhttp3.MediaType; import okhttp3.RequestBody; import xyz.fycz.myreader.entity.SearchBookBean; -import xyz.fycz.myreader.entity.StrResponse; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; import xyz.fycz.myreader.greendao.entity.rule.BookSource; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.model.third.analyzeRule.AnalyzeUrl; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; import xyz.fycz.myreader.model.third.content.BookChapterList; import xyz.fycz.myreader.model.third.content.BookContent; import xyz.fycz.myreader.model.third.content.BookInfo; import xyz.fycz.myreader.model.third.content.BookList; -import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.util.utils.NetworkUtils; import xyz.fycz.myreader.util.utils.OkHttpUtils; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -141,7 +136,7 @@ public class CommonApi { * * @param key */ - public static Observable> search(String key, final ReadCrawler rc) { + public static Observable> search(String key, final ReadCrawler rc) { if (rc instanceof ThirdCrawler) { return searchByTC(key, (ThirdCrawler) rc); } @@ -192,14 +187,14 @@ public class CommonApi { * @param rc * @return */ - public static Observable> searchByTC(String key, final ThirdCrawler rc) { + public static Observable> searchByTC(String key, final ThirdCrawler rc) { try { BookSource source = rc.getSource(); AnalyzeUrl analyzeUrl = new AnalyzeUrl(source.getSearchRule().getSearchUrl(), key, 1, null, source.getSourceUrl()); BookList bookList = new BookList(source.getSourceUrl(), source.getSourceName(), source, false); return OkHttpUtils.getStrResponse(analyzeUrl).flatMap(bookList::analyzeSearchBook) - .flatMap((Function, ObservableSource>>) books -> Observable.create((ObservableOnSubscribe>) emitter -> { + .flatMap((Function, ObservableSource>>) books -> Observable.create((ObservableOnSubscribe>) emitter -> { emitter.onNext(rc.getBooks(books)); emitter.onComplete(); })); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseReadCrawler.java index f80be5e..f4fabd6 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseReadCrawler.java @@ -4,10 +4,9 @@ import java.util.ArrayList; import java.util.Map; import xyz.fycz.myreader.entity.SearchBookBean; -import xyz.fycz.myreader.entity.StrResponse; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; /** * 因新版书源使用StrResponse，为了兼容旧版本，书源全部继承自此类 @@ -21,7 +20,7 @@ public abstract class BaseReadCrawler implements ReadCrawler { } @Override - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { + public ConMVMap getBooksFromSearchHtml(String html) { return null; } diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawler.java index f99e04d..a3673a6 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawler.java @@ -19,7 +19,7 @@ import xyz.fycz.myreader.greendao.entity.rule.BookSource; import xyz.fycz.myreader.greendao.entity.rule.InfoRule; import xyz.fycz.myreader.greendao.entity.rule.SearchRule; import xyz.fycz.myreader.greendao.entity.rule.TocRule; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.model.sourceAnalyzer.BaseAnalyzer; import xyz.fycz.myreader.model.sourceAnalyzer.MatcherAnalyzer; import xyz.fycz.myreader.util.StringHelper; @@ -82,7 +82,7 @@ public abstract class BaseSourceCrawler extends BaseReadCrawler implements BookI * @param searchRule * @param books */ - protected void getBooksNoList(Object obj, SearchRule searchRule, ConcurrentMultiValueMap books) { + protected void getBooksNoList(Object obj, SearchRule searchRule, ConMVMap books) { List names = analyzer.getStringList(searchRule.getName(), obj); //未搜索到书籍，按详情页处理 if (names.size() == 0) { @@ -133,7 +133,7 @@ public abstract class BaseSourceCrawler extends BaseReadCrawler implements BookI * @param searchRule * @param books */ - protected void getBooks(Object obj, SearchRule searchRule, ConcurrentMultiValueMap books) { + protected void getBooks(Object obj, SearchRule searchRule, ConMVMap books) { List bookList = getList(searchRule.getList(), obj); if (bookList.size() == 0) { Book book = new Book(); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawlerNoInfo.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawlerNoInfo.java index a7776c0..84b9c44 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawlerNoInfo.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/BaseSourceCrawlerNoInfo.java @@ -6,8 +6,7 @@ import java.util.Map; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.greendao.entity.rule.BookSource; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; /** * @author fengyue @@ -46,7 +45,7 @@ public class BaseSourceCrawlerNoInfo extends BaseReadCrawler { } @Override - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { + public ConMVMap getBooksFromSearchHtml(String html) { return crawler.getBooksFromSearchHtml(html); } diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/ReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/ReadCrawler.java index cbaa5da..44e2305 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/ReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/base/ReadCrawler.java @@ -1,10 +1,9 @@ package xyz.fycz.myreader.webapi.crawler.base; import xyz.fycz.myreader.entity.SearchBookBean; -import xyz.fycz.myreader.entity.StrResponse; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import java.util.ArrayList; import java.util.Map; @@ -21,7 +20,7 @@ public interface ReadCrawler { String getNameSpace(); // 书源主页地址 Boolean isPost(); // 是否以post请求搜索 Map getHeaders();// 自定义请求头，可添加cookie等 - ConcurrentMultiValueMap getBooksFromSearchHtml(String html); // 搜索书籍规则 + ConMVMap getBooksFromSearchHtml(String html); // 搜索书籍规则 ArrayList getChaptersFromHtml(String html); // 获取书籍章节列表规则 String getContentFormHtml(String html); // 获取书籍内容规则 } diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/Ben100FindCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/Ben100FindCrawler.java index 573d482..b22380d 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/Ben100FindCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/Ben100FindCrawler.java @@ -1,7 +1,5 @@ package xyz.fycz.myreader.webapi.crawler.find; -import android.text.Html; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -11,15 +9,10 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; -import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.entity.bookstore.BookType; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; -import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; -import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; import xyz.fycz.myreader.webapi.crawler.base.FindCrawler; -import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler; @Deprecated public class Ben100FindCrawler extends FindCrawler { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/MiaoBiFindCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/MiaoBiFindCrawler.java index bb9cd24..6d95296 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/MiaoBiFindCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/MiaoBiFindCrawler.java @@ -1,7 +1,5 @@ package xyz.fycz.myreader.webapi.crawler.find; -import android.text.Html; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -11,14 +9,10 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; -import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.entity.bookstore.BookType; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; -import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; import xyz.fycz.myreader.webapi.crawler.base.FindCrawler; -import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler; public class MiaoBiFindCrawler extends FindCrawler { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/XS7FindCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/XS7FindCrawler.java index 1097bb7..dc481ad 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/XS7FindCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/XS7FindCrawler.java @@ -1,7 +1,5 @@ package xyz.fycz.myreader.webapi.crawler.find; -import android.text.Html; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -10,14 +8,10 @@ import org.jsoup.select.Elements; import java.util.ArrayList; import java.util.List; -import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.entity.bookstore.BookType; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; -import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; import xyz.fycz.myreader.webapi.crawler.base.FindCrawler; -import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler; public class XS7FindCrawler extends FindCrawler{ diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Ben100ReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Ben100ReadCrawler.java index 7c1e90c..045fc7a 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Ben100ReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Ben100ReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -102,8 +102,8 @@ public class Ben100ReadCrawler extends BaseReadCrawler implements BookInfoCrawle * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Elements divs = doc.getElementsByClass("recommand"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiJianReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiJianReadCrawler.java index 4c0d7c0..b5a419c 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiJianReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiJianReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -98,8 +98,8 @@ public class BiJianReadCrawler extends BaseReadCrawler { * 小说详情 * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("book-list"); Element div = divs.get(0); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGe44ReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGe44ReadCrawler.java index c70a730..f0d3b4a 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGe44ReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGe44ReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -108,8 +108,8 @@ public class BiQuGe44ReadCrawler extends BaseReadCrawler implements BookInfoCraw * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByTag("table"); Element div = divs.get(0); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGeReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGeReadCrawler.java index 029f724..bce7adb 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGeReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/BiQuGeReadCrawler.java @@ -10,7 +10,7 @@ import xyz.fycz.myreader.entity.bookstore.BookType; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -160,8 +160,8 @@ public class BiQuGeReadCrawler extends BaseReadCrawler implements BookInfoCrawle * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - final ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + final ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String urlType = doc.select("meta[property=og:type]").attr("content"); if ("novel".equals(urlType)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/CansShu99ReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/CansShu99ReadCrawler.java index e2076fa..a7c15e5 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/CansShu99ReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/CansShu99ReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import java.util.ArrayList; @@ -101,8 +101,8 @@ public class CansShu99ReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Elements divs = doc.getElementsByClass("list_box"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChaoXingReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChaoXingReadCrawler.java index d57c2be..638ba74 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChaoXingReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChaoXingReadCrawler.java @@ -12,7 +12,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import java.util.ArrayList; @@ -103,8 +103,8 @@ public class ChaoXingReadCrawler extends BaseReadCrawler { * @param json * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String json) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String json) { + ConMVMap books = new ConMVMap<>(); try { JSONArray booksArray = new JSONArray(json); for (int i = 0; i < booksArray.length(); i++) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChuanQiReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChuanQiReadCrawler.java index c98517c..9518ce3 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChuanQiReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ChuanQiReadCrawler.java @@ -14,7 +14,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @Deprecated @@ -126,8 +126,8 @@ public class ChuanQiReadCrawler extends BaseReadCrawler { */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { String urlType = doc.select("meta[property=og:type]").attr("content"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/DSTQReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/DSTQReadCrawler.java index 69cf87b..51b40bb 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/DSTQReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/DSTQReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -95,8 +95,8 @@ public class DSTQReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); try { Element div = doc.getElementsByClass("library").first(); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Du1DuReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Du1DuReadCrawler.java index 4c5359d..73dfe4b 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Du1DuReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/Du1DuReadCrawler.java @@ -12,7 +12,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -102,8 +102,8 @@ public class Du1DuReadCrawler extends BaseReadCrawler implements BookInfoCrawler * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("panel-body"); Element div = divs.get(0); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/EWenXueReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/EWenXueReadCrawler.java index 8304db4..7b11daa 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/EWenXueReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/EWenXueReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -110,8 +110,8 @@ public class EWenXueReadCrawler extends BaseReadCrawler implements BookInfoCrawl *
2019-07-05 16:03
* */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements elements = doc.getElementsByClass("clearfix"); for (int i = 1; i < elements.size(); i++) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/FYReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/FYReadCrawler.java index b14ce7f..ab00c34 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/FYReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/FYReadCrawler.java @@ -11,7 +11,7 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import java.util.ArrayList; @@ -98,8 +98,8 @@ public class FYReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements nodes = doc.getElementsByClass("secd-rank-list"); for (Element div : nodes) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/HongChenReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/HongChenReadCrawler.java index 32a6cab..d66429a 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/HongChenReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/HongChenReadCrawler.java @@ -14,7 +14,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -123,8 +123,8 @@ public class HongChenReadCrawler extends BaseReadCrawler { */ @Deprecated - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Element div = doc.getElementsByClass("s-b-list").first(); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/JiuTaoReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/JiuTaoReadCrawler.java index 7ff4104..bebe047 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/JiuTaoReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/JiuTaoReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import java.util.ArrayList; @@ -95,8 +95,8 @@ public class JiuTaoReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Element div = doc.getElementsByClass("library").first(); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LaoYaoReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LaoYaoReadCrawler.java index 4afc0bf..57a8755 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LaoYaoReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LaoYaoReadCrawler.java @@ -14,7 +14,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @Deprecated @@ -129,8 +129,8 @@ public class LaoYaoReadCrawler extends BaseReadCrawler { */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { String urlType = doc.select("meta[property=og:type]").attr("content"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LiuLangCatReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LiuLangCatReadCrawler.java index e02e384..dc09217 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LiuLangCatReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LiuLangCatReadCrawler.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; /** @@ -70,8 +70,8 @@ public class LiuLangCatReadCrawler extends BaseReadCrawler { * */ /*@Override - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Element div = doc.getElementById("booklist"); Elements lis = div.getElementsByTag("li"); @@ -103,8 +103,8 @@ public class LiuLangCatReadCrawler extends BaseReadCrawler { * */ @Override - public ConcurrentMultiValueMap getBooksFromSearchHtml(String json) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String json) { + ConMVMap books = new ConMVMap<>(); try { JSONArray array = new JSONArray(json); for (int i = 0; i < array.length(); i++) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LuoQiuReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LuoQiuReadCrawler.java index aa83ce5..78469ab 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LuoQiuReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/LuoQiuReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -111,8 +111,8 @@ public class LuoQiuReadCrawler extends BaseReadCrawler implements BookInfoCrawle * 连载 * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String urlType = doc.select("meta[property=og:type]").attr("content"); if ("novel".equals(urlType)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiQuReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiQuReadCrawler.java index fbecef5..56c5cfb 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiQuReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiQuReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -96,8 +96,8 @@ public class MiQuReadCrawler extends BaseReadCrawler implements BookInfoCrawler * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("lastest"); Element div = divs.get(0); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiaoBiReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiaoBiReadCrawler.java index 69e4fb6..6aa98d6 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiaoBiReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/MiaoBiReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -95,8 +95,8 @@ public class MiaoBiReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Element div = doc.getElementById("sitembox"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PiaoTianReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PiaoTianReadCrawler.java index bf763df..f20da90 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PiaoTianReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PiaoTianReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -96,8 +96,8 @@ public class PiaoTianReadCrawler extends BaseReadCrawler implements BookInfoCraw * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String urlType = doc.select("meta[property=og:type]").attr("content"); if ("novel".equals(urlType)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler.java index e84e316..1331dc2 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler.java @@ -10,7 +10,7 @@ import org.jsoup.select.Elements; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -108,8 +108,8 @@ public class PinShuReadCrawler extends BaseReadCrawler implements BookInfoCrawle * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Element div = doc.getElementById("Content"); Elements elementsSelected = div.select("[id=CListTitle]"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler2.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler2.java index 7510730..a979b70 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler2.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/PinShuReadCrawler2.java @@ -10,7 +10,7 @@ import org.jsoup.select.Elements; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -107,8 +107,8 @@ public class PinShuReadCrawler2 extends BaseReadCrawler implements BookInfoCrawl * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Element div = doc.getElementsByClass("booklist").first(); Elements divs = div.getElementsByClass("clearfix"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QB5ReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QB5ReadCrawler.java index 9686461..7cc83d7 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QB5ReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QB5ReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -90,8 +90,8 @@ public class QB5ReadCrawler extends BaseReadCrawler implements BookInfoCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - final ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + final ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String urlType = doc.select("meta[property=og:type]").attr("content"); if ("novel".equals(urlType)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QiQiReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QiQiReadCrawler.java index ba5f2c4..d9e3a25 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QiQiReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QiQiReadCrawler.java @@ -9,7 +9,7 @@ import org.jsoup.select.Elements; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import java.util.ArrayList; @@ -101,8 +101,8 @@ public class QiQiReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); try { Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("result-list"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QianDianReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QianDianReadCrawler.java index e6d00fd..6b2c746 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QianDianReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QianDianReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -98,8 +98,8 @@ public class QianDianReadCrawler extends BaseReadCrawler { * 小说详情 * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Element div = doc.getElementById("result-list"); Elements elementsByTag = div.getElementsByTag("li"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QuanNovelReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QuanNovelReadCrawler.java index 5a755c0..23e75d8 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QuanNovelReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/QuanNovelReadCrawler.java @@ -10,7 +10,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -100,8 +100,8 @@ public class QuanNovelReadCrawler extends BaseReadCrawler implements BookInfoCra * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); try { Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("main list"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ReXueReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ReXueReadCrawler.java index 11c5539..453b856 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ReXueReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ReXueReadCrawler.java @@ -13,7 +13,7 @@ import java.util.Collections; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; /** @@ -126,8 +126,8 @@ public class ReXueReadCrawler extends BaseReadCrawler { */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { String urlType = doc.select("meta[property=og:type]").attr("content"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShiGuangReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShiGuangReadCrawler.java index 4f4c72e..d85a9ed 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShiGuangReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShiGuangReadCrawler.java @@ -14,7 +14,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -126,8 +126,8 @@ public class ShiGuangReadCrawler extends BaseReadCrawler { */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { String urlType = doc.select("meta[property=og:type]").attr("content"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShuHaiGeReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShuHaiGeReadCrawler.java index aa48574..d1104b6 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShuHaiGeReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ShuHaiGeReadCrawler.java @@ -16,7 +16,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.util.utils.OkHttpUtils; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -149,8 +149,8 @@ public class ShuHaiGeReadCrawler extends BaseReadCrawler implements BookInfoCraw * 连载 * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Element div = doc.getElementsByClass("novelslist2").first(); Elements elements = div.getElementsByTag("li"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/SoNovelReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/SoNovelReadCrawler.java index 9a486e3..6d2e71a 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/SoNovelReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/SoNovelReadCrawler.java @@ -10,7 +10,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -112,8 +112,8 @@ public class SoNovelReadCrawler extends BaseReadCrawler implements BookInfoCrawl * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); try { Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("novelslist2"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/TianLaiReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/TianLaiReadCrawler.java index 69e1f73..08763dc 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/TianLaiReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/TianLaiReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -115,8 +115,8 @@ public class TianLaiReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // Element node = doc.getElementById("results"); // for (Element div : node.children()) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/WoLongReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/WoLongReadCrawler.java index fc3645e..424db5a 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/WoLongReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/WoLongReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -105,8 +105,8 @@ public class WoLongReadCrawler extends BaseReadCrawler { * * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements elementsByTag = doc.getElementsByClass("searchresult"); for (int i = 0; i < elementsByTag.size(); i++) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XBiQuGeReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XBiQuGeReadCrawler.java index d49863a..d14ed59 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XBiQuGeReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XBiQuGeReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -115,8 +115,8 @@ public class XBiQuGeReadCrawler extends BaseReadCrawler { * * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("rank_ullist"); Element div = divs.get(0); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler.java index 8f705cb..126c9c6 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -96,8 +96,8 @@ public class XS7ReadCrawler extends BaseReadCrawler { * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Element alist = doc.getElementById("alist"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler2.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler2.java index 6df7e21..ec3dde8 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler2.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XS7ReadCrawler2.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -111,8 +111,8 @@ public class XS7ReadCrawler2 extends BaseReadCrawler implements BookInfoCrawler * 连载 * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String urlType = doc.select("meta[property=og:type]").attr("content"); if ("novel".equals(urlType)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XiaGuReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XiaGuReadCrawler.java index d94a37a..e6ae15f 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XiaGuReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XiaGuReadCrawler.java @@ -14,7 +14,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -131,8 +131,8 @@ public class XiaGuReadCrawler extends BaseReadCrawler { */ @Deprecated - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Element div = doc.getElementsByClass("subject-list").first(); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XingXingReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XingXingReadCrawler.java index 8fd4af7..c4734f7 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XingXingReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/XingXingReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -123,8 +123,8 @@ public class XingXingReadCrawler extends BaseReadCrawler { */ @Deprecated - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); // try { Element div = doc.getElementsByClass("leftBox").first(); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YanQingLouReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YanQingLouReadCrawler.java index 42e9ee4..4d9b957 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YanQingLouReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YanQingLouReadCrawler.java @@ -18,7 +18,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.utils.OkHttpUtils; import xyz.fycz.myreader.util.utils.StringUtils; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -157,8 +157,8 @@ public class YanQingLouReadCrawler extends BaseReadCrawler { * * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String bookName = doc.select("meta[property=og:novel:book_name]").attr("content"); if ("".equals(bookName)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YunZhongReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YunZhongReadCrawler.java index 8b5f92b..f8cc3d0 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YunZhongReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/YunZhongReadCrawler.java @@ -10,7 +10,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -104,8 +104,8 @@ public class YunZhongReadCrawler extends BaseReadCrawler implements BookInfoCraw * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); // try { Document doc = Jsoup.parse(html); Elements divs = doc.getElementsByClass("ul_b_list"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZW37ReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZW37ReadCrawler.java index 51c332b..b196ba6 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZW37ReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZW37ReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -101,8 +101,8 @@ public class ZW37ReadCrawler extends BaseReadCrawler implements BookInfoCrawler * 连载 * */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - final ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + final ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String urlType = doc.select("meta[property=og:type]").attr("content"); if ("novel".equals(urlType)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZaiShuYuanReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZaiShuYuanReadCrawler.java index 12a1218..a14c201 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZaiShuYuanReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZaiShuYuanReadCrawler.java @@ -13,7 +13,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; @@ -101,8 +101,8 @@ public class ZaiShuYuanReadCrawler extends BaseReadCrawler { *
最新章节：第一千五百五十一章 邪神陨落（大结局） 更新时间：2020-2-26 13:26:49
* */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); String urlType = doc.select("meta[property=og:type]").attr("content"); if ("novel".equals(urlType)) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZuoPinReadCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZuoPinReadCrawler.java index 43cafc8..41882b5 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZuoPinReadCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/read/ZuoPinReadCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.enums.LocalBookSource; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -95,8 +95,8 @@ public class ZuoPinReadCrawler extends BaseReadCrawler implements BookInfoCrawle * @param html * @return */ - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); Document doc = Jsoup.parse(html); Element div = doc.getElementById("J_TableContainer"); Elements elementsByClass = div.getElementsByClass("search-bookele"); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/JsonPathCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/JsonPathCrawler.java index 337bd40..e82766d 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/JsonPathCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/JsonPathCrawler.java @@ -11,7 +11,7 @@ import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; import xyz.fycz.myreader.greendao.entity.rule.BookSource; import xyz.fycz.myreader.greendao.entity.rule.SearchRule; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.model.sourceAnalyzer.JsonPathAnalyzer; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseSourceCrawler; @@ -30,8 +30,8 @@ public class JsonPathCrawler extends BaseSourceCrawler { } @Override - public ConcurrentMultiValueMap getBooksFromSearchHtml(String json) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String json) { + ConMVMap books = new ConMVMap<>(); ReadContext rc = analyzer.getReadContext(json); SearchRule searchRule = source.getSearchRule(); if (StringHelper.isEmpty(searchRule.getList())) { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/MatcherCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/MatcherCrawler.java index ef5752a..be5279f 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/MatcherCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/MatcherCrawler.java @@ -7,7 +7,7 @@ import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; import xyz.fycz.myreader.greendao.entity.rule.BookSource; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.model.sourceAnalyzer.MatcherAnalyzer; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.util.utils.NetworkUtils; @@ -27,8 +27,8 @@ public class MatcherCrawler extends BaseSourceCrawler { } @Override - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); String list = analyzer.getString(source.getSearchRule().getList(), html); if (StringHelper.isEmpty(list)) list = html; List names = analyzer.getStringList(source.getSearchRule().getName(), list); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/ThirdCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/ThirdCrawler.java index 9175f13..c9c00ef 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/ThirdCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/ThirdCrawler.java @@ -6,7 +6,8 @@ import java.util.Map; import xyz.fycz.myreader.entity.SearchBookBean; import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.rule.BookSource; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; +import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseReadCrawler; import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler; @@ -60,9 +61,10 @@ public class ThirdCrawler extends BaseReadCrawler implements BookInfoCrawler { return null; } - public ConcurrentMultiValueMap getBooks(List books) { - ConcurrentMultiValueMap newBooks = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooks(List books) { + ConMVMap newBooks = new ConMVMap<>(); for (Book book : books){ + if (book == null || StringHelper.isEmpty(book.getName())) continue; book.setSource(source.getSourceUrl()); SearchBookBean sbb = new SearchBookBean(book.getName(), book.getAuthor()); newBooks.add(sbb, book); diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/XpathCrawler.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/XpathCrawler.java index d549cf8..458540b 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/XpathCrawler.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/source/XpathCrawler.java @@ -10,7 +10,7 @@ import xyz.fycz.myreader.greendao.entity.Book; import xyz.fycz.myreader.greendao.entity.Chapter; import xyz.fycz.myreader.greendao.entity.rule.BookSource; import xyz.fycz.myreader.greendao.entity.rule.SearchRule; -import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap; +import xyz.fycz.myreader.model.mulvalmap.ConMVMap; import xyz.fycz.myreader.model.sourceAnalyzer.XpathAnalyzer; import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.webapi.crawler.base.BaseSourceCrawler; @@ -28,8 +28,8 @@ public class XpathCrawler extends BaseSourceCrawler { } @Override - public ConcurrentMultiValueMap getBooksFromSearchHtml(String html) { - ConcurrentMultiValueMap books = new ConcurrentMultiValueMap<>(); + public ConMVMap getBooksFromSearchHtml(String html) { + ConMVMap books = new ConMVMap<>(); JXDocument jxDoc = JXDocument.create(html); SearchRule searchRule = source.getSearchRule(); if (StringHelper.isEmpty(searchRule.getList())) {