Show mangas from catalogue

app/src/main/java/eu/kanade/mangafeed/presenter/CatalogueListPresenter.java

@@ -5,14 +5,26 @@ import android.content.Intent;
 import javax.inject.Inject;
 
 import eu.kanade.mangafeed.App;
+import eu.kanade.mangafeed.data.helpers.DatabaseHelper;
 import eu.kanade.mangafeed.data.helpers.SourceManager;
+import eu.kanade.mangafeed.data.models.Manga;
+import eu.kanade.mangafeed.sources.Source;
+import eu.kanade.mangafeed.ui.adapter.CatalogueListHolder;
 import eu.kanade.mangafeed.view.CatalogueListView;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+import uk.co.ribot.easyadapter.EasyAdapter;
 
 public class CatalogueListPresenter {
 
     CatalogueListView view;
+    EasyAdapter<Manga> adapter;
+    Source selectedSource;
 
     @Inject SourceManager sourceManager;
+    @Inject DatabaseHelper db;
+
 
     public CatalogueListPresenter(CatalogueListView view) {
         this.view = view;
@@ -20,8 +32,30 @@ public class CatalogueListPresenter {
     }
 
     public void initializeSource() {
-        Intent intent = view.getIntent();
-        int sourceId = intent.getIntExtra(Intent.EXTRA_UID, -1);
-        view.setSource(sourceManager.get(sourceId));
+        int sourceId = view.getIntent().getIntExtra(Intent.EXTRA_UID, -1);
+        selectedSource = sourceManager.get(sourceId);
+        view.setSource(selectedSource);
+
+        adapter = new EasyAdapter<>(view.getActivity(), CatalogueListHolder.class);
+        view.setAdapter(adapter);
+
+        getMangasFromSource();
     }
+
+    private void getMangasFromSource() {
+        selectedSource.pullPopularMangasFromNetwork(1)
+                .subscribeOn(Schedulers.io())
+                .flatMap(Observable::from)
+                .flatMap(networkManga -> db.getManga(networkManga.url)
+                        .flatMap(result -> {
+                            if (result.size() == 0) {
+                                return db.insertManga(networkManga)
+                                        .flatMap(i -> Observable.just(networkManga));
+                            }
+                            return Observable.just(networkManga);
+                        }))
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(adapter::addItem);
+    }
+
 }

app/src/main/java/eu/kanade/mangafeed/presenter/LibraryPresenter.java

@@ -16,8 +16,6 @@ import eu.kanade.mangafeed.view.LibraryView;
 import rx.Observable;
 import rx.schedulers.Schedulers;
 
-import static rx.android.schedulers.AndroidSchedulers.mainThread;
-
 public class LibraryPresenter extends BasePresenter {
 
     private LibraryView view;
@@ -54,7 +52,6 @@ public class LibraryPresenter extends BasePresenter {
         view.setMangaClickListener();
 
         subscriptions.add(db.getMangasWithUnread()
-                        .observeOn(mainThread())
                         .subscribe(adapter::setNewItems)
         );