eric: comparison src/eric7/Project/Project.py

-:e3381757d40d
+:4aa36fcd4a30
 from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtCore import (
 QByteArray,
 QCryptographicHash,
-QFile,
-QIODevice,
 QObject,
 QProcess,
 pyqtSignal,
 pyqtSlot,
 )
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
-from eric7.EricXML.DebuggerPropertiesReader import DebuggerPropertiesReader
-from eric7.EricXML.ProjectReader import ProjectReader
-from eric7.EricXML.SessionReader import SessionReader
-from eric7.EricXML.TasksReader import TasksReader
-from eric7.EricXML.UserProjectReader import UserProjectReader
 from eric7.Globals import recentNameProject
 from eric7.Sessions.SessionFile import SessionFile
 from eric7.SystemUtilities import (
 FileSystemUtilities,
 OSUtilities,
 "AUTHOR": "",
 "EMAIL": "",
 "HASH": "",
 "PROGLANGUAGE": "Python3",
 "MIXEDLANGUAGE": False,
-"PROJECTTYPE": "PyQt5",
+"PROJECTTYPE": "PyQt6",
 "SPELLLANGUAGE": Preferences.getEditor("SpellCheckingDefaultLanguage"),
 "SPELLWORDS": "",
 "SPELLEXCLUDES": "",
 "FILETYPES": {},
 "LEXERASSOCS": {},
 "*.txt": "OTHERS",
 "*.md": "OTHERS",
 "*.rst": "OTHERS",
 "README": "OTHERS",
 "README.*": "OTHERS",
-"*.e4p": "OTHERS",
 "*.epj": "OTHERS",
 "GNUmakefile": "OTHERS",
 "makefile": "OTHERS",
 "Makefile": "OTHERS",
 "*.ini": "OTHERS",
 self.__pdata[index].remove(file)
 self.setDirty(True)
 def __readProject(self, fn):
 """
-Private method to read in a project (.epj or .e4p) file.
+Private method to read in a project (.epj) file.
 @param fn filename of the project file to be read
 @type str
 @return flag indicating success
 @rtype bool
 """
-if os.path.splitext(fn)[1] == ".epj":
+with EricOverrideCursor():
-# new JSON based format
+res = self.__projectFile.readFile(fn)
-with EricOverrideCursor():
-res = self.__projectFile.readFile(fn)
-else:
-# old XML based format
-f = QFile(fn)
-if f.open(QIODevice.OpenModeFlag.ReadOnly):
-reader = ProjectReader(f, self)
-reader.readXML()
-res = not reader.hasError()
-f.close()
-# create hash value, if it doesn't have one
-if reader.version.startswith("5.") and not self.__pdata["HASH"]:
-hashStr = str(
-QCryptographicHash.hash(
-QByteArray(self.ppath.encode("utf-8")),
-QCryptographicHash.Algorithm.Sha1,
-).toHex(),
-encoding="utf-8",
-)
-self.__pdata["HASH"] = hashStr
-self.setDirty(True)
-else:
-EricMessageBox.critical(
-self.ui,
-self.tr("Read Project File"),
-self.tr(
-"<p>The project file <b>{0}</b> could not be read.</p>"
-).format(fn),
-)
-res = False
 if res:
 self.pfile = os.path.abspath(fn)
 self.ppath = os.path.abspath(os.path.dirname(fn))
 return res
 def __readUserProperties(self):
 """
-Private method to read in the user specific project file (.eqj or
+Private method to read in the user specific project file (.eqj).
-.e4q).
 """
 if self.pfile is None:
 return
 fn1, ext = os.path.splitext(os.path.basename(self.pfile))
 fn = os.path.join(self.getProjectManagementDir(), "{0}.eqj".format(fn1))
 if os.path.exists(fn):
-# try the new JSON based format first
 self.__userProjectFile.readFile(fn)
-else:
-# try the old XML based format second
-fn = os.path.join(self.getProjectManagementDir(), "{0}.e4q".format(fn1))
-if os.path.exists(fn):
-f = QFile(fn)
-if f.open(QIODevice.OpenModeFlag.ReadOnly):
-reader = UserProjectReader(f, self)
-reader.readXML()
-f.close()
-else:
-EricMessageBox.critical(
-self.ui,
-self.tr("Read User Project Properties"),
-self.tr(
-"<p>The user specific project properties file"
-" <b>{0}</b> could not be read.</p>"
-).format(fn),
-)
 def __writeUserProperties(self):
 """
 Private method to write the user specific project data to a JSON file.
 """
 enable = True
 if self.pfile is None:
 enable = False
 else:
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
-fn_new = os.path.join(self.getProjectManagementDir(), "{0}.esj".format(fn))
+fn_sess = os.path.join(self.getProjectManagementDir(), "{0}.esj".format(fn))
-fn_old = os.path.join(self.getProjectManagementDir(), "{0}.e5s".format(fn))
+enable = os.path.exists(fn_sess)
-enable = os.path.exists(fn_new) or os.path.exists(fn_old)
 self.sessActGrp.findChild(QAction, "project_load_session").setEnabled(enable)
 self.sessActGrp.findChild(QAction, "project_delete_session").setEnabled(enable)
 @pyqtSlot()
 def __readSession(self, quiet=False, indicator=""):
 """
-Private method to read in the project session file (.esj or .e5s).
+Private method to read in the project session file (.esj).
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 @type bool
 @param indicator indicator string
 fn1, ext = os.path.splitext(os.path.basename(self.pfile))
 fn = os.path.join(
 self.getProjectManagementDir(), "{0}{1}.esj".format(fn1, indicator)
 )
 if os.path.exists(fn):
-# try the new JSON based format first
 self.__sessionFile.readFile(fn)
-else:
-# try the old XML based format second
-fn = os.path.join(
-self.getProjectManagementDir(), "{0}{1}.e5s".format(fn1, indicator)
-)
-if os.path.exists(fn):
-f = QFile(fn)
-if f.open(QIODevice.OpenModeFlag.ReadOnly):
-reader = SessionReader(f, False)
-reader.readXML(quiet=quiet)
-f.close()
-else:
-if not quiet:
-EricMessageBox.critical(
-self.ui,
-self.tr("Read project session"),
-self.tr(
-"<p>The project session file <b>{0}</b> could"
-" not be read.</p>"
-).format(fn),
-)
 @pyqtSlot()
 def __writeSession(self, quiet=False, indicator=""):
 """
 Private method to write the session data to an XML file (.esj).
 )
 return
 fname, ext = os.path.splitext(os.path.basename(self.pfile))
-for ext in (".esj", ".e5s", ".e4s"):
+fn = os.path.join(self.getProjectManagementDir(), f"{fname}.esj")
-fn = os.path.join(
+if os.path.exists(fn):
-self.getProjectManagementDir(), "{0}{1}".format(fname, ext)
+try:
-)
+os.remove(fn)
-if os.path.exists(fn):
+except OSError:
-try:
+EricMessageBox.critical(
-os.remove(fn)
+self.ui,
-except OSError:
+self.tr("Delete Project Session"),
-EricMessageBox.critical(
+self.tr(
-self.ui,
+"<p>The project session file <b>{0}</b> could"
-self.tr("Delete Project Session"),
+" not be deleted.</p>"
-self.tr(
+).format(fn),
-"<p>The project session file <b>{0}</b> could"
+)
-" not be deleted.</p>"
-).format(fn),
-)
 def __readTasks(self):
 """
-Private method to read in the project tasks file (.etj or .e6t).
+Private method to read in the project tasks file (.etj).
 """
 if self.pfile is None:
 EricMessageBox.critical(
 self.ui,
 self.tr("Read Tasks"),
 return
 base, ext = os.path.splitext(os.path.basename(self.pfile))
 fn = os.path.join(self.getProjectManagementDir(), "{0}.etj".format(base))
 if os.path.exists(fn):
-# try new style JSON file first
 self.__tasksFile.readFile(fn)
-else:
-# try old style XML file second
-fn = os.path.join(self.getProjectManagementDir(), "{0}.e6t".format(base))
-if os.path.exists(fn):
-f = QFile(fn)
-if f.open(QIODevice.OpenModeFlag.ReadOnly):
-reader = TasksReader(f, True)
-reader.readXML()
-f.close()
-else:
-EricMessageBox.critical(
-self.ui,
-self.tr("Read Tasks"),
-self.tr(
-"<p>The tasks file <b>{0}</b> could not be read.</p>"
-).format(fn),
-)
 def writeTasks(self):
 """
 Public method to write the tasks data to a JSON file (.etj).
 """
 enable = True
 if self.pfile is None:
 enable = False
 else:
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
-# try new style file first
 fn = os.path.join(self.getProjectManagementDir(), "{0}.edj".format(fn))
-if not os.path.exists(fn):
-# try old style file second
-fn = os.path.join(self.getProjectManagementDir(), "{0}.e4d".format(fn))
 enable = os.path.exists(fn)
 self.dbgActGrp.findChild(
 QAction, "project_debugger_properties_load"
 ).setEnabled(enable)
 self.dbgActGrp.findChild(
 ).setEnabled(enable)
 @pyqtSlot()
 def __readDebugProperties(self, quiet=False):
 """
-Private method to read in the project debugger properties file
+Private method to read in the project debugger properties file (.edj).
-(.edj or .e4d).
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 @type bool
 """
 )
 return
 fn1, ext = os.path.splitext(os.path.basename(self.pfile))
 fn = os.path.join(self.getProjectManagementDir(), "{0}.edj".format(fn1))
-if os.path.exists(fn):
+if (
-# try the new JSON based format first
+os.path.exists(fn)
-if self.__debuggerPropertiesFile.readFile(fn):
+and self.__debuggerPropertiesFile.readFile(fn)
-self.debugPropertiesLoaded = True
+):
-self.debugPropertiesChanged = False
+self.debugPropertiesLoaded = True
-else:
+self.debugPropertiesChanged = False
-# try the old XML based format second
-fn = os.path.join(self.getProjectManagementDir(), "{0}.e4d".format(fn1))
-f = QFile(fn)
-if f.open(QIODevice.OpenModeFlag.ReadOnly):
-reader = DebuggerPropertiesReader(f, self)
-reader.readXML(quiet=quiet)
-f.close()
-self.debugPropertiesLoaded = True
-self.debugPropertiesChanged = False
-else:
-if not quiet:
-EricMessageBox.critical(
-self.ui,
-self.tr("Read Debugger Properties"),
-self.tr(
-"<p>The project debugger properties file"
-" <b>{0}</b> could not be read.</p>"
-).format(fn),
-)
 @pyqtSlot()
 def __writeDebugProperties(self, quiet=False):
 """
 Private method to write the project debugger properties file (.edj).
 with EricOverrideCursor():
 self.__debuggerPropertiesFile.writeFile(fn)
 def __deleteDebugProperties(self):
 """
-Private method to delete the project debugger properties file
+Private method to delete the project debugger properties file (.edj).
-(.edj or .e4d).
 """
 if self.pfile is None:
 EricMessageBox.critical(
 self.ui,
 self.tr("Delete Debugger Properties"),
 )
 return
 fname, ext = os.path.splitext(os.path.basename(self.pfile))
-for ext in (".edj", ".e4d"):
+fn = os.path.join(self.getProjectManagementDir(), f"{fname}.edj")
-fn = os.path.join(
+if os.path.exists(fn):
-self.getProjectManagementDir(), "{0}{1}".format(fname, ext)
+try:
-)
+os.remove(fn)
-if os.path.exists(fn):
+except OSError:
-try:
+EricMessageBox.critical(
-os.remove(fn)
+self.ui,
-except OSError:
+self.tr("Delete Debugger Properties"),
-EricMessageBox.critical(
+self.tr(
-self.ui,
+"<p>The project debugger properties file"
-self.tr("Delete Debugger Properties"),
+" <b>{0}</b> could not be deleted.</p>"
-self.tr(
+).format(fn),
-"<p>The project debugger properties file"
+)
-" <b>{0}</b> could not be deleted.</p>"
-).format(fn),
-)
 def __initDebugProperties(self):
 """
 Private method to initialize the debug properties.
 """
 newfn = EricFileDialog.getSaveFileName(
 None,
 self.tr("Rename file"),
 oldfn,
 "",
-EricFileDialog.DontConfirmOverwrite,
+options=EricFileDialog.DontConfirmOverwrite,
 )
 if not newfn:
 return False
 newfn = FileSystemUtilities.toNativeSeparators(newfn)
 ms = os.path.join(self.ppath, self.__pdata["MAINSCRIPT"])
 else:
 ms = self.__pdata["MAINSCRIPT"]
 if not os.path.exists(ms):
 try:
-os.makedirs(os.path.dirname(ms))
+os.makedirs(os.path.dirname(ms), exist_ok=True)
 with open(ms, "w"):
 pass
 except OSError as err:
 EricMessageBox.critical(
 self.ui,
 mf = os.path.join(self.ppath, mf)
 else:
 mf = os.path.join(self.ppath, Project.DefaultMakefile)
 if not os.path.exists(mf):
 try:
-os.makedirs(os.path.dirname(mf))
+os.makedirs(os.path.dirname(mf), exist_ok=True)
 with open(mf, "w"):
 pass
 except OSError as err:
 EricMessageBox.critical(
 self.ui,
 if fn is None:
 fn = EricFileDialog.getOpenFileName(
 self.parent(),
 self.tr("Open project"),
 Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir(),
-self.tr("Project Files (*.epj);;XML Project Files (*.e4p)"),
+self.tr("Project Files (*.epj)"),
 )
 if fn and self.closeProject():
 with EricOverrideCursor():
 ok = self.__readProject(fn)
 @return flag indicating success
 @rtype bool
 """
 if self.isDirty():
 if len(self.pfile) > 0:
-if self.pfile.endswith(".e4p"):
-self.pfile = self.pfile.replace(".e4p", ".epj")
-self.__syncRecent()
 ok = self.__writeProject()
 else:
 ok = self.saveProjectAs()
 else:
 ok = True
 pattern
 for pattern, filetype in self.__pdata["FILETYPES"].items()
 if filetype == "__IGNORE__"
 ]
-dirs = self.subdirs[:]
+dirs = [""] if recursiveSearch else self.subdirs[:] + [""]
 for directory in dirs:
 skip = False
 for ignore_pattern in ignore_patterns:
 if fnmatch.fnmatch(directory, ignore_pattern):
 skip = True
 else "*.ts"
 )
 binpattern = self.__binaryTranslationFile(pattern)
 for ns in newSources:
 # ignore hidden files and directories
-if ns.startswith("."):
+if ns.startswith(".") or ns == "__pycache__":
-continue
-if (
-OSUtilities.isWindowsPlatform()
-and os.path.isdir(os.path.join(curpath, ns))
-and ns.startswith("_")
-):
-# dot net hack
 continue
 # set fn to project relative name
 # then reset ns to fully qualified name for insertion,
 # possibly.
 Private method to find the path of the embedded virtual environment.
 @return path of the embedded virtual environment (empty if not found)
 @rtype str
 """
-with os.scandir(self.getProjectPath()) as ppathDirEntriesIterator:
+ppath = self.getProjectPath()
-for dirEntry in ppathDirEntriesIterator:
+if ppath and os.path.exists(ppath):
-# potential venv directory; check for 'pyvenv.cfg'
+with os.scandir(self.getProjectPath()) as ppathDirEntriesIterator:
-if dirEntry.is_dir() and os.path.exists(
+for dirEntry in ppathDirEntriesIterator:
-os.path.join(dirEntry.path, "pyvenv.cfg")
+# potential venv directory; check for 'pyvenv.cfg'
-):
+if dirEntry.is_dir() and os.path.exists(
-return dirEntry.path
+os.path.join(dirEntry.path, "pyvenv.cfg")
+):
-# check for some common names in case 'pyvenv.cfg' is missing
+return dirEntry.path
-for venvPathName in (".venv", "venv", ".env", "env"):
-venvPath = os.path.join(self.getProjectPath(), venvPathName)
+# check for some common names in case 'pyvenv.cfg' is missing
-if os.path.isdir(venvPath):
+for venvPathName in (".venv", "venv", ".env", "env"):
-return venvPath
+venvPath = os.path.join(self.getProjectPath(), venvPathName)
+if os.path.isdir(venvPath):
+return venvPath
 return ""
 def __setEmbeddedEnvironmentProjectConfig(self, value):
 """

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Project/Project.py

src/eric7/Project/Project.py