From 289de074c86df25631a76dd98075066910ae6e7f Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Tue, 10 Jul 2018 04:20:24 -0700 Subject: [PATCH] [FoolSlide/WpManga] Set time to midnight for 'today' and 'yesterday' date handling so date_upload doesn't change on every refresh (#393) [FoolSlide/WpManga] Set time to midnight for 'today' and 'yesterday' date handling --- src/all/foolslide/build.gradle | 4 ++-- .../tachiyomi/extension/en/foolslide/FoolSlide.kt | 10 +++++++++- src/all/wpmanga/build.gradle | 4 ++-- .../kanade/tachiyomi/extension/all/wpmanga/WpManga.kt | 10 +++++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/all/foolslide/build.gradle b/src/all/foolslide/build.gradle index b723e7bba..248ef6719 100644 --- a/src/all/foolslide/build.gradle +++ b/src/all/foolslide/build.gradle @@ -5,8 +5,8 @@ ext { appName = 'Tachiyomi: FoolSlide' pkgNameSuffix = "all.foolslide" extClass = '.FoolSlideFactory' - extVersionCode = 7 - extVersionSuffix = 7 + extVersionCode = 8 + extVersionSuffix = 8 libVersion = '1.2' } dependencies { diff --git a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlide.kt b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlide.kt index a20a704b1..b311d5bb2 100644 --- a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlide.kt +++ b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlide.kt @@ -143,13 +143,21 @@ open class FoolSlide(override val name: String, override val baseUrl: String, ov if (lcDate.endsWith(" ago")) parseRelativeDate(lcDate)?.let { return it } - //Handle 'yesterday' and 'today' + //Handle 'yesterday' and 'today', using midnight var relativeDate: Calendar? = null if (lcDate.startsWith("yesterday")) { relativeDate = Calendar.getInstance() relativeDate.add(Calendar.DAY_OF_MONTH, -1) //yesterday + relativeDate.set(Calendar.HOUR_OF_DAY, 0) + relativeDate.set(Calendar.MINUTE, 0) + relativeDate.set(Calendar.SECOND, 0) + relativeDate.set(Calendar.MILLISECOND, 0) } else if (lcDate.startsWith("today")) { relativeDate = Calendar.getInstance() + relativeDate.set(Calendar.HOUR_OF_DAY, 0) + relativeDate.set(Calendar.MINUTE, 0) + relativeDate.set(Calendar.SECOND, 0) + relativeDate.set(Calendar.MILLISECOND, 0) } relativeDate?.timeInMillis?.let { diff --git a/src/all/wpmanga/build.gradle b/src/all/wpmanga/build.gradle index 35806f856..eae20a2de 100644 --- a/src/all/wpmanga/build.gradle +++ b/src/all/wpmanga/build.gradle @@ -5,8 +5,8 @@ ext { appName = 'Tachiyomi: WPManga (Many sources)' pkgNameSuffix = "all.wpmanga" extClass = '.WpMangaFactory' - extVersionCode = 1 - extVersionSuffix = 1 + extVersionCode = 2 + extVersionSuffix = 2 libVersion = '1.2' } dependencies { diff --git a/src/all/wpmanga/src/eu/kanade/tachiyomi/extension/all/wpmanga/WpManga.kt b/src/all/wpmanga/src/eu/kanade/tachiyomi/extension/all/wpmanga/WpManga.kt index 71509889c..a3432e4cc 100644 --- a/src/all/wpmanga/src/eu/kanade/tachiyomi/extension/all/wpmanga/WpManga.kt +++ b/src/all/wpmanga/src/eu/kanade/tachiyomi/extension/all/wpmanga/WpManga.kt @@ -108,13 +108,21 @@ open class WpManga(override val name: String, override val baseUrl: String, over if (lcDate.endsWith(" ago")) parseRelativeDate(lcDate)?.let { return it } - //Handle 'yesterday' and 'today' + //Handle 'yesterday' and 'today', using midnight var relativeDate: Calendar? = null if (lcDate.startsWith("yesterday")) { relativeDate = Calendar.getInstance() relativeDate.add(Calendar.DAY_OF_MONTH, -1) //yesterday + relativeDate.set(Calendar.HOUR_OF_DAY, 0) + relativeDate.set(Calendar.MINUTE, 0) + relativeDate.set(Calendar.SECOND, 0) + relativeDate.set(Calendar.MILLISECOND, 0) } else if (lcDate.startsWith("today")) { relativeDate = Calendar.getInstance() + relativeDate.set(Calendar.HOUR_OF_DAY, 0) + relativeDate.set(Calendar.MINUTE, 0) + relativeDate.set(Calendar.SECOND, 0) + relativeDate.set(Calendar.MILLISECOND, 0) } relativeDate?.timeInMillis?.let {