eric: comparison eric6/MultiProject/MultiProject.py

-:59d1c0f80286
+:c4110b8b5931
 import UI.PixmapCache
 import Preferences
 import Utilities
+from .MultiProjectFile import MultiProjectFile
 class MultiProject(QObject):
 """
 Class implementing the project management functionality.
 self.ui = parent
 self.projectObject = project
 self.__initData()
+self.__multiProjectFile = MultiProjectFile(self)
 self.recent = []
 self.__loadRecent()
 if filename is not None:
 self.openMultiProject(filename)
 """
 return [c for c in self.categories if c]
 def __readMultiProject(self, fn):
 """
-Private method to read in a multi project (.e4m, .e5m) file.
+Private method to read in a multi project (.emj, .e4m, .e5m) file.
 @param fn filename of the multi project file to be read (string)
 @return flag indicating success
 """
-f = QFile(fn)
+if os.path.splitext(fn)[1] == ".emj":
-if f.open(QIODevice.ReadOnly):
+# new JSON based format
 with E5OverrideCursor():
-from E5XML.MultiProjectReader import MultiProjectReader
+res = self.__multiProjectFile.readFile(fn)
-reader = MultiProjectReader(f, self)
-reader.readXML()
-f.close()
-if reader.hasError():
-return False
 else:
-E5MessageBox.critical(
+# old XML based format
-self.ui,
+f = QFile(fn)
-self.tr("Read multiproject file"),
+if f.open(QIODevice.ReadOnly):
-self.tr(
+with E5OverrideCursor():
-"<p>The multiproject file <b>{0}</b> could not be"
+from E5XML.MultiProjectReader import MultiProjectReader
-" read.</p>").format(fn))
+reader = MultiProjectReader(f, self)
-return False
+reader.readXML()
+f.close()
-self.pfile = os.path.abspath(fn)
+res = not reader.hasError()
-self.ppath = os.path.abspath(os.path.dirname(fn))
+else:
+E5MessageBox.critical(
-self.__extractCategories()
+self.ui,
+self.tr("Read Multi Project File"),
-# insert filename into list of recently opened multi projects
+self.tr(
-self.__syncRecent()
+"<p>The multi project file <b>{0}</b> could not be"
+" read.</p>").format(fn))
-self.name = os.path.splitext(os.path.basename(fn))[0]
+res = False
-# check, if the files of the multi project still exist
+if res:
-self.__checkFilesExist()
+self.pfile = os.path.abspath(fn)
+self.ppath = os.path.abspath(os.path.dirname(fn))
-return True
+self.__extractCategories()
+# insert filename into list of recently opened multi projects
+self.__syncRecent()
+self.name = os.path.splitext(os.path.basename(fn))[0]
+# check, if the files of the multi project still exist
+self.__checkFilesExist()
+return res
 def __writeMultiProject(self, fn=None):
 """
 Private method to save the multi project infos to a multi project file.
 @return flag indicating success
 """
 if fn is None:
 fn = self.pfile
-f = QFile(fn)
+if os.path.splitext(fn)[1] == ".emj":
-if f.open(QIODevice.WriteOnly):
+# new JSON based format
-from E5XML.MultiProjectWriter import MultiProjectWriter
+res = self.__multiProjectFile.writeFile(fn)
-MultiProjectWriter(
-f,
-self, os.path.splitext(os.path.basename(fn))[0]
-).writeXML()
-res = True
 else:
-E5MessageBox.critical(
+# old XML based format
-self.ui,
+f = QFile(fn)
-self.tr("Save multiproject file"),
+if f.open(QIODevice.WriteOnly):
-self.tr(
+from E5XML.MultiProjectWriter import MultiProjectWriter
-"<p>The multiproject file <b>{0}</b> could not be "
+MultiProjectWriter(
-"written.</p>").format(fn))
+f,
-res = False
+self, os.path.splitext(os.path.basename(fn))[0]
+).writeXML()
+res = True
+else:
+E5MessageBox.critical(
+self.ui,
+self.tr("Save Multi Project File"),
+self.tr(
+"<p>The multi project file <b>{0}</b> could not be "
+"written.</p>").format(fn))
+res = False
 if res:
 self.pfile = os.path.abspath(fn)
 self.ppath = os.path.abspath(os.path.dirname(fn))
 self.name = os.path.splitext(os.path.basename(fn))[0]
 def openMultiProject(self, fn=None, openMaster=True):
 """
 Public slot to open a multi project.
 @param fn optional filename of the multi project file to be
-read (string)
+read
+@type str
 @param openMaster flag indicating, that the master project
-should be opened depending on the configuration (boolean)
+should be opened depending on the configuration
+@rtype bool
 """
 if not self.checkDirty():
 return
 if fn is None:
 fn = E5FileDialog.getOpenFileName(
 self.parent(),
-self.tr("Open multiproject"),
+self.tr("Open Multi Project"),
 Preferences.getMultiProject("Workspace") or
 Utilities.getHomeDir(),
-self.tr("Multiproject Files (*.e5m *.e4m)"))
+self.tr("Multi Project Files (*.emj);;"
+"XML Multi Project Files (*.e5m *.e4m)"))
 if fn == "":
 fn = None
 QApplication.processEvents()
 def saveMultiProject(self):
 """
 Public slot to save the current multi project.
-@return flag indicating success (boolean)
+@return flag indicating success
+@rtype bool
 """
 if self.isDirty():
 if len(self.pfile) > 0:
-if self.pfile.endswith(".e4m"):
+if self.pfile.endswith((".e4m", ".e5m")):
-self.pfile = self.pfile.replace(".e4m", ".e5m")
+self.pfile = (self.pfile
+.replace(".e4m", ".emj")
+.replace(".e5m", ".emj"))
 self.__syncRecent()
 ok = self.__writeMultiProject()
 else:
 ok = self.saveMultiProjectAs()
 else:
 def saveMultiProjectAs(self):
 """
 Public slot to save the current multi project to a different file.
-@return flag indicating success (boolean)
+@return flag indicating success
-"""
+@rtype bool
-defaultFilter = self.tr("Multiproject Files (*.e5m)")
+"""
+defaultFilter = self.tr("Multi Project Files (*.emj)")
 if self.ppath:
 defaultPath = self.ppath
 else:
 defaultPath = (
 Preferences.getMultiProject("Workspace") or
 )
 fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 self.parent(),
 self.tr("Save multiproject as"),
 defaultPath,
-self.tr("Multiproject Files (*.e5m)"),
+self.tr("Multi Project Files (*.emj);;"
+"XML Multi Project Files (*.e5m)"),
 defaultFilter,
 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
 if fn:
 ext = QFileInfo(fn).suffix()

Mercurial Repositories > eric / file comparison

comparison: eric6/MultiProject/MultiProject.py

eric6/MultiProject/MultiProject.py