diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt index 6c42fbd577..5e02584c0d 100644 --- a/packages/addons/service/multimedia/tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/tvheadend/changelog.txt @@ -1,3 +1,6 @@ +3.0.10 (in progress) +- added the ability to use a script's stdout as the xmltv source instead of a fixed file or URL + 3.0.9 - update to TVHeadend 3.4 diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file b/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file index c4116042b9..580a3009f3 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file @@ -27,6 +27,7 @@ ADDON_SETTINGS="$ADDON_HOME/settings.xml" XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` XMLTV_LOCATION_WEB=`grep XMLTV_LOCATION_WEB $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +XMLTV_LOCATION_SCRIPT=`grep XMLTV_LOCATION_SCRIPT $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` dflag= vflag= @@ -36,6 +37,10 @@ if [[ $# -lt 1 ]]; then if [ "$XMLTV_TYPE" = "FILE" ]; then cat "$XMLTV_LOCATION_FILE" exit 0 + elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then + if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then + exec "$XMLTV_LOCATION_SCRIPT" + fi elif [ "$XMLTV_TYPE" = "WEB" ]; then wget -qO - "$XMLTV_LOCATION_WEB" exit 0 diff --git a/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml index 3c90281869..93ce0233aa 100644 --- a/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml @@ -8,6 +8,7 @@ XMLTV source type XMLTV File location XMLTV Web location + XMLTV Script location DVB Configuration Unload DVB mudules before suspend Wait for frontend initialization diff --git a/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml index dcc5a1b567..b1071e5f60 100644 --- a/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml +++ b/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml @@ -5,9 +5,10 @@ - + - + +