[processing] use native API to get GDAL driver name from filename

qgis · Oct 11, 2017 · 7965d52 · 7965d52
1 parent 56863b8
commit 7965d52
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/python/plugins/processing/algs/gdal/aspect.py b/python/plugins/processing/algs/gdal/aspect.py
@@ -28,7 +28,8 @@
 
 import os
 
-from qgis.core import (QgsProcessingParameterRasterLayer,
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessingParameterRasterLayer,
                        QgsProcessingParameterBand,
                        QgsProcessingParameterBoolean,
                        QgsProcessingParameterRasterDestination)
@@ -85,7 +86,7 @@ def getConsoleCommands(self, parameters, context, feedback):
         arguments.append(out)
 
         arguments.append('-of')
-        arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
+        arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
 
         arguments.append('-b')
         arguments.append(str(self.parameterAsInt(parameters, self.BAND, context)))

diff --git a/python/plugins/processing/algs/gdal/nearblack.py b/python/plugins/processing/algs/gdal/nearblack.py
@@ -28,7 +28,8 @@
 
 import os
 
-from qgis.core import (QgsProcessingParameterRasterLayer,
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessingParameterRasterLayer,
                        QgsProcessingParameterBoolean,
                        QgsProcessingParameterNumber,
                        QgsProcessingParameterRasterDestination)
@@ -74,17 +75,20 @@ def group(self):
         return self.tr('Raster analysis')
 
     def getConsoleCommands(self, parameters, context, feedback):
-        out = str(self.parameterAsOutputLayer(parameters, self.OUTPUT, context))
-
         arguments = []
+        out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
         arguments.append('-o')
         arguments.append(out)
+
         arguments.append('-of')
-        arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
+        arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
+
         arguments.append('-near')
         arguments.append(str(self.parameterAsInt(parameters, self.NEAR, context)))
+
         if self.parameterAsBool(parameters, self.WHITE, context):
             arguments.append('-white')
+
         arguments.append(self.parameterAsRasterLayer(parameters, self.INPUT, context).source())
 
         return ['nearblack', GdalUtils.escapeAndJoin(arguments)]
diff --git a/python/plugins/processing/algs/gdal/pct2rgb.py b/python/plugins/processing/algs/gdal/pct2rgb.py
@@ -31,7 +31,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsProcessingParameterRasterLayer,
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessingParameterRasterLayer,
                        QgsProcessingParameterBand,
                        QgsProcessingParameterBoolean,
                        QgsProcessingParameterRasterDestination)
@@ -81,7 +82,7 @@ def getConsoleCommands(self, parameters, context, feedback):
         arguments.append(out)
 
         arguments.append('-of')
-        arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
+        arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
 
         arguments.append('-b')
         arguments.append(str(self.parameterAsInt(parameters, self.BAND, context)))

diff --git a/python/plugins/processing/algs/gdal/rgb2pct.py b/python/plugins/processing/algs/gdal/rgb2pct.py
@@ -31,7 +31,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsProcessingParameterRasterLayer,
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessingParameterRasterLayer,
                        QgsProcessingParameterNumber,
                        QgsProcessingParameterRasterDestination)
 from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
@@ -75,7 +76,7 @@ def getConsoleCommands(self, parameters, context, feedback):
         arguments.append(str(self.parameterAsInt(parameters, rgb2pct.NCOLORS, context)))
         arguments.append('-of')
         out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
-        arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
+        arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
         arguments.append(self.parameterAsRasterLayer(parameters, self.INPUT, context).source())
         arguments.append(out)
 

diff --git a/python/plugins/processing/algs/gdal/translate.py b/python/plugins/processing/algs/gdal/translate.py
@@ -30,7 +30,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsProcessingParameterRasterLayer,
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessingParameterRasterLayer,
                        QgsProcessingParameterNumber,
                        QgsProcessingParameterBoolean,
                        QgsProcessingParameterString,
@@ -127,7 +128,7 @@ def getConsoleCommands(self, parameters, context, feedback):
 
         arguments = []
         arguments.append('-of')
-        arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
+        arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
         arguments.append('-ot')
         arguments.append(self.TYPE[self.parameterAsEnum(parameters, self.RTYPE, context)])
         if outsizePerc:

diff --git a/python/plugins/processing/algs/gdal/warp.py b/python/plugins/processing/algs/gdal/warp.py
@@ -29,7 +29,8 @@
 import os
 
 from qgis.PyQt.QtGui import QIcon
-from qgis.core import (QgsProcessingParameterRasterLayer,
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessingParameterRasterLayer,
                        QgsProcessingParameterCrs,
                        QgsProcessingParameterString,
                        QgsProcessingParameterNumber,
@@ -157,7 +158,7 @@ def getConsoleCommands(self, parameters, context, feedback):
 
         arguments.append('-of')
         out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
-        arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
+        arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
 
         if self.parameterAsDouble(parameters, self.TR, context) != 0:
             arguments.append('-tr')