Merge pull request #1 from gedoor/master

修复htmlFormatter错误

app/src/main/java/io/legado/app/constant/AppPattern.kt

@@ -9,7 +9,7 @@ object AppPattern {
     val EXP_PATTERN: Pattern = Pattern.compile("\\{\\{([\\w\\W]*?)\\}\\}")
     //图片有data-开头的数据属性时优先用数据属性作为src，没有数据属性时才匹配src
     val imgPattern: Pattern =
-        Pattern.compile("<img(?:(?![^>]*data-)src|(?=[^>]*data-)[^>]*data-[^= ]+) *= *\"([^\"{]+(?:\\{(?:[^{}]|\\{[^{}]*\\})*\\})?)\"[^>]*>", Pattern.CASE_INSENSITIVE)
+        Pattern.compile("<img .*?src.*?=.*?\"(.*?(?:,\\{.*\\})?)\".*?>", Pattern.CASE_INSENSITIVE)
 
     val nameRegex = Regex("\\s+作\\s*者.*|\\s+\\S+\\s+著")
     val authorRegex = Regex("^.*?作\\s*者[:：\\s]*|\\s+著")

app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt

@@ -118,12 +118,10 @@ object ChapterProvider {
                             val matcher = AppPattern.imgPattern.matcher(text)
                             if (matcher.find()) {
                                 matcher.group(1)?.let { src ->
-                                    //if (!book.isEpub()) {
                                     durY = setTypeImage(
                                         book, bookChapter, src,
                                         durY, textPages, book.getImageStyle()
                                     )
-                                    //}
                                 }
                             } else {
                                 val isTitle = index == 0