kunfei 4 лет назад
Родитель
Сommit
6d65175efc

+ 4 - 4
app/src/main/java/io/legado/app/data/dao/BookGroupDao.kt

@@ -23,11 +23,11 @@ interface BookGroupDao {
         with const as (SELECT sum(groupId) sumGroupId FROM book_groups where groupId > 0)
         SELECT book_groups.* FROM book_groups, const where (groupId >= 0 and show > 0)
         or (groupId = -1 and show > 0)
-        or (groupId = -2 and show > 0 and (select count(bookUrl) from books where type & ${BookType.local} > 0) > 0)
-        or (groupId = -3 and show > 0 and (select count(bookUrl) from books where type & ${BookType.audio} > 0) > 0)
+        or (groupId = -2 and show > 0 and (select count(*) from books where type & ${BookType.local} > 0) > 0)
+        or (groupId = -3 and show > 0 and (select count(*) from books where type & ${BookType.audio} > 0) > 0)
         or (groupId = -4 and show > 0 
             and (
-                select count(bookUrl) from books 
+                select count(*) from books 
                 where type & ${BookType.audio} = 0
                 and type & ${BookType.local} = 0
                 and const.sumGroupId & `group` = 0
@@ -35,7 +35,7 @@ interface BookGroupDao {
         )
         or (groupId = -5 and show > 0 
             and (
-                select count(bookUrl) from books 
+                select count(*) from books 
                 where type & ${BookType.audio} = 0
                 and type & ${BookType.local} > 0
                 and const.sumGroupId & `group` = 0

+ 1 - 1
app/src/main/java/io/legado/app/model/localBook/LocalBook.kt

@@ -148,7 +148,7 @@ object LocalBook {
         if (book == null) {
             val nameAuthor = analyzeNameAuthor(fileName)
             book = Book(
-                type = BookType.text and BookType.local,
+                type = BookType.text or BookType.local,
                 bookUrl = bookUrl,
                 name = nameAuthor.first,
                 author = nameAuthor.second,