yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Better handling of loading progress and image load.

Browse Source
This commit is contained in:
inorichi
2015-10-28 17:20:00 +01:00
parent d26049155c
commit e160f53bb2
11 changed files with 108 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/mangafeed/sources/base/Source.java
View File

@@ -80,7 +80,6 @@ public abstract class Source extends BaseSource {
public Observable<Page> getRemainingImageUrlsFromPageList(final List<Page> pages) {
return Observable.from(pages)
.filter(page -> page.getImageUrl() == null)
.doOnNext(page -> page.setStatus(Page.DOWNLOAD))
.window(overrideNumberOfConcurrentPageDownloads())
.concatMap(batchedPages ->
batchedPages.concatMap(this::getImageUrlFromPage)
@@ -88,6 +87,7 @@ public abstract class Source extends BaseSource {
}
private Observable<Page> getImageUrlFromPage(final Page page) {
page.setStatus(Page.LOAD_PAGE);
return mNetworkService
.getStringResponse(overrideRemainingPagesUrl(page.getUrl()), mRequestHeaders, null)
.flatMap(unparsedHtml -> Observable.just(parseHtmlToImageUrl(unparsedHtml)))
@@ -108,7 +108,7 @@ public abstract class Source extends BaseSource {
return obs;
if (!mCacheManager.isImageInCache(page.getImageUrl())) {
page.setStatus(Page.DOWNLOAD);
page.setStatus(Page.DOWNLOAD_IMAGE);
obs = cacheImage(page);
}