Merge pull request google#493 from jusjoken/master

SD EPG fixes [ci release]

Author: Jeffrey Kardatzke

.github/workflows/ci.yml

@@ -9,8 +9,8 @@ on:
 jobs:
   build:
 
-#    runs-on: ubuntu-latest
-    runs-on: ubuntu-18.04
+#    runs-on: ubuntu-latest 2025-03-04 changed to 22.04 as 20.04 is no longer supported as of 4/1/2025
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2

CHANGELOG.md

@@ -1,9 +1,23 @@
 # Change Log
 
 ## Next
+
+## Version 9.2.9 (2025-03-11)
 * Updated gradle script so that project could build in Netbeans
 * Updated the FFMPEGTranscoder to fallback to frame count instead of time to calculate progress
 * Allow IR blasters that support it to xmit non-numeric Tune strings (eg 42-1).
+* SD EPG changes to correct image retrieval without token and other API corrections/updates
+* SD EPG added debug_sd_support property to enable extra debug info when contacting SD support
+* SD EPG added sdepg_core/bypassCelebrityImages to allow users in the future to bypass reteiving Celebrity images from SD if causing issues
+* SD EPG added sdepg_core/bypassProgramImages to allow users in the future to bypass retrieving Program images from SD if causing issues
+* SD EPG added sdepg_core/bypassEPGUpdates to allow users in the future to bypass retrieving EPG from SD if causing issues
+* SD EPG added wizard/scheduled_maintenance and wizard/scheduled_maintenance_offset to allow users to set the hour that the daily maintenance will run
+* SD EPG added code to support SD now passing back the current token along with its expiration
+* SD EPG fix for send SD empty program lists as well as malformed endpoint for metadata/program
+* SD EPG fix enpoint call for metadata/programs to use 14 character programID rather than shortended to 10
+* Added seeker/duration_for_watchdog property to handle long running watchdog process for larger libraries (defaults to 60000)
+* Windows installer build notes updated for location of missing files needed for the build
+* Added ability to notify user if a new version is available on Github (defaults to enabled but can be disabled)
 
 ## Version 9.2.8 (2022-01-05)
 * Update to build process to support Linux build on Ubuntu 18.04 and JDK 11

build.gradle

@@ -48,7 +48,7 @@ ext {
 version = fullVersion
 
 // Just printing out the SAGETV build version for informational purposes
-// System.out.println("SAGETV VERSION ${versionArch}");
+//System.out.println("SAGETV VERSION ${versionArch}");
 
 // set gradle's buildDir to something other than the default 'build', or
 // we'll end up deleting EVERYTHING in 'build' when we ./gradlew clean
@@ -322,19 +322,22 @@ def getBuildNumber() {
 
   if (OperatingSystem.current().isLinux()) {
     // use git to find the build version
-    ant.exec(
-      command: 'git rev-list HEAD --count',
-      os: 'Linux',
-      failonerror: true,
-      outputproperty: 'sagebuildnum')
-
-    buildVer = ant.sagebuildnum
+    // 03-06-2025 jusjoken: Also we should note that you will get error code 128 if you have git
+    //  installed, but you did not pull this project using git because git will not know where 
+    //  to get the commit count from. 
+    new ByteArrayOutputStream().withStream { outputStream ->
+      exec {
+        executable 'git'
+        args 'rev-list', 'HEAD', '--count'
+        standardOutput = outputStream
+      }
+      buildVer = outputStream.toString().trim()
+    }
   } else if (OperatingSystem.current().isWindows()) {
     //ensure full path to git\bin is in the Path Environment variable on windows
     // 04-24-2017 JS: I changed this to remove the dependency on sh. Also we should note that
     // you will get error code 128 if you have git installed, but you did not pull this project
-    // using git because git will not know where to get the commit count from. This is likely
-    // true for Linux too.
+    // using git because git will not know where to get the commit count from. 
     new ByteArrayOutputStream().withStream { outputStream ->
       exec {
         executable 'git'
@@ -381,7 +384,7 @@ task(updateBuildNumber)  {
     // save buildnumber to file
     // we'll be referencing it later
     // Eventually we'll do this, but for now, fetch it every time
-    // new File('.buildnumber').write(buildVersion)
+    new File('.buildnumber').write(buildVersion)
   }
 }
 

build/buildmplayer.sh

@@ -38,7 +38,7 @@ if [ "$MPLAYER_NEW" = "1" ] ; then
 else
 	# use legacy mplayer build
 	cd ../third_party/mplayer/
-	LDFLAGS="-no-pie" ./configure --host-cc=gcc --disable-gcc-check --enable-runtime-cpudetection --disable-mencoder --disable-gl --enable-directx --enable-largefiles --disable-langinfo --disable-tv --disable-dvdread --disable-dvdread-internal --disable-menu --disable-libdvdcss-internal --enable-pthreads --disable-debug --disable-freetype --disable-fontconfig --enable-stv --enable-stream-sagetv --disable-ivtv --disable-x264 --extra-libs=-lpthread --disable-png || { echo "Build failed, exiting."; exit 1; }
+	LDFLAGS="-no-pie" ./configure --host-cc=gcc --disable-gcc-check --enable-runtime-cpudetection --disable-mencoder --disable-gl --enable-directx --enable-largefiles --disable-langinfo --disable-tv --disable-dvdread --disable-dvdread-internal --disable-menu --disable-libdvdcss-internal --enable-pthreads --disable-debug --disable-freetype --disable-fontconfig --enable-stv --enable-stream-sagetv --disable-ivtv --disable-x264 --extra-libs="-lpthread -pthread" --disable-png || { echo "Build failed, exiting."; exit 1; }
 	make -j32 || { echo "Build failed, exiting."; exit 1; }
   echo "Built OLD mplayer"
 	cp -v mplayer ../../build/elf

installer/Readme.md

@@ -2,20 +2,19 @@
 
  This folder includes the files needed to perform the build of the installers for windows
 
-  Note: this is a work in progress and I hope to add more scripting and automation over time
-
 ## Change the versions for an installer release
 * all version information is retreived from java/sage/Version.java
 
 ## Use powershell script to build each part of the product
 ### From Admin Powershell
-* cd C:\Projects\Installer\sagetv\installer\wix\SageTVSetup
+* cd C:\Projects\sagetv\installer\wix\SageTVSetup  #or whatever the path is to ""
 * .\installerbuild.ps1 -A
 ### Notes
 * run .\installerbuild.ps1 without any parameters to see the list of available options
-* to upload to bintray add the -u parameter such as ".\installerbuild.ps1 -A -u"
+* if building the sage.jar, miniclient.jar elsewhere then use .\installerbuild.ps1 -A -xAll -nj
 
 ## Notes:
 * building of imageloader.dll and swscale.dll still need to be added to this powershell script
-* I will expand on this document as time permits as you will need WIX installed as well as VS2015 and a number of environment variables to make this work.
+* after cloning the sagetv github repo you will be missing files needed for the installer build.  They can be downloaded here...
+    https://github.com/OpenSageTV/sagetv-windows/releases/tag/v1.1