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

Add property to get the number of a page

Browse Source
This commit is contained in:
len 2016-11-29 22:32:44 +01:00
parent d30c019b89
commit 3e1dc9f400
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
View File

@ -302,7 +302,7 @@ class Downloader(private val context: Context, private val provider: DownloadPro
if (page.imageUrl == null) if (page.imageUrl == null)
return Observable.just(page) return Observable.just(page)
val filename = String.format("%03d", page.index + 1) val filename = String.format("%03d", page.number)
val tmpFile = tmpDir.findFile("$filename.tmp") val tmpFile = tmpDir.findFile("$filename.tmp")
// Delete temp file if it exists. // Delete temp file if it exists.

3
app/src/main/java/eu/kanade/tachiyomi/data/source/model/Page.kt
View File

@ -12,6 +12,9 @@ class Page(
@Transient var uri: Uri? = null @Transient var uri: Uri? = null
) : ProgressListener { ) : ProgressListener {
val number: Int
get() = index + 1
@Transient lateinit var chapter: ReaderChapter @Transient lateinit var chapter: ReaderChapter
@Transient @Volatile var status: Int = 0 @Transient @Volatile var status: Int = 0

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -331,7 +331,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
fun onPageChanged(page: Page) { fun onPageChanged(page: Page) {
presenter.onPageChanged(page) presenter.onPageChanged(page)
val pageNumber = page.index + 1 val pageNumber = page.number
val pageCount = page.chapter.pages!!.size val pageCount = page.chapter.pages!!.size
page_number.text = "$pageNumber/$pageCount" page_number.text = "$pageNumber/$pageCount"
if (page_seekbar.rotation != 180f) { if (page_seekbar.rotation != 180f) {

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View File

@ -579,7 +579,7 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
// Build destination file. // Build destination file.
val ext = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg" val ext = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg"
val filename = DiskUtil.buildValidFilename( val filename = DiskUtil.buildValidFilename(
"${manga.title} - ${chapter.name}") + " - ${page.index + 1}.$ext" "${manga.title} - ${chapter.name}") + " - ${page.number}.$ext"
val destFile = File(destDir, filename) val destFile = File(destDir, filename)
context.contentResolver.openInputStream(page.uri).use { input -> context.contentResolver.openInputStream(page.uri).use { input ->