fix: fix problems of not ending initialization nouvelle initialisatio…

…n de l'application #2
cnumr · Sep 8, 2024 · eb2e01a · eb2e01a
1 parent cbb6ea8
commit eb2e01a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 57 deletions.
diff --git a/src/main/handlers/Initalization.ts b/src/main/handlers/Initalization.ts
@@ -57,6 +57,25 @@ export const initialization = async (
     forceInitialisation = false
 ) => {
     const mainLog = getMainLog().scope('main/initialization')
+    const updatePlugin = async () => {
+        mainLog.log(`8.3 Plugin installation ...`)
+        const getPluginNormalInstallationReturned =
+            await initPluginNormalInstallation(event)
+        initializedDatas.initPluginNormalInstallation =
+            getPluginNormalInstallationReturned.result as boolean
+        mainLog.log(getPluginNormalInstallationReturned)
+        const normalPluginInstallation = new ConfigData('plugin_installed')
+        normalPluginInstallation.result =
+            initializedDatas.initPluginNormalInstallation
+        normalPluginInstallation.message =
+            initializedDatas.initPluginNormalInstallation
+                ? `Plugin installed`
+                : `Installation plugin failed`
+        getMainWindow().webContents.send(
+            channels.INITIALIZATION_DATAS,
+            normalPluginInstallation
+        )
+    }
     mainLog.info(`forceInitialisation`, forceInitialisation)
     const initializedDatas: initializedDatas = {}
     try {
@@ -339,25 +358,7 @@ export const initialization = async (
                     pluginVersion
                 )
             } else {
-                mainLog.log(`8.3 Plugin installation ...`)
-                const getPluginNormalInstallationReturned =
-                    await initPluginNormalInstallation(event)
-                initializedDatas.initPluginNormalInstallation =
-                    getPluginNormalInstallationReturned.result as boolean
-                mainLog.log(getPluginNormalInstallationReturned)
-                const normalPluginInstallation = new ConfigData(
-                    'plugin_installed'
-                )
-                normalPluginInstallation.result =
-                    initializedDatas.initPluginNormalInstallation
-                normalPluginInstallation.message =
-                    initializedDatas.initPluginNormalInstallation
-                        ? `Plugin installed`
-                        : `Installation plugin failed`
-                getMainWindow().webContents.send(
-                    channels.INITIALIZATION_DATAS,
-                    normalPluginInstallation
-                )
+                await updatePlugin()
             }
         } else {
             // plugin not installed
@@ -387,43 +388,8 @@ export const initialization = async (
                 channels.INITIALIZATION_DATAS,
                 normalPluginInstallation
             )
-            // } else {
-            //     mainLog.log(`7.3 Electron CAN'T install plugin ...`)
-            //     mainLog.log(`7.3 Plugin SUDO installation ...`)
-            //     const getPluginSudoInstallationReturned =
-            //         await initPluginSudoInstallation(event)
-            //     initializedDatas.initPluginSudoInstallation =
-            //         getPluginSudoInstallationReturned.result as boolean
-            //     mainLog.log(getPluginSudoInstallationReturned)
-            //     const sudoPluginInstallation = new ConfigData(
-            //         'plugin_installed'
-            //     )
-            //     sudoPluginInstallation.result =
-            //         initializedDatas.initPluginNormalInstallation
-            //     sudoPluginInstallation.message =
-            //         initializedDatas.initPluginNormalInstallation
-            //             ? `Plugin installed`
-            //             : `Installation plugin failed`
-            //     getMainWindow().webContents.send(
-            //         channels.INITIALIZATION_DATAS,
-            //         sudoPluginInstallation
-            //     )
-            // }
             mainLog.log(`8.2 Plugin NOT installed on host ...`)
-            mainLog.log(`8.3 Verify plugin version after install ...`)
-            const getPluginGetLastVersionReturned =
-                await initPluginGetLastVersion(event, `uninstalled`)
-            initializedDatas.initPluginGetLastVersion =
-                getPluginGetLastVersionReturned.result as string
-            mainLog.log(getPluginGetLastVersionReturned)
-            const pluginMessage = `Plugin version installed is ${initializedDatas.initPluginGetLastVersion}`
-            const pluginVersion = new ConfigData('plugin_version')
-            pluginVersion.result = initializedDatas.initPluginGetLastVersion
-            pluginVersion.message = pluginMessage
-            getMainWindow().webContents.send(
-                channels.INITIALIZATION_DATAS,
-                pluginVersion
-            )
+            await updatePlugin()
         }
 
         // #region END

diff --git a/src/renderer/MainWindow/App.tsx b/src/renderer/MainWindow/App.tsx
@@ -153,14 +153,14 @@ function TheApp() {
     /**
      * Increment function to handle the waiting popin.
      */
-    const increment = () => {
+    const increment = (force = false) => {
         const STEPS = 7
         initReloadButton(false)
         loadingScreen = loadingScreen + 1
         setProgress(loadingScreen * (100 / STEPS))
         frontLog.log(`Verify configuration step ${loadingScreen}/${STEPS}`)
         setPopinText(`${t('Loading...')} ${loadingScreen}/${STEPS}`)
-        if (loadingScreen === STEPS) {
+        if (loadingScreen === STEPS || force) {
             initReloadButton(true)
             frontLog.log(`All initialization datas readed! 👀`)
             setDisplayPopin(false)
@@ -490,6 +490,7 @@ function TheApp() {
                         break
                     case ConfigData.APP_READY:
                         setAppReady(configData.result as boolean)
+                        increment(true)
                         break
                     case ConfigData.APP_CAN_NOT_BE_LAUNCHED:
                         frontLog.log(