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

-:9c1f429cb56b
+:b47dfa7a137d
 pyqtSlot,
 )
 from PyQt6.QtGui import QAction, QKeySequence
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu, QToolBar
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences, Utilities
 from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
 from eric7.CodeFormatting.BlackUtilities import aboutBlack
 from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
 from eric7.CodeFormatting.IsortUtilities import aboutIsort
 from eric7.EricGui import EricPixmapCache
 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,
+PythonUtilities,
+QtUtilities,
+)
 from eric7.Tasks.TasksFile import TasksFile
 from eric7.UI import Config
 from eric7.UI.NotificationWidget import NotificationTypes
 from .DebuggerPropertiesFile import DebuggerPropertiesFile
 "MicroPython": ["Console", "Other"],
 "Ruby": ["Console", "Other"],
 "JavaScript": ["Other"],
 }
-if Utilities.checkPyside(variant=2):
+if QtUtilities.checkPyside(variant=2):
 self.__projectTypes["PySide2"] = self.tr("PySide2 GUI")
 self.__projectTypes["PySide2C"] = self.tr("PySide2 Console")
 self.__projectProgLanguages["Python3"].extend(["PySide2", "PySide2C"])
-if Utilities.checkPyside(variant=6):
+if QtUtilities.checkPyside(variant=6):
 self.__projectTypes["PySide6"] = self.tr("PySide6 GUI")
 self.__projectTypes["PySide6C"] = self.tr("PySide6 Console")
 self.__projectProgLanguages["Python3"].extend(["PySide6", "PySide6C"])
 def getProjectTypes(self, progLanguage=""):
 if dlg.exec() == QDialog.DialogCode.Accepted:
 fnames, target, isSource = dlg.getData()
 if target != "":
 for fn in fnames:
 targetfile = os.path.join(target, os.path.basename(fn))
-if not Utilities.samepath(os.path.dirname(fn), target):
+if not FileSystemUtilities.samepath(os.path.dirname(fn), target):
 try:
 if not os.path.isdir(target):
 os.makedirs(target)
 if os.path.exists(targetfile):
 " any files belonging to the selected category.</p>"
 ),
 )
 return
-if not Utilities.samepath(target, source) and not os.path.isdir(target):
+if not FileSystemUtilities.samepath(target, source) and not os.path.isdir(
+target
+):
 try:
 os.makedirs(target)
 except OSError as why:
 EricMessageBox.critical(
 self.ui,
 for pattern in ignorePatterns:
 if fnmatch.fnmatch(file, pattern):
 continue
 targetfile = os.path.join(target, os.path.basename(file))
-if not Utilities.samepath(target, source):
+if not FileSystemUtilities.samepath(target, source):
 try:
 if os.path.exists(targetfile):
 res = EricMessageBox.yesNo(
 self.ui,
 self.tr("Add directory"),
 "",
 EricFileDialog.DontConfirmOverwrite,
 )
 if not newfn:
 return False
-newfn = Utilities.toNativeSeparators(newfn)
+newfn = FileSystemUtilities.toNativeSeparators(newfn)
 if os.path.exists(newfn):
 res = EricMessageBox.yesNo(
 self.ui,
 self.tr("Rename File"),
 with EricOverrideCursor():
 # search the project directory for files with known extensions
 filespecs = list(self.__pdata["FILETYPES"].keys())
 for filespec in filespecs:
-files = Utilities.direntries(self.ppath, True, filespec)
+files = FileSystemUtilities.direntries(self.ppath, True, filespec)
 for file in files:
 self.appendFile(file)
 # special handling for translation files
 if self.translationsRoot:
 pattern = pattern.replace("%language%", "*")
 else:
 tpd = self.__pdata["TRANSLATIONPATTERN"].split("%language%")[0]
 else:
 pattern = "*.ts"
-tslist.extend(Utilities.direntries(tpd, True, pattern))
+tslist.extend(FileSystemUtilities.direntries(tpd, True, pattern))
 pattern = self.__binaryTranslationFile(pattern)
 if pattern:
-tslist.extend(Utilities.direntries(tpd, True, pattern))
+tslist.extend(FileSystemUtilities.direntries(tpd, True, pattern))
 if tslist:
 if "_" in os.path.basename(tslist[0]):
 # the first entry determines the mainscript name
 mainscriptname = (
 os.path.splitext(mainscript)[0]
 )
 pattern = os.path.basename(
 self.__pdata["TRANSLATIONPATTERN"]
 ).replace("%language%", "*")
 pattern = self.__binaryTranslationFile(pattern)
-qmlist = Utilities.direntries(tpd, True, pattern)
+qmlist = FileSystemUtilities.direntries(tpd, True, pattern)
 for qm in qmlist:
 self.__pdata["TRANSLATIONS"].append(qm)
 self.projectFileAdded.emit(qm, "TRANSLATIONS")
 if not self.__pdata["MAINSCRIPT"] and bool(mainscriptname):
 if self.__pdata["PROGLANGUAGE"] in ["Python3", "MicroPython"]:
 if fn is None:
 fn = EricFileDialog.getOpenFileName(
 self.parent(),
 self.tr("Open project"),
-Preferences.getMultiProject("Workspace") or Utilities.getHomeDir(),
+Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir(),
 self.tr("Project Files (*.epj);;XML Project Files (*.e4p)"),
 )
 if fn and self.closeProject():
 with EricOverrideCursor():
 """
 defaultFilter = self.tr("Project Files (*.epj)")
 defaultPath = (
 self.ppath
 if self.ppath
-else (Preferences.getMultiProject("Workspace") or Utilities.getHomeDir())
+else (Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir())
 )
 fn, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self.parent(),
 self.tr("Save Project"),
 defaultPath,
 @return flag indicating that the path starts with the project path
 @rtype bool
 """
 return bool(self.ppath) and (
 path == self.ppath
-or Utilities.normcasepath(Utilities.toNativeSeparators(path)).startswith(
+or FileSystemUtilities.normcasepath(
-Utilities.normcasepath(Utilities.toNativeSeparators(self.ppath + "/"))
+FileSystemUtilities.toNativeSeparators(path)
+).startswith(
+FileSystemUtilities.normcasepath(
+FileSystemUtilities.toNativeSeparators(self.ppath + "/")
+)
 )
 )
 def getProjectFile(self):
 """
 @param path file or directory name to convert (string)
 @return project relative path or unchanged path, if path doesn't
 belong to the project (string)
 """
-return Utilities.fromNativeSeparators(self.getRelativePath(path))
+return FileSystemUtilities.fromNativeSeparators(self.getRelativePath(path))
 def getAbsolutePath(self, fn):
 """
 Public method to convert a project relative file path to an absolute
 file path.
 @param fn file or directory name to convert (string)
 @return absolute path (string)
 """
 if not os.path.isabs(fn):
-fn = os.path.join(self.ppath, Utilities.toNativeSeparators(fn))
+fn = os.path.join(self.ppath, FileSystemUtilities.toNativeSeparators(fn))
 return fn
 def getEolString(self):
 """
 Public method to get the EOL-string to be used by the project.
 ericApp()
 .getObject("VirtualEnvManager")
 .getVirtualenvInterpreter(venvName)
 )
 if not interpreter and resolveGlobal:
-interpreter = Globals.getPythonExecutable()
+interpreter = PythonUtilities.getPythonExecutable()
 return interpreter
 def getProjectExecPath(self):
 """
 group == "OTHERS"
 and any(newfn.startswith(entry) for entry in self.__pdata[group])
 ):
 return True
-if Utilities.isWindowsPlatform():
+if OSUtilities.isWindowsPlatform():
 # try the above case-insensitive
 newfn = newfn.lower()
 if any(entry.lower() == newfn for entry in self.__pdata[group]):
 return True
 """
 Private method to synchronize the list of recently opened projects
 with the central store.
 """
 for recent in self.recent[:]:
-if Utilities.samepath(self.pfile, recent):
+if FileSystemUtilities.samepath(self.pfile, recent):
 self.recent.remove(recent)
 self.recent.insert(0, self.pfile)
 maxRecent = Preferences.getProject("RecentNumber")
 if len(self.recent) > maxRecent:
 self.recent = self.recent[:maxRecent]
 for idx, rp in enumerate(self.recent, start=1):
 formatStr = "&{0:d}. {1}" if idx < 10 else "{0:d}. {1}"
 act = self.recentMenu.addAction(
 formatStr.format(
-idx, Utilities.compactPath(rp, self.ui.maxMenuFilePathLen)
+idx, FileSystemUtilities.compactPath(rp, self.ui.maxMenuFilePathLen)
 )
 )
 act.setData(rp)
 act.setEnabled(pathlib.Path(rp).exists())
 for ns in newSources:
 # ignore hidden files and directories
 if ns.startswith("."):
 continue
 if (
-Utilities.isWindowsPlatform()
+OSUtilities.isWindowsPlatform()
 and os.path.isdir(os.path.join(curpath, ns))
 and ns.startswith("_")
 ):
 # dot net hack
 continue
 for entry in lst_:
 if os.path.isdir(self.getAbsolutePath(entry)):
 lst.extend(
 [
 self.getRelativePath(p)
-for p in Utilities.direntries(self.getAbsolutePath(entry), True)
+for p in FileSystemUtilities.direntries(
+self.getAbsolutePath(entry), True
+)
 ]
 )
 continue
 else:
 lst.append(entry)
 try:
 newline = None if self.__pdata["EOL"] == 0 else self.getEolString()
 with open(pkglist, "w", encoding="utf-8", newline=newline) as pkglistFile:
 pkglistFile.write("\n".join(header) + "\n")
 pkglistFile.write(
-"\n".join([Utilities.fromNativeSeparators(f) for f in lst])
+"\n".join(
+[FileSystemUtilities.fromNativeSeparators(f) for f in lst]
+)
 )
 pkglistFile.write("\n")
 # ensure the file ends with an empty line
 except OSError as why:
 EricMessageBox.critical(

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Project/Project.py

src/eric7/Project/Project.py