From deeb03582999ed9c6a3f95627eccfdde3ee82762 Mon Sep 17 00:00:00 2001
From: harlekin <5800926-mw102@users.noreply.gitlab.com>
Date: Tue, 19 Dec 2023 14:34:48 +0000
Subject: [PATCH] Feat: broadened color management error detection

---
 src/main/java/com/sheepit/client/Job.java | 31 ++++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/sheepit/client/Job.java b/src/main/java/com/sheepit/client/Job.java
index 6f93a76..237f266 100644
--- a/src/main/java/com/sheepit/client/Job.java
+++ b/src/main/java/com/sheepit/client/Job.java
@@ -806,15 +806,28 @@ import java.util.regex.Pattern;
 			// 07-04 07:43:12 (debug) /tmp///rend.exe: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /tmp///lib/libboost_filesystem.so.1.80.0)
 			return Type.OS_NOT_SUPPORTED;
 		}
-		else if (line.contains("Color management:") && line.contains(" not found")) {
-			//30-11 01:16:57 (debug) Blender 4.0.0 (hash 878f71061b8e built 2023-11-14 01:20:37)
-			//30-11 01:16:57 (debug) Color management: display "sRGB" used by scene not found, setting to default ("Blender").
-			//30-11 01:16:57 (debug) Color management: scene view "AgX" not found, setting default "Standard".
-			//30-11 01:16:57 (debug) Read blend: "C:\Users\tianji\AppData\Local\Temp\farm_3210908783605063546\254263927\Car Scene 3.blend"
-			//30-11 01:16:57 (debug) Color management: display "sRGB" used by scene not found, setting to default ("Blender").
-			//30-11 01:16:57 (debug) Color management: scene view "AgX" not found, setting default "Standard".
-			//30-11 01:16:57 (debug) Color management: scene look "AgX - Medium High Contrast" not found, setting default "None".
-			//30-11 01:16:57 (debug) Color management: image colorspace "Linear Rec.709" not found, will use default instead.
+		else if (line.contains("Color management:")) {
+			String[] errors = { " not found", " is not compatible ", " Error could not find role", "using fallback mode" };
+			for (var error : errors) {
+				if (line.contains(error)) {
+			
+					//30-11 01:16:57 (debug) Blender 4.0.0 (hash 878f71061b8e built 2023-11-14 01:20:37)
+					//30-11 01:16:57 (debug) Color management: display "sRGB" used by scene not found, setting to default ("Blender").
+					//30-11 01:16:57 (debug) Color management: scene view "AgX" not found, setting default "Standard".
+					//30-11 01:16:57 (debug) Read blend: "C:\Users\tianji\AppData\Local\Temp\farm_3210908783605063546\254263927\Car Scene 3.blend"
+					//30-11 01:16:57 (debug) Color management: display "sRGB" used by scene not found, setting to default ("Blender").
+					//30-11 01:16:57 (debug) Color management: scene view "AgX" not found, setting default "Standard".
+					//30-11 01:16:57 (debug) Color management: scene look "AgX - Medium High Contrast" not found, setting default "None".
+					//30-11 01:16:57 (debug) Color management: image colorspace "Linear Rec.709" not found, will use default instead.
+					return Type.COLOR_MANAGEMENT_ERROR;
+				}
+			}
+		}
+		else if (line.contains("OpenColorIO Error:")) {
+			//28-11 12:43:40 (debug) Fra:340 Mem:11.74M (Peak 28.28M) | Time:00:01.69 | Compositing | Tile 1-1
+			//28-11 12:43:40 (debug) Fra:340 Mem:11.68M (Peak 28.28M) | Time:00:01.69 | Compositing | De-initializing execution
+			//28-11 12:43:40 (debug) OpenColorIO Error: The specified file reference 'srgb_inv.spi1d' could not be located. The following attempts were made: 'E:\SheepIt\sheepit\6b752e00cd23e1789e00285310cb6845\3.6\datafiles\colormanagement\luts\srgb_inv.spi1d' : 'E:\SheepIt\sheepit\6b752e00cd23e1789e00285310cb6845\3.6\datafiles\colormanagement\filmic\srgb_inv.spi1d'.
+			//28-11 12:43:40 (debug) Saved: 'E:\SheepIt\sheepit\1_0340.png'
 			return Type.COLOR_MANAGEMENT_ERROR;
 		}
 		else if (line.contains("CUDA error: Out of memory")) {