Merge pull request #369 from 1552980358/master

Modify code style of package `io.legado.app.data`

app/src/main/java/io/legado/app/data/AppDatabase.kt

@@ -19,14 +19,14 @@ import io.legado.app.data.entities.*
     version = 20,
     exportSchema = true
 )
-abstract class AppDatabase : RoomDatabase() {
+abstract class AppDatabase: RoomDatabase() {
     
     companion object {
         
         private const val DATABASE_NAME = "legado.db"
         
-        fun createDatabase(context: Context): AppDatabase {
+        fun createDatabase(context: Context) =
-            return Room.databaseBuilder(context, AppDatabase::class.java, DATABASE_NAME)
+            Room.databaseBuilder(context, AppDatabase::class.java, DATABASE_NAME)
                 .fallbackToDestructiveMigration()
                 .addMigrations(
                     migration_10_11,
@@ -41,9 +41,8 @@ abstract class AppDatabase : RoomDatabase() {
                 )
                 .allowMainThreadQueries()
                 .build()
-        }
         
-        private val migration_10_11 = object : Migration(10, 11) {
+        private val migration_10_11 = object: Migration(10, 11) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("DROP TABLE txtTocRules")
                 database.execSQL(
@@ -56,19 +55,19 @@ abstract class AppDatabase : RoomDatabase() {
             }
         }
         
-        private val migration_11_12 = object : Migration(11, 12) {
+        private val migration_11_12 = object: Migration(11, 12) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE rssSources ADD style TEXT ")
             }
         }
         
-        private val migration_12_13 = object : Migration(12, 13) {
+        private val migration_12_13 = object: Migration(12, 13) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE rssSources ADD articleStyle INTEGER NOT NULL DEFAULT 0 ")
             }
         }
         
-        private val migration_13_14 = object : Migration(13, 14) {
+        private val migration_13_14 = object: Migration(13, 14) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL(
                     """
@@ -87,25 +86,25 @@ abstract class AppDatabase : RoomDatabase() {
             }
         }
         
-        private val migration_14_15 = object : Migration(14, 15) {
+        private val migration_14_15 = object: Migration(14, 15) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE bookmarks ADD bookAuthor TEXT NOT NULL DEFAULT ''")
             }
         }
         
-        private val migration_15_17 = object : Migration(15, 17) {
+        private val migration_15_17 = object: Migration(15, 17) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("CREATE TABLE IF NOT EXISTS `readRecord` (`bookName` TEXT NOT NULL, `readTime` INTEGER NOT NULL, PRIMARY KEY(`bookName`))")
             }
         }
         
-        private val migration_17_18 = object : Migration(17, 18) {
+        private val migration_17_18 = object: Migration(17, 18) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("CREATE TABLE IF NOT EXISTS `httpTTS` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))")
             }
         }
         
-        private val migration_18_19 = object : Migration(18, 19) {
+        private val migration_18_19 = object: Migration(18, 19) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("CREATE TABLE IF NOT EXISTS `readRecordNew` (`androidId` TEXT NOT NULL, `bookName` TEXT NOT NULL, `readTime` INTEGER NOT NULL, PRIMARY KEY(`androidId`, `bookName`))")
                 database.execSQL("INSERT INTO readRecordNew(androidId, bookName, readTime) select '${App.androidId}' as androidId, bookName, readTime from readRecord")
@@ -113,7 +112,7 @@ abstract class AppDatabase : RoomDatabase() {
                 database.execSQL("ALTER TABLE readRecordNew RENAME TO readRecord")
             }
         }
-        private val migration_19_20 = object : Migration(19,20) {
+        private val migration_19_20 = object: Migration(19, 20) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE book_sources ADD bookSourceComment TEXT")
             }

app/src/main/java/io/legado/app/data/entities/Book.kt

@@ -55,7 +55,7 @@ data class Book(
     var originOrder: Int = 0,                   //书源排序
     var useReplaceRule: Boolean = AppConfig.replaceEnableDefault,         // 正文使用净化替换规则
     var variable: String? = null                // 自定义书籍变量信息(用于书源规则检索书籍信息)
-) : Parcelable, BaseBook {
+): Parcelable, BaseBook {
     
     fun isLocalBook(): Boolean {
         return origin == BookType.local
@@ -120,8 +120,7 @@ data class Book(
         return name.replace(AppPattern.fileNameRegex, "") + MD5Utils.md5Encode16(bookUrl)
     }
     
-    fun toSearchBook(): SearchBook {
+    fun toSearchBook() = SearchBook(
-        return SearchBook(
         name = name,
         author = author,
         kind = kind,
@@ -140,7 +139,6 @@ data class Book(
         this.infoHtml = this@Book.infoHtml
         this.tocHtml = this@Book.tocHtml
     }
-    }
     
     fun changeTo(newBook: Book) {
         newBook.group = group

app/src/main/java/io/legado/app/data/entities/BookChapter.kt

@@ -52,16 +52,9 @@ data class BookChapter(
         variable = GSON.toJson(variableMap)
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode() = url.hashCode()
-        return url.hashCode()
-    }
 
-    override fun equals(other: Any?): Boolean {
+    override fun equals(other: Any?) = if (other is BookChapter) other.url == url else false
-        if (other is BookChapter) {
-            return other.url == url
-        }
-        return false
-    }
 
 }
 

app/src/main/java/io/legado/app/data/entities/BookSource.kt

@@ -11,8 +11,8 @@ import io.legado.app.data.entities.rule.*
 import io.legado.app.help.JsExtensions
 import io.legado.app.utils.*
 import kotlinx.android.parcel.Parcelize
-import java.util.*
 import javax.script.SimpleBindings
+import kotlin.collections.HashMap
 
 @Parcelize
 @TypeConverters(BookSource.Converters::class)
@@ -42,57 +42,41 @@ data class BookSource(
     var ruleBookInfo: BookInfoRule? = null,         // 书籍信息页规则
     var ruleToc: TocRule? = null,                   // 目录页规则
     var ruleContent: ContentRule? = null            // 正文页规则
-) : Parcelable, JsExtensions {
+): Parcelable, JsExtensions {
     
     override fun hashCode(): Int {
         return bookSourceUrl.hashCode()
     }
     
-    override fun equals(other: Any?): Boolean {
+    override fun equals(other: Any?) = if (other is BookSource) other.bookSourceUrl == bookSourceUrl else false
-        if (other is BookSource) {
-            return other.bookSourceUrl == bookSourceUrl
-        }
-        return false
-    }
     
     @Throws(Exception::class)
-    fun getHeaderMap(): Map<String, String> {
+    fun getHeaderMap() = (HashMap<String, String>().apply {
-        val headerMap = HashMap<String, String>()
+        this[AppConst.UA_NAME] = App.INSTANCE.getPrefString("user_agent") ?: userAgent
-        headerMap[AppConst.UA_NAME] = App.INSTANCE.getPrefString("user_agent") ?: userAgent
         header?.let {
-            val header1 = when {
+            GSON.fromJsonObject<Map<String, String>>(
+                when {
                     it.startsWith("@js:", true) ->
                         evalJS(it.substring(4)).toString()
                     it.startsWith("<js>", true) ->
                         evalJS(it.substring(4, it.lastIndexOf("<"))).toString()
                     else -> it
                 }
-            GSON.fromJsonObject<Map<String, String>>(header1)?.let { map ->
+            )?.let { map ->
-                headerMap.putAll(map)
+                putAll(map)
-            }
             }
-        return headerMap
         }
+    }) as Map<String, String>
     
-    fun getSearchRule(): SearchRule {
+    fun getSearchRule() = ruleSearch ?: SearchRule()
-        return ruleSearch ?: SearchRule()
-    }
     
-    fun getExploreRule(): ExploreRule {
+    fun getExploreRule() = ruleExplore ?: ExploreRule()
-        return ruleExplore ?: ExploreRule()
-    }
     
-    fun getBookInfoRule(): BookInfoRule {
+    fun getBookInfoRule() = ruleBookInfo ?: BookInfoRule()
-        return ruleBookInfo ?: BookInfoRule()
-    }
     
-    fun getTocRule(): TocRule {
+    fun getTocRule() = ruleToc ?: TocRule()
-        return ruleToc ?: TocRule()
-    }
     
-    fun getContentRule(): ContentRule {
+    fun getContentRule() = ruleContent ?: ContentRule()
-        return ruleContent ?: ContentRule()
-    }
     
     fun addGroup(group: String) {
         bookSourceGroup?.let {
@@ -111,8 +95,7 @@ data class BookSource(
         }
     }
     
-    fun getExploreKinds(): ArrayList<ExploreKind>? {
+    fun getExploreKinds() = arrayListOf<ExploreKind>().apply {
-        val exploreKinds = arrayListOf<ExploreKind>()
         exploreUrl?.let {
             var a = it
             if (a.isNotBlank()) {
@@ -135,14 +118,13 @@ data class BookSource(
                     b.forEach { c ->
                         val d = c.split("::")
                         if (d.size > 1)
-                            exploreKinds.add(ExploreKind(d[0], d[1]))
+                            add(ExploreKind(d[0], d[1]))
                     }
                 } catch (e: Exception) {
-                    exploreKinds.add(ExploreKind(e.localizedMessage ?: ""))
+                    add(ExploreKind(e.localizedMessage ?: ""))
                 }
             }
         }
-        return exploreKinds
     }
     
     /**
@@ -155,8 +137,8 @@ data class BookSource(
         return AppConst.SCRIPT_ENGINE.eval(jsStr, bindings)
     }
     
-    fun equal(source: BookSource): Boolean {
+    fun equal(source: BookSource) =
-        return equal(bookSourceName, source.bookSourceName)
+        equal(bookSourceName, source.bookSourceName)
             && equal(bookSourceUrl, source.bookSourceUrl)
             && equal(bookSourceGroup, source.bookSourceGroup)
             && bookSourceType == source.bookSourceType
@@ -173,11 +155,8 @@ data class BookSource(
             && getBookInfoRule() == source.getBookInfoRule()
             && getTocRule() == source.getTocRule()
             && getContentRule() == source.getContentRule()
-    }
     
-    private fun equal(a: String?, b: String?): Boolean {
+    private fun equal(a: String?, b: String?) = a == b || (a.isNullOrEmpty() && b.isNullOrEmpty())
-        return a == b || (a.isNullOrEmpty() && b.isNullOrEmpty())
-    }
     
     data class ExploreKind(
         var title: String,
@@ -186,54 +165,34 @@ data class BookSource(
     
     class Converters {
         @TypeConverter
-        fun exploreRuleToString(exploreRule: ExploreRule?): String? {
+        fun exploreRuleToString(exploreRule: ExploreRule?) = GSON.toJson(exploreRule)
-            return GSON.toJson(exploreRule)
-        }
         
         @TypeConverter
-        fun stringToExploreRule(json: String?): ExploreRule? {
+        fun stringToExploreRule(json: String?) = GSON.fromJsonObject<ExploreRule>(json)
-            return GSON.fromJsonObject<ExploreRule>(json)
-        }
         
         @TypeConverter
-        fun searchRuleToString(searchRule: SearchRule?): String? {
+        fun searchRuleToString(searchRule: SearchRule?) = GSON.toJson(searchRule)
-            return GSON.toJson(searchRule)
-        }
         
         @TypeConverter
-        fun stringToSearchRule(json: String?): SearchRule? {
+        fun stringToSearchRule(json: String?) = GSON.fromJsonObject<SearchRule>(json)
-            return GSON.fromJsonObject<SearchRule>(json)
-        }
         
         @TypeConverter
-        fun bookInfoRuleToString(bookInfoRule: BookInfoRule?): String? {
+        fun bookInfoRuleToString(bookInfoRule: BookInfoRule?) = GSON.toJson(bookInfoRule)
-            return GSON.toJson(bookInfoRule)
-        }
         
         @TypeConverter
-        fun stringToBookInfoRule(json: String?): BookInfoRule? {
+        fun stringToBookInfoRule(json: String?) = GSON.fromJsonObject<BookInfoRule>(json)
-            return GSON.fromJsonObject<BookInfoRule>(json)
-        }
         
         @TypeConverter
-        fun tocRuleToString(tocRule: TocRule?): String? {
+        fun tocRuleToString(tocRule: TocRule?) = GSON.toJson(tocRule)
-            return GSON.toJson(tocRule)
-        }
         
         @TypeConverter
-        fun stringToTocRule(json: String?): TocRule? {
+        fun stringToTocRule(json: String?) = GSON.fromJsonObject<TocRule>(json)
-            return GSON.fromJsonObject<TocRule>(json)
-        }
         
         @TypeConverter
-        fun contentRuleToString(contentRule: ContentRule?): String? {
+        fun contentRuleToString(contentRule: ContentRule?) = GSON.toJson(contentRule)
-            return GSON.toJson(contentRule)
-        }
         
         @TypeConverter
-        fun stringToContentRule(json: String?): ContentRule? {
+        fun stringToContentRule(json: String?) = GSON.fromJsonObject<ContentRule>(json)
-            return GSON.fromJsonObject<ContentRule>(json)
-        }
         
     }
 }

app/src/main/java/io/legado/app/data/entities/RssArticle.kt

@@ -20,22 +20,14 @@ data class RssArticle(
     var read: Boolean = false
 ) {
     
-    override fun hashCode(): Int {
+    override fun hashCode() = link.hashCode()
-        return link.hashCode()
-    }
     
     override fun equals(other: Any?): Boolean {
-        if (other == null) {
+        other ?: return false
-            return false
+        return if (other is RssArticle) origin == other.origin && link == other.link else false
-        }
-        if (other is RssArticle) {
-            return origin == other.origin && link == other.link
-        }
-        return false
     }
     
-    fun toStar(): RssStar {
+    fun toStar() = RssStar(
-        return RssStar(
         origin = origin,
         sort = sort,
         title = title,
@@ -46,5 +38,4 @@ data class RssArticle(
         content = content,
         image = image
     )
-    }
 }

app/src/main/java/io/legado/app/data/entities/RssSource.kt

@@ -41,47 +41,35 @@ data class RssSource(
     var loadWithBaseUrl: Boolean = false,
     
     var customOrder: Int = 0
-) : Parcelable, JsExtensions {
+): Parcelable, JsExtensions {
     
-    override fun equals(other: Any?): Boolean {
+    override fun equals(other: Any?) = if (other is RssSource) other.sourceUrl == sourceUrl else false
-        if (other is RssSource) {
-            return other.sourceUrl == sourceUrl
-        }
-        return false
-    }
     
-    override fun hashCode(): Int {
+    override fun hashCode() = sourceUrl.hashCode()
-        return sourceUrl.hashCode()
-    }
     
     @Throws(Exception::class)
-    fun getHeaderMap(): Map<String, String> {
+    fun getHeaderMap() = HashMap<String, String>().apply {
-        val headerMap = HashMap<String, String>()
+        this[AppConst.UA_NAME] = App.INSTANCE.getPrefString("user_agent") ?: AppConst.userAgent
-        headerMap[AppConst.UA_NAME] = App.INSTANCE.getPrefString("user_agent") ?: AppConst.userAgent
         header?.let {
-            val header1 = when {
+            GSON.fromJsonObject<Map<String, String>>(
+                when {
                     it.startsWith("@js:", true) ->
                         evalJS(it.substring(4)).toString()
                     it.startsWith("<js>", true) ->
                         evalJS(it.substring(4, it.lastIndexOf("<"))).toString()
                     else -> it
                 }
-            GSON.fromJsonObject<Map<String, String>>(header1)?.let { map ->
+            )?.let { map ->
-                headerMap.putAll(map)
+                putAll(map)
             }
         }
-        return headerMap
     }
     
     /**
      * 执行JS
      */
     @Throws(Exception::class)
-    private fun evalJS(jsStr: String): Any {
+    private fun evalJS(jsStr: String): Any = AppConst.SCRIPT_ENGINE.eval(jsStr, SimpleBindings().apply { this["java"] = this@RssSource })
-        val bindings = SimpleBindings()
-        bindings["java"] = this
-        return AppConst.SCRIPT_ENGINE.eval(jsStr, bindings)
-    }
     
     fun equal(source: RssSource): Boolean {
         return equal(sourceUrl, source.sourceUrl)
@@ -103,16 +91,15 @@ data class RssSource(
         return a == b || (a.isNullOrEmpty() && b.isNullOrEmpty())
     }
     
-    fun sortUrls(): LinkedHashMap<String, String> {
+    fun sortUrls(): LinkedHashMap<String, String> =
-        val sortMap = linkedMapOf<String, String>()
+        linkedMapOf<String, String>().apply {
             sortUrl?.split("(&&|\n)+".toRegex())?.forEach { c ->
                 val d = c.split("::")
                 if (d.size > 1)
-                sortMap[d[0]] = d[1]
+                    this[d[0]] = d[1]
             }
-        if (sortMap.isEmpty()) {
+            if (isEmpty()) {
-            sortMap[""] = sourceUrl
+                this[""] = sourceUrl
             }
-        return sortMap
         }
 }

app/src/main/java/io/legado/app/data/entities/RssStar.kt

@@ -18,8 +18,7 @@ data class RssStar(
     var content: String? = null,
     var image: String? = null
 ) {
-    fun toRssArticle(): RssArticle {
+    fun toRssArticle() = RssArticle(
-        return RssArticle(
             origin = origin,
             sort = sort,
             title = title,
@@ -29,5 +28,4 @@ data class RssStar(
             content = content,
             image = image
         )
-    }
 }

app/src/main/java/io/legado/app/data/entities/SearchBook.kt

@@ -36,7 +36,7 @@ data class SearchBook(
     var time: Long = System.currentTimeMillis(),
     var variable: String? = null,
     var originOrder: Int = 0
-) : Parcelable, BaseBook, Comparable<SearchBook> {
+): Parcelable, BaseBook, Comparable<SearchBook> {
     
     @Ignore
     @IgnoredOnParcel
@@ -46,18 +46,9 @@ data class SearchBook(
     @IgnoredOnParcel
     override var tocHtml: String? = null
     
-    override fun equals(other: Any?): Boolean {
+    override fun equals(other: Any?) = other is SearchBook && other.bookUrl == bookUrl
-        if (other is SearchBook) {
-            if (other.bookUrl == bookUrl) {
-                return true
-            }
-        }
-        return false
-    }
     
-    override fun hashCode(): Int {
+    override fun hashCode() = bookUrl.hashCode()
-        return bookUrl.hashCode()
-    }
     
     override fun compareTo(other: SearchBook): Int {
         return other.originOrder - this.originOrder
@@ -93,8 +84,7 @@ data class SearchBook(
         return "无最新章节"
     }
     
-    fun toBook(): Book {
+    fun toBook() = Book(
-        return Book(
         name = name,
         author = author,
         kind = kind,
@@ -113,5 +103,4 @@ data class SearchBook(
         this.infoHtml = this@SearchBook.infoHtml
         this.tocUrl = this@SearchBook.tocUrl
     }
-    }
 }