From c73779ea3b1c8d19a980dc13f85c18d526af9b66 Mon Sep 17 00:00:00 2001 From: inorichi Date: Thu, 5 Nov 2015 00:50:39 +0100 Subject: [PATCH] Listen for downloaded pages, but it's not updating the UI yet --- .../presenter/DownloadQueuePresenter.java | 49 ++++++++++++++++++- .../mangafeed/ui/holder/DownloadHolder.java | 1 + app/src/main/res/layout/item_download.xml | 30 +++++++----- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/mangafeed/presenter/DownloadQueuePresenter.java b/app/src/main/java/eu/kanade/mangafeed/presenter/DownloadQueuePresenter.java index 34fd9a016e..4600dc7865 100644 --- a/app/src/main/java/eu/kanade/mangafeed/presenter/DownloadQueuePresenter.java +++ b/app/src/main/java/eu/kanade/mangafeed/presenter/DownloadQueuePresenter.java @@ -4,6 +4,7 @@ import android.os.Bundle; import java.util.HashMap; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import javax.inject.Inject; @@ -16,6 +17,7 @@ import rx.Observable; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import rx.subjects.PublishSubject; import timber.log.Timber; public class DownloadQueuePresenter extends BasePresenter { @@ -25,6 +27,7 @@ public class DownloadQueuePresenter extends BasePresenter private DownloadQueue downloadQueue; private Subscription statusSubscription; private HashMap progressSubscriptions; + private HashMap pageStatusSubscriptions; public final static int GET_DOWNLOAD_QUEUE = 1; @@ -34,6 +37,7 @@ public class DownloadQueuePresenter extends BasePresenter downloadQueue = downloadManager.getQueue(); progressSubscriptions = new HashMap<>(); + pageStatusSubscriptions = new HashMap<>(); restartableLatestCache(GET_DOWNLOAD_QUEUE, () -> Observable.just(downloadQueue.get()), @@ -48,12 +52,12 @@ public class DownloadQueuePresenter extends BasePresenter protected void onTakeView(DownloadQueueFragment view) { super.onTakeView(view); - statusSubscription = downloadQueue.getStatusObservable() + add(statusSubscription = downloadQueue.getStatusObservable() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(download -> { processStatus(download, view); - }); + })); } @Override @@ -66,9 +70,11 @@ public class DownloadQueuePresenter extends BasePresenter switch (download.getStatus()) { case Download.DOWNLOADING: observeProgress(download, view); + observePagesStatus(download, view); break; case Download.DOWNLOADED: unsubscribeProgress(download); + unsubscribePagesStatus(download); download.totalProgress = download.pages.size() * 100; view.updateProgress(download); break; @@ -89,13 +95,52 @@ public class DownloadQueuePresenter extends BasePresenter progressSubscriptions.put(download, subscription); } + private void observePagesStatus(Download download, DownloadQueueFragment view) { + PublishSubject pageStatusSubject = PublishSubject.create(); + for (Page page : download.pages) + page.setStatusSubject(pageStatusSubject); + + final AtomicInteger downloadedPages = new AtomicInteger(0); + + Subscription subscription = pageStatusSubject + .startWith(Observable.from(download.pages) + .filter(page -> page.getStatus() == Page.READY) + .map(page -> Page.READY)) + .filter(status -> status == Page.READY) + .map(status -> downloadedPages.incrementAndGet()) + .subscribe(count -> { + // TODO + }); + + pageStatusSubscriptions.put(download, subscription); + } + private void unsubscribeProgress(Download download) { Subscription subscription = progressSubscriptions.remove(download); if (subscription != null) subscription.unsubscribe(); } + private void unsubscribePagesStatus(Download download) { + for (Page page : download.pages) + page.setStatusSubject(null); + + Subscription subscription = pageStatusSubscriptions.remove(download); + if (subscription != null) + subscription.unsubscribe(); + } + private void destroySubscriptions() { + for (Download download : pageStatusSubscriptions.keySet()) { + for (Page page : download.pages) + page.setStatusSubject(null); + } + + for (Subscription subscription : pageStatusSubscriptions.values()) { + subscription.unsubscribe(); + } + pageStatusSubscriptions.clear(); + for (Subscription subscription : progressSubscriptions.values()) { subscription.unsubscribe(); } diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/holder/DownloadHolder.java b/app/src/main/java/eu/kanade/mangafeed/ui/holder/DownloadHolder.java index c23c963ecd..5e3e20228c 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/holder/DownloadHolder.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/holder/DownloadHolder.java @@ -16,6 +16,7 @@ public class DownloadHolder extends ItemViewHolder { @ViewId(R.id.download_title) TextView downloadTitle; @ViewId(R.id.download_progress) ProgressBar downloadProgress; + @ViewId(R.id.download_progress_text) TextView downloadProgressText; public DownloadHolder(View view) { super(view); diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml index 93167e7b3e..5136181bb8 100644 --- a/app/src/main/res/layout/item_download.xml +++ b/app/src/main/res/layout/item_download.xml @@ -5,28 +5,34 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp"> - + android:orientation="horizontal"> - - - + android:id="@+id/download_title"/> + + + android:layout_gravity="left" /> - + + + \ No newline at end of file