SD image requests - adding logging for testing 12

Author: jusjoken

java/sage/MetaImage.java

@@ -3273,25 +3273,25 @@ private boolean loadCacheFile()
                   if ("application/json".equals(httpConn.getContentType())){
                       //SD returned an error which is within the returned json
                       //TODO: remove after testing
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: Prior to ErrorHandling");
-                      SDUtils.handleSDJsonErrorFromHttpResponse(httpConn);
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: After ErrorHandling");
-                      is.close();
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: is closed");
-                      is = null;
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: is nul now");
-                      break;
-                  }else{
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: ELSE: content type:" + httpConn.getContentType());
-                      
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: Prior to ErrorHandling");
-                      SDUtils.handleSDJsonErrorFromHttpResponse(httpConn);
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: After ErrorHandling");
-                      is.close();
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: is closed");
-                      is = null;
-                      if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: is nul now");
-                      break;
+                      int imageErrorCode = SDUtils.handleSDJsonErrorFromHttpResponse(httpConn);
+                      if(imageErrorCode==1004){ //no or invalid token
+                        is.close();
+                        is = null;
+                        break;
+                      }else if(imageErrorCode==5000){ //image does not exist - do not ask again
+                        //create a blank image to store in cache so next request returns the blank rather than asking for an image that does not exist in SD
+                        if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: error 5000 - SD image does not exist - creating a blank image for the cache to avoid re-requesting");
+                        is = SDUtils.createBlankImageInputStream(270,360,"jpg");
+                        break;
+                      }else if(imageErrorCode==5002 || imageErrorCode==5003){ //5002-max downloads, 5003-max downloads trial
+                        is.close();
+                        is = null;
+                        break;
+                      }else{
+                        is.close();
+                        is = null;
+                        break;
+                      }
                   }
               }
               if (httpConn.getResponseCode() / 100 == 3)

java/sage/epg/sd/SDUtils.java

@@ -61,6 +61,11 @@
 import java.util.List;
 import java.util.TimeZone;
 import java.util.zip.GZIPInputStream;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import javax.imageio.ImageIO;
 
 public class SDUtils
 {
@@ -83,7 +88,7 @@ public class SDUtils
     GSON = gsonBuilder.create();
   }
 
-  public static void handleSDJsonErrorFromHttpResponse(HttpURLConnection httpConn) throws IOException, SDException
+  public static int handleSDJsonErrorFromHttpResponse(HttpURLConnection httpConn)
   {
     InputStream inputStream = new BufferedInputStream(httpConn.getInputStream());
     InputStreamReader reader = new InputStreamReader(inputStream, SDSession.IN_CHARSET);
@@ -92,19 +97,33 @@ public static void handleSDJsonErrorFromHttpResponse(HttpURLConnection httpConn)
 
     if (errorElement instanceof JsonObject)
     {
-        if (Sage.DBG) System.out.println("SDUtils.handleSDJsonErrorFromHttpResponse: JsonObject found");
         JsonElement codeElement = ((JsonObject) errorElement).get("code");
-        if (Sage.DBG) System.out.println("SDUtils.handleSDJsonErrorFromHttpResponse: JsonElement:" + codeElement);
         int code = codeElement != null ? codeElement.getAsInt() : -1;
-
-        if (Sage.DBG) System.out.println("SDUtils.handleSDJsonErrorFromHttpResponse: Error code:" + code);
-        
-        //SDErrors.throwErrorForCode(code);
         if (Sage.DBG) System.out.println("SDUtils.handleSDJsonErrorFromHttpResponse: Error:" + code + " : " + SDErrors.getErrorForCode(code));
+        return code;
     }else{
         if (Sage.DBG) System.out.println("SDUtils.handleSDJsonErrorFromHttpResponse: Unknown Error");
+        return -9999;
     }
   }
+  
+  public static ByteArrayInputStream createBlankImageInputStream(int width, int height, String format) {
+    // Create a blank BufferedImage (white background)
+    BufferedImage blankImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+    // Fill the image with white color
+    blankImage.createGraphics().fillRect(0, 0, width, height);
+
+    // Convert BufferedImage to byte array using ImageIO
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    try {
+        ImageIO.write(blankImage, format, baos);
+    } catch (IOException e) {
+        throw new RuntimeException("Failed to write blank image to stream", e);
+    }
+
+    // Convert byte array to ByteArrayInputStream
+    return new ByteArrayInputStream(baos.toByteArray());
+  }  
 
   /**
    * Determine what kind of stream is returned and wrap it with an appropriate processing layer.