From 5aa0f6561aa2686698775770d5ed90b1b896df35 Mon Sep 17 00:00:00 2001
From: Gregor Fuis <gregor.fuis@gmail.com>
Date: Wed, 22 Feb 2012 20:29:09 +0100
Subject: [PATCH] tvheadend: add ability to browse for file with xmltv epg
 format

---
 .../service/multimedia/hts-tvheadend/config/settings.xml   | 3 ++-
 .../multimedia/hts-tvheadend/source/bin/tv_grab_file       | 7 ++++---
 .../source/resources/language/English/strings.xml          | 5 +++--
 .../multimedia/hts-tvheadend/source/resources/settings.xml | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
index 6be91dac2a..0cb958058d 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
@@ -1,4 +1,5 @@
 <settings>
-    <setting id="XMLTV_LOCATION" value="" />
+    <setting id="XMLTV_LOCATION_FILE" value="" />
+    <setting id="XMLTV_LOCATION_WEB" value="http://" />
     <setting id="XMLTV_TYPE" value="NONE" />
 </settings>
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
index 8029e80ad0..e129276102 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
@@ -25,7 +25,8 @@
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 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=`grep XMLTV_LOCATION $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"`
 
 dflag=
 vflag=
@@ -33,10 +34,10 @@ cflag=
 
 if [[ $# -lt 1 ]]; then
   if [ "$XMLTV_TYPE" = "FILE" ]; then
-    cat "$XMLTV_LOCATION"
+    cat "$XMLTV_LOCATION_FILE"
     exit 0
   elif [ "$XMLTV_TYPE" = "WEB" ]; then
-    wget -qO - "$XMLTV_LOCATION"
+    wget -qO - "$XMLTV_LOCATION_WEB"
     exit 0
   fi
 fi
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
index 6eeb22a953..ad5eb930f8 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
 
-	<!-- SABnzbd-Suite -->
+	<!-- HTS TVHEADEND -->
 	<string id="1000">XMLTV</string>
 	<string id="1011">XMLTV configuration</string>
 	<string id="1011">XMLTV source type</string>
-	<string id="1012">XMLTV location</string>
+	<string id="1012">XMLTV File location</string>
+	<string id="1013">XMLTV Web location</string>
 
 </strings>
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
index c8771ebbd6..c18406ba27 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
@@ -6,6 +6,7 @@
 		<setting label="1010" type="lsep"/>
 		<setting type="sep" />
 		<setting id="XMLTV_TYPE" type="labelenum" label="1011" values="NONE|FILE|WEB" sort="yes" default="NONE"/>
-		<setting id="XMLTV_LOCATION" type="text" label="1012" default="" enable="!eq(-1,1)"/>
+		<setting id="XMLTV_LOCATION_FILE" type="file" label="1012" default="" enable="eq(-1,0)"/>
+		<setting id="XMLTV_LOCATION_WEB" type="text" label="1013" default="http://" enable="eq(-2,2)"/>
     </category>
 </settings>