6.12.2 commit

XilinJia · Oct 23, 2024 · d3ca132 · d3ca132
1 parent 79c1bf4
commit d3ca132
Show file tree

Hide file tree

Showing 14 changed files with 197 additions and 217 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         testApplicationId "ac.mdiq.podcini.tests"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 3020279
-        versionName "6.12.1"
+        versionCode 3020280
+        versionName "6.12.2"
 
         applicationId "ac.mdiq.podcini.R"
         def commit = ""

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/playback/ServiceStatusHandler.kt b/app/src/main/kotlin/ac/mdiq/podcini/playback/ServiceStatusHandler.kt
@@ -45,7 +45,7 @@ abstract class ServiceStatusHandler(private val activity: FragmentActivity) {
                     Logd(TAG, "statusUpdate onReceive doing updates")
                     MediaPlayerBase.status = info.playerStatus
                     prevStatus = MediaPlayerBase.status
-                    curMedia = info.playable
+//                    curMedia = info.playable
                     handleStatus()
                 }
             } else {
@@ -177,7 +177,7 @@ abstract class ServiceStatusHandler(private val activity: FragmentActivity) {
         Logd(TAG, "Querying service info")
         if (playbackService != null && PlaybackService.mPlayerInfo != null) {
             MediaPlayerBase.status = PlaybackService.mPlayerInfo!!.playerStatus
-            curMedia = PlaybackService.mPlayerInfo!!.playable
+//            curMedia = PlaybackService.mPlayerInfo!!.playable
             // make sure that new media is loaded if it's available
             mediaInfoLoaded = false
             handleStatus()

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/playback/base/MediaPlayerBase.kt b/app/src/main/kotlin/ac/mdiq/podcini/playback/base/MediaPlayerBase.kt
@@ -271,11 +271,13 @@ abstract class MediaPlayerBase protected constructor(protected val context: Cont
         Log.d(TAG, "${this.javaClass.simpleName}: Setting player status to $newStatus")
         this.oldStatus = status
         status = newStatus
-        if (newMedia != null) setPlayable(newMedia)
-        if (newMedia != null && newStatus != PlayerStatus.INDETERMINATE) {
-            when {
-                oldStatus == PlayerStatus.PLAYING && newStatus != PlayerStatus.PLAYING -> callback.onPlaybackPause(newMedia, position)
-                oldStatus != PlayerStatus.PLAYING && newStatus == PlayerStatus.PLAYING -> callback.onPlaybackStart(newMedia, position)
+        if (newMedia != null) {
+            setPlayable(newMedia)
+            if (newStatus != PlayerStatus.INDETERMINATE) {
+                when {
+                    oldStatus == PlayerStatus.PLAYING && newStatus != PlayerStatus.PLAYING -> callback.onPlaybackPause(newMedia, position)
+                    oldStatus != PlayerStatus.PLAYING && newStatus == PlayerStatus.PLAYING -> callback.onPlaybackStart(newMedia, position)
+                }
             }
         }
         callback.statusChanged(MediaPlayerInfo(oldStatus, status, curMedia))

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/playback/service/PlaybackService.kt b/app/src/main/kotlin/ac/mdiq/podcini/playback/service/PlaybackService.kt
@@ -389,15 +389,23 @@ class PlaybackService : MediaLibraryService() {
                 }
             }
             if (item != null) {
+//                fun shouldSkipKeepEpisode(): Boolean {
+//                    return appPrefs.getBoolean(UserPreferences.Prefs.prefSkipKeepsEpisode.name, true)
+//                }
+//                fun shouldFavoriteKeepEpisode(): Boolean {
+//                    return appPrefs.getBoolean(UserPreferences.Prefs.prefFavoriteKeepsEpisode.name, true)
+//                }
                 runOnIOScope {
-                    if (ended || smartMarkAsPlayed || autoSkipped || (skipped && !shouldSkipKeepEpisode())) {
+                    val shouldSkipKeepEpisode = appPrefs.getBoolean(UserPreferences.Prefs.prefSkipKeepsEpisode.name, true)
+                    val shouldFavoriteKeepEpisode = appPrefs.getBoolean(UserPreferences.Prefs.prefFavoriteKeepsEpisode.name, true)
+                    if (ended || smartMarkAsPlayed || autoSkipped || (skipped && !shouldSkipKeepEpisode)) {
                         Logd(TAG, "onPostPlayback ended: $ended smartMarkAsPlayed: $smartMarkAsPlayed autoSkipped: $autoSkipped skipped: $skipped")
                         // only mark the item as played if we're not keeping it anyways
                         item = setPlayStateSync(PlayState.PLAYED.code, ended || (skipped && smartMarkAsPlayed), item!!)
                         val action = item?.feed?.preferences?.autoDeleteAction
                         val shouldAutoDelete = (action == AutoDeleteAction.ALWAYS ||
                                 (action == AutoDeleteAction.GLOBAL && item?.feed != null && shouldAutoDeleteItem(item!!.feed!!)))
-                        if (playable is EpisodeMedia && shouldAutoDelete && (item?.isFavorite != true || !shouldFavoriteKeepEpisode())) {
+                        if (playable is EpisodeMedia && shouldAutoDelete && (item?.isFavorite != true || !shouldFavoriteKeepEpisode)) {
                             item = deleteMediaSync(this@PlaybackService, item!!)
                             if (shouldDeleteRemoveFromQueue()) removeFromQueueSync(null, item!!)
                         }
@@ -407,14 +415,6 @@ class PlaybackService : MediaLibraryService() {
             }
         }
 
-        fun shouldSkipKeepEpisode(): Boolean {
-            return appPrefs.getBoolean(UserPreferences.Prefs.prefSkipKeepsEpisode.name, true)
-        }
-
-        fun shouldFavoriteKeepEpisode(): Boolean {
-            return appPrefs.getBoolean(UserPreferences.Prefs.prefFavoriteKeepsEpisode.name, true)
-        }
-
         override fun onPlaybackStart(playable: Playable, position: Int) {
             Logd(TAG, "onPlaybackStart position: $position")
             taskManager.startWidgetUpdater()
@@ -747,12 +747,10 @@ class PlaybackService : MediaLibraryService() {
 
     override fun onDestroy() {
         Logd(TAG, "Service is about to be destroyed")
-
         playbackService = null
         isRunning = false
         currentMediaType = MediaType.UNKNOWN
         castStateListener.destroy()
-
         currentitem = null
 
         LocalMediaPlayer.cleanup()
@@ -1967,8 +1965,8 @@ class PlaybackService : MediaLibraryService() {
                 }
                 override fun onIsPlayingChanged(isPlaying: Boolean) {
 //                    val stat = if (isPlaying) PlayerStatus.PLAYING else PlayerStatus.PAUSED
-//                    TODO: test
-                    val stat = if (isPlaying) PlayerStatus.PLAYING else PlayerStatus.INDETERMINATE
+//                    TODO: test: changing PAUSED to STOPPED or INDETERMINATE makes resume not possible if interrupted
+                    val stat = if (isPlaying) PlayerStatus.PLAYING else PlayerStatus.PAUSED
                     setPlayerStatus(stat, curMedia)
                     Logd(TAG, "onIsPlayingChanged $isPlaying")
                 }

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/storage/model/EpisodeFilter.kt b/app/src/main/kotlin/ac/mdiq/podcini/storage/model/EpisodeFilter.kt
@@ -20,6 +20,8 @@ class EpisodeFilter(vararg properties: String) : Serializable {
     val showNotAutoDownloadable: Boolean = hasProperty(States.not_auto_downloadable.name)
     val showHasMedia: Boolean = hasProperty(States.has_media.name)
     val showNoMedia: Boolean = hasProperty(States.no_media.name)
+    val showHasComments: Boolean = hasProperty(States.has_comments.name)
+    val showNoComments: Boolean = hasProperty(States.no_comments.name)
     val showIsFavorite: Boolean = hasProperty(States.is_favorite.name)
     val showNotFavorite: Boolean = hasProperty(States.not_favorite.name)
 
@@ -48,6 +50,8 @@ class EpisodeFilter(vararg properties: String) : Serializable {
             showNotAutoDownloadable && item.isAutoDownloadEnabled -> return false
             showHasMedia && item.media == null -> return false
             showNoMedia && item.media != null -> return false
+            showHasComments && item.comment.isEmpty() -> return false
+            showNoComments && item.comment.isNotEmpty() -> return false
             showIsFavorite && !item.isFavorite -> return false
             showNotFavorite && item.isFavorite -> return false
             showQueued && !inAnyQueue(item) -> return false
@@ -69,7 +73,7 @@ class EpisodeFilter(vararg properties: String) : Serializable {
         val statements: MutableList<String> = ArrayList()
         when {
             showPlayed -> statements.add("playState >= ${PlayState.PLAYED.code}")
-            showUnplayed -> statements.add(" playState < ${PlayState.PLAYED.code}> ") // Match "New" items (read = -1) as well
+            showUnplayed -> statements.add(" playState < ${PlayState.PLAYED.code} ") // Match "New" items (read = -1) as well
             showNew -> statements.add("playState == -1 ")
         }
         when {
@@ -93,8 +97,12 @@ class EpisodeFilter(vararg properties: String) : Serializable {
             showNoMedia -> statements.add("media == nil ")
         }
         when {
-            showIsFavorite -> statements.add("isFavorite == true ")
-            showNotFavorite -> statements.add("isFavorite == false ")
+            showHasComments -> statements.add(" comment != '' ")
+            showNoComments -> statements.add(" comment == '' ")
+        }
+        when {
+            showIsFavorite -> statements.add("rating == ${Rating.FAVORITE.code} ")
+            showNotFavorite -> statements.add("rating != ${Rating.FAVORITE.code} ")
         }
 
         if (statements.isEmpty()) return "id > 0"
@@ -120,6 +128,8 @@ class EpisodeFilter(vararg properties: String) : Serializable {
         not_favorite,
         has_media,
         no_media,
+        has_comments,
+        no_comments,
         queued,
         not_queued,
         downloaded,

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/storage/model/FeedFilter.kt b/app/src/main/kotlin/ac/mdiq/podcini/storage/model/FeedFilter.kt
@@ -11,6 +11,8 @@ class FeedFilter(vararg properties: String) : Serializable {
     val showNotKeepUpdated: Boolean = hasProperty(States.not_keepUpdated.name)
     val showGlobalPlaySpeed: Boolean = hasProperty(States.global_playSpeed.name)
     val showCustomPlaySpeed: Boolean = hasProperty(States.custom_playSpeed.name)
+    val showHasComments: Boolean = hasProperty(States.has_comments.name)
+    val showNoComments: Boolean = hasProperty(States.no_comments.name)
     val showHasSkips: Boolean = hasProperty(States.has_skips.name)
     val showNoSkips: Boolean = hasProperty(States.no_skips.name)
     val showAlwaysAutoDelete: Boolean = hasProperty(States.always_auto_delete.name)
@@ -36,6 +38,8 @@ class FeedFilter(vararg properties: String) : Serializable {
             showNotKeepUpdated && feed.preferences?.keepUpdated != false  -> return false
             showGlobalPlaySpeed && feed.preferences?.playSpeed != SPEED_USE_GLOBAL -> return false
             showCustomPlaySpeed && feed.preferences?.playSpeed == SPEED_USE_GLOBAL -> return false
+            showHasComments && feed.comment.isEmpty() -> return false
+            showNoComments && feed.comment.isEmpty()  -> return false
             showHasSkips && feed.preferences?.introSkip == 0 && feed.preferences?.endingSkip == 0  -> return false
             showNoSkips && (feed.preferences?.introSkip != 0 || feed.preferences?.endingSkip != 0)  -> return false
             showAlwaysAutoDelete && feed.preferences?.autoDeleteAction != FeedPreferences.AutoDeleteAction.ALWAYS  -> return false
@@ -60,6 +64,10 @@ class FeedFilter(vararg properties: String) : Serializable {
             showHasSkips -> statements.add(" preferences.introSkip != 0 OR preferences.endingSkip != 0 ")
             showNoSkips -> statements.add(" preferences.introSkip == 0 AND preferences.endingSkip == 0 ")
         }
+        when {
+            showHasComments -> statements.add(" comment != '' ")
+            showNoComments -> statements.add(" comment == '' ")
+        }
         when {
             showAlwaysAutoDelete -> statements.add(" preferences.autoDelete == ${FeedPreferences.AutoDeleteAction.ALWAYS.code} ")
             showNeverAutoDelete -> statements.add(" preferences.playSpeed == ${FeedPreferences.AutoDeleteAction.NEVER.code} ")
@@ -89,6 +97,8 @@ class FeedFilter(vararg properties: String) : Serializable {
         custom_playSpeed,
         has_skips,
         no_skips,
+        has_comments,
+        no_comments,
 //        global_auto_delete,
         always_auto_delete,
         never_auto_delete,