Move progressbar while importing/exporting type contracts

Author: nikitabobko

ide-plugin/src/org/jetbrains/plugins/ruby/ruby/actions/ImportExportContractsAction.kt

@@ -4,6 +4,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.fileChooser.FileChooserDescriptor
 import com.intellij.openapi.fileChooser.ex.FileChooserDialogImpl
 import com.intellij.openapi.module.Module
+import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.project.Project
@@ -22,7 +23,15 @@ import java.io.File
 
 const val CHUNK_SIZE = 1500
 
-fun Database.copyTo(destination: Database) {
+fun Database.copyTo(destination: Database, moveProgressBar: Boolean) {
+    var progressIndicator: ProgressIndicator? = null
+    var count: Int? = null
+
+    if (moveProgressBar) {
+        progressIndicator = ProgressManager.getInstance().progressIndicator
+        count = transaction(this) { CallInfoTable.selectAll().count() }
+    }
+
     var offset = 0
     while (true) {
         val info: List<CallInfo> = transaction(this) {
@@ -35,7 +44,12 @@ fun Database.copyTo(destination: Database) {
         transaction(destination) {
             info.forEach { CallInfoTable.insertInfoIfNotContains(it) }
         }
+
         offset += CHUNK_SIZE
+
+        if (moveProgressBar) {
+            progressIndicator!!.fraction = offset.toDouble() / count!!
+        }
     }
 }
 
@@ -45,11 +59,11 @@ class ExportContractsAction : ExportFileActionBase(
         extensions = arrayOf("mv.db")
 ) {
     override fun backgroundProcess(absoluteFilePath: String, module: Module?, sdk: Sdk?, project: Project) {
-        exportContractsToFile(absoluteFilePath)
+        exportContractsToFile(absoluteFilePath, moveProgressBar = true)
     }
 
     companion object {
-        fun exportContractsToFile(pathToExport: String) {
+        fun exportContractsToFile(pathToExport: String, moveProgressBar: Boolean) {
             check(pathToExport.endsWith(DatabaseProvider.H2_DB_FILE_EXTENSION)) {
                 "Path to export must end with .mv.db"
             }
@@ -58,7 +72,7 @@ class ExportContractsAction : ExportFileActionBase(
             val databaseToExportTo = DatabaseProvider.connectToDB(pathToExport)
             DatabaseProvider.createAllDatabases(databaseToExportTo)
 
-            DatabaseProvider.defaultDatabase!!.copyTo(databaseToExportTo)
+            DatabaseProvider.defaultDatabase!!.copyTo(databaseToExportTo, moveProgressBar)
         }
     }
 }
@@ -76,25 +90,24 @@ class ImportContractsAction : DumbAwareAction() {
 
         try {
             ProgressManager.getInstance().runProcessWithProgressSynchronously(ThrowableComputable<Unit, Exception> {
-                files.forEach { importContractsFromFile(it.path) }
+                files.forEach { importContractsFromFile(it.path, moveProgressBar = true) }
                 return@ThrowableComputable
             }, "Importing type contracts", false, project)
             resetAllRubyTypeProviderAndIDEACaches(project)
-            Messages.showDialog("Type contracts imported successfully", "Info", arrayOf("OK"), 0, null)
         } catch (ex: Exception) {
             Messages.showErrorDialog(ex.message, "Error while importing type contracts")
         }
     }
 
     companion object {
-        fun importContractsFromFile(pathToImportFrom: String) {
+        fun importContractsFromFile(pathToImportFrom: String, moveProgressBar: Boolean) {
             check(pathToImportFrom.endsWith(DatabaseProvider.H2_DB_FILE_EXTENSION)) {
                 "Path to import from must end with .mv.db"
             }
 
             val dbToImportFrom = DatabaseProvider.connectToDB(pathToImportFrom)
 
-            dbToImportFrom.copyTo(DatabaseProvider.defaultDatabase!!)
+            dbToImportFrom.copyTo(DatabaseProvider.defaultDatabase!!, moveProgressBar)
         }
     }
 }

ide-plugin/src/test/java/org/jetbrains/plugins/ruby/ruby/actions/ImportExportTests.kt

@@ -1,6 +1,5 @@
 package org.jetbrains.plugins.ruby.ruby.actions
 
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase
 import junit.framework.Assert
 import junit.framework.TestCase
 import org.jetbrains.exposed.sql.Database
@@ -27,7 +26,7 @@ class ImportExportTests : TestCase() {
         }
 
         val exportedDB = generateTempDBFilePath().let { pathToExport: String ->
-            ExportContractsAction.exportContractsToFile(pathToExport)
+            ExportContractsAction.exportContractsToFile(pathToExport, moveProgressBar = false)
 
             return@let DatabaseProvider.connectToDB(pathToExport)
         }
@@ -52,7 +51,7 @@ class ImportExportTests : TestCase() {
                 data.forEach { CallInfoTable.insertInfoIfNotContains(it) }
             }
 
-            ImportContractsAction.importContractsFromFile(pathToImport)
+            ImportContractsAction.importContractsFromFile(pathToImport, moveProgressBar = false)
 
             return@let db
         }
@@ -89,7 +88,7 @@ class ImportExportTests : TestCase() {
                 data.forEach { CallInfoTable.insertInfoIfNotContains(it) }
             }
 
-            ImportContractsAction.importContractsFromFile(pathToImport)
+            ImportContractsAction.importContractsFromFile(pathToImport, moveProgressBar = false)
 
             return@let db
         }