feat(downloads): add format picker and custom download path support

.github/actions/setup-coverart/action.yml

@@ -0,0 +1,25 @@
+name: Setup Coverart Native Library
+description: Download prebuilt coverart native library from workflow artifacts
+
+runs:
+  using: composite
+  steps:
+    - name: Download coverart library
+      run: |
+        echo "Downloading coverart library..."
+
+        # Use nightly.link to get public URL for the artifact
+        DOWNLOAD_URL="https://nightly.link/MetrolistGroup/metrolist-coverart-lib/workflows/build-release/main/libcoverart-jniLibs.zip"
+
+        curl -L -o /tmp/libcoverart-jniLibs.zip "$DOWNLOAD_URL"
+
+        # Extract to app/src/main/jniLibs
+        mkdir -p app/src/main/jniLibs
+        unzip -o /tmp/libcoverart-jniLibs.zip -d app/src/main/jniLibs
+
+        # Cleanup
+        rm /tmp/libcoverart-jniLibs.zip
+
+        echo "Coverart library installed:"
+        find app/src/main/jniLibs -name "*.so" -exec ls -la {} \;
+      shell: bash

.github/workflows/build.yml

@@ -50,6 +50,9 @@ jobs:
       - name: Setup and Generate Protobuf
         uses: ./.github/actions/setup-protobuf
 
+      - name: Setup Coverart Native Library
+        uses: ./.github/actions/setup-coverart
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
@@ -123,6 +126,9 @@ jobs:
       - name: Setup and Generate Protobuf
         uses: ./.github/actions/setup-protobuf
 
+      - name: Setup Coverart Native Library
+        uses: ./.github/actions/setup-coverart
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

.github/workflows/build_pr.yml

@@ -29,6 +29,9 @@ jobs:
       - name: Setup and Generate Protobuf
         uses: ./.github/actions/setup-protobuf
 
+      - name: Setup Coverart Native Library
+        uses: ./.github/actions/setup-coverart
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

.github/workflows/build_quick.yml

@@ -40,6 +40,9 @@ jobs:
       - name: Setup and Generate Protobuf
         uses: ./.github/actions/setup-protobuf
 
+      - name: Setup Coverart Native Library
+        uses: ./.github/actions/setup-coverart
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

.github/workflows/release.yml

@@ -103,6 +103,9 @@ jobs:
       - name: Setup and Generate Protobuf
         uses: ./.github/actions/setup-protobuf
 
+      - name: Setup Coverart Native Library
+        uses: ./.github/actions/setup-coverart
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

.gitignore

@@ -106,3 +106,6 @@ app/src/main/java/com/metrolist/music/listentogether/proto/*
 # FFTW third-party library build artifacts
 .build-fftw
 app/src/main/cpp/coverart/
+
+# Prebuilt native libraries (downloaded during build)
+app/src/main/jniLibs/

app/proguard-rules.pro

@@ -195,6 +195,14 @@
 -keep class com.metrolist.music.listentogether.proto.** { *; }
 -keepclassmembers class com.metrolist.music.listentogether.proto.** { *; }
 
+## CoverArt Native JNI and metadata embedding
+-keep class com.metrolist.music.utils.CoverArtNative { *; }
+-keepclassmembers class com.metrolist.music.utils.CoverArtNative {
+    native <methods>;
+}
+-keep class com.metrolist.music.utils.CoverArtEmbedder { *; }
+-keep class com.metrolist.music.utils.DownloadExportHelper { *; }
+
 ## Shazam Models
 -keep class com.metrolist.shazamkit.models.** { *; }
 -keepclassmembers class com.metrolist.shazamkit.models.** {

app/schemas/com.metrolist.music.db.InternalDatabase/35.json

@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 35,
-    "identityHash": "73924a5ef1b9fb713b5e197988a0c633",
+    "identityHash": "bc001f6b5493d53559519d1df971006d",
     "entities": [
       {
         "tableName": "song",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `duration` INTEGER NOT NULL, `thumbnailUrl` TEXT, `albumId` TEXT, `albumName` TEXT, `explicit` INTEGER NOT NULL DEFAULT 0, `year` INTEGER, `date` INTEGER, `dateModified` INTEGER, `liked` INTEGER NOT NULL, `likedDate` INTEGER, `totalPlayTime` INTEGER NOT NULL, `inLibrary` INTEGER, `dateDownload` INTEGER, `isLocal` INTEGER NOT NULL DEFAULT false, `libraryAddToken` TEXT, `libraryRemoveToken` TEXT, `lyricsOffset` INTEGER NOT NULL DEFAULT 0, `romanizeLyrics` INTEGER NOT NULL DEFAULT true, `isDownloaded` INTEGER NOT NULL DEFAULT 0, `isUploaded` INTEGER NOT NULL DEFAULT false, `isVideo` INTEGER NOT NULL DEFAULT false, `isEpisode` INTEGER NOT NULL DEFAULT false, `playbackPosition` INTEGER DEFAULT NULL, `uploadEntityId` TEXT DEFAULT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `duration` INTEGER NOT NULL, `thumbnailUrl` TEXT, `albumId` TEXT, `albumName` TEXT, `explicit` INTEGER NOT NULL DEFAULT 0, `year` INTEGER, `date` INTEGER, `dateModified` INTEGER, `liked` INTEGER NOT NULL, `likedDate` INTEGER, `totalPlayTime` INTEGER NOT NULL, `inLibrary` INTEGER, `dateDownload` INTEGER, `isLocal` INTEGER NOT NULL DEFAULT false, `libraryAddToken` TEXT, `libraryRemoveToken` TEXT, `lyricsOffset` INTEGER NOT NULL DEFAULT 0, `romanizeLyrics` INTEGER NOT NULL DEFAULT true, `isDownloaded` INTEGER NOT NULL DEFAULT 0, `isUploaded` INTEGER NOT NULL DEFAULT false, `isVideo` INTEGER NOT NULL DEFAULT false, `isEpisode` INTEGER NOT NULL DEFAULT false, `playbackPosition` INTEGER DEFAULT NULL, `uploadEntityId` TEXT DEFAULT NULL, `downloadUri` TEXT DEFAULT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -160,6 +160,12 @@
             "columnName": "uploadEntityId",
             "affinity": "TEXT",
             "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "downloadUri",
+            "columnName": "downloadUri",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
           }
         ],
         "primaryKey": {
@@ -1335,7 +1341,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '73924a5ef1b9fb713b5e197988a0c633')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'bc001f6b5493d53559519d1df971006d')"
     ]
   }
-}
+}

app/schemas/com.metrolist.music.db.InternalDatabase/36.json

@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 36,
-    "identityHash": "afcd734f45bc50034a6692f5255e7b92",
+    "identityHash": "35dab5008e4f24f10662df49b1e52193",
     "entities": [
       {
         "tableName": "song",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `duration` INTEGER NOT NULL, `thumbnailUrl` TEXT, `albumId` TEXT, `albumName` TEXT, `explicit` INTEGER NOT NULL DEFAULT 0, `year` INTEGER, `date` INTEGER, `dateModified` INTEGER, `liked` INTEGER NOT NULL, `likedDate` INTEGER, `totalPlayTime` INTEGER NOT NULL, `inLibrary` INTEGER, `dateDownload` INTEGER, `isLocal` INTEGER NOT NULL DEFAULT false, `libraryAddToken` TEXT, `libraryRemoveToken` TEXT, `lyricsOffset` INTEGER NOT NULL DEFAULT 0, `romanizeLyrics` INTEGER NOT NULL DEFAULT true, `isDownloaded` INTEGER NOT NULL DEFAULT 0, `isUploaded` INTEGER NOT NULL DEFAULT false, `isVideo` INTEGER NOT NULL DEFAULT false, `isEpisode` INTEGER NOT NULL DEFAULT false, `playbackPosition` INTEGER DEFAULT NULL, `uploadEntityId` TEXT DEFAULT NULL, `isCached` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `duration` INTEGER NOT NULL, `thumbnailUrl` TEXT, `albumId` TEXT, `albumName` TEXT, `explicit` INTEGER NOT NULL DEFAULT 0, `year` INTEGER, `date` INTEGER, `dateModified` INTEGER, `liked` INTEGER NOT NULL, `likedDate` INTEGER, `totalPlayTime` INTEGER NOT NULL, `inLibrary` INTEGER, `dateDownload` INTEGER, `isLocal` INTEGER NOT NULL DEFAULT false, `libraryAddToken` TEXT, `libraryRemoveToken` TEXT, `lyricsOffset` INTEGER NOT NULL DEFAULT 0, `romanizeLyrics` INTEGER NOT NULL DEFAULT true, `isDownloaded` INTEGER NOT NULL DEFAULT 0, `isUploaded` INTEGER NOT NULL DEFAULT false, `isVideo` INTEGER NOT NULL DEFAULT false, `isEpisode` INTEGER NOT NULL DEFAULT false, `playbackPosition` INTEGER DEFAULT NULL, `uploadEntityId` TEXT DEFAULT NULL, `isCached` INTEGER NOT NULL DEFAULT 0, `downloadUri` TEXT DEFAULT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -167,6 +167,12 @@
             "affinity": "INTEGER",
             "notNull": true,
             "defaultValue": "0"
+          },
+          {
+            "fieldPath": "downloadUri",
+            "columnName": "downloadUri",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
           }
         ],
         "primaryKey": {
@@ -1342,7 +1348,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'afcd734f45bc50034a6692f5255e7b92')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '35dab5008e4f24f10662df49b1e52193')"
     ]
   }
 }

app/setup_coverart.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# Downloads the prebuilt coverart native library for local development
+
+DOWNLOAD_URL="https://nightly.link/MetrolistGroup/metrolist-coverart-lib/workflows/build-release/main/libcoverart-jniLibs.zip"
+
+echo "Downloading coverart library from latest build..."
+
+# Download the zip file
+curl -L -o /tmp/libcoverart-jniLibs.zip "$DOWNLOAD_URL"
+
+if [ $? -ne 0 ]; then
+    echo "Failed to download from ${DOWNLOAD_URL}"
+    echo "The workflow may not have run yet. Please check:"
+    echo "https://github.com/MetrolistGroup/metrolist-coverart-lib/actions"
+    exit 1
+fi
+
+# Create jniLibs directory
+mkdir -p src/main/jniLibs
+
+# Extract
+unzip -o /tmp/libcoverart-jniLibs.zip -d src/main/jniLibs
+
+# Cleanup
+rm /tmp/libcoverart-jniLibs.zip
+
+echo "Coverart library installed successfully:"
+find src/main/jniLibs -name "*.so" -exec ls -la {} \;

app/src/main/kotlin/com/metrolist/music/constants/PreferenceKeys.kt

@@ -118,6 +118,10 @@ val MaxImageCacheSizeKey = intPreferencesKey("maxImageCacheSize")
 val MaxSongCacheSizeKey = intPreferencesKey("maxSongCacheSize")
 val EnableSongCacheKey = booleanPreferencesKey("enableSongCache")
 
+// Custom download path
+val CustomDownloadPathEnabledKey = booleanPreferencesKey("customDownloadPathEnabled")
+val CustomDownloadPathUriKey = stringPreferencesKey("customDownloadPathUri")
+
 val PauseListenHistoryKey = booleanPreferencesKey("pauseListenHistory")
 val PauseSearchHistoryKey = booleanPreferencesKey("pauseSearchHistory")
 val DisableScreenshotKey = booleanPreferencesKey("disableScreenshot")

app/src/main/kotlin/com/metrolist/music/db/DatabaseDao.kt

@@ -1130,6 +1130,12 @@ interface DatabaseDao {
     @Query("SELECT playbackPosition FROM song WHERE id = :songId")
     fun playbackPositionFlow(songId: String): Flow<Long?>
 
+    @Query("UPDATE song SET downloadUri = :uri WHERE id = :songId")
+    fun updateDownloadUri(songId: String, uri: String?)
+
+    @Query("SELECT downloadUri FROM song WHERE id = :songId")
+    fun getDownloadUri(songId: String): String?
+
     @Transaction
     @Query("SELECT * FROM song WHERE isUploaded = 1 ORDER BY dateDownload")
     fun uploadedSongsByCreateDateAsc(): Flow<List<Song>>

app/src/main/kotlin/com/metrolist/music/db/entities/SongEntity.kt

@@ -63,7 +63,9 @@ data class SongEntity(
     @ColumnInfo(name = "uploadEntityId", defaultValue = "NULL")
     val uploadEntityId: String? = null,
     @ColumnInfo(name = "isCached", defaultValue = "0")
-    val isCached: Boolean = false
+    val isCached: Boolean = false,
+    @ColumnInfo(name = "downloadUri", defaultValue = "NULL")
+    val downloadUri: String? = null
 ) {
     fun localToggleLike() = copy(
         liked = !liked,