[processing] restore ogr2ogr algorithm

qgis · Oct 11, 2017 · 750e80f · 750e80f
1 parent efa97b2
commit 750e80f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 107 deletions.
diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
@@ -77,12 +77,12 @@
 from .ClipVectorByExtent import ClipVectorByExtent
 from .ClipVectorByMask import ClipVectorByMask
 from .OffsetCurve import OffsetCurve
+from .ogr2ogr import ogr2ogr
 from .ogrinfo import ogrinfo
 from .OgrToPostGis import OgrToPostGis
 from .OneSideBuffer import OneSideBuffer
 from .PointsAlongLines import PointsAlongLines
 
-# from .ogr2ogr import Ogr2Ogr
 # from .ogr2ogrtopostgislist import Ogr2OgrToPostGisList
 # from .ogr2ogrdissolve import Ogr2OgrDissolve
 # from .ogr2ogrtabletopostgislist import Ogr2OgrTableToPostGisList
@@ -179,11 +179,11 @@ def loadAlgorithms(self):
             ClipVectorByExtent(),
             ClipVectorByMask(),
             OffsetCurve(),
+            ogr2ogr(),
             ogrinfo(),
             OgrToPostGis(),
             OneSideBuffer(),
             PointsAlongLines(),
-            # Ogr2Ogr(),
             # Ogr2OgrToPostGisList(),
             # Ogr2OgrDissolve(),
             # Ogr2OgrTableToPostGisList(),

diff --git a/python/plugins/processing/algs/gdal/ogr2ogr.py b/python/plugins/processing/algs/gdal/ogr2ogr.py
@@ -16,7 +16,6 @@
 *                                                                         *
 ***************************************************************************
 """
-from builtins import str
 
 __author__ = 'Victor Olaya'
 __date__ = 'November 2012'
@@ -28,89 +27,37 @@
 
 import os
 
-from processing.core.parameters import ParameterVector
-from processing.core.parameters import ParameterString
-from processing.core.parameters import ParameterSelection
-from processing.core.outputs import OutputVector
-
+from qgis.core import (QgsProcessingException,
+                       QgsProcessingParameterDefinition,
+                       QgsProcessingParameterFeatureSource,
+                       QgsProcessingParameterString,
+                       QgsProcessingParameterVectorDestination)
 from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils
 
-from processing.tools.system import isWindows
-
-
-FORMATS = [
-    'ESRI Shapefile',
-    'GeoJSON',
-    'GeoRSS',
-    'SQLite',
-    'GMT',
-    'MapInfo File',
-    'INTERLIS 1',
-    'INTERLIS 2',
-    'GML',
-    'Geoconcept',
-    'DXF',
-    'DGN',
-    'CSV',
-    'BNA',
-    'S57',
-    'KML',
-    'GPX',
-    'PGDump',
-    'GPSTrackMaker',
-    'ODS',
-    'XLSX',
-    'PDF',
-    'GPKG',
-]
-
-EXTS = [
-    '.shp',
-    '.geojson',
-    '.xml',
-    '.sqlite',
-    '.gmt',
-    '.tab',
-    '.ili',
-    '.ili',
-    '.gml',
-    '.txt',
-    '.dxf',
-    '.dgn',
-    '.csv',
-    '.bna',
-    '.000',
-    '.kml',
-    '.gpx',
-    '.pgdump',
-    '.gtm',
-    '.ods',
-    '.xlsx',
-    '.pdf',
-    '.gpkg',
-]
-
-
-class Ogr2Ogr(GdalAlgorithm):
-
-    OUTPUT_LAYER = 'OUTPUT_LAYER'
-    INPUT_LAYER = 'INPUT_LAYER'
-    FORMAT = 'FORMAT'
+
+class ogr2ogr(GdalAlgorithm):
+
+    INPUT = 'INPUT'
     OPTIONS = 'OPTIONS'
+    OUTPUT = 'OUTPUT'
 
     def __init__(self):
         super().__init__()
 
     def initAlgorithm(self, config=None):
-        self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer')))
-        self.addParameter(ParameterSelection(self.FORMAT,
-                                             self.tr('Destination Format'), FORMATS))
-        self.addParameter(ParameterString(self.OPTIONS,
-                                          self.tr('Creation options'), '', optional=True))
+        self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
+                                                              self.tr('Input layer')))
 
-        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Converted')))
+        options_param = QgsProcessingParameterString(self.OPTIONS,
+                                                     self.tr('Additional creation options'),
+                                                     defaultValue='',
+                                                     optional=True)
+        options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
+        self.addParameter(options_param)
+
+        self.addParameter(QgsProcessingParameterVectorDestination(self.OUTPUT,
+                                                                  self.tr('Converted')))
 
     def name(self):
         return 'convertformat'
@@ -121,45 +68,28 @@ def displayName(self):
     def group(self):
         return self.tr('Vector conversion')
 
-    def getConsoleCommands(self, parameters, context, feedback):
-        inLayer = self.getParameterValue(self.INPUT_LAYER)
-        ogrLayer = GdalUtils.ogrConnectionString(inLayer, context)[1:-1]
-
-        output = self.getOutputFromName(self.OUTPUT_LAYER)
-        outFile = output.value
+    def commandName(self):
+        return 'ogr2ogr'
 
-        formatIdx = self.getParameterValue(self.FORMAT)
-        outFormat = FORMATS[formatIdx]
-        ext = EXTS[formatIdx]
-        if not outFile.endswith(ext):
-            outFile += ext
-            output.value = outFile
+    def getConsoleCommands(self, parameters, context, feedback):
+        ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
+        options = self.parameterAsString(parameters, self.OPTIONS, context)
+        outFile = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
 
-        output = GdalUtils.ogrConnectionString(outFile, context)
-        options = str(self.getParameterValue(self.OPTIONS))
+        output, outputFormat = GdalUtils.ogrConnectionStringAndFormat(outFile, context)
 
-        if outFormat == 'SQLite' and os.path.isfile(output):
-            os.remove(output)
+        if outputFormat == 'SQLite' and os.path.isfile(output):
+            raise QgsProcessinException(self.tr('Output file "{}" already exists.'.format(output)))
 
         arguments = []
-        arguments.append('-f')
-        arguments.append(outFormat)
+        if outputFormat:
+            arguments.append('-f {}'.format(outputFormat))
 
-        if options is not None and len(options.strip()) > 0:
+        if options:
             arguments.append(options)
 
         arguments.append(output)
         arguments.append(ogrLayer)
-        arguments.append(GdalUtils.ogrLayerName(inLayer))
-
-        commands = []
-        if isWindows():
-            commands = ['cmd.exe', '/C ', 'ogr2ogr.exe',
-                        GdalUtils.escapeAndJoin(arguments)]
-        else:
-            commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
+        arguments.append(layerName)
 
-        return commands
-
-    def commandName(self):
-        return "ogr2ogr"
+        return ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]