SD Fixes

Author: jusjoken

i18n/SageTVCoreTranslations.properties

@@ -449,7 +449,6 @@ DISKSPACE_INADEQUATE_ERR_MSG=Your system is out of diskspace for recording TV. S
 SYSTEM_LOCKUP_DETECTION=System Lockup Detected
 OUT_OF_MEMORY=Out of Memory Detected
 OUT_OF_MEMORY_MSG=SageTV has detected that it has run out of memory. You may need to increase your JVM heap size or there could be a plugin/customization that is causing an issue.
-SOFTWARE_UPDATE_AVAILABLE=Software Updates Available
 PLUGIN_UPDATE_AVAILABLE_MSG=There is an update available of the plugin "{0}" to version {1}.
 STORAGE_MONITOR=Storage Monitor
 STORAGE_MONITOR_MSG=A degraded state has been detected for the RAID device "{0}" due to a hard disk failure. Please use the server Administrator console from your web browser to diagnose and resolve the problem.
@@ -485,8 +484,8 @@ LINEUP_SD_ACCOUNT_LOCKOUT=Schedules Direct Account Locked
 LINEUP_SD_ACCOUNT_LOCKOUT_MSG=The Schedules Direct account is locked. There have been too many login failures. The account will unlock again in 15 minutes.
 LINEUP_SD_ACCOUNT_BLOCKED=Schedules Direct Account Blocked
 LINEUP_SD_ACCOUNT_BLOCKED_MSG=The Schedules Direct account is blocked. Please contact Schedules Direct to resolve this issue.
-SOFTWARE_UPDATE_AVAILABLE_MSG=Software update available
-SOFTWARE_UPDATE_AVAILABLE=New version available on Github: "{0}". Go to: "{1}" to check it out.
+SOFTWARE_UPDATE_AVAILABLE=Software update available
+SOFTWARE_UPDATE_AVAILABLE_MSG=New version available on Github: "{0}". Go to: "{1}" to check it out.
 Team=Team
 Guest_Voice=Guest Voice
 Anchor=Anchor

java/sage/SageConstants.java

@@ -22,5 +22,5 @@ private SageConstants()
     // Non-instantiable
   }
 
-  public static final int BUILD_VERSION = 1046;
+  public static final int BUILD_VERSION = 1037;
 }

java/sage/epg/sd/SDRipper.java

@@ -91,6 +91,7 @@
 import static sage.epg.sd.SDErrors.SAGETV_UNKNOWN;
 import static sage.epg.sd.SDErrors.SERVICE_OFFLINE;
 import static sage.epg.sd.SDErrors.TOO_MANY_LOGINS;
+import static sage.epg.sd.SDSession.debugEnabled;
 
 public class SDRipper extends EPGDataSource
 {
@@ -227,7 +228,7 @@ private static SDSession openNewSession() throws IOException, SDException
   {
     SDSession returnValue = null;
     BufferedReader reader = null;
-    
+
     //2025-02-28 jusjoken: switch to using sage properties for user/pass so it can be shared with clients that need it
     String propUsername = null;
     String propPassword = null;
@@ -242,7 +243,6 @@ private static SDSession openNewSession() throws IOException, SDException
           propUsername = serverProp.toString();
           serverProp = SageTV.api("GetServerProperty", new Object[] { PROP_PASSWORD, null });
           propPassword = serverProp.toString();
-          //if (Sage.DBG) System.out.println("***EPG*** getting from CLIENT user/pass: username:" + username + " password:" + password);
         }
         catch (Throwable t)
         {
@@ -256,10 +256,7 @@ private static SDSession openNewSession() throws IOException, SDException
         propPassword = Sage.get(PROP_PASSWORD, null);
     }
 
-    //if (Sage.DBG) System.out.println("***EPG*** checking for user/pass: username:" + username + " password:" + password);
-    
     //get user/pass from old sdauth file
-    //if (Sage.DBG) System.out.println("***EPG*** reading user/pass from old file");
     File authFile = new File(AUTH_FILE);
     if (!authFile.exists() || authFile.length() == 0)
       throw new SDException(SDErrors.SAGETV_NO_PASSWORD);
@@ -307,9 +304,8 @@ private static SDSession openNewSession() throws IOException, SDException
             // This will throw an exception if there are any issues connecting.
             returnValue = new SDSageSession(propUsername, propPassword);
             authenticated = true;
-            if (Sage.DBG) System.out.println("SDRipper:openNewSession: Authenticated using prop based user/pass PASSED: username:" + propUsername + " password:" + propPassword);
         } catch (Exception e) {
-            if (Sage.DBG) System.out.println("SDRipper:openNewSession: Checking for prop based user/pass FAILED: username:" + propUsername + " password:" + propPassword);
+            if (Sage.DBG) System.out.println("SDRipper:openNewSession: Checking for prop based user/pass FAILED");
         }
     }
 
@@ -321,9 +317,8 @@ private static SDSession openNewSession() throws IOException, SDException
             authenticated = true;
             Sage.put(PROP_USERNAME, fileUsername);
             Sage.put(PROP_PASSWORD, filePassword);
-            if (Sage.DBG) System.out.println("SDRipper:openNewSession: Authenticated using file based user/pass PASSED: username:" + fileUsername + " password:" + filePassword);
         } catch (Exception e) {
-            if (Sage.DBG) System.out.println("SDRipper:openNewSession: Checking for file based user/pass FAILED: username:" + fileUsername + " password:" + filePassword);
+            if (Sage.DBG) System.out.println("SDRipper:openNewSession: Checking for file based user/pass FAILED");
         }
     }
 
@@ -336,7 +331,7 @@ private static SDSession openNewSession() throws IOException, SDException
     // We have just successfully authenticated, so this needs to be cleared so that updates can
     // start immediately.
     SDRipper.retryWait = 0;
-    if (Sage.DBG) System.out.println("SDRipper:openNewSession: Successfully got token: " + returnValue.token);
+    if (Sage.DBG&& debugEnabled()) System.out.println("SDRipper:openNewSession: Successfully got token: " + returnValue.token);
     return returnValue;
   }
 

java/sage/msg/SystemMessage.java

@@ -61,10 +61,11 @@ public class SystemMessage extends SageMsg
   // General
   public static final int SYSTEM_LOCKUP_DETECTION_MSG = 1200;
   public static final int OUT_OF_MEMORY_MSG = 1201;
-  public static final int SOFTWARE_UPDATE_AVAILABLE_MSG = 1202;
+  public static final int PLUGIN_UPDATE_AVAILABLE_MSG = 1202;
   public static final int STORAGE_MONITOR_MSG = 1203;
   public static final int GENERAL_MSG = 1204;
   public static final int PLUGIN_INSTALL_MISSING_FILE_MSG = 1205;
+  public static final int SOFTWARE_UPDATE_AVAILABLE_MSG = 1206;
 
   public static String getNameForMsgType(int msgType)
   {
@@ -117,7 +118,7 @@ public static String getNameForMsgType(int msgType)
       case RECORDING_BITRATE_TOO_LOW_ERROR_MSG:
         return sage.Sage.rez("RECORDING_BITRATE_TOO_LOW_ERROR");
       case SOFTWARE_UPDATE_AVAILABLE_MSG:
-        return sage.Sage.rez("SOFTWARE_UPDATE_AVAILABLE");
+        return sage.Sage.rez("SOFTWARE_UPDATE_AVAILABLE_MSG");
       case STORAGE_MONITOR_MSG:
         return sage.Sage.rez("STORAGE_MONITOR");
       case CAPTURE_DEVICE_DATASCAN_ERROR_MSG:
@@ -199,9 +200,8 @@ public static SystemMessage createVersionUpdateMsg(String version, String locati
     java.util.Properties props = new java.util.Properties();
     props.setProperty("Version", version);
     props.setProperty("Location", location);
-    String versionMsg = "New version on github: " + version + " go to:" + location;
     return new SystemMessage(SOFTWARE_UPDATE_AVAILABLE_MSG, INFO_PRIORITY,
-        sage.Sage.rez("SOFTWARE_UPDATE_AVAILABLE", new Object[] { version, location }), props);
+        sage.Sage.rez("SOFTWARE_UPDATE_AVAILABLE_MSG", new Object[] { version, location }), props);
   }
 
   public static SystemMessage createPluginUpdateMsg(String pluginID, String pluginName, String version)
@@ -211,7 +211,7 @@ public static SystemMessage createPluginUpdateMsg(String pluginID, String plugin
     props.setProperty("PluginName", pluginName);
     props.setProperty("Version", version);
     props.setProperty("IsPluginUpdate", "true");
-    return new SystemMessage(SOFTWARE_UPDATE_AVAILABLE_MSG, INFO_PRIORITY,
+    return new SystemMessage(PLUGIN_UPDATE_AVAILABLE_MSG, INFO_PRIORITY,
         sage.Sage.rez("PLUGIN_UPDATE_AVAILABLE_MSG", new Object[] { pluginName, version }), props);
   }