From e6b00b10254da064fa6f31ea7f55684a0ea908c2 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 15 Apr 2023 18:39:46 -0600
Subject: [PATCH] build: bump to 3.0.5

Bump the version to 3.0.5.
---
 CHANGELOG.md                                  |  8 +++++++
 README.md                                     |  4 ++--
 app/build.gradle                              |  4 ++--
 .../java/org/oxycblt/auxio/music/Music.kt     |  8 +++----
 .../org/oxycblt/auxio/music/system/Indexer.kt | 24 +++++++++++--------
 .../oxycblt/auxio/widgets/WidgetComponent.kt  |  4 ++--
 .../metadata/android/en-US/changelogs/29.txt  |  3 +++
 7 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/29.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0201041b3..fec2ba549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## dev
+
+#### What's Fixed
+- Fixed inconsistent corner radius on widget
+- Fixed crash that would occur due to intelligent sort name functionality
+- Fixed crashing on music loading failures that should route to an error
+screen
+
 ## 3.0.4
 
 #### What's New
diff --git a/README.md b/README.md
index 373c5680d..ceb879047 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 <h1 align="center"><b>Auxio</b></h1>
 <h4 align="center">A simple, rational music player for android.</h4>
 <p align="center">
-    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.0.4">
-        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.0.4&color=64B5F6&style=flat">
+    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.0.5">
+        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.0.5&color=64B5F6&style=flat">
     </a>
     <a href="https://github.com/oxygencobalt/Auxio/releases/">
         <img alt="Releases" src="https://img.shields.io/github/downloads/OxygenCobalt/Auxio/total.svg?color=4B95DE&style=flat">
diff --git a/app/build.gradle b/app/build.gradle
index 69e5a79a7..7ae1e5b25 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
 
     defaultConfig {
         applicationId namespace
-        versionName "3.0.4"
-        versionCode 28
+        versionName "3.0.5"
+        versionCode 29
 
         minSdk 21
         targetSdk 33
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
index 1ccde597b..baabe4ccf 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -369,7 +369,7 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
     init {
         var sortName = name
         if (musicSettings.intelligentSorting) {
-            sortName = sortName.replace(leadingPunctuation, "")
+            sortName = sortName.replace(LEADING_PUNCTUATION_REGEX, "")
 
             sortName =
                 sortName.run {
@@ -382,7 +382,7 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
                 }
 
             // Zero pad all numbers to six digits for better sorting
-            sortName = sortName.replace(consecutiveDigits) { it.value.padStart(6, '0') }
+            sortName = sortName.replace(CONSECUTIVE_DIGITS_REGEX) { it.value.padStart(6, '0') }
         }
 
         collationKey = COLLATOR.getCollationKey(sortName)
@@ -407,8 +407,8 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
 
     private companion object {
         val COLLATOR: Collator = Collator.getInstance().apply { strength = Collator.PRIMARY }
-        val leadingPunctuation: Regex = Regex("""^\p{Punct}+""")
-        val consecutiveDigits: Regex = Regex("""\d+""")
+        val LEADING_PUNCTUATION_REGEX = Regex("[^\\p{Punct}+]")
+        val CONSECUTIVE_DIGITS_REGEX = Regex("\\d+")
     }
 }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
index c032299ef..0a67af75d 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
@@ -23,9 +23,11 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.content.ContextCompat
-import kotlinx.coroutines.*
 import java.util.LinkedList
 import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.music.*
@@ -37,8 +39,6 @@ import org.oxycblt.auxio.music.storage.MediaStoreExtractor
 import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.logE
 import org.oxycblt.auxio.util.logW
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * Core music loading state class.
@@ -394,14 +394,18 @@ constructor(
         return libraryJob.await().getOrThrow()
     }
 
-    private inline fun <R> CoroutineScope.tryAsync(context: CoroutineContext = EmptyCoroutineContext, crossinline block: suspend () -> R) = async(context) {
-        try {
-            Result.success(block())
-        } catch (e: Exception) {
-            Result.failure(e)
+    private inline fun <R> CoroutineScope.tryAsync(
+        context: CoroutineContext = EmptyCoroutineContext,
+        crossinline block: suspend () -> R
+    ) =
+        async(context) {
+            try {
+                Result.success(block())
+            } catch (e: Exception) {
+                Result.failure(e)
+            }
         }
-    }
-    
+
     /**
      * Emit a new [Indexer.State.Indexing] state. This can be used to signal the current state of
      * the music loading process to external code. Assumes that the callee has already checked if
diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt
index 8bc813c48..6c1e9e91b 100644
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt
@@ -98,8 +98,8 @@ constructor(
                         builder
                             .size(getSafeRemoteViewsImageSize(context, 10f))
                             .transformations(
-                            SquareFrameTransform.INSTANCE,
-                            RoundedCornersTransformation(cornerRadius.toFloat()))
+                                SquareFrameTransform.INSTANCE,
+                                RoundedCornersTransformation(cornerRadius.toFloat()))
                     } else {
                         builder.size(getSafeRemoteViewsImageSize(context))
                     }
diff --git a/fastlane/metadata/android/en-US/changelogs/29.txt b/fastlane/metadata/android/en-US/changelogs/29.txt
new file mode 100644
index 000000000..0eb6a89b9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29.txt
@@ -0,0 +1,3 @@
+Auxio 3.0.0 massively improves the music library experience, with a new advanced music loader, a new unified artist model, and a new selection system that makes enqueueing music much simpler.
+This release fixes critical issues.
+For more information, see https://github.com/OxygenCobalt/Auxio/releases/tag/v3.0.5.
\ No newline at end of file