update irdb (#9)

* update irdb * fix identify by name * add merge group
flipperdevices · Sep 16, 2024 · 79558f4 · 79558f4
1 parent b4a344c
commit 79558f4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,6 +1,7 @@
 name: Pull Request CI
 
 on:
+  merge_group:
   pull_request:
     branches:
       - 'dev'

diff --git a/IRDB b/IRDB
diff --git a/...database/src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalTable.kt b/...database/src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalTable.kt
@@ -24,13 +24,15 @@ object SignalTable : LongIdTable("SIGNAL_TABLE") {
 
     init {
         uniqueIndex(
+            name,
             brandId,
             type,
             frequency,
             dutyCycle,
             data
         )
         uniqueIndex(
+            name,
             brandId,
             type,
             protocol,

diff --git a/...nerator/paths/src/main/kotlin/com/flipperdevices/ifrmvp/parser/util/ParserPathResolver.kt b/...nerator/paths/src/main/kotlin/com/flipperdevices/ifrmvp/parser/util/ParserPathResolver.kt
@@ -126,7 +126,9 @@ object ParserPathResolver {
             brand = brand,
             ifrFolderName = ifrFolderName
         )
-        return Json.decodeFromString(file.readText())
+        return kotlin.runCatching { Json.decodeFromString<DeviceConfiguration>(file.readText()) }
+            .onFailure { println("Could not parse file ${file.absoluteFile}") }
+            .getOrThrow()
     }
 
     fun irFileConfigurationFile(

diff --git a/...tor/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/presentation/FillerController.kt b/...tor/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/presentation/FillerController.kt
@@ -164,7 +164,10 @@ internal class FillerController(private val database: Database) : CoroutineScope
                                         this[SignalKeyTable.type] = IfrKeyIdentifier.Empty.TYPE
                                     }
 
-                                    is IfrKeyIdentifier.Name -> error("Identifying by name is not possible!")
+                                    is IfrKeyIdentifier.Name -> {
+                                        this[SignalKeyTable.remoteKeyName] = keyIdentifier.name
+                                        this[SignalKeyTable.type] = IfrKeyIdentifier.Name.TYPE
+                                    }
 
                                     is IfrKeyIdentifier.Sha256 -> {
                                         this[SignalKeyTable.remoteKeyName] = keyIdentifier.name
@@ -191,7 +194,9 @@ internal class FillerController(private val database: Database) : CoroutineScope
                                                 andWhere { SignalTable.hash eq keyIdentifier.hash }
                                             }
 
-                                            is IfrKeyIdentifier.Name -> error("Identifying by name is not possible!")
+                                            is IfrKeyIdentifier.Name -> {
+                                                andWhere { SignalTable.name eq keyIdentifier.name }
+                                            }
                                         }
                                     }
                                     .map { it[SignalTable.id] }

diff --git a/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt b/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt
@@ -119,6 +119,11 @@ internal class SignalRouteRegistry(
                                     .or { SignalKeyTable.hash.eq(identifier.hash) }
                             }
                         }
+                        is IfrKeyIdentifier.Name -> {
+                            andWhere {
+                                SignalKeyTable.remoteKeyName.eq(identifier.name)
+                            }
+                        }
 
                         else -> andWhere { SignalKeyTable.deviceKey.eq(order.key) }
                     }