eric: comparison src/eric7/Debugger/DebugServer.py

-:2b015db9761a
+:ba20efe10336
 from PyQt6.QtNetwork import QHostAddress, QHostInfo, QNetworkInterface, QTcpServer
 from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.SystemUtilities import FileSystemUtilities
 from . import DebugClientCapabilities
 from .BreakPointModel import BreakPointModel
 from .WatchPointModel import WatchPointModel
 self.lastClientType = ""
 self.__autoClearShell = False
 self.__forProject = False
+self.__ericServerDebugging = False
 self.clientClearBreak.connect(self.__clientClearBreakPoint)
 self.clientClearWatch.connect(self.__clientClearWatchPoint)
 self.newConnection.connect(self.__newConnection)
 self.breakpointModel.rowsAboutToBeRemoved.connect(self.__deleteBreakPoints)
 unplanned=True,
 clType=None,
 forProject=False,
 runInConsole=False,
 venvName="",
-workingDir=None,
+workingDir="",
 configOverride=None,
+startRemote=None,
 ):
 """
 Public method to start a debug client.
-@param unplanned flag indicating that the client has died
+@param unplanned flag indicating that the client has died (defaults to True)
-@type bool
+@type bool (optional)
-@param clType type of client to be started
+@param clType type of client to be started (defaults to None)
-@type str
+@type str (optional)
-@param forProject flag indicating a project related action
+@param forProject flag indicating a project related action (defaults to False)
-@type bool
+@type bool (optional)
 @param runInConsole flag indicating to start the debugger in a
-console window
+console window (defaults to False)
-@type bool
+@type bool (optional)
-@param venvName name of the virtual environment to be used
+@param venvName name of the virtual environment to be used (defaults to "")
-@type str
+@type str (optional)
-@param workingDir directory to start the debugger client in
+@param workingDir directory to start the debugger client in (defaults to "")
-@type str
+@type str (optional)
-@param configOverride dictionary containing the global config override
+@param configOverride dictionary containing the global config override data
-data
+(defaults to None)
-@type dict
+@type dict (optional)
+@param startRemote flag indicating to start the client via an eric-ide server
+(defaults to None)
+@type bool (optional)
 """
 self.running = False
 if (
 (not self.passive or not self.passiveClientExited)
 runInConsole,
 venvName,
 self.__originalPathString,
 workingDir=workingDir,
 configOverride=configOverride,
+startRemote=startRemote,
 )
 else:
 if not venvName and project.getProjectData(dataKey="EMBEDDED_VENV"):
 venvName = self.getProjectEnvironmentString()
 runInConsole,
 venvName,
 self.__originalPathString,
 workingDir=workingDir,
 configOverride=configOverride,
+startRemote=startRemote,
 )
 else:
 (
 self.clientProcess,
 _isNetworked,
 runInConsole,
 venvName,
 self.__originalPathString,
 workingDir=workingDir,
 configOverride=configOverride,
+startRemote=startRemote,
 )
 if self.clientProcess:
 self.clientProcess.readyReadStandardError.connect(
 self.__clientProcessError
 self.clientProcess.readyReadStandardOutput.connect(
 self.__clientProcessOutput
 )
 # Perform actions necessary, if client type has changed
+if self.lastClientType != self.clientType:
+self.lastClientType = self.clientType
+self.remoteBanner()
+elif self.__autoClearShell:
+self.__autoClearShell = False
+self.remoteBanner()
+elif startRemote:
+self.__ericServerDebugging = True
 if self.lastClientType != self.clientType:
 self.lastClientType = self.clientType
 self.remoteBanner()
 elif self.__autoClearShell:
 self.__autoClearShell = False
 ) = self.breakpointModel.getBreakPointByIndex(index)[:6]
 if (fn, lineno) in self.__reportedBreakpointIssues:
 self.__reportedBreakpointIssues.remove((fn, lineno))
-self.remoteBreakpoint(debuggerId, fn, lineno, True, cond, temp)
+if (
-if not enabled:
+self.__ericServerDebugging
-self.__remoteBreakpointEnable(debuggerId, fn, lineno, False)
+and FileSystemUtilities.isRemoteFileName(fn)
-if ignorecount:
+) or (
-self.__remoteBreakpointIgnore(debuggerId, fn, lineno, ignorecount)
+not self.__ericServerDebugging
+and FileSystemUtilities.isPlainFileName(fn)
+):
+self.remoteBreakpoint(debuggerId, fn, lineno, True, cond, temp)
+if not enabled:
+self.__remoteBreakpointEnable(debuggerId, fn, lineno, False)
+if ignorecount:
+self.__remoteBreakpointIgnore(
+debuggerId, fn, lineno, ignorecount
+)
 def __makeWatchCondition(self, cond, special):
 """
 Private method to construct the condition string.
 """
 return self.clientType
 def isClientProcessUp(self):
 """
-Public method to check, if the debug client process is up.
+Public method to check, if the debug client process is up or we are
+doing debugging via the eric-ide server.
 @return flag indicating a running debug client process
 @rtype bool
 """
-return self.clientProcess is not None
+return self.clientProcess is not None or self.__ericServerDebugging
 def __newConnection(self):
 """
 Private slot to handle a new connection.
 """
 False,
 forProject=forProject,
 runInConsole=runInConsole,
 venvName=venvName,
 configOverride=configOverride,
+startRemote=FileSystemUtilities.isRemoteFileName(fn),
 )
 self.setCallTraceEnabled("", enableCallTrace)
 self.remoteEnvironment(env)
 False,
 forProject=forProject,
 runInConsole=runInConsole,
 venvName=venvName,
 configOverride=configOverride,
+startRemote=FileSystemUtilities.isRemoteFileName(fn),
 )
 self.remoteEnvironment(env)
 self.debuggerInterface.remoteRun(fn, argv, wd)
 False,
 forProject=forProject,
 runInConsole=runInConsole,
 venvName=venvName,
 configOverride=configOverride,
+startRemote=FileSystemUtilities.isRemoteFileName(fn),
 )
 self.remoteEnvironment(env)
 self.debuggerInterface.remoteCoverage(fn, argv, wd, erase)
 False,
 forProject=forProject,
 runInConsole=runInConsole,
 venvName=venvName,
 configOverride=configOverride,
+startRemote=FileSystemUtilities.isRemoteFileName(fn),
 )
 self.remoteEnvironment(env)
 self.debuggerInterface.remoteProfile(fn, argv, wd, erase)
 if self.passive:
 self.__createDebuggerInterface("None")
 self.signalClientOutput(self.tr("\nNot connected\n"))
 self.signalClientStatement(False, "")
 self.running = False
+self.__ericServerDebugging = False
 def signalClientClearBreak(self, filename, lineno, debuggerId):
 """
 Public method to process the client clear breakpoint command.
 else:
 return ""
 except KeyError:
 # The project object is not present
 return ""
+def getEricServerEnvironmentString(self):
+"""
+Public method to get the string for an eric-ide server environment.
+@return string for the eric-ide server environment
+@rtype str
+"""
+return "eric-ide Server"

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Debugger/DebugServer.py

src/eric7/Debugger/DebugServer.py