update IRDB (#21)

Author: makeevrserg

IRDB

@@ -8,7 +8,7 @@ org.gradle.parallel=true
 makeevrserg.project.name=IRDBBackend
 makeevrserg.project.url=https://github.com/flipperdevices/IRDB-Backend
 makeevrserg.project.group=com.flipperdevices.ifrmvp.backend
-makeevrserg.project.version.string=0.8.1
+makeevrserg.project.version.string=0.8.2
 makeevrserg.project.description=Api for IfrSample
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 # Java

gradle.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu May 23 11:47:58 MSK 2024
-sdk.dir=/Users/romanmakeev/Library/Android/sdk
+#Tue Jul 15 10:37:24 MSK 2025
+sdk.dir=/home/makeevrserg/Android/Sdk

local.properties

@@ -7,4 +7,3 @@ interface Loggable {
 
     class Default(tag: String) : Loggable by Slf4jLoggable(tag)
 }
-

modules/core/src/main/kotlin/com/flipperdevices/ifrmvp/backend/core/logging/Loggable.kt

@@ -15,7 +15,10 @@ class Slf4jLoggable(tag: String) : Loggable {
     }
 
     override fun error(throwable: Throwable?, msg: () -> String) {
-        if (throwable == null) logger.error(msg.invoke())
-        else logger.error(msg.invoke(), throwable)
+        if (throwable == null) {
+            logger.error(msg.invoke())
+        } else {
+            logger.error(msg.invoke(), throwable)
+        }
     }
-}
+}

modules/core/src/main/kotlin/com/flipperdevices/ifrmvp/backend/core/logging/Slf4jLoggable.kt

@@ -36,4 +36,4 @@ object InfraredRemoteEncoder {
             val sha256 = JvmEncoder(ByteArrayEncoder.Algorithm.SHA_256).encode(byteArray)
             return IfrKeyIdentifier.Sha256(name, sha256)
         }
-}
+}

modules/infrared/src/main/kotlin/com/flipperdevices/infrared/editor/encoding/InfraredRemoteEncoder.kt

@@ -16,5 +16,4 @@ class JvmEncoder(override val algorithm: ByteArrayEncoder.Algorithm) : ByteArray
             .digest(byteArray)
             .toHexString()
     }
-
 }

modules/infrared/src/main/kotlin/com/flipperdevices/infrared/editor/encoding/JvmEncoder.kt

@@ -20,7 +20,6 @@ object InfraredMapper {
         return raw
             .let(FlipperFileFormat.Companion::fromFileContent)
             .let(InfraredKeyParser::mapParsedKeyToInfraredRemotes)
-
     }
 
     fun parseRemotes(file: File): List<InfraredRemote> {
@@ -64,5 +63,4 @@ object InfraredMapper {
             append("\n")
         }
     }
-
-}
+}

modules/infrared/src/main/kotlin/com/flipperdevices/infrared/editor/util/InfraredMapper.kt

@@ -7,7 +7,6 @@ import com.flipperdevices.ifrmvp.generator.config.category.api.AirPurifierCatego
 import com.flipperdevices.ifrmvp.generator.config.category.api.AvReceiverCategoryConfigGenerator
 import com.flipperdevices.ifrmvp.generator.config.category.api.BoxCategoryConfigGenerator
 import com.flipperdevices.ifrmvp.generator.config.category.api.CameraCategoryConfigGenerator
-import com.flipperdevices.ifrmvp.generator.config.category.api.DeviceKeyExt
 import com.flipperdevices.ifrmvp.generator.config.category.api.DeviceKeyExt.getAllowedCategories
 import com.flipperdevices.ifrmvp.generator.config.category.api.DvdCategoryConfigGenerator
 import com.flipperdevices.ifrmvp.generator.config.category.api.FanCategoryConfigGenerator
@@ -62,7 +61,7 @@ private fun generateDevicesConfigFiles() {
                     ).onEach { irFile ->
                         val config = DefaultDeviceConfigGenerator(AnyDeviceKeyNamesProvider)
                             .generate(irFile)
-                        if (config.keyMap.isEmpty()) error("Config file for ${irFile} is empty")
+                        if (config.keyMap.isEmpty()) error("Config file for $irFile is empty")
                         val configFile = irFile.parentFile.resolve("config.json")
                         val string = json.encodeToString(config)
                         configFile.writeText(string)
@@ -72,7 +71,6 @@ private fun generateDevicesConfigFiles() {
 }
 
 fun printAllKeys() {
-
     val keyNames = DeviceKey.entries.associateWith { AnyDeviceKeyNamesProvider.getKeyNames(it) }
     val namesToCategories = mutableMapOf<String, MutableSet<String>>()
     val nameToCount = mutableMapOf<String, Int>()
@@ -104,9 +102,10 @@ fun printAllKeys() {
         .sortedByDescending { nameToCount[it.name.lowercase()] }
         .onEach { key ->
             val filteredMap = keyNames.filterValues { it.map { it.lowercase() }.contains(key.name.lowercase()) }
-            println("${key.name.lowercase()} -> ${nameToCount[key.name.lowercase()]} ${namesToCategories[key.name.lowercase()]}  -> ${filteredMap.map { (k, v) -> "$k - ${k.getAllowedCategories()} -${v}" }}")
+            println(
+                "${key.name.lowercase()} -> ${nameToCount[key.name.lowercase()]} ${namesToCategories[key.name.lowercase()]}  -> ${filteredMap.map { (k, v) -> "$k - ${k.getAllowedCategories()} -$v" }}"
+            )
         }
-
 }
 
 private fun filterSameInfraredFiles() {

modules/kenerator/configuration/src/main/kotlin/com/flipperdevices/ifrmvp/generator/config/Main.kt

@@ -6,13 +6,11 @@ import com.flipperdevices.ifrmvp.backend.model.DeviceKey
 import com.flipperdevices.ifrmvp.generator.config.category.api.DeviceKeyExt.getAllowedCategories
 import com.flipperdevices.ifrmvp.model.buttondata.IconButtonData
 import com.flipperdevices.ifrmvp.model.buttondata.PowerButtonData
-import com.flipperdevices.ifrmvp.model.buttondata.ShutterButtonData
-import com.flipperdevices.ifrmvp.model.buttondata.TextButtonData
 
 object AirPurifierCategoryConfigGenerator {
     @Suppress("LongMethod")
     fun generate(): CategoryConfiguration {
-        var i  =0
+        var i = 0
         return CategoryConfiguration(
             orders = listOf(
                 CategoryConfiguration.OrderModel(