V2 prepare

- Use batch inserts to make parser faster
flipperdevices · Jul 24, 2024 · b41e4a7 · b41e4a7
1 parent 1a0c3a9
commit b41e4a7
Show file tree

Hide file tree

Showing 32 changed files with 250 additions and 525 deletions.
diff --git a/...core/src/main/kotlin/com/flipperdevices/ifrmvp/backend/core/di/factory/DatabaseFactory.kt b/...core/src/main/kotlin/com/flipperdevices/ifrmvp/backend/core/di/factory/DatabaseFactory.kt
@@ -14,7 +14,7 @@ interface DatabaseFactory {
             return when (dbConnection) {
                 is DBConnection.H2 -> {
                     Database.connect(
-                        url = "jdbc:h2:${dbConnection.path};DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false",
+                        url = "jdbc:h2:${dbConnection.path};DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL",
                         driver = dbConnection.driver
                     )
                 }

diff --git a/...in/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/di/factory/SignalDatabaseFactory.kt b/...in/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/di/factory/SignalDatabaseFactory.kt
@@ -6,6 +6,7 @@ import com.flipperdevices.ifrmvp.backend.db.signal.table.CategoryMetaTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.CategoryTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileToSignalTable
+import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalKeyTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.UiPresetTable
 import com.flipperdevices.ifrmvp.backend.envkonfig.model.DBConnection
@@ -32,6 +33,7 @@ internal class SignalDatabaseFactory(
                     InfraredFileTable,
                     InfraredFileToSignalTable,
                     SignalTable,
+                    SignalKeyTable,
                     UiPresetTable,
                 )
             }

diff --git a/...abase/src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalKeyTable.kt b/...abase/src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalKeyTable.kt
@@ -0,0 +1,15 @@
+package com.flipperdevices.ifrmvp.backend.db.signal.table
+
+import com.flipperdevices.ifrmvp.backend.model.DeviceKey
+import org.jetbrains.exposed.dao.id.LongIdTable
+
+object SignalKeyTable : LongIdTable("SIGNAL_KEY") {
+    val infraredFileId = reference("ir_file_id", InfraredFileTable)
+    val signalId = reference("signal_id", SignalTable)
+
+    /**
+     * The name of brand folder
+     */
+    val deviceKey = enumeration<DeviceKey>("device_key")
+    val remoteKeyName = text("remote_key_name")
+}
diff --git a/modules/kenerator/configuration/build.gradle.kts b/modules/kenerator/configuration/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
     implementation(projects.modules.database)
     implementation(projects.modules.infrared)
     implementation(projects.modules.kenerator.sql)
+    implementation(projects.modules.kenerator.paths)
 }
 
 application {

diff --git a/...enerator/configuration/src/main/kotlin/com/flipperdevices/ifrmvp/generator/config/Main.kt b/...enerator/configuration/src/main/kotlin/com/flipperdevices/ifrmvp/generator/config/Main.kt
@@ -1,7 +1,7 @@
 package com.flipperdevices.ifrmvp.generator.config
 
 import com.flipperdevices.ifrmvp.generator.config.category.api.AllCategoryConfigGenerator
-import com.flipperdevices.ifrmvp.generator.config.category.model.CategoryType
+import com.flipperdevices.ifrmvp.backend.model.CategoryType
 import com.flipperdevices.ifrmvp.generator.config.device.api.DefaultDeviceConfigGenerator
 import com.flipperdevices.ifrmvp.generator.config.device.api.any.AnyDeviceKeyNamesProvider
 import com.flipperdevices.ifrmvp.parser.util.ParserPathResolver

diff --git a/...lin/com/flipperdevices/ifrmvp/generator/config/category/api/AllCategoryConfigGenerator.kt b/...lin/com/flipperdevices/ifrmvp/generator/config/category/api/AllCategoryConfigGenerator.kt
@@ -2,8 +2,8 @@ package com.flipperdevices.ifrmvp.generator.config.category.api
 
 import com.flipperdevices.ifrmvp.backend.model.DeviceKey
 import com.flipperdevices.ifrmvp.generator.config.category.api.DeviceKeyExt.getAllowedCategories
-import com.flipperdevices.ifrmvp.generator.config.category.model.CategoryConfiguration
-import com.flipperdevices.ifrmvp.generator.config.category.model.CategoryType
+import com.flipperdevices.ifrmvp.backend.model.CategoryConfiguration
+import com.flipperdevices.ifrmvp.backend.model.CategoryType
 import com.flipperdevices.ifrmvp.model.buttondata.IconButtonData
 import com.flipperdevices.ifrmvp.model.buttondata.TextButtonData
 

diff --git a/...n/src/main/kotlin/com/flipperdevices/ifrmvp/generator/config/category/api/DeviceKeyExt.kt b/...n/src/main/kotlin/com/flipperdevices/ifrmvp/generator/config/category/api/DeviceKeyExt.kt
@@ -1,7 +1,7 @@
 package com.flipperdevices.ifrmvp.generator.config.category.api
 
 import com.flipperdevices.ifrmvp.backend.model.DeviceKey
-import com.flipperdevices.ifrmvp.generator.config.category.model.CategoryType
+import com.flipperdevices.ifrmvp.backend.model.CategoryType
 
 object DeviceKeyExt {
     @Suppress("LongMethod", "CyclomaticComplexMethod")

diff --git a/...lin/com/flipperdevices/ifrmvp/generator/config/device/api/DefaultDeviceConfigGenerator.kt b/...lin/com/flipperdevices/ifrmvp/generator/config/device/api/DefaultDeviceConfigGenerator.kt
@@ -1,7 +1,7 @@
 package com.flipperdevices.ifrmvp.generator.config.device.api
 
 import com.flipperdevices.ifrmvp.generator.config.device.api.DeviceKeyNamesProvider.Companion.getKey
-import com.flipperdevices.ifrmvp.generator.config.device.model.DeviceConfiguration
+import com.flipperdevices.ifrmvp.backend.model.DeviceConfiguration
 import java.io.File
 
 class DefaultDeviceConfigGenerator(private val keyNamesProvider: DeviceKeyNamesProvider) : DeviceConfigGenerator {

diff --git a/...ain/kotlin/com/flipperdevices/ifrmvp/generator/config/device/api/DeviceConfigGenerator.kt b/...ain/kotlin/com/flipperdevices/ifrmvp/generator/config/device/api/DeviceConfigGenerator.kt
@@ -1,7 +1,7 @@
 package com.flipperdevices.ifrmvp.generator.config.device.api
 
 import com.flipperdevices.bridge.dao.api.model.FlipperFileFormat
-import com.flipperdevices.ifrmvp.generator.config.device.model.DeviceConfiguration
+import com.flipperdevices.ifrmvp.backend.model.DeviceConfiguration
 import com.flipperdevices.infrared.editor.model.InfraredRemote
 import com.flipperdevices.infrared.editor.viewmodel.InfraredKeyParser
 import java.io.File

diff --git a/modules/kenerator/paths/build.gradle.kts b/modules/kenerator/paths/build.gradle.kts
@@ -0,0 +1,16 @@
+import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo
+
+plugins {
+    id("org.jetbrains.kotlin.jvm")
+    alias(libs.plugins.kotlin.serialization)
+}
+
+dependencies {
+    implementation(libs.kotlin.serialization.json)
+    implementation(kotlin("test"))
+    // Local
+    implementation(projects.modules.buildKonfig)
+    implementation(projects.modules.core)
+    implementation(projects.modules.model)
+    implementation(projects.modules.infrared)
+}
diff --git a/.../ifrmvp/parser/util/ParserPathResolver.kt → .../ifrmvp/parser/util/ParserPathResolver.kt b/.../ifrmvp/parser/util/ParserPathResolver.kt → .../ifrmvp/parser/util/ParserPathResolver.kt
@@ -1,7 +1,9 @@
 package com.flipperdevices.ifrmvp.parser.util
 
 import com.flipperdevices.ifrmvp.backend.envkonfig.EnvKonfig
+import com.flipperdevices.ifrmvp.backend.model.CategoryConfiguration
 import com.flipperdevices.ifrmvp.backend.model.CategoryMeta
+import com.flipperdevices.ifrmvp.backend.model.DeviceConfiguration
 import kotlinx.serialization.json.Json
 import java.io.File
 import kotlin.io.encoding.Base64
@@ -37,6 +39,15 @@ object ParserPathResolver {
         return categoriesFolder.resolve(category)
     }
 
+    fun categoryConfiguration(category: String): CategoryConfiguration {
+        val file = categoryConfigurationFile(category = category)
+        return Json.decodeFromString(file.readText())
+    }
+
+    fun categoryConfigurationFile(category: String): File {
+        return categoryPath(category).resolve("config.json")
+    }
+
     /**
      * Get all brands of current category
      * @param category the name of category
@@ -105,6 +116,27 @@ object ParserPathResolver {
         return folder.resolve("$ifrFolderName.ir")
     }
 
+    fun irFileConfiguration(
+        category: String,
+        brand: String,
+        ifrFolderName: String
+    ): DeviceConfiguration {
+        val file = irFileConfigurationFile(
+            category = category,
+            brand = brand,
+            ifrFolderName = ifrFolderName
+        )
+        return Json.decodeFromString(file.readText())
+    }
+
+    fun irFileConfigurationFile(
+        category: String,
+        brand: String,
+        ifrFolderName: String
+    ): File {
+        return brandPath(category, brand).resolve(ifrFolderName).resolve("config.json")
+    }
+
     /**
      * Get specific ui preset file
      * @param category category name of brand

diff --git a/...s/ifrmvp/parser/ParserPathResolverTest.kt → ...s/ifrmvp/parser/ParserPathResolverTest.kt b/...s/ifrmvp/parser/ParserPathResolverTest.kt → ...s/ifrmvp/parser/ParserPathResolverTest.kt
diff --git a/modules/kenerator/sql/build.gradle.kts b/modules/kenerator/sql/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     implementation(projects.modules.model)
     implementation(projects.modules.database)
     implementation(projects.modules.infrared)
+    implementation(projects.modules.kenerator.paths)
 }
 
 application {

diff --git a/modules/kenerator/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/api/SignalTableApi.kt b/modules/kenerator/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/api/SignalTableApi.kt