Tickets #390, #558, #664, #771, #813, #867, #957, updates & improvements (#1031)

Co-authored-by: Sergio Rua <58211930+digiserg@users.noreply.github.com>

Author: mhmdkrmabd

custom_modules/main/pty.js

@@ -188,16 +188,22 @@ class Pty {
               throw 0
 
             // Add the received data to the variable
-            instance.allOutput += minifyText(data)
+            instance.allOutput += minifyText(data, false)
 
             // If any of the keywords have been found
-            if ((['KEYWORD:OUTPUT:COMPLETED:ALL', 'KEYWORD:CQLSH:STARTED', 'cqlsh>']).some((keyword) => instance.allOutput.indexOf(minifyText(keyword)) != -1)) {
+            if ((['KEYWORD:OUTPUT:COMPLETED:ALL', 'KEYWORD:CQLSH:STARTED', 'cqlsh>']).some((keyword) => instance.allOutput.indexOf(minifyText(keyword, false)) != -1)) {
+              let loggedInUsername = ''
+
+              try {
+                loggedInUsername = instance.allOutput.match(/KEYWORD\:USERNAME\:\[(.*?)\]/i)[1]
+              } catch (e) {}
+
               // Add the ignore keyword
               instance.allOutput = 'ignore-text'
 
               // Send the `started` keyword to the renderer thread
               return instance[instance.windowBackground != null ? 'windowBackground' : 'window'].webContents.send(`pty:data:${instance.id}`, {
-                output: 'KEYWORD:CQLSH:STARTED'
+                output: (`${loggedInUsername}`.length != 0 ? (OS.EOL + `KEYWORD:USERNAME:[${loggedInUsername}] `) : '') + 'KEYWORD:CQLSH:STARTED'
               })
             }
           } catch (e) {
@@ -1282,7 +1288,7 @@ let cleanCommand = (command) => {
  *
  * @Return: {string} the manipulated text
  */
-let minifyText = (text) => {
+let minifyText = (text, toLowerCase = true) => {
   // Define the regex expression to be created
   let regexs = ['\\n', '\\r']
 
@@ -1296,7 +1302,10 @@ let minifyText = (text) => {
   })
 
   // Call the text manipulation function
-  text = `${text}`.replace(/\s+/gm, '').toLowerCase()
+  text = `${text}`.replace(/\s+/gm, '')
+
+  if (toLowerCase)
+    text = `${text}`.toLowerCase()
 
   // Return final result
   return text

custom_modules/renderer/connections.js

@@ -1838,6 +1838,21 @@ let getPrePostScripts = async (workspaceID, connectionID = null) => {
   }
 }
 
+let ignoredConnections = [],
+  watchConnectionPath = (connectionID, connectionPath, callback) => {
+    if (Modules.Connections.ignoredConnections.includes(connectionID)) {
+      Modules.Connections.ignoredConnections = Modules.Connections.ignoredConnections.filter((id) => id != connectionID)
+      return
+    }
+
+    setTimeout(() => {
+      if (!pathIsAccessible(connectionPath, false))
+        return callback()
+
+      watchConnectionPath(connectionID, connectionPath, callback)
+    }, getRandom.numberInterval(1000, 10000))
+  }
+
 module.exports = {
   // Main connection's operations
   getConnections,
@@ -1859,5 +1874,7 @@ module.exports = {
   getSnapshots,
   getNewestSnapshot,
   executeScript,
-  getPrePostScripts
+  getPrePostScripts,
+  ignoredConnections,
+  watchConnectionPath
 }

custom_modules/renderer/workspaces.js

@@ -382,10 +382,27 @@ let deleteWorkspace = async (workspace, workspaces, keepFiles = false) => {
   }
 }
 
+let ignoredWorkspaces = [],
+  watchWorkspacePath = (workspaceID, workspacePath, callback) => {
+    if (Modules.Workspaces.ignoredWorkspaces.includes(workspaceID)) {
+      Modules.Workspaces.ignoredWorkspaces = Modules.Workspaces.ignoredWorkspaces.filter((id) => id != workspaceID)
+      return
+    }
+
+    setTimeout(() => {
+      if (!pathIsAccessible(workspacePath, false))
+        return callback()
+
+      watchWorkspacePath(workspaceID, workspacePath, callback)
+    }, getRandom.numberInterval(1000, 10000))
+  }
+
 module.exports = {
   getWorkspaces,
   getWorkspacesNoAsync,
   saveWorkspace,
   updateWorkspace,
-  deleteWorkspace
+  deleteWorkspace,
+  ignoredWorkspaces,
+  watchWorkspacePath
 }