Merge pull request #3 from danpejobo/dev

v.2.0.1 - bug with checking version

Author: danpejobo

__init__.py

@@ -26,7 +26,7 @@
 __date__ = '2024-01-17'
 __copyright__ = '(C) 2024 by DPE'
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 import sys
 from pathlib import Path

metadata.txt

@@ -7,7 +7,7 @@ name=Geovita GIS Processing provider
 qgisMinimumVersion=3.28
 qgisMaximumVersion=3.99
 description=This plugin adds different Geovita custom processing algorithms to QGIS
-version=2.0.0
+version=2.0.1
 author=DPE
 [email protected]
 
@@ -28,7 +28,10 @@ repository=https://github.com/danpejobo/geovita_processing_plugin
 
 hasProcessingProvider=yes
 # Uncomment the following line and add your changelog:
-changelog=v.2.0.0 (29.01.2024)
+changelog=v.2.0.1 (30.01.2024)
+	- Fix bug with checking version. Undefined variable if version < 33200
+
+	v.2.0.0 (29.01.2024)
 	- Add reproject functionality
 	- Fix: Access violation error due to maipulating GUI from process thread
 	- Fix: Group/layers in TOC updates correctly

utils/methodslib.py

@@ -29,10 +29,6 @@
 from typing import Union
 import shutil
 
-if Qgis.QGIS_VERSION_INT < 33200:
-    import tempfile
-    QGIS_VERSION = Qgis.QGIS_VERSION_INT
-
 def get_shapefile_as_json_pyqgis(layer, logger=None):
         if logger is not None:
             logger.debug("@get_shapefile_as_json_pyqgis@: ShapeFN id: {}".format(layer.id()))
@@ -95,13 +91,8 @@ def process_raster_for_impactmap(source_excavation_poly, dtb_raster_layer, clipp
     Returns:
     - Path: Path object of the processed raster in TIFF format.
     """
-    # Check if the running version of QGIS is lower than the requirement
-    if QGIS_VERSION < 33200:
-        # Create a temporary directory using Python's tempfile module
-        temp_dir = tempfile.mkdtemp()
-        temp_folder = Path(temp_dir)
-    else:
-        temp_folder = Path(QgsProcessingContext.temporaryFolder(context) if context else QgsProcessingUtils.tempFolder())
+    # Check if the running version of QGIS is lower than the requirement, and create temp_folder based on that
+    temp_folder = create_temp_folder_for_version(Qgis.QGIS_VERSION_INT, context if context else None)
 
     # Prepare processing context and feedback
     if not context:
@@ -268,13 +259,8 @@ def reproject_layers(keep_interm_layer: bool,
     Returns:
     - Tuple: (reprojected_vector_path, reprojected_raster_path) Paths to the reprojected layers.
     """
-    # Check if the running version of QGIS is lower than the requirement
-    if QGIS_VERSION < 33200:
-        # Create a temporary directory using Python's tempfile module
-        temp_dir = tempfile.mkdtemp()
-        temp_folder = Path(temp_dir)
-    else:
-        temp_folder = Path(QgsProcessingContext.temporaryFolder(context) if context else QgsProcessingUtils.tempFolder())
+    # Check if the running version of QGIS is lower than the requirement, and create temp_folder based on that
+    temp_folder = create_temp_folder_for_version(Qgis.QGIS_VERSION_INT, context if context else None)
 
     # Prepare processing context and feedback
     if not context:
@@ -357,4 +343,24 @@ def move_file_components(original_file_path: Path, destination_file_path: Path):
         src_file = original_file_path.with_suffix(ext)
         dest_file = destination_folder / (destination_base_name + ext)
         if src_file.exists():
-            shutil.move(str(src_file), str(dest_file))
+            shutil.move(str(src_file), str(dest_file))
+            
+def create_temp_folder_for_version(qgis_version_int : int, context: QgsProcessingContext = None) -> Path:
+    """
+    Creates a temporary folder based on the QGIS version.
+
+    Args:
+        qgis_version_int  (int): The integer representation of the QGIS version.
+        context (QgsProcessingContext, optional): The context for processing. Default is None.
+
+    Returns:
+        Path: The path to the temporary folder.
+    """
+    # Check if the running version of QGIS is lower than the requirement
+    if qgis_version_int >= 33200 and context is not None:
+        # For QGIS versions 3.32.0 and above
+        temp_folder = context.temporaryFolder()
+    else:
+        # For older versions, or if no context is provided, use the global Processing temporary folder
+        temp_folder = QgsProcessingUtils.tempFolder()
+    return Path(temp_folder)