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

-:0f4017309f35
+:b6f5e27daeb5
 @param fileTypeFilter filter to be used by the add file dialog
 @type str
 @param startdir start directory for the selection dialog
 @type str
 """
-# TODO: adapt to remote server
 from .AddFileDialog import AddFileDialog
 if not startdir:
 startdir = self.ppath
 dlg = AddFileDialog(self, self.parent(), fileTypeFilter, startdir=startdir)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 fnames, target, isSource = dlg.getData()
 if target != "":
+isRemote = FileSystemUtilities.isRemoteFileName(target)
 for fn in fnames:
-targetfile = os.path.join(target, os.path.basename(fn))
+targetfile = (
-if not FileSystemUtilities.samepath(os.path.dirname(fn), target):
+self.__remotefsInterface.join(
+target, self.__remotefsInterface.basename(fn)
+)
+if isRemote
+else os.path.join(target, os.path.basename(fn))
+)
+if not FileSystemUtilities.samepath(
+self.__remotefsInterface.dirname(fn)
+if isRemote
+else os.path.dirname(fn),
+target
+):
 try:
-if not os.path.isdir(target):
+if isRemote:
-os.makedirs(target)
+if not self.__remotefsInterface.isdir(target):
+self.__remotefsInterface.makedirs(target)
-if os.path.exists(targetfile):
+else:
+if not os.path.isdir(target):
+os.makedirs(target)
+if (
+not isRemote and os.path.exists(targetfile)
+) or (
+isRemote and self.__remotefsInterface.exists(targetfile)
+):
 res = EricMessageBox.yesNo(
 self.ui,
-self.tr("Add file"),
+self.tr("Add File"),
 self.tr(
 "<p>The file <b>{0}</b> already"
 " exists.</p><p>Overwrite it?</p>"
 ).format(targetfile),
 icon=EricMessageBox.Warning,
 )
 if not res:
 return  # don't overwrite
-shutil.copy(fn, target)
+if isRemote:
+self.__remotefsInterface.shutilCopy(fn, target)
+else:
+shutil.copy(fn, target)
 except OSError as why:
 EricMessageBox.critical(
 self.ui,
-self.tr("Add file"),
+self.tr("Add File"),
 self.tr(
 "<p>The selected file <b>{0}</b> could"
 " not be added to <b>{1}</b>.</p>"
 "<p>Reason: {2}</p>"
 ).format(fn, target, str(why)),
 patterns.append(pattern)
 elif patterntype == "__IGNORE__":
 ignorePatterns.append(pattern)
 files = []
+isRemote = FileSystemUtilities.isRemoteFileName(target)
 for pattern in patterns:
-sstring = "{0}{1}{2}".format(source, os.sep, pattern)
+if isRemote:
-files.extend(glob.glob(sstring))
+sstring = self.__remotefsInterface.join(source, pattern)
+files.extend(self.__remotefsInterface.glob(sstring))
+else:
+sstring = os.path.join(source, pattern)
+files.extend(glob.glob(sstring))
 if len(files) == 0:
 if not quiet:
 EricMessageBox.information(
 self.ui,
-self.tr("Add directory"),
+self.tr("Add Directory"),
 self.tr(
 "<p>The source directory doesn't contain"
 " any files belonging to the selected category.</p>"
 ),
 )
 return
-if not FileSystemUtilities.samepath(target, source) and not os.path.isdir(
+if not FileSystemUtilities.samepath(target, source) and not (
-target
+(not isRemote and os.path.isdir(target)) or (
+isRemote and self.__remotefsInterface.isdir(target)
+)
 ):
 try:
-os.makedirs(target)
+if isRemote:
+self.__remotefsInterface.makedirs(target)
+else:
+os.makedirs(target)
 except OSError as why:
 EricMessageBox.critical(
 self.ui,
-self.tr("Add directory"),
+self.tr("Add Directory"),
 self.tr(
 "<p>The target directory <b>{0}</b> could not be"
 " created.</p><p>Reason: {1}</p>"
 ).format(target, str(why)),
 )
 for file in files:
 for pattern in ignorePatterns:
 if fnmatch.fnmatch(file, pattern):
 continue
-targetfile = os.path.join(target, os.path.basename(file))
+targetfile = (
+self.__remotefsInterface.join(
+target, self.__remotefsInterface.basename(file)
+)
+if isRemote
+else os.path.join(target, os.path.basename(file))
+)
 if not FileSystemUtilities.samepath(target, source):
 try:
-if os.path.exists(targetfile):
+if (
+not isRemote and os.path.exists(targetfile)
+) or (
+isRemote and self.__remotefsInterface.exists(targetfile)
+):
 res = EricMessageBox.yesNo(
 self.ui,
-self.tr("Add directory"),
+self.tr("Add Directory"),
 self.tr(
 "<p>The file <b>{0}</b> already exists.</p>"
 "<p>Overwrite it?</p>"
 ).format(targetfile),
 icon=EricMessageBox.Warning,
 )
 if not res:
 continue
 # don't overwrite, carry on with next file
-shutil.copy(file, target)
+if isRemote:
+self.__remotefsInterface.shutilCopy(file,target )
+else:
+shutil.copy(file, target)
 except OSError:
 continue
 self.appendFile(targetfile)
 def __addRecursiveDirectory(self, filetype, source, target):
 pattern
 for pattern, filetype in self.__pdata["FILETYPES"].items()
 if filetype == "__IGNORE__"
 ]
-# now recurse into subdirectories
+# now recurs into subdirectories
-with os.scandir(source) as dirEntriesIterator:
+if FileSystemUtilities.isRemoteFileName(target):
-for dirEntry in dirEntriesIterator:
+for entry in self.__remotefsInterface.listdir(source)[2]:
-if dirEntry.is_dir() and not any(
+if entry["is_dir"] and not any(
-fnmatch.fnmatch(dirEntry.name, ignore_pattern)
+fnmatch.fnmatch(entry["name"], ignore_pattern)
 for ignore_pattern in ignore_patterns
 ):
 self.__addRecursiveDirectory(
-filetype, dirEntry.path, os.path.join(target, dirEntry.name)
+filetype,
+entry["path"],
+self.__remotefsInterface.join(target, entry["name"]),
 )
+else:
+with os.scandir(source) as dirEntriesIterator:
+for dirEntry in dirEntriesIterator:
+if dirEntry.is_dir() and not any(
+fnmatch.fnmatch(dirEntry.name, ignore_pattern)
+for ignore_pattern in ignore_patterns
+):
+self.__addRecursiveDirectory(
+filetype, dirEntry.path, os.path.join(target, dirEntry.name)
+)
 @pyqtSlot()
 def addDirectory(self, fileTypeFilter=None, startdir=None):
 """
 Public method used to add all files of a directory to the project.

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Project/Project.py

src/eric7/Project/Project.py