Merge pull request #33 from sparklyballs/repo-change

switch to european mirror to download libiconv source

Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER saarg
 # package version
 ARG ARGTABLE_VER="2.13"
 ARG UNICODE_VER="2.09"
-ARG XMLTV_VER="0.5.67"
+ARG XMLTV_VER="0.5.68"
 
 # Environment settings
 ENV HOME="/config"
@@ -27,8 +27,10 @@ RUN \
 	gettext-dev \
 	git \
 	libhdhomerun-dev \
+	libgcrypt-dev \
 	libtool \
 	libxml2-dev \
+	libxslt-dev \
 	make \
 	mercurial \
 	openssl-dev \
@@ -59,7 +61,10 @@ RUN \
 	perl-compress-raw-zlib \
 	perl-date-manip \
 	perl-datetime \
+	perl-digest-sha1 \
 	perl-file-slurp \
+	perl-file-temp \
+	perl-getopt-long \
 	perl-html-parser \
 	perl-html-tree \
 	perl-http-cookies \
@@ -77,6 +82,7 @@ RUN \
 	perl-term-readkey \
 	perl-test-exception \
 	perl-test-requires \
+	perl-try-tiny \
 	perl-xml-parser \
 	perl-xml-sax \
 	python \
@@ -90,7 +96,7 @@ RUN \
  /tmp/iconv-src && \
  curl -o \
  /tmp/iconv.tar.gz -L \
-	http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz && \
+	ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz && \
  tar xf /tmp/iconv.tar.gz -C \
 	/tmp/iconv-src --strip-components=1 && \
  cd /tmp/iconv-src && \
@@ -104,20 +110,32 @@ RUN \
 
 # install perl modules
  curl -L http://cpanmin.us | perl - App::cpanminus && \
+ cpanm Date::Language && \
+ cpanm DateTime::Format::ISO8601 && \
+ cpanm DateTime::Format::Strptime && \
+ cpanm HTML::Entities && \
  cpanm HTML::TableExtract && \
+ cpanm HTML::TreeBuilder && \
  cpanm HTTP::Cache::Transparent && \
  cpanm inc && \
  cpanm IO::Scalar && \
  cpanm IO::Socket::SSL && \
+ cpanm JSON::PP && \
  cpanm Lingua::EN::Numbers::Ordinate && \
  cpanm Lingua::Preferred && \
+ cpanm List::MoreUtils && \
+ cpanm LWP::Simple && \
+ cpanm LWP::UserAgent && \
  cpanm PerlIO::gzip && \
  cpanm SOAP::Lite && \
+ cpanm Storable && \
  cpanm Term::ProgressBar && \
  cpanm Unicode::UTF8simple && \
  cpanm version && \
  cpanm WWW::Mechanize && \
+ cpanm XML::DOM && \
  cpanm XML::LibXML && \
+ cpanm XML::LibXSLT && \
  cpanm XML::TreePP && \
  cpanm XML::Twig && \
  cpanm XML::Writer && \
@@ -208,7 +226,9 @@ RUN \
  apk add --no-cache \
 	ffmpeg \
 	ffmpeg-libs \
-	libhdhomerun-libs && \
+	libhdhomerun-libs \
+	libxml2 \
+	libxslt && \
 
 # cleanup
  apk del --purge \

README.md

@@ -26,6 +26,7 @@ Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV D
 ```
 docker create \
   --name=tvheadend \
+  --net=bridge \
   -v <path to data>:/config \
   -e PGID=<gid> -e PUID=<uid>  \
   -p 9981:9981 \
@@ -54,6 +55,8 @@ If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --ne
 * `-v /config` - explain what lives here
 * `-e PGID` for GroupID - see below for explanation
 * `-e PUID` for UserID - see below for explanation
+* `--device=/dev/dvb` - for passing through DVB-cards
+* `--net=host` - for IPTV, SAT>IP and HDHomeRun
 * `-e TZ` - for timezone information *eg Europe/London, etc*
 
 It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it tvheadend /bin/bash`.
@@ -114,8 +117,9 @@ FFmpeg is installed in /usr/bin/ in case you need to use it with pipe.
 
 **EPG XML file**
 
-If you have EPG data in XML format from a supplier, you can drop it in the data folder of your your /config volume mapping. Then choose the XML file grabber in Configuration --> Channel/EPG --> EPG Grabber Modules.
+If you have EPG data in XML format from a supplier, you can drop it in the data folder of your /config volume mapping. If it doesn't exist, create it. Then choose the XML file grabber in Configuration --> Channel/EPG --> EPG Grabber Modules.
 If you use WebGrab+Plus, choose the WebGrab+Plus XML file grabber. The XML file goes in the same path as above.
+The xml file has to be named guide.xml.
 
 For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
 
@@ -126,5 +130,7 @@ For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
 
 ## Versions
 
++ **22.09.2016:** Fix broken tv_grab_wg, libs for xmltv and update README.
++ **18.09.2016:** Update XMLTV to 0.5.68 and update README.
 + **10.09.2016:** Add layer badges to README.
 + **05.09.2016:** Initial release.

root/usr/bin/tv_grab_wg

@@ -1,12 +1,11 @@
 #!/bin/bash
-xmltv_file_location=/config/data/*.xml
 dflag=
 vflag=
 cflag=
 qflag=
 if (( $# < 1 ))
 then
-  cat "$xmltv_file_location"
+  cat /config/data/*.xml
   exit 0
 fi