sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing][grass] Fix bad move/copy paths in grass i.gensig/maxlik algs

Browse Source 
Refs #19539
This commit is contained in:
Nyall Dawson 2018-08-07 08:20:17 +10:00
parent 3fc8e8d61b
commit 282f95c9f7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
python/plugins/processing/algs/grass7/ext/i.py
View File

@ -28,6 +28,7 @@ __revision__ = '$Format:%H$'
import os import os
from processing.tools.system import (isWindows, getTempFilename) from processing.tools.system import (isWindows, getTempFilename)
from processing.algs.grass7.Grass7Utils import Grass7Utils from processing.algs.grass7.Grass7Utils import Grass7Utils
from qgis.PyQt.QtCore import QDir
from qgis.core import QgsProcessingParameterString from qgis.core import QgsProcessingParameterString
from qgis.core import QgsMessageLog from qgis.core import QgsMessageLog
@ -191,9 +192,9 @@ def verifyRasterNum(alg, parameters, context, rasters, mini, maxi=None):
def createDestDir(alg, toFile): def createDestDir(alg, toFile):
""" Generates an mkdir command for GRASS7 script """ """ Generates an mkdir command for GRASS7 script """
# Creates the destination directory # Creates the destination directory
command = "{} {}".format( command = "{} \"{}\"".format(
"MD" if isWindows() else "mkdir -p", "MD" if isWindows() else "mkdir -p",
os.path.dirname(toFile) QDir.toNativeSeparators(os.path.dirname(toFile))
) )
alg.commands.append(command) alg.commands.append(command)
@ -201,10 +202,10 @@ def createDestDir(alg, toFile):
def moveFile(alg, fromFile, toFile): def moveFile(alg, fromFile, toFile):
""" Generates a move command for GRASS7 script """ """ Generates a move command for GRASS7 script """
createDestDir(alg, toFile) createDestDir(alg, toFile)
command = "{} {} {}".format( command = "{} \"{}\" \"{}\"".format(
"MOVE /Y" if isWindows() else "mv -f", "MOVE /Y" if isWindows() else "mv -f",
fromFile, QDir.toNativeSeparators(fromFile),
toFile QDir.toNativeSeparators(toFile)
) )
alg.commands.append(command) alg.commands.append(command)
@ -212,8 +213,8 @@ def moveFile(alg, fromFile, toFile):
def copyFile(alg, fromFile, toFile): def copyFile(alg, fromFile, toFile):
""" Generates a copy command for GRASS7 script """ """ Generates a copy command for GRASS7 script """
createDestDir(alg, toFile) createDestDir(alg, toFile)
command = "{} {} {}".format( command = "{} \"{}\" \"{}\"".format(
"COPY /Y" if isWindows() else "cp -f", "COPY /Y" if isWindows() else "cp -f",
fromFile, QDir.toNativeSeparators(fromFile),
toFile) QDir.toNativeSeparators(toFile))
alg.commands.append(command) alg.commands.append(command)