From 5d600166eaaf904eb110196f4528f46273e063b5 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Tue, 26 Jan 2021 20:25:59 -0500 Subject: [PATCH] Move EnhancedSource helper functions to SourceHelpers --- .../java/exh/source/EnhancedHttpSource.kt | 19 ------------------- app/src/main/java/exh/source/SourceHelper.kt | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/exh/source/EnhancedHttpSource.kt b/app/src/main/java/exh/source/EnhancedHttpSource.kt index bc82190bf..0f6fd7833 100644 --- a/app/src/main/java/exh/source/EnhancedHttpSource.kt +++ b/app/src/main/java/exh/source/EnhancedHttpSource.kt @@ -1,7 +1,6 @@ package exh.source import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.Page @@ -255,21 +254,3 @@ class EnhancedHttpSource( } } } - -fun Source.getMainSource(): Source = if (this is EnhancedHttpSource) { - this.source() -} else { - this -} - -fun Source.getOriginalSource(): Source = if (this is EnhancedHttpSource) { - this.originalSource -} else { - this -} - -fun Source.getEnhancedSource(): Source = if (this is EnhancedHttpSource) { - this.enhancedSource -} else { - this -} diff --git a/app/src/main/java/exh/source/SourceHelper.kt b/app/src/main/java/exh/source/SourceHelper.kt index 71f8979df..6973e91f1 100644 --- a/app/src/main/java/exh/source/SourceHelper.kt +++ b/app/src/main/java/exh/source/SourceHelper.kt @@ -105,3 +105,21 @@ fun isMetadataSource(source: Long) = source in 6900..6999 || fun Source.isEhBasedSource() = id == EH_SOURCE_ID || id == EXH_SOURCE_ID fun Manga.isEhBasedManga() = source == EH_SOURCE_ID || source == EXH_SOURCE_ID + +fun Source.getMainSource(): Source = if (this is EnhancedHttpSource) { + this.source() +} else { + this +} + +fun Source.getOriginalSource(): Source = if (this is EnhancedHttpSource) { + this.originalSource +} else { + this +} + +fun Source.getEnhancedSource(): Source = if (this is EnhancedHttpSource) { + this.enhancedSource +} else { + this +}