Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 01:51:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty directory. Fix travis

Browse Source
This commit is contained in:
len 2016-11-24 16:11:01 +01:00
parent f9c5379400
commit 20041701cd
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -5,7 +5,7 @@ android:
- tools - tools
# The BuildTools version used by your project # The BuildTools version used by your project
- build-tools-25.0.0 - build-tools-25.0.1
- android-25 - android-25
- extra-android-m2repository - extra-android-m2repository
- extra-google-m2repository - extra-google-m2repository

19
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
View File

@ -96,16 +96,17 @@ class DownloadManager(context: Context) {
*/ */
private fun buildPageList(chapterDir: UniFile?): Observable<List<Page>> { private fun buildPageList(chapterDir: UniFile?): Observable<List<Page>> {
return Observable.fromCallable { return Observable.fromCallable {
val pages = mutableListOf<Page>() val files = chapterDir?.listFiles().orEmpty()
chapterDir?.listFiles() .filter { "image" in it.type.orEmpty() }
?.filter { it.type?.startsWith("image") ?: false }
?.sortedBy { it.name } if (files.isEmpty()) {
?.forEach { file -> throw Exception("Page list is empty")
val page = Page(pages.size, uri = file.uri) }
pages.add(page)
page.status = Page.READY files.sortedBy { it.name }
.mapIndexed { i, file ->
Page(i, uri = file.uri).apply { status = Page.READY }
} }
pages
} }
} }