sync anime lib implementation with 12 (#133)

* sync anime lib implementation with 11

* fix wrong api

* delete unused classes

* adapt to lib 12

* add LICENSE for eu.kanade.tachiyomi

* changes for lib 12

* update to lib 12

* update webUI

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt

@@ -9,7 +9,7 @@ interface AnimeCatalogueSource : AnimeSource {
     /**
      * An ISO 639-1 compliant language code (two letters in lower case).
      */
-    val lang: String
+    override val lang: String
 
     /**
      * Whether the source has support for latest updates.

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSource.kt

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.animesource
 
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
 import rx.Observable
 
 /**
@@ -19,6 +20,9 @@ interface AnimeSource {
      */
     val name: String
 
+    val lang: String
+        get() = ""
+
     /**
      * Returns an observable with the updated details for a anime.
      *
@@ -36,12 +40,12 @@ interface AnimeSource {
     fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>>
 
     /**
-     * Returns an observable with a link for the episode of an anime.
+     * Returns an observable with a list of video for the episode of an anime.
      *
      * @param episode the episode to get the link for.
      */
 //    @Deprecated("Use getEpisodeList instead")
-    fun fetchEpisodeLink(episode: SEpisode): Observable<String>
+    fun fetchVideoList(episode: SEpisode): Observable<List<Video>>
 
 //    /**
 //     * [1.x API] Get the updated details for a anime.
@@ -74,4 +78,4 @@ interface AnimeSource {
 
 // fun AnimeSource.icon(): Drawable? = Injekt.get<AnimeExtensionManager>().getAppIconForSource(this)
 
-// fun AnimeSource.getPreferenceKey(): String = "source_$id"
+fun AnimeSource.getPreferenceKey(): String = "source_$id"

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSourceManager.kt

@@ -1,76 +0,0 @@
-package eu.kanade.tachiyomi.animesource
-
-import android.content.Context
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
-import rx.Observable
-
-open class AnimeSourceManager(private val context: Context) {
-
-    private val sourcesMap = mutableMapOf<Long, AnimeSource>()
-
-    private val stubSourcesMap = mutableMapOf<Long, StubSource>()
-
-    init {
-        createInternalSources().forEach { registerSource(it) }
-    }
-
-    open fun get(sourceKey: Long): AnimeSource? {
-        return sourcesMap[sourceKey]
-    }
-
-    fun getOrStub(sourceKey: Long): AnimeSource {
-        return sourcesMap[sourceKey] ?: stubSourcesMap.getOrPut(sourceKey) {
-            StubSource(sourceKey)
-        }
-    }
-
-    fun getOnlineSources() = sourcesMap.values.filterIsInstance<AnimeHttpSource>()
-
-    fun getCatalogueSources() = sourcesMap.values.filterIsInstance<AnimeCatalogueSource>()
-
-    internal fun registerSource(source: AnimeSource) {
-        if (!sourcesMap.containsKey(source.id)) {
-            sourcesMap[source.id] = source
-        }
-        if (!stubSourcesMap.containsKey(source.id)) {
-            stubSourcesMap[source.id] = StubSource(source.id)
-        }
-    }
-
-    internal fun unregisterSource(source: AnimeSource) {
-        sourcesMap.remove(source.id)
-    }
-
-    private fun createInternalSources(): List<AnimeSource> = listOf(
-//        LocalAnimeSource(context)
-    )
-
-    inner class StubSource(override val id: Long) : AnimeSource {
-
-        override val name: String
-            get() = id.toString()
-
-        override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun fetchEpisodeLink(episode: SEpisode): Observable<String> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun toString(): String {
-            return name
-        }
-
-        private fun getSourceNotInstalledException(): Exception {
-//            return Exception(context.getString(R.string.source_not_installed, id.toString()))
-            return Exception("source not found")
-        }
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/model/SAnime.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.animesource.model
 
+// import tachiyomi.animesource.model.AnimeInfo
 import java.io.Serializable
 
 interface SAnime : Serializable {
@@ -23,9 +24,7 @@ interface SAnime : Serializable {
     var initialized: Boolean
 
     fun copyFrom(other: SAnime) {
-        if (other.title != null) {
-            title = other.title
-        }
+        title = other.title
 
         if (other.author != null) {
             author = other.author
@@ -65,3 +64,30 @@ interface SAnime : Serializable {
         }
     }
 }
+
+// fun SAnime.toAnimeInfo(): AnimeInfo {
+//    return AnimeInfo(
+//        key = this.url,
+//        title = this.title,
+//        artist = this.artist ?: "",
+//        author = this.author ?: "",
+//        description = this.description ?: "",
+//        genres = this.genre?.split(", ") ?: emptyList(),
+//        status = this.status,
+//        cover = this.thumbnail_url ?: ""
+//    )
+// }
+
+// fun AnimeInfo.toSAnime(): SAnime {
+//    val animeInfo = this
+//    return SAnime.create().apply {
+//        url = animeInfo.key
+//        title = animeInfo.title
+//        artist = animeInfo.artist
+//        author = animeInfo.author
+//        description = animeInfo.description
+//        genre = animeInfo.genres.joinToString(", ")
+//        status = animeInfo.status
+//        thumbnail_url = animeInfo.cover
+//    }
+// }

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/model/SEpisode.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.animesource.model
 
+// import tachiyomi.animesource.model.EpisodeInfo
 import java.io.Serializable
 
 interface SEpisode : Serializable {
@@ -28,3 +29,24 @@ interface SEpisode : Serializable {
         }
     }
 }
+
+// fun SEpisode.toEpisodeInfo(): EpisodeInfo {
+//    return EpisodeInfo(
+//        dateUpload = this.date_upload,
+//        key = this.url,
+//        name = this.name,
+//        number = this.episode_number,
+//        scanlator = this.scanlator ?: ""
+//    )
+// }
+//
+// fun EpisodeInfo.toSEpisode(): SEpisode {
+//    val episode = this
+//    return SEpisode.create().apply {
+//        url = episode.key
+//        name = episode.name
+//        date_upload = episode.dateUpload
+//        episode_number = episode.number
+//        scanlator = episode.scanlator
+//    }
+// }

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/model/Video.kt

@@ -0,0 +1,73 @@
+package eu.kanade.tachiyomi.animesource.model
+
+import android.net.Uri
+import eu.kanade.tachiyomi.network.ProgressListener
+import rx.subjects.Subject
+// import tachiyomi.animesource.model.VideoUrl
+
+open class Video(
+    val url: String = "",
+    val quality: String = "",
+    var videoUrl: String? = null,
+    @Transient var uri: Uri? = null // Deprecated but can't be deleted due to extensions
+) : ProgressListener {
+
+    @Transient
+    @Volatile
+    var status: Int = 0
+        set(value) {
+            field = value
+            statusSubject?.onNext(value)
+            statusCallback?.invoke(this)
+        }
+
+    @Transient
+    @Volatile
+    var progress: Int = 0
+        set(value) {
+            field = value
+            statusCallback?.invoke(this)
+        }
+
+    @Transient
+    private var statusSubject: Subject<Int, Int>? = null
+
+    @Transient
+    private var statusCallback: ((Video) -> Unit)? = null
+
+    override fun update(bytesRead: Long, contentLength: Long, done: Boolean) {
+        progress = if (contentLength > 0) {
+            (100 * bytesRead / contentLength).toInt()
+        } else {
+            -1
+        }
+    }
+
+    fun setStatusSubject(subject: Subject<Int, Int>?) {
+        this.statusSubject = subject
+    }
+
+    fun setStatusCallback(f: ((Video) -> Unit)?) {
+        statusCallback = f
+    }
+
+    companion object {
+        const val QUEUE = 0
+        const val LOAD_VIDEO = 1
+        const val DOWNLOAD_IMAGE = 2
+        const val READY = 3
+        const val ERROR = 4
+    }
+}
+
+// fun Video.toVideoUrl(): VideoUrl {
+//    return VideoUrl(
+//        url = this.videoUrl ?: this.url
+//    )
+// }
+//
+// fun VideoUrl.toVideo(index: Int): Video {
+//    return Video(
+//        videoUrl = this.url
+//    )
+// }

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSource.kt

@@ -5,11 +5,11 @@ import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.network.newCallWithProgress
-import eu.kanade.tachiyomi.source.model.Page
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -218,14 +218,6 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
         }
     }
 
-    override fun fetchEpisodeLink(episode: SEpisode): Observable<String> {
-        return client.newCall(episodeLinkRequest(episode))
-            .asObservableSuccess()
-            .map { response ->
-                episodeLinkParse(response)
-            }
-    }
-
     /**
      * Returns the request for updating the episode list. Override only if it's needed to override
      * the url, send different headers or request method like POST.
@@ -236,16 +228,6 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
         return GET(baseUrl + anime.url, headers)
     }
 
-    /**
-     * Returns the request for getting the episode link. Override only if it's needed to override
-     * the url, send different headers or request method like POST.
-     *
-     * @param episode the episode to look for links.
-     */
-    protected open fun episodeLinkRequest(episode: SEpisode): Request {
-        return GET(baseUrl + episode.url, headers)
-    }
-
     /**
      * Parses the response from the site and returns a list of episodes.
      *
@@ -254,19 +236,25 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
     protected abstract fun episodeListParse(response: Response): List<SEpisode>
 
     /**
-     * Parses the response from the site and returns a list of episodes.
+     * Returns an observable with the page list for a chapter.
      *
-     * @param response the response from the site.
+     * @param chapter the chapter whose page list has to be fetched.
      */
-    protected abstract fun episodeLinkParse(response: Response): String
+    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+        return client.newCall(videoListRequest(episode))
+            .asObservableSuccess()
+            .map { response ->
+                videoListParse(response)
+            }
+    }
 
     /**
-     * Returns the request for getting the page list. Override only if it's needed to override the
-     * url, send different headers or request method like POST.
+     * Returns the request for getting the episode link. Override only if it's needed to override
+     * the url, send different headers or request method like POST.
      *
-     * @param episode the episode whose page list has to be fetched.
+     * @param episode the episode to look for links.
      */
-    protected open fun pageListRequest(episode: SEpisode): Request {
+    protected open fun videoListRequest(episode: SEpisode): Request {
         return GET(baseUrl + episode.url, headers)
     }
 
@@ -275,7 +263,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @param response the response from the site.
      */
-    protected abstract fun pageListParse(response: Response): List<Page>
+    protected abstract fun videoListParse(response: Response): List<Video>
 
     /**
      * Returns an observable with the page containing the source url of the image. If there's any
@@ -283,20 +271,20 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @param page the page whose source image has to be fetched.
      */
-    open fun fetchImageUrl(page: Page): Observable<String> {
-        return client.newCall(imageUrlRequest(page))
+    open fun fetchVideoUrl(video: Video): Observable<String> {
+        return client.newCall(videoUrlRequest(video))
             .asObservableSuccess()
-            .map { imageUrlParse(it) }
+            .map { videoUrlParse(it) }
     }
 
     /**
      * Returns the request for getting the url to the source image. Override only if it's needed to
      * override the url, send different headers or request method like POST.
      *
-     * @param page the episode whose page list has to be fetched
+     * @param page the chapter whose page list has to be fetched
      */
-    protected open fun imageUrlRequest(page: Page): Request {
-        return GET(page.url, headers)
+    protected open fun videoUrlRequest(video: Video): Request {
+        return GET(video.url, headers)
     }
 
     /**
@@ -304,15 +292,15 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @param response the response from the site.
      */
-    protected abstract fun imageUrlParse(response: Response): String
+    protected abstract fun videoUrlParse(response: Response): String
 
     /**
      * Returns an observable with the response of the source image.
      *
      * @param page the page whose source image has to be downloaded.
      */
-    fun fetchImage(page: Page): Observable<Response> {
-        return client.newCallWithProgress(imageRequest(page), page)
+    fun fetchVideo(video: Video): Observable<Response> {
+        return client.newCallWithProgress(videoRequest(video), video)
             .asObservableSuccess()
     }
 
@@ -320,10 +308,10 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      * Returns the request for getting the source image. Override only if it's needed to override
      * the url, send different headers or request method like POST.
      *
-     * @param page the episode whose page list has to be fetched
+     * @param video the video whose link has to be fetched
      */
-    protected open fun imageRequest(page: Page): Request {
-        return GET(page.imageUrl!!, headers)
+    protected open fun videoRequest(video: Video): Request {
+        return GET(video.videoUrl!!, headers)
     }
 
     /**

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSourceFetcher.kt

@@ -1,26 +1,25 @@
-package eu.kanade.tachiyomi.source.online
+package eu.kanade.tachiyomi.animesource.online
 
-import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
-import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.animesource.model.Video
 import rx.Observable
 
-fun AnimeHttpSource.getImageUrl(page: Page): Observable<Page> {
-    page.status = Page.LOAD_PAGE
-    return fetchImageUrl(page)
-        .doOnError { page.status = Page.ERROR }
+fun AnimeHttpSource.getVideoUrl(video: Video): Observable<Video> {
+    video.status = Video.LOAD_VIDEO
+    return fetchVideoUrl(video)
+        .doOnError { video.status = Video.ERROR }
         .onErrorReturn { null }
-        .doOnNext { page.imageUrl = it }
-        .map { page }
+        .doOnNext { video.videoUrl = it }
+        .map { video }
 }
 
-fun AnimeHttpSource.fetchAllImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
-    return Observable.from(pages)
-        .filter { !it.imageUrl.isNullOrEmpty() }
-        .mergeWith(fetchRemainingImageUrlsFromPageList(pages))
+fun AnimeHttpSource.fetchUrlFromVideo(video: Video): Observable<Video> {
+    return Observable.just(video)
+        .filter { !it.videoUrl.isNullOrEmpty() }
+        .mergeWith(fetchRemainingVideoUrlsFromVideoList(video))
 }
 
-fun AnimeHttpSource.fetchRemainingImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
-    return Observable.from(pages)
-        .filter { it.imageUrl.isNullOrEmpty() }
-        .concatMap { getImageUrl(it) }
+fun AnimeHttpSource.fetchRemainingVideoUrlsFromVideoList(video: Video): Observable<Video> {
+    return Observable.just(video)
+        .filter { it.videoUrl.isNullOrEmpty() }
+        .concatMap { getVideoUrl(it) }
 }

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/ParsedAnimeHttpSource.kt

@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.animesource.online
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -159,21 +159,6 @@ abstract class ParsedAnimeHttpSource : AnimeHttpSource() {
      */
     protected abstract fun episodeListSelector(): String
 
-    /**
-     * Parses the response from the site and returns a list of episodes.
-     *
-     * @param response the response from the site.
-     */
-    override fun episodeLinkParse(response: Response): String {
-        val document = response.asJsoup()
-        return linkFromElement(document.select(episodeLinkSelector()).first())
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each episode.
-     */
-    protected abstract fun episodeLinkSelector(): String
-
     /**
      * Returns a episode from the given element.
      *
@@ -181,36 +166,35 @@ abstract class ParsedAnimeHttpSource : AnimeHttpSource() {
      */
     protected abstract fun episodeFromElement(element: Element): SEpisode
 
-    /**
-     * Returns a episode from the given element.
-     *
-     * @param element an element obtained from [episodeListSelector].
-     */
-    protected abstract fun linkFromElement(element: Element): String
-
     /**
      * Parses the response from the site and returns the page list.
      *
      * @param response the response from the site.
      */
-    override fun pageListParse(response: Response): List<Page> {
-        return pageListParse(response.asJsoup())
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        return document.select(videoListSelector()).map { videoFromElement(it) }
     }
 
     /**
-     * Returns a page list from the given document.
-     *
-     * @param document the parsed document.
+     * Returns the Jsoup selector that returns a list of [Element] corresponding to each video.
      */
-    protected abstract fun pageListParse(document: Document): List<Page>
+    protected abstract fun videoListSelector(): String
 
     /**
-     * Parse the response from the site and returns the absolute url to the source image.
+     * Returns a video from the given element.
+     *
+     * @param element an element obtained from [videoListSelector].
+     */
+    protected abstract fun videoFromElement(element: Element): Video
+
+    /**
+     * Parse the response from the site and returns the absolute url to the source video.
      *
      * @param response the response from the site.
      */
-    override fun imageUrlParse(response: Response): String {
-        return imageUrlParse(response.asJsoup())
+    override fun videoUrlParse(response: Response): String {
+        return videoUrlParse(response.asJsoup())
     }
 
     /**
@@ -218,5 +202,5 @@ abstract class ParsedAnimeHttpSource : AnimeHttpSource() {
      *
      * @param document the parsed document.
      */
-    protected abstract fun imageUrlParse(document: Document): String
+    protected abstract fun videoUrlParse(document: Document): String
 }