Add disambiguation messages

Author: eliemichel

blender/LilySurfaceScraper/CyclesMaterialData.py

@@ -7,9 +7,27 @@
 import bpy
 from bpy_extras.node_shader_utils import PrincipledBSDFWrapper
 from .MaterialData import MaterialData
-from .cycles_utils import getCyclesImage, autoAlignNodes, findColorSpace
+from .cycles_utils import getCyclesImage, autoAlignNodes
 from .preferences import getPreferences
 
+def listAvailableColorSpaces(image):
+    # Warning: hack ahead
+    try:
+        image.colorspace_settings.name = ''
+    except TypeError as e:
+        s = str(e)
+    return eval(s[s.find('('):])
+
+def findColorSpace(image, key):
+    """This is important for custom OCIO config"""
+    availableColorSpaces = listAvailableColorSpaces(image)
+    if key in availableColorSpaces:
+        return key
+    for cs in availableColorSpaces:
+        if key in cs:
+            return cs
+    return availableColorSpaces[0]
+
 class CyclesMaterialData(MaterialData):
     # Translate our internal map names into cycles principled inputs
     input_tr = {

blender/LilySurfaceScraper/CyclesWorldData.py

@@ -50,7 +50,7 @@ def createWorld(self):
         if img is not None:
             texture_node = nodes.new(type="ShaderNodeTexEnvironment")
             texture_node.image = getCyclesImage(img)
-            color_space = guessColorSpaceFromExtension(texture_node.image, img)
+            color_space = guessColorSpaceFromExtension(img)
             texture_node.image.colorspace_settings.name = color_space["name"]
             if hasattr(texture_node, "color_space"):
                 texture_node.color_space = color_space["old_name"]

blender/LilySurfaceScraper/ScrapedData.py

@@ -22,6 +22,7 @@
 # from a single URL
 
 from .settings import UNSUPPORTED_PROVIDER_ERR
+from .ScrapersManager import ScrapersManager
 
 
 class ScrapedData():
@@ -55,7 +56,10 @@ def __init__(self, url, texture_root="", asset_name=None, scraping_type=None):
         self.reinstall = False
 
         if self._scraper is None:
-            self.error = UNSUPPORTED_PROVIDER_ERR
+            self.error = scraping_type.capitalize() + " " + UNSUPPORTED_PROVIDER_ERR
+            for S in ScrapersManager.getScrapersList():
+                if S.canHandleUrl(self.url) and S.scraped_type:
+                    self.error = f"This URL corresponds to a {next(iter(S.scraped_type)).lower()} but you are trying to import it as a {scraping_type.lower()}"
         else:
             self._scraper.texture_root = texture_root
             self._scraper.metadata.scrape_type = scraping_type

blender/LilySurfaceScraper/cycles_utils.py

@@ -126,34 +126,16 @@ def __init__(self, world):
             elif self.node_out is None and n.type == "OUTPUT_WORLD":
                 self.node_out = n
 
-def listAvailableColorSpaces(image):
-    # Warning: hack ahead
-    try:
-        image.colorspace_settings.name = ''
-    except TypeError as e:
-        s = str(e)
-    return eval(s[s.find('('):])
-
-def findColorSpace(image, key):
-    """This is important for custom OCIO config"""
-    availableColorSpaces = listAvailableColorSpaces(image)
-    if key in availableColorSpaces:
-        return key
-    for cs in availableColorSpaces:
-        if key in cs:
-            return cs
-    return availableColorSpaces[0]
-
-def guessColorSpaceFromExtension(image, image_filename):
+def guessColorSpaceFromExtension(img):
     """Guess the most appropriate color space from filename extension"""
-    name = image_filename.lower()
-    if name.endswith(".jpg") or name.endswith(".jpeg") or name.endswith(".png"):
+    img = img.lower()
+    if img.endswith(".jpg") or img.endswith(".jpeg") or img.endswith(".png"):
         return {
-            "name": findColorSpace(image, 'sRGB'),
+            "name": "sRGB",
             "old_name": "COLOR", # mostly for backward compatibility
         }
     else:
         return {
-            "name": findColorSpace(image, 'Non-Color'),
+            "name": "Linear",
             "old_name": "NONE",
         }

blender/LilySurfaceScraper/frontend.py

@@ -148,7 +148,16 @@ def invoke(self, context, event):
         return self.execute(context)
 
     def execute(self, context):
-        bpy.ops.object.lily_surface_import('EXEC_DEFAULT', url=bpy.context.window_manager.clipboard)
+        try:
+            bpy.ops.object.lily_surface_import('EXEC_DEFAULT', url=bpy.context.window_manager.clipboard)
+        except RuntimeError as err:
+            msg = err.args[0]
+            if msg.startswith("Invalid Input Error: "):
+                error = msg[len("Invalid Input Error: "):]
+                self.report({'ERROR_INVALID_INPUT'}, error)
+                return {'CANCELLED'}
+            else:
+                raise err
         return {'FINISHED'}
 
 def list_variant_enum(self, context):
@@ -306,7 +315,16 @@ def invoke(self, context, event):
         return self.execute(context)
 
     def execute(self, context):
-        bpy.ops.object.lily_world_import('EXEC_DEFAULT', url=bpy.context.window_manager.clipboard)
+        try:
+            bpy.ops.object.lily_world_import('EXEC_DEFAULT', url=bpy.context.window_manager.clipboard)
+        except RuntimeError as err:
+            msg = err.args[0]
+            if msg.startswith("Invalid Input Error: "):
+                error = msg[len("Invalid Input Error: "):]
+                self.report({'ERROR_INVALID_INPUT'}, error)
+                return {'CANCELLED'}
+            else:
+                raise err
         return {'FINISHED'}
 
 def list_variant_enum(self, context):
@@ -425,7 +443,16 @@ def invoke(self, context, event):
         return self.execute(context)
 
     def execute(self, context):
-        bpy.ops.object.lily_light_import('EXEC_DEFAULT', url=bpy.context.window_manager.clipboard)
+        try:
+            bpy.ops.object.lily_light_import('EXEC_DEFAULT', url=bpy.context.window_manager.clipboard)
+        except RuntimeError as err:
+            msg = err.args[0]
+            if msg.startswith("Invalid Input Error: "):
+                error = msg[len("Invalid Input Error: "):]
+                self.report({'ERROR_INVALID_INPUT'}, error)
+                return {'CANCELLED'}
+            else:
+                raise err
         return {'FINISHED'}
 
 # -------------------------------------------------------------------

blender/LilySurfaceScraper/settings.py

@@ -24,4 +24,4 @@
 ## Constants
 
 TEXTURE_DIR = "LilySurface"
-UNSUPPORTED_PROVIDER_ERR = "Material provider not supported. See the documentation for a list of supported material providers."
+UNSUPPORTED_PROVIDER_ERR = "provider not supported. See the documentation for a list of supported providers."