eric: comparison eric6/UI/UserInterface.py

-:c4110b8b5931
+:29818ac4853c
 import Preferences
 import Utilities
 import Globals
 import UI.PixmapCache
+from Sessions.SessionFile import SessionFile
 from E5Network.E5NetworkProxyFactory import (
 E5NetworkProxyFactory, proxyAuthenticationRequired
 )
 try:
 # list of web addresses serving the versions file
 self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
 self.__inVersionCheck = False
 self.__versionCheckProgress = None
+# create the various JSON file interfaces
+self.__sessionFile = SessionFile(True)
 # Initialize the actions, menus, toolbars and statusbar
 splash.showMessage(self.tr("Initializing Actions..."))
 self.__initActions()
 splash.showMessage(self.tr("Initializing Menus..."))
 "<p>The tasks file <b>{0}</b> could not be read.</p>")
 .format(fn))
 def __writeSession(self, filename="", crashSession=False):
 """
-Private slot to write the session data to an XML file (.e5s).
+Private slot to write the session data to a JSON file (.esj).
 @param filename name of a session file to write
 @type str
 @param crashSession flag indicating to write a crash session file
 @type bool
 @return flag indicating success
 @rtype bool
 """
-res = False
 if filename:
 fn = filename
 elif crashSession:
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6_crash_session.e5s")
+"eric6_crash_session.esj")
 else:
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.e5s")
+"eric6session.esj")
-f = QFile(fn)
-if f.open(QIODevice.WriteOnly):
+if fn.endswith(".esj"):
-from E5XML.SessionWriter import SessionWriter
+res = self.__sessionFile.writeFile(fn)
-SessionWriter(f, None).writeXML()
-f.close()
-res = True
 else:
-E5MessageBox.critical(
-self,
-self.tr("Save session"),
-self.tr("<p>The session file <b>{0}</b> could not be"
-" written.</p>")
-.format(fn))
-return res
-def __readSession(self, filename=""):
-"""
-Private slot to read in the session file (.e5s or .e4s).
-@param filename name of a session file to read
-@type str
-@return flag indicating success
-@rtype bool
-"""
-if filename:
-fn = filename
-else:
-fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.e5s")
-if not os.path.exists(fn):
-fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.e4s")
-if not os.path.exists(fn):
-E5MessageBox.critical(
-self,
-self.tr("Read session"),
-self.tr("<p>The session file <b>{0}</b> could not"
-" be read.</p>")
-.format(fn))
-fn = ""
-res = False
-if fn:
 f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
+if f.open(QIODevice.WriteOnly):
-from E5XML.SessionReader import SessionReader
+from E5XML.SessionWriter import SessionWriter
-self.__readingSession = True
+SessionWriter(f, None).writeXML()
-reader = SessionReader(f, True)
-reader.readXML()
-self.__readingSession = False
 f.close()
 res = True
 else:
 E5MessageBox.critical(
 self,
-self.tr("Read session"),
+self.tr("Save Session"),
 self.tr("<p>The session file <b>{0}</b> could not be"
-" read.</p>")
+" written.</p>")
 .format(fn))
+res = False
+return res
+def __readSession(self, filename=""):
+"""
+Private slot to read in the session file (.esj or .e5s).
+@param filename name of a session file to read
+@type str
+@return flag indicating success
+@rtype bool
+"""
+if filename:
+fn = filename
+else:
+fn = os.path.join(Utilities.getConfigDir(),
+"eric6session.esj")
+if not os.path.exists(fn):
+fn = os.path.join(Utilities.getConfigDir(),
+"eric6session.e5s")
+if not os.path.exists(fn):
+E5MessageBox.critical(
+self,
+self.tr("Read Session"),
+self.tr("<p>The session file <b>{0}</b> could not"
+" be read.</p>")
+.format(fn))
+fn = ""
+res = False
+if fn:
+if fn.endswith(".esj"):
+# new JSON based format
+self.__readingSession = True
+res = self.__sessionFile.readFile(fn)
+self.__readingSession = False
+else:
+# old XML based format
+f = QFile(fn)
+if f.open(QIODevice.ReadOnly):
+from E5XML.SessionReader import SessionReader
+self.__readingSession = True
+reader = SessionReader(f, True)
+reader.readXML()
+self.__readingSession = False
+f.close()
+res = True
+else:
+E5MessageBox.critical(
+self,
+self.tr("Read session"),
+self.tr("<p>The session file <b>{0}</b> could not be"
+" read.</p>")
+.format(fn))
 # Write a crash session after a session was read.
 self.__writeCrashSession()
 return res
 """
 Private slot to save a session to disk.
 """
 sessionFile, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 self,
-self.tr("Save session"),
+self.tr("Save Session"),
 Utilities.getHomeDir(),
-self.tr("eric Session Files (*.e5s)"),
+self.tr("eric Session Files (*.esj);;"
+"eric XML Session Files (*.e5s)"),
 "")
 if not sessionFile:
 return
 """
 sessionFile = E5FileDialog.getOpenFileName(
 self,
 self.tr("Load session"),
 Utilities.getHomeDir(),
-self.tr("eric Session Files (*.e5s)"))
+self.tr("eric Session Files (*.esj);;"
+"eric XML Session Files (*.e5s)"))
 if not sessionFile:
 return
 self.__readSession(filename=sessionFile)
 def __deleteCrashSession(self):
 """
 Private slot to delete the crash session file.
 """
-fn = os.path.join(Utilities.getConfigDir(),
+for ext in (".esj", ".e5s"):
-"eric6_crash_session.e5s")
+fn = os.path.join(Utilities.getConfigDir(),
-if os.path.exists(fn):
+f"eric6_crash_session{ext}")
-try:
+if os.path.exists(fn):
-os.remove(fn)
+try:
-except OSError:
+os.remove(fn)
-# ignore it silently
+except OSError:
-pass
+# ignore it silently
+pass
 def __writeCrashSession(self):
 """
 Private slot to write a crash session file.
 """
 not self.__disableCrashSession and
 not self.__noCrashOpenAtStartup and
 Preferences.getUI("OpenCrashSessionOnStartup")
 ):
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6_crash_session.e5s")
+"eric6_crash_session.esj")
 if os.path.exists(fn):
 yes = E5MessageBox.yesNo(
 self,
 self.tr("Crash Session found!"),
 self.tr("""A session file of a crashed session was"""

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py