Support multi-repository firmware updates with proper data migration

app/schemas/ca.cgagnier.wlednativeandroid.repository.DevicesDatabase/11.json

@@ -0,0 +1,220 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "2760473c3744dbf6f299b09b0c84a05d",
+    "entities": [
+      {
+        "tableName": "Device2",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`macAddress` TEXT NOT NULL, `address` TEXT NOT NULL, `isHidden` INTEGER NOT NULL, `originalName` TEXT NOT NULL DEFAULT '', `customName` TEXT NOT NULL DEFAULT '', `skipUpdateTag` TEXT NOT NULL DEFAULT '', `branch` TEXT NOT NULL DEFAULT 'UNKNOWN', `lastSeen` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`macAddress`))",
+        "fields": [
+          {
+            "fieldPath": "macAddress",
+            "columnName": "macAddress",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isHidden",
+            "columnName": "isHidden",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalName",
+            "columnName": "originalName",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "customName",
+            "columnName": "customName",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "skipUpdateTag",
+            "columnName": "skipUpdateTag",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "branch",
+            "columnName": "branch",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'UNKNOWN'"
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "macAddress"
+          ]
+        }
+      },
+      {
+        "tableName": "Version",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tagName` TEXT NOT NULL, `repository` TEXT NOT NULL DEFAULT 'wled/WLED', `name` TEXT NOT NULL, `description` TEXT NOT NULL, `isPrerelease` INTEGER NOT NULL, `publishedDate` TEXT NOT NULL, `htmlUrl` TEXT NOT NULL, PRIMARY KEY(`tagName`, `repository`))",
+        "fields": [
+          {
+            "fieldPath": "tagName",
+            "columnName": "tagName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repository",
+            "columnName": "repository",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'wled/WLED'"
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrerelease",
+            "columnName": "isPrerelease",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publishedDate",
+            "columnName": "publishedDate",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "htmlUrl",
+            "columnName": "htmlUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "tagName",
+            "repository"
+          ]
+        }
+      },
+      {
+        "tableName": "Asset",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`versionTagName` TEXT NOT NULL, `repository` TEXT NOT NULL, `name` TEXT NOT NULL, `size` INTEGER NOT NULL, `downloadUrl` TEXT NOT NULL, `assetId` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`versionTagName`, `repository`, `name`), FOREIGN KEY(`versionTagName`, `repository`) REFERENCES `Version`(`tagName`, `repository`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "versionTagName",
+            "columnName": "versionTagName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repository",
+            "columnName": "repository",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "downloadUrl",
+            "columnName": "downloadUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "assetId",
+            "columnName": "assetId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "versionTagName",
+            "repository",
+            "name"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Asset_versionTagName",
+            "unique": false,
+            "columnNames": [
+              "versionTagName"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Asset_versionTagName` ON `${TABLE_NAME}` (`versionTagName`)"
+          },
+          {
+            "name": "index_Asset_repository",
+            "unique": false,
+            "columnNames": [
+              "repository"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Asset_repository` ON `${TABLE_NAME}` (`repository`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Version",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "versionTagName",
+              "repository"
+            ],
+            "referencedColumns": [
+              "tagName",
+              "repository"
+            ]
+          }
+        ]
+      }
+    ],
+    "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, '2760473c3744dbf6f299b09b0c84a05d')"
+    ]
+  }
+}

app/src/main/java/ca/cgagnier/wlednativeandroid/model/Asset.kt

@@ -5,18 +5,20 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 
 @Entity(
-    primaryKeys = ["versionTagName", "name"],
+    primaryKeys = ["versionTagName", "repository", "name"],
     foreignKeys = [ForeignKey(
         entity = Version::class,
-        parentColumns = arrayOf("tagName"),
-        childColumns = arrayOf("versionTagName"),
+        parentColumns = arrayOf("tagName", "repository"),
+        childColumns = arrayOf("versionTagName", "repository"),
         onDelete = ForeignKey.CASCADE
     )]
 )
 data class Asset(
 
     @ColumnInfo(index = true)
     val versionTagName: String,
+    @ColumnInfo(index = true)
+    val repository: String,
     val name: String,
     val size: Long,
     val downloadUrl: String,

app/src/main/java/ca/cgagnier/wlednativeandroid/model/Version.kt

@@ -1,12 +1,15 @@
 package ca.cgagnier.wlednativeandroid.model
 
+import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.PrimaryKey
 
-@Entity
+@Entity(
+    primaryKeys = ["tagName", "repository"]
+)
 data class Version(
-    @PrimaryKey
     val tagName: String,
+    @ColumnInfo(defaultValue = "'wled/WLED'")
+    val repository: String,
     val name: String,
     val description: String,
     val isPrerelease: Boolean,
@@ -18,6 +21,7 @@ data class Version(
         fun getPreviewVersion(): Version {
             return Version(
                 tagName = "v1.0.0",
+                repository = "wled/WLED",
                 name = "new version",
                 description = "this is a test version",
                 isPrerelease = false,

app/src/main/java/ca/cgagnier/wlednativeandroid/model/wledapi/Info.kt

@@ -19,6 +19,8 @@ data class Info(
     @param:Json(name = "cn") val codeName: String? = null,
     // Added in 0.15
     @param:Json(name = "release") val release: String? = null,
+    // Added in 0.15.2
+    @param:Json(name = "repo") val repo: String? = null,
     @param:Json(name = "name") val name: String,
     @param:Json(name = "str") val syncToggleReceive: Boolean? = null,
     @param:Json(name = "udpport") val udpPort: Int? = null,

app/src/main/java/ca/cgagnier/wlednativeandroid/repository/DevicesDatabase.kt

@@ -11,14 +11,16 @@ import ca.cgagnier.wlednativeandroid.model.Device
 import ca.cgagnier.wlednativeandroid.model.Version
 import ca.cgagnier.wlednativeandroid.repository.migrations.DbMigration7To8
 import ca.cgagnier.wlednativeandroid.repository.migrations.DbMigration8To9
+import ca.cgagnier.wlednativeandroid.repository.migrations.MIGRATION_9_10
+import ca.cgagnier.wlednativeandroid.repository.migrations.MIGRATION_10_11
 
 @Database(
     entities = [
         Device::class,
         Version::class,
         Asset::class,
     ],
-    version = 9,
+    version = 11,
     exportSchema = true,
     autoMigrations = [
         AutoMigration(from = 1, to = 2),
@@ -47,7 +49,9 @@ abstract class DevicesDatabase : RoomDatabase() {
                     context.applicationContext,
                     DevicesDatabase::class.java,
                     "devices_database"
-                ).build()
+                )
+                .addMigrations(MIGRATION_9_10, MIGRATION_10_11)
+                .build()
                 INSTANCE = instance
                 instance
             }

app/src/main/java/ca/cgagnier/wlednativeandroid/repository/VersionDao.kt

@@ -36,16 +36,16 @@ interface VersionDao {
     suspend fun deleteAll()
 
     @Transaction
-    @Query("SELECT * FROM version WHERE isPrerelease = 0 AND tagName != '$IGNORED_TAG' ORDER BY publishedDate DESC LIMIT 1")
-    suspend fun getLatestStableVersionWithAssets(): VersionWithAssets?
+    @Query("SELECT * FROM version WHERE repository = :repository AND isPrerelease = 0 AND tagName != '$IGNORED_TAG' ORDER BY publishedDate DESC LIMIT 1")
+    suspend fun getLatestStableVersionWithAssets(repository: String): VersionWithAssets?
 
     @Transaction
-    @Query("SELECT * FROM version WHERE tagName != '$IGNORED_TAG' ORDER BY publishedDate DESC LIMIT 1")
-    suspend fun getLatestBetaVersionWithAssets(): VersionWithAssets?
+    @Query("SELECT * FROM version WHERE repository = :repository AND tagName != '$IGNORED_TAG' ORDER BY publishedDate DESC LIMIT 1")
+    suspend fun getLatestBetaVersionWithAssets(repository: String): VersionWithAssets?
 
     @Transaction
-    @Query("SELECT * FROM version WHERE tagName = :tagName LIMIT 1")
-    suspend fun getVersionByTagName(tagName: String): VersionWithAssets?
+    @Query("SELECT * FROM version WHERE repository = :repository AND tagName = :tagName LIMIT 1")
+    suspend fun getVersionByTagName(repository: String, tagName: String): VersionWithAssets?
 
     @Transaction
     @Query("SELECT * FROM version")

app/src/main/java/ca/cgagnier/wlednativeandroid/repository/VersionWithAssetsRepository.kt

@@ -22,15 +22,15 @@ class VersionWithAssetsRepository @Inject constructor(
         }
     }
 
-    suspend fun getLatestStableVersionWithAssets(): VersionWithAssets? {
-        return versionDao.getLatestStableVersionWithAssets()
+    suspend fun getLatestStableVersionWithAssets(repository: String): VersionWithAssets? {
+        return versionDao.getLatestStableVersionWithAssets(repository)
     }
 
-    suspend fun getLatestBetaVersionWithAssets(): VersionWithAssets? {
-        return versionDao.getLatestBetaVersionWithAssets()
+    suspend fun getLatestBetaVersionWithAssets(repository: String): VersionWithAssets? {
+        return versionDao.getLatestBetaVersionWithAssets(repository)
     }
 
-    suspend fun getVersionByTag(tagName: String): VersionWithAssets? {
-        return versionDao.getVersionByTagName(tagName)
+    suspend fun getVersionByTag(repository: String, tagName: String): VersionWithAssets? {
+        return versionDao.getVersionByTagName(repository, tagName)
     }
 }

app/src/main/java/ca/cgagnier/wlednativeandroid/repository/migrations/DbMigration10To11.kt

@@ -0,0 +1,23 @@
+package ca.cgagnier.wlednativeandroid.repository.migrations
+
+import android.util.Log
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+private const val TAG = "DbMigration10To11"
+
+/**
+ * Migration from 10->11 removes the old Version and Asset tables after data has been migrated
+ * to the new schema with repository tracking support.
+ */
+val MIGRATION_10_11 = object : Migration(10, 11) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        Log.i(TAG, "Starting migration from 10 to 11")
+
+        // Drop the old tables if they exist (cleanup from previous migration)
+        db.execSQL("DROP TABLE IF EXISTS Version_old")
+        db.execSQL("DROP TABLE IF EXISTS Asset_old")
+
+        Log.i(TAG, "Migration from 10 to 11 complete!")
+    }
+}