eric: comparison eric7/Project/Project.py

-:bd90cbe0b7d2
+:a763d57e23bc
 import glob
 import fnmatch
 import copy
 import zipfile
 import contextlib
+import pathlib
 from PyQt6.QtCore import (
-pyqtSlot, QFile, QFileInfo, pyqtSignal, QCryptographicHash, QIODevice,
+pyqtSlot, QFile, pyqtSignal, QCryptographicHash, QIODevice, QByteArray,
-QByteArray, QObject, QProcess
+QObject, QProcess
 )
 from PyQt6.QtGui import QKeySequence, QAction
 from PyQt6.QtWidgets import (
 QLineEdit, QToolBar, QDialog, QInputDialog, QMenu
 )
 "PathPrefix": "",
 },
 "EOL": -1,
 "DOCSTRING": "",
 "TESTING_FRAMEWORK": "",
+"LICENSE": "",
 }
 self.__initDebugProperties()
 self.pudata = {
 self.recent = []
 Preferences.Prefs.rsettings.sync()
 rp = Preferences.Prefs.rsettings.value(recentNameProject)
 if rp is not None:
 for f in rp:
-if QFileInfo(f).exists():
+if pathlib.Path(f).exists():
 self.recent.append(f)
 def __saveRecent(self):
 """
 Private method to save the list of recently opened filenames.
 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):
 # try the new JSON based format first
-self.__debuggerPropertiesFile.readFile(fn)
+if self.__debuggerPropertiesFile.readFile(fn):
+self.debugPropertiesLoaded = True
+self.debugPropertiesChanged = False
 else:
 # try the old XML based format second
 fn = os.path.join(self.getProjectManagementDir(),
 '{0}.e4d'.format(fn1))
 bool(self.pdata["TRANSLATIONPATTERN"]))
 self.makeGrp.setEnabled(
 self.pdata["MAKEPARAMS"]["MakeEnabled"])
 self.menuMakeAct.setEnabled(
 self.pdata["MAKEPARAMS"]["MakeEnabled"])
+self.menuOtherToolsAct.setEnabled(True)
 self.projectAboutToBeCreated.emit()
 hashStr = str(QCryptographicHash.hash(
 QByteArray(self.ppath.encode("utf-8")),
 bool(self.pdata["TRANSLATIONPATTERN"]))
 self.makeGrp.setEnabled(
 self.pdata["MAKEPARAMS"]["MakeEnabled"])
 self.menuMakeAct.setEnabled(
 self.pdata["MAKEPARAMS"]["MakeEnabled"])
+self.menuOtherToolsAct.setEnabled(True)
 # open a project debugger properties file being quiet
 # about errors
 if Preferences.getProject("AutoLoadDbgProperties"):
 self.__readDebugProperties(True)
 self.tr("Project Files (*.epj)"),
 defaultFilter,
 EricFileDialog.DontConfirmOverwrite)
 if fn:
-ext = QFileInfo(fn).suffix()
+fpath = pathlib.Path(fn)
-if not ext:
+if not fpath.suffix:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
-fn += ex
+fpath = fpath.with_suffix(ex)
-if QFileInfo(fn).exists():
+if fpath.exists():
 res = EricMessageBox.yesNo(
 self.ui,
 self.tr("Save File"),
 self.tr("""<p>The file <b>{0}</b> already exists."""
-""" Overwrite it?</p>""").format(fn),
+""" Overwrite it?</p>""").format(fpath),
 icon=EricMessageBox.Warning)
 if not res:
 return False
-self.name = QFileInfo(fn).baseName()
+self.name = fpath.stem
-ok = self.__writeProject(fn)
+ok = self.__writeProject(str(fpath))
 if ok:
 # create management directory if not present
 self.createProjectManagementDir()
 self.menuApidocAct.setEnabled(False)
 self.menuPackagersAct.setEnabled(False)
 self.pluginGrp.setEnabled(False)
 self.makeGrp.setEnabled(False)
 self.menuMakeAct.setEnabled(False)
+self.menuOtherToolsAct.setEnabled(False)
 self.__model.projectClosed()
 self.projectClosedHooks.emit()
 self.projectClosed.emit(shutdown)
 @return testing framework name of the project
 @rtype str
 """
 try:
 return self.pdata["TESTING_FRAMEWORK"]
+except KeyError:
+return ""
+def getProjectLicense(self):
+"""
+Public method to get the license type used by the project.
+@return license type of the project
+@rtype str
+"""
+try:
+return self.pdata["LICENSE"]
 except KeyError:
 return ""
 def __isInPdata(self, fn):
 """
 """ target is necessary.</p>"""
 ))
 self.makeTestAct.triggered.connect(
 lambda: self.__executeMake(questionOnly=True))
 self.actions.append(self.makeTestAct)
+self.createSBOMAct = EricAction(
+self.tr('Create SBOM File'),
+self.tr('Create &SBOM File'), 0, 0,
+self, 'project_create_sbom')
+self.createSBOMAct.setStatusTip(
+self.tr("Create a SBOM file of the project dependencies."))
+self.createSBOMAct.setWhatsThis(self.tr(
+"""<b>Create SBOM File</b>"""
+"""<p>This allows the creation of a SBOM file of the project"""
+""" dependencies. This may be based on various input sources"""
+""" and will be saved as a CycloneDX SBOM file.</p>"""
+))
+self.createSBOMAct.triggered.connect(self.__createSBOMFile)
+self.actions.append(self.createSBOMAct)
 self.closeAct.setEnabled(False)
 self.saveAct.setEnabled(False)
 self.saveasAct.setEnabled(False)
 self.actGrp2.setEnabled(False)
 self.graphicsMenu = QMenu(self.tr('&Diagrams'), toolsMenu)
 self.packagersMenu = QMenu(self.tr('Pac&kagers'), toolsMenu)
 self.apidocMenu = QMenu(self.tr('Source &Documentation'), toolsMenu)
 self.apidocMenu.setTearOffEnabled(True)
 self.makeMenu = QMenu(self.tr('Make'), toolsMenu)
+self.othersMenu = QMenu(self.tr('Other Tools'), toolsMenu)
 self.__menus = {
 "Main": menu,
 "Recent": self.recentMenu,
 "VCS": self.vcsMenu,
 "Session": self.sessionMenu,
 "Apidoc": self.apidocMenu,
 "Debugger": self.debuggerMenu,
 "Packagers": self.packagersMenu,
 "Make": self.makeMenu,
+"OtherTools": self.othersMenu,
 }
 # connect the aboutToShow signals
 self.recentMenu.aboutToShow.connect(self.__showContextMenuRecent)
 self.recentMenu.triggered.connect(self.__openRecent)
 self.apidocMenu.aboutToShow.connect(self.__showContextMenuApiDoc)
 self.packagersMenu.aboutToShow.connect(self.__showContextMenuPackagers)
 self.sessionMenu.aboutToShow.connect(self.__showContextMenuSession)
 self.debuggerMenu.aboutToShow.connect(self.__showContextMenuDebugger)
 self.makeMenu.aboutToShow.connect(self.__showContextMenuMake)
+self.othersMenu.aboutToShow.connect(self.__showContextMenuOthers)
 menu.aboutToShow.connect(self.__showMenu)
 # build the show menu
 self.menuShow.setTearOffEnabled(True)
 self.menuShow.addAction(self.codeMetricsAct)
 # build the make menu
 self.makeMenu.setTearOffEnabled(True)
 self.makeMenu.addActions(self.makeGrp.actions())
 self.makeMenu.addSeparator()
+# build the 'Other Tools' menu
+self.othersMenu.setTearOffEnabled(True)
+self.othersMenu.addAction(self.createSBOMAct)
 # build the project main menu
 menu.setTearOffEnabled(True)
 menu.addActions(self.actGrp1.actions())
 self.menuRecentAct = menu.addMenu(self.recentMenu)
 self.menuShowAct = toolsMenu.addMenu(self.menuShow)
 toolsMenu.addSeparator()
 self.menuApidocAct = toolsMenu.addMenu(self.apidocMenu)
 toolsMenu.addSeparator()
 self.menuPackagersAct = toolsMenu.addMenu(self.packagersMenu)
+toolsMenu.addSeparator()
+self.menuOtherToolsAct = toolsMenu.addMenu(self.othersMenu)
 self.menuCheckAct.setEnabled(False)
 self.menuShowAct.setEnabled(False)
 self.menuDiagramAct.setEnabled(False)
 self.menuSessionAct.setEnabled(False)
 self.menuDebuggerAct.setEnabled(False)
 self.menuApidocAct.setEnabled(False)
 self.menuPackagersAct.setEnabled(False)
 self.menuMakeAct.setEnabled(False)
+self.menuOtherToolsAct.setEnabled(False)
 self.__menu = menu
 self.__toolsMenu = toolsMenu
 return menu, toolsMenu
 act = self.recentMenu.addAction(
 formatStr.format(
 idx,
 Utilities.compactPath(rp, self.ui.maxMenuFilePathLen)))
 act.setData(rp)
-act.setEnabled(QFileInfo(rp).exists())
+act.setEnabled(pathlib.Path(rp).exists())
 self.recentMenu.addSeparator()
 self.recentMenu.addAction(self.tr('&Clear'), self.clearRecent)
 def __openRecent(self, act):
 """ selected. Aborting...</p>"""))
 return
 progress = EricProgressDialog(
 self.tr("Creating plugin archives..."), self.tr("Abort"),
-0, len(selectedLists), self.tr("%v/%m Archives"))
+0, len(selectedLists), self.tr("%v/%m Archives"), self.ui)
 progress.setMinimumDuration(0)
 progress.setWindowTitle(self.tr("Create Plugin Archives"))
 errors = 0
 for count, pkglist in enumerate(selectedLists):
 progress.setValue(count)
 @return configured docstring style
 @rtype str
 """
 return self.pdata["DOCSTRING"]
+#########################################################################
+## Below are methods implementing the 'SBOM' support
+#########################################################################
+def __showContextMenuOthers(self):
+"""
+Private slot called before the 'Other Tools' menu is shown.
+"""
+self.showMenu.emit("OtherTools", self.othersMenu)
+@pyqtSlot()
+def __createSBOMFile(self):
+"""
+Private slot to create a SBOM file of the project dependencies.
+"""
+import CycloneDXInterface
+CycloneDXInterface.createCycloneDXFile("<project>")
 #
 # eflag: noqa = M601

Mercurial Repositories > eric / file comparison

comparison: eric7/Project/Project.py

eric7/Project/Project.py