Handle empty directory. Fix travis

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

View File

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

View File

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