temp path for processing output configurable

(cherry picked from commit 8274566)
qgis · Nov 29, 2019 · 20e5e32 · 20e5e32
1 parent 0059f9f
commit 20e5e32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/python/plugins/processing/core/ProcessingConfig.py b/python/plugins/processing/core/ProcessingConfig.py
@@ -28,7 +28,8 @@
                        QgsApplication,
                        QgsSettings,
                        QgsVectorFileWriter,
-                       QgsRasterFileWriter)
+                       QgsRasterFileWriter,
+                       QgsProcessingUtils)
 from processing.tools.system import defaultOutputFolder
 import processing.tools.dataobjects
 from multiprocessing import cpu_count
@@ -60,6 +61,7 @@ class ProcessingConfig:
     MAX_THREADS = 'MAX_THREADS'
     DEFAULT_OUTPUT_RASTER_LAYER_EXT = 'DefaultOutputRasterLayerExt'
     DEFAULT_OUTPUT_VECTOR_LAYER_EXT = 'DefaultOutputVectorLayerExt'
+    TEMP_PATH = 'TEMP_PATH'
 
     settings = {}
     settingIcons = {}
@@ -165,6 +167,12 @@ def initialize():
             valuetype=Setting.SELECTION,
             options=extensions))
 
+        ProcessingConfig.addSetting(Setting(
+            ProcessingConfig.tr('General'),
+            ProcessingConfig.TEMP_PATH,
+            ProcessingConfig.tr('Temporary output folder path'), QgsProcessingUtils.tempFolder(),
+            valuetype=Setting.FOLDER))
+
     @staticmethod
     def setGroupIcon(group, icon):
         ProcessingConfig.settingIcons[group] = icon

diff --git a/src/core/processing/qgsprocessingutils.cpp b/src/core/processing/qgsprocessingutils.cpp
@@ -691,7 +691,7 @@ QString QgsProcessingUtils::tempFolder()
   if ( sFolder.isEmpty() )
   {
     QString subPath = QUuid::createUuid().toString().remove( '-' ).remove( '{' ).remove( '}' );
-    sFolder = QDir::tempPath() + QStringLiteral( "/processing_" ) + subPath;
+    sFolder = QgsSettings().value( QStringLiteral( "Processing/Configuration/TEMP_PATH" ), QDir::tempPath() ).toString() + QStringLiteral( "/processing_" ) + subPath;
     if ( !QDir( sFolder ).exists() )
       QDir().mkpath( sFolder );
   }