Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: fix horrible numeric function naming

Browse source 
"nonZeroOrNull" is actuallly more apt as "positiveOrNull".
This commit is contained in:
Alexander Capehart 2023-07-04 15:16:08 -06:00
parent 7adf7f7beb
commit b4394c3a4a
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
6 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
View file

@ -45,7 +45,7 @@ import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.playback.PlaybackViewModel
import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.playback.formatDurationMs
import org.oxycblt.auxio.util.collectImmediately import org.oxycblt.auxio.util.collectImmediately
import org.oxycblt.auxio.util.nonZeroOrNull import org.oxycblt.auxio.util.positiveOrNull
/** /**
* A [ListFragment] that shows a list of [Artist]s. * A [ListFragment] that shows a list of [Artist]s.
@ -104,7 +104,7 @@ class ArtistListFragment :
is Sort.Mode.ByDuration -> artist.durationMs?.formatDurationMs(false) is Sort.Mode.ByDuration -> artist.durationMs?.formatDurationMs(false)
// Count -> Use song count // Count -> Use song count
is Sort.Mode.ByCount -> artist.songs.size.nonZeroOrNull()?.toString() is Sort.Mode.ByCount -> artist.songs.size.positiveOrNull()?.toString()
// Unsupported sort, error gracefully // Unsupported sort, error gracefully
else -> null else -> null

4
app/src/main/java/org/oxycblt/auxio/music/device/DeviceMusicImpl.kt
View file

@ -39,7 +39,7 @@ import org.oxycblt.auxio.music.info.ReleaseType
import org.oxycblt.auxio.music.metadata.parseId3GenreNames import org.oxycblt.auxio.music.metadata.parseId3GenreNames
import org.oxycblt.auxio.music.metadata.parseMultiValue import org.oxycblt.auxio.music.metadata.parseMultiValue
import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
import org.oxycblt.auxio.util.nonZeroOrNull import org.oxycblt.auxio.util.positiveOrNull
import org.oxycblt.auxio.util.toUuidOrNull import org.oxycblt.auxio.util.toUuidOrNull
import org.oxycblt.auxio.util.unlikelyToBeNull import org.oxycblt.auxio.util.unlikelyToBeNull
import org.oxycblt.auxio.util.update import org.oxycblt.auxio.util.update
@ -407,7 +407,7 @@ class ArtistImpl(grouping: Grouping<RawArtist, Music>, musicSettings: MusicSetti
albums = albumMap.keys albums = albumMap.keys
explicitAlbums = albums.filterTo(mutableSetOf()) { albumMap[it] == true } explicitAlbums = albums.filterTo(mutableSetOf()) { albumMap[it] == true }
implicitAlbums = albums.filterNotTo(mutableSetOf()) { albumMap[it] == true } implicitAlbums = albums.filterNotTo(mutableSetOf()) { albumMap[it] == true }
durationMs = songs.sumOf { it.durationMs }.nonZeroOrNull() durationMs = songs.sumOf { it.durationMs }.positiveOrNull()
hashCode = 31 * hashCode + rawArtist.hashCode() hashCode = 31 * hashCode + rawArtist.hashCode()
hashCode = 31 * hashCode + songs.hashCode() hashCode = 31 * hashCode + songs.hashCode()

4
app/src/main/java/org/oxycblt/auxio/music/info/Date.kt
View file

@ -25,7 +25,7 @@ import kotlin.math.max
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.util.inRangeOrNull import org.oxycblt.auxio.util.inRangeOrNull
import org.oxycblt.auxio.util.logE import org.oxycblt.auxio.util.logE
import org.oxycblt.auxio.util.nonZeroOrNull import org.oxycblt.auxio.util.positiveOrNull
/** /**
* An ISO-8601/RFC 3339 Date. * An ISO-8601/RFC 3339 Date.
@ -247,7 +247,7 @@ class Date private constructor(private val tokens: List<Int>) : Comparable<Date>
* @param dst The destination list to add valid tokens to. * @param dst The destination list to add valid tokens to.
*/ */
private fun transformTokens(src: List<Int>, dst: MutableList<Int>) { private fun transformTokens(src: List<Int>, dst: MutableList<Int>) {
dst.add(src.getOrNull(0)?.nonZeroOrNull() ?: return) dst.add(src.getOrNull(0)?.positiveOrNull() ?: return)
dst.add(src.getOrNull(1)?.inRangeOrNull(1..12) ?: return) dst.add(src.getOrNull(1)?.inRangeOrNull(1..12) ?: return)
dst.add(src.getOrNull(2)?.inRangeOrNull(1..31) ?: return) dst.add(src.getOrNull(2)?.inRangeOrNull(1..31) ?: return)
dst.add(src.getOrNull(3)?.inRangeOrNull(0..23) ?: return) dst.add(src.getOrNull(3)?.inRangeOrNull(0..23) ?: return)

4
app/src/main/java/org/oxycblt/auxio/music/metadata/TagUtil.kt
View file

@ -19,7 +19,7 @@
package org.oxycblt.auxio.music.metadata package org.oxycblt.auxio.music.metadata
import org.oxycblt.auxio.music.MusicSettings import org.oxycblt.auxio.music.MusicSettings
import org.oxycblt.auxio.util.nonZeroOrNull import org.oxycblt.auxio.util.positiveOrNull
/// --- GENERIC PARSING --- /// --- GENERIC PARSING ---
@ -154,7 +154,7 @@ fun parseVorbisPositionField(pos: String?, total: String?) =
* - The position was zeroed AND the total value was not present/zeroed * - The position was zeroed AND the total value was not present/zeroed
*/ */
fun transformPositionField(pos: Int?, total: Int?) = fun transformPositionField(pos: Int?, total: Int?) =
if (pos != null && (pos > 0 || (total?.nonZeroOrNull() != null))) { if (pos != null && (pos > 0 || (total?.positiveOrNull() != null))) {
pos pos
} else { } else {
null null

6
app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt
View file

@ -314,11 +314,7 @@ private class TagWorkerImpl(
* @return A parsed adjustment float, or null if the adjustment had invalid formatting. * @return A parsed adjustment float, or null if the adjustment had invalid formatting.
*/ */
private fun List<String>.parseReplayGainAdjustment() = private fun List<String>.parseReplayGainAdjustment() =
first() first().replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "").toFloatOrNull()?.nonZeroOrNull()
.replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "")
.toFloatOrNull()
?.nonZeroOrNull()
.also { logD(it) }
private companion object { private companion object {
val COMPILATION_ALBUM_ARTISTS = listOf("Various Artists") val COMPILATION_ALBUM_ARTISTS = listOf("Various Artists")

4
app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt
View file

@ -41,14 +41,14 @@ fun <T> unlikelyToBeNull(value: T?) =
* *
* @return The given number if it's non-zero, null otherwise. * @return The given number if it's non-zero, null otherwise.
*/ */
fun Int.nonZeroOrNull() = if (this > 0) this else null fun Int.positiveOrNull() = if (this > 0) this else null
/** /**
* Aliases a check to ensure that the given number is non-zero. * Aliases a check to ensure that the given number is non-zero.
* *
* @return The same number if it's non-zero, null otherwise. * @return The same number if it's non-zero, null otherwise.
*/ */
fun Long.nonZeroOrNull() = if (this > 0) this else null fun Long.positiveOrNull() = if (this > 0) this else null
/** /**
* Aliases a check to ensure that the given number is non-zero. * Aliases a check to ensure that the given number is non-zero.