eric: comparison src/eric7/Sessions/SessionFile.py

-:fbd61fd3fdc1
+:79842be466d3
 """
 Module implementing a class representing the session JSON file.
 """
+import contextlib
 import json
 import time
 from PyQt6.QtCore import QObject, Qt
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.SystemUtilities import FileSystemUtilities
+# TODO: add info about connected eric-ide server
 class SessionFile(QObject):
 """
 Class representing the session JSON file.
 """
 @type str
 @return flag indicating a successful write
 @rtype bool
 """
 # get references to objects we need
-fsInterface = (
+serverInterface = ericApp().getObject("EricServer")
-ericApp().getObject("EricServer").getServiceInterface("FileSystem")
+fsInterface = serverInterface.getServiceInterface("FileSystem")
-)
 project = ericApp().getObject("Project")
 projectBrowser = ericApp().getObject("ProjectBrowser")
 multiProject = ericApp().getObject("MultiProject")
 vm = ericApp().getObject("ViewManager")
 ] = "This file was generated automatically, do not edit."
 if Preferences.getProject("TimestampFile") or self.__isGlobal:
 sessionDict["header"]["saved"] = time.strftime("%Y-%m-%d, %H:%M:%S")
-# step 1: open multi project and project for global session
+# TODO: save currently connected server (host and port)
+# step 1: eric-ide Server Connection
+# ==================================
+sessionDict["RemoteServer"] = (
+serverInterface.getHost() if serverInterface.isServerConnected() else ""
+)
+# step 2: open multi project and project for global session
+# =========================================================
 sessionDict["MultiProject"] = ""
 sessionDict["Project"] = ""
 if self.__isGlobal:
 if multiProject.isOpen():
 sessionDict["MultiProject"] = multiProject.getMultiProjectFile()
 if project.isOpen():
 sessionDict["Project"] = project.getProjectFile()
-# step 2: all open (project) filenames and the active editor
+# step 3: all open (project) filenames and the active editor
+# ==========================================================
 if vm.canSplit():
 sessionDict["ViewManagerSplits"] = {
 "Count": vm.splitCount(),
 "Orientation": vm.getSplitOrientation().value,
 }
 sessionDict["ActiveWindow"] = {
 "Filename": aw,
 "Cursor": ed.getCursorPosition(),
 }
-# step 3: breakpoints
+# step 4: breakpoints
+# ===================
 allBreaks = Preferences.getProject("SessionAllBreakpoints")
 projectFiles = project.getSources(True)
 bpModel = dbs.getBreakPointModel()
 if self.__isGlobal or allBreaks:
 sessionDict["Breakpoints"] = bpModel.getAllBreakpoints()
 else:
 sessionDict["Breakpoints"] = [
 bp for bp in bpModel.getAllBreakpoints() if bp[0] in projectFiles
 ]
-# step 4: watch expressions
+# step 5: watch expressions
+# =========================
 wpModel = dbs.getWatchPointModel()
 sessionDict["Watchpoints"] = wpModel.getAllWatchpoints()
-# step 5: debug info
+# step 6: debug info
+# ==================
 if self.__isGlobal:
 if len(dbg.scriptsHistory):
 dbgScriptName = dbg.scriptsHistory[0]
 else:
 dbgScriptName = ""
 "EnableMultiprocess": project.dbgEnableMultiprocess,
 "MultiprocessNoDebug": project.dbgMultiprocessNoDebug,
 "GlobalConfigOverride": project.dbgGlobalConfigOverride,
 }
-# step 6: bookmarks
+# step 7: bookmarks
+# =================
 bookmarksList = []
 for fileName in editorsDict:
 if self.__isGlobal or project.isProjectFile(fileName):
 editor = editorsDict[fileName]
 bookmarks = editor.getBookmarks()
 "Lines": bookmarks,
 }
 )
 sessionDict["Bookmarks"] = bookmarksList
-# step 7: state of the various project browsers
+# step 8: state of the various project browsers
+# =============================================
 browsersList = []
 for browserName in projectBrowser.getProjectBrowserNames():
 expandedItems = projectBrowser.getProjectBrowser(
 browserName
 ).getExpandedItemNames()
 multiProject = ericApp().getObject("MultiProject")
 vm = ericApp().getObject("ViewManager")
 dbg = ericApp().getObject("DebugUI")
 dbs = ericApp().getObject("DebugServer")
-# step 1: multi project and project
+serverInterface = ericApp().getObject("EricServer")
+# step 1: eric-ide Server Connection
+# ==================================
+with contextlib.suppress(KeyError):
+if sessionDict["RemoteServer"]:
+hostname, port = serverInterface.parseHost(sessionDict["RemoteServer"])
+serverInterface.connectToServer(hostname, port)
+# step 2: multi project and project
 # =================================
 if sessionDict["MultiProject"]:
 multiProject.openMultiProject(sessionDict["MultiProject"], False)
 if sessionDict["Project"]:
 project.openProject(sessionDict["Project"], False)
-# step 2: (project) filenames and the active editor
+# step 3: (project) filenames and the active editor
 # =================================================
 vm.setSplitOrientation(
 Qt.Orientation(sessionDict["ViewManagerSplits"]["Orientation"])
 )
 vm.setSplitCount(sessionDict["ViewManagerSplits"]["Count"])
 if editorDict["Folds"]:
 ed.recolor()
 ed.setContractedFolds(editorDict["Folds"])
 ed.setCursorPosition(*editorDict["Cursor"])
-# step 3: breakpoints
+# step 4: breakpoints
 # ===================
 bpModel = dbs.getBreakPointModel()
 bpModel.addBreakPoints(sessionDict["Breakpoints"])
-# step 4: watch expressions
+# step 5: watch expressions
 # =========================
 wpModel = dbs.getWatchPointModel()
 wpModel.addWatchPoints(sessionDict["Watchpoints"])
-# step 5: debug info
+# step 6: debug info
 # ==================
 debugInfoDict = sessionDict["DebugInfo"]
 # adjust for newer session types
 if "GlobalConfigOverride" not in debugInfoDict:
 debugInfoDict["EnableMultiprocess"],
 debugInfoDict["MultiprocessNoDebug"],
 debugInfoDict["GlobalConfigOverride"],
 )
-# step 6: bookmarks
+# step 7: bookmarks
 # =================
 for bookmark in sessionDict["Bookmarks"]:
 editor = vm.getOpenEditor(bookmark["Filename"])
 if editor is not None:
 for lineno in bookmark["Lines"]:
 editor.toggleBookmark(lineno)
-# step 7: state of the various project browsers
+# step 8: state of the various project browsers
 # =============================================
 for browserState in sessionDict["ProjectBrowserStates"]:
 browser = projectBrowser.getProjectBrowser(browserState["Name"])
 if browser is not None:
 browser.expandItemsByName(browserState["ExpandedItems"])
-# step 8: active window
+# step 9: active window
 # =====================
 if sessionDict["ActiveWindow"]:
 vm.openFiles(sessionDict["ActiveWindow"]["Filename"])
 ed = vm.getOpenEditor(sessionDict["ActiveWindow"]["Filename"])
 if ed is not None:

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Sessions/SessionFile.py

src/eric7/Sessions/SessionFile.py