Rename OnlineSource to HttpSource

app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt

@@ -7,8 +7,8 @@ import android.content.pm.PackageManager
 import android.os.Environment
 import dalvik.system.PathClassLoader
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.source.online.OnlineSource
-import eu.kanade.tachiyomi.source.online.YamlOnlineSource
+import eu.kanade.tachiyomi.source.online.HttpSource
+import eu.kanade.tachiyomi.source.online.YamlHttpSource
 import eu.kanade.tachiyomi.source.online.english.*
 import eu.kanade.tachiyomi.source.online.german.WieManga
 import eu.kanade.tachiyomi.source.online.russian.Mangachan
@@ -31,7 +31,7 @@ open class SourceManager(private val context: Context) {
         return sourcesMap[sourceKey]
     }
 
-    fun getOnlineSources() = sourcesMap.values.filterIsInstance<OnlineSource>()
+    fun getOnlineSources() = sourcesMap.values.filterIsInstance<HttpSource>()
 
     fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>()
 
@@ -71,7 +71,7 @@ open class SourceManager(private val context: Context) {
             for (file in parsersDir.listFiles().filter { it.extension == "yml" }) {
                 try {
                     val map = file.inputStream().use { yaml.loadAs(it, Map::class.java) }
-                    sources.add(YamlOnlineSource(map))
+                    sources.add(YamlHttpSource(map))
                 } catch (e: Exception) {
                     Timber.e("Error loading source from file. Bad format?")
                 }
@@ -80,13 +80,13 @@ open class SourceManager(private val context: Context) {
         return sources
     }
 
-    private fun createExtensionSources(): List<OnlineSource> {
+    private fun createExtensionSources(): List<HttpSource> {
         val pkgManager = context.packageManager
         val flags = PackageManager.GET_CONFIGURATIONS or PackageManager.GET_SIGNATURES
         val installedPkgs = pkgManager.getInstalledPackages(flags)
         val extPkgs = installedPkgs.filter { it.reqFeatures.orEmpty().any { it.name == FEATURE } }
 
-        val sources = mutableListOf<OnlineSource>()
+        val sources = mutableListOf<HttpSource>()
         for (pkgInfo in extPkgs) {
             val appInfo = pkgManager.getApplicationInfo(pkgInfo.packageName,
                     PackageManager.GET_META_DATA) ?: continue
@@ -121,12 +121,12 @@ open class SourceManager(private val context: Context) {
         return true
     }
 
-    private fun loadExtension(ext: Extension, pkgManager: PackageManager): OnlineSource? {
+    private fun loadExtension(ext: Extension, pkgManager: PackageManager): HttpSource? {
         return try {
             val classLoader = PathClassLoader(ext.appInfo.sourceDir, null, context.classLoader)
             val resources = pkgManager.getResourcesForApplication(ext.appInfo)
 
-            Class.forName(ext.sourceClass, false, classLoader).newInstance() as? OnlineSource
+            Class.forName(ext.sourceClass, false, classLoader).newInstance() as? HttpSource
         } catch (e: Exception) {
             null
         } catch (e: LinkageError) {

app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -1,10 +1,10 @@
 package eu.kanade.tachiyomi.source.online
 
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 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.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.*
 import okhttp3.Headers
@@ -20,7 +20,7 @@ import java.security.MessageDigest
 /**
  * A simple implementation for sources from a website.
  */
-abstract class OnlineSource : CatalogueSource {
+abstract class HttpSource : CatalogueSource {
 
     /**
      * Network service.

app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSourceFetcher.kt

@@ -21,7 +21,7 @@ private val chapterCache: ChapterCache by injectLazy()
  *
  * @param chapter the chapter whose page list has to be fetched.
  */
-fun OnlineSource.fetchPageListFromCacheThenNet(chapter: Chapter): Observable<List<Page>> {
+fun HttpSource.fetchPageListFromCacheThenNet(chapter: Chapter): Observable<List<Page>> {
     return chapterCache
             .getPageListFromCache(chapter)
             .onErrorResumeNext { fetchPageList(chapter) }
@@ -32,14 +32,14 @@ fun OnlineSource.fetchPageListFromCacheThenNet(chapter: Chapter): Observable<Lis
  *
  * @param page the page whose source image has to be downloaded.
  */
-fun OnlineSource.fetchImageFromCacheThenNet(page: Page): Observable<Page> {
+fun HttpSource.fetchImageFromCacheThenNet(page: Page): Observable<Page> {
     return if (page.imageUrl.isNullOrEmpty())
         getImageUrl(page).flatMap { getCachedImage(it) }
     else
         getCachedImage(page)
 }
 
-fun OnlineSource.getImageUrl(page: Page): Observable<Page> {
+fun HttpSource.getImageUrl(page: Page): Observable<Page> {
     page.status = Page.LOAD_PAGE
     return fetchImageUrl(page)
             .doOnError { page.status = Page.ERROR }
@@ -54,7 +54,7 @@ fun OnlineSource.getImageUrl(page: Page): Observable<Page> {
  *
  * @param page the page.
  */
-fun OnlineSource.getCachedImage(page: Page): Observable<Page> {
+fun HttpSource.getCachedImage(page: Page): Observable<Page> {
     val imageUrl = page.imageUrl ?: return Observable.just(page)
 
     return Observable.just(page)
@@ -78,20 +78,20 @@ fun OnlineSource.getCachedImage(page: Page): Observable<Page> {
  *
  * @param page the page.
  */
-private fun OnlineSource.cacheImage(page: Page): Observable<Page> {
+private fun HttpSource.cacheImage(page: Page): Observable<Page> {
     page.status = Page.DOWNLOAD_IMAGE
     return fetchImage(page)
             .doOnNext { chapterCache.putImageToCache(page.imageUrl!!, it) }
             .map { page }
 }
 
-fun OnlineSource.fetchAllImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
+fun HttpSource.fetchAllImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
     return Observable.from(pages)
             .filter { !it.imageUrl.isNullOrEmpty() }
             .mergeWith(fetchRemainingImageUrlsFromPageList(pages))
 }
 
-fun OnlineSource.fetchRemainingImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
+fun HttpSource.fetchRemainingImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
     return Observable.from(pages)
             .filter { it.imageUrl.isNullOrEmpty() }
             .concatMap { getImageUrl(it) }

app/src/main/java/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt

@@ -12,7 +12,7 @@ import org.jsoup.nodes.Element
 /**
  * A simple implementation for sources from a website using Jsoup, an HTML parser.
  */
-abstract class ParsedOnlineSource : OnlineSource() {
+abstract class ParsedHttpSource : HttpSource() {
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.

app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt

@@ -12,7 +12,7 @@ import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.*
 
-class YamlOnlineSource(mappings: Map<*, *>) : OnlineSource() {
+class YamlHttpSource(mappings: Map<*, *>) : HttpSource() {
 
     val map = YamlSourceNode(mappings)
 

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Batoto.kt

@@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservable
 import eu.kanade.tachiyomi.source.model.*
 import eu.kanade.tachiyomi.source.online.LoginSource
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import eu.kanade.tachiyomi.util.selectText
 import okhttp3.FormBody
@@ -22,7 +22,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
-class Batoto : ParsedOnlineSource(), LoginSource {
+class Batoto : ParsedHttpSource(), LoginSource {
 
     override val id: Long = 1
 

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Kissmanga.kt

@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.source.online.english
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.FormBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -13,7 +13,7 @@ import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.regex.Pattern
 
-class Kissmanga : ParsedOnlineSource() {
+class Kissmanga : ParsedHttpSource() {
 
     override val id: Long = 4
 

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Mangafox.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.HttpUrl
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -11,7 +11,7 @@ import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
 
-class Mangafox : ParsedOnlineSource() {
+class Mangafox : ParsedHttpSource() {
 
     override val id: Long = 3
 

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Mangahere.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.HttpUrl
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -11,7 +11,7 @@ import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
 
-class Mangahere : ParsedOnlineSource() {
+class Mangahere : ParsedHttpSource() {
 
     override val id: Long = 2
 

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Mangasee.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
 
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.FormBody
 import okhttp3.HttpUrl
 import okhttp3.Request
@@ -11,7 +11,7 @@ import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.regex.Pattern
 
-class Mangasee : ParsedOnlineSource() {
+class Mangasee : ParsedHttpSource() {
 
     override val id: Long = 9
 

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Readmangatoday.kt

@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.source.online.english
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -11,7 +11,7 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.util.*
 
-class Readmangatoday : ParsedOnlineSource() {
+class Readmangatoday : ParsedHttpSource() {
 
     override val id: Long = 8
 

app/src/main/java/eu/kanade/tachiyomi/source/online/german/WieManga.kt

@@ -5,13 +5,13 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 
-class WieManga : ParsedOnlineSource() {
+class WieManga : ParsedHttpSource() {
 
     override val id: Long = 10
 

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Mangachan.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.russian
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Request
 import okhttp3.Response
@@ -11,7 +11,7 @@ import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.*
 
-class Mangachan : ParsedOnlineSource() {
+class Mangachan : ParsedHttpSource() {
 
     override val id: Long = 7
 

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Mintmanga.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.russian
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -11,7 +11,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
-class Mintmanga : ParsedOnlineSource() {
+class Mintmanga : ParsedHttpSource() {
 
     override val id: Long = 6
 

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Readmanga.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.russian
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedOnlineSource
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -11,7 +11,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Pattern
 
-class Readmanga : ParsedOnlineSource() {
+class Readmanga : ParsedHttpSource() {
 
     override val id: Long = 5