Menu
▾
▴
xmltv-commit — XMLTV commit messages
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(70) |
Feb
(137) |
Mar
(102) |
Apr
(50) |
May
(62) |
Jun
(6) |
Jul
|
Aug
(12) |
Sep
(146) |
Oct
(108) |
Nov
(49) |
Dec
(84) |
| 2003 |
Jan
(60) |
Feb
(126) |
Mar
(111) |
Apr
(170) |
May
(162) |
Jun
(87) |
Jul
(88) |
Aug
(51) |
Sep
(50) |
Oct
(24) |
Nov
(95) |
Dec
(62) |
| 2004 |
Jan
(93) |
Feb
(81) |
Mar
(106) |
Apr
(94) |
May
(109) |
Jun
(8) |
Jul
(22) |
Aug
(15) |
Sep
(82) |
Oct
(26) |
Nov
(44) |
Dec
(28) |
| 2005 |
Jan
(25) |
Feb
(17) |
Mar
(27) |
Apr
(7) |
May
(25) |
Jun
(22) |
Jul
(21) |
Aug
(22) |
Sep
(11) |
Oct
(15) |
Nov
(20) |
Dec
(42) |
| 2006 |
Jan
(200) |
Feb
(42) |
Mar
(56) |
Apr
(91) |
May
(37) |
Jun
(54) |
Jul
(33) |
Aug
(15) |
Sep
(26) |
Oct
(30) |
Nov
(71) |
Dec
(102) |
| 2007 |
Jan
(48) |
Feb
(40) |
Mar
(24) |
Apr
(25) |
May
(7) |
Jun
(14) |
Jul
(35) |
Aug
(32) |
Sep
(28) |
Oct
(55) |
Nov
(57) |
Dec
(14) |
| 2008 |
Jan
(40) |
Feb
(32) |
Mar
(25) |
Apr
(29) |
May
(16) |
Jun
(49) |
Jul
(26) |
Aug
(31) |
Sep
(7) |
Oct
(16) |
Nov
(11) |
Dec
(13) |
| 2009 |
Jan
(13) |
Feb
(30) |
Mar
(38) |
Apr
(8) |
May
(23) |
Jun
(19) |
Jul
(24) |
Aug
(46) |
Sep
(65) |
Oct
(30) |
Nov
(28) |
Dec
(37) |
| 2010 |
Jan
(31) |
Feb
(41) |
Mar
(43) |
Apr
(82) |
May
(39) |
Jun
(40) |
Jul
(31) |
Aug
(46) |
Sep
(104) |
Oct
(55) |
Nov
(67) |
Dec
(32) |
| 2011 |
Jan
(26) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(17) |
Mar
(32) |
Apr
(34) |
May
(15) |
Jun
(50) |
Jul
(19) |
Aug
(8) |
Sep
(16) |
Oct
(18) |
Nov
(12) |
Dec
(3) |
| 2013 |
Jan
(7) |
Feb
(11) |
Mar
(11) |
Apr
(13) |
May
(17) |
Jun
(5) |
Jul
(4) |
Aug
(2) |
Sep
(4) |
Oct
(44) |
Nov
(14) |
Dec
(57) |
| 2014 |
Jan
(42) |
Feb
(11) |
Mar
(13) |
Apr
(33) |
May
(48) |
Jun
(22) |
Jul
(7) |
Aug
(19) |
Sep
(11) |
Oct
(34) |
Nov
(12) |
Dec
(18) |
| 2015 |
Jan
(17) |
Feb
(17) |
Mar
(15) |
Apr
(23) |
May
(2) |
Jun
(41) |
Jul
(31) |
Aug
(33) |
Sep
(6) |
Oct
(5) |
Nov
(8) |
Dec
(23) |
| 2016 |
Jan
(9) |
Feb
(6) |
Mar
(26) |
Apr
(2) |
May
(24) |
Jun
(20) |
Jul
(34) |
Aug
(4) |
Sep
(1) |
Oct
|
Nov
(2) |
Dec
(1) |
| 2017 |
Jan
(17) |
Feb
(6) |
Mar
(8) |
Apr
|
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(4) |
Sep
(14) |
Oct
(1) |
Nov
(8) |
Dec
|
|
From: Nick M. <kno...@us...> - 2017-08-18 00:32:27
|
Update of /cvsroot/xmltv/xmltv/filter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30328/filter Modified Files: tv_grep.PL Log Message: Provide explicit paths to current directory for 'require's Perl 5.26 drops "." from @INC by default, so ensure require/use/do find files in currdir when necessary Index: tv_grep.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/filter/tv_grep.PL,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tv_grep.PL 24 Feb 2017 22:35:58 -0000 1.7 --- tv_grep.PL 18 Aug 2017 00:32:24 -0000 1.8 *************** *** 14,20 **** use XMLTV; ! # Perl 5.24.1+ does not include '.' in @INC but we need some libs during build ! use lib '.'; ! require 'filter/Grep.pm'; my $out = shift @ARGV; die "no output file given" if not defined $out; --- 14,18 ---- use XMLTV; ! require './filter/Grep.pm'; my $out = shift @ARGV; die "no output file given" if not defined $out; |
|
From: Nick M. <kno...@us...> - 2017-08-18 00:32:26
|
Update of /cvsroot/xmltv/xmltv/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30328/lib Modified Files: XMLTV.pm.PL Log Message: Provide explicit paths to current directory for 'require's Perl 5.26 drops "." from @INC by default, so ensure require/use/do find files in currdir when necessary Index: XMLTV.pm.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/lib/XMLTV.pm.PL,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XMLTV.pm.PL 24 Feb 2017 22:35:58 -0000 1.6 --- XMLTV.pm.PL 18 Aug 2017 00:32:24 -0000 1.7 *************** *** 9,16 **** my $out = shift @ARGV; die "no output file given" if not defined $out; ! my $in = 'lib/XMLTV.pm.in'; - # Perl 5.24.1+ does not include '.' in @INC but we need some libs during build - use lib '.'; require $in; --- 9,14 ---- my $out = shift @ARGV; die "no output file given" if not defined $out; ! my $in = './lib/XMLTV.pm.in'; require $in; |
|
From: Nick M. <kno...@us...> - 2017-07-15 21:25:35
|
Update of /cvsroot/xmltv/xmltv/filter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29591/filter Modified Files: tv_to_latex tv_to_text Log Message: Fix build failures in Perl 5.26+ caused by 'use POSIX 'tmpnam' POSIX 'tmpnam' was deprecated in Perl 5.24 and removed in Perl 5.26, and is actually unused in the code. Index: tv_to_latex =================================================================== RCS file: /cvsroot/xmltv/xmltv/filter/tv_to_latex,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** tv_to_latex 5 May 2014 16:02:53 -0000 1.18 --- tv_to_latex 15 Jul 2017 21:25:33 -0000 1.19 *************** *** 38,42 **** use XMLTV::Version '$Id$ '; use IO::File; - use POSIX 'tmpnam'; use Getopt::Long; --- 38,41 ---- Index: tv_to_text =================================================================== RCS file: /cvsroot/xmltv/xmltv/filter/tv_to_text,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tv_to_text 8 Jun 2015 17:41:14 -0000 1.8 --- tv_to_text 15 Jul 2017 21:25:33 -0000 1.9 *************** *** 35,39 **** use IO::File; use Date::Manip; - use POSIX 'tmpnam'; use Getopt::Long; --- 35,38 ---- |
|
From: Stefan B. <ste...@us...> - 2017-07-12 19:33:04
|
Update of /cvsroot/xmltv/xmltv/grab/fi In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27680/grab/fi Modified Files: test.conf Log Message: - foxtv: fix programme start time parsing - common: work around meta-in-body bug in HTML::TreeBuilder - yle: updated for site changes - NOTE: IDs for yle.fi have changed! Index: test.conf =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/fi/test.conf,v retrieving revision 2.17 retrieving revision 2.18 diff -C2 -d -r2.17 -r2.18 *** test.conf 9 Jul 2017 17:24:06 -0000 2.17 --- test.conf 12 Jul 2017 19:33:02 -0000 2.18 *************** *** 13,81 **** # NOTE: ##channel are those channels that should not be unmasked during testing # ! #channel 10.iltapulu.fi Yle Fem ! #channel 11.iltapulu.fi AVA ! #channel 12.iltapulu.fi TV5 ! #channel 13.iltapulu.fi Kutonen ! #channel 14.iltapulu.fi Hero ! ##channel 15.iltapulu.fi FRII ! ##channel 16.iltapulu.fi MTV ! ##channel 17.iltapulu.fi Discovery Channel ! ##channel 18.iltapulu.fi Disney Channel ! ##channel 19.iltapulu.fi Eurosport channel 1.iltapulu.fi YLE TV1 ! ##channel 20.iltapulu.fi MTV MAX ! ##channel 21.iltapulu.fi MTV Fakta ! ##channel 22.iltapulu.fi MTV Juniori ! ##channel 23.iltapulu.fi MTV Sport 1 ! ##channel 24.iltapulu.fi MTV Sport 2 ! ##channel 25.iltapulu.fi C More First ! ##channel 26.iltapulu.fi C More Series ! ##channel 27.iltapulu.fi C More Hits ! ##channel 28.iltapulu.fi C More Action ! ##channel 29.iltapulu.fi C More Emotion channel 2.iltapulu.fi YLE TV2 ##channel 30.iltapulu.fi SF-kanalen ##channel 31.iltapulu.fi C More First HD ! ##channel 32.iltapulu.fi C More Tennis ##channel 33.iltapulu.fi C More Hits HD ##channel 34.iltapulu.fi C More Series HD ! ##channel 35.iltapulu.fi Nelonen Nappula ! ##channel 36.iltapulu.fi Nelonen Prime ! ##channel 37.iltapulu.fi Nelonen Maailma ! ##channel 38.iltapulu.fi Nelonen Pro 1 ! ##channel 39.iltapulu.fi Nelonen Pro 2 channel 3.iltapulu.fi MTV3 ! ##channel 40.iltapulu.fi Eurosport 2 ! ##channel 41.iltapulu.fi viasatsport SE ! ##channel 42.iltapulu.fi Viasat Golf ! ##channel 43.iltapulu.fi Viasat Hockey ! ##channel 44.iltapulu.fi Viasat Hockey Finland ! ##channel 45.iltapulu.fi Viasat Jalkapallo HD ! ##channel 46.iltapulu.fi Viasat Jaakiekko HD ! ##channel 47.iltapulu.fi Viasat Sport Premium ! ##channel 48.iltapulu.fi Viasat Fotboll ! ##channel 49.iltapulu.fi Viasat Film #channel 4.iltapulu.fi Nelonen ! ##channel 50.iltapulu.fi Viasat Film Action ! ##channel 51.iltapulu.fi Viasat Film Family ! ##channel 52.iltapulu.fi Viasat Film Comedy ! ##channel 53.iltapulu.fi Viasat Film Hits ! ##channel 54.iltapulu.fi Viasat Explore Nordic ! ##channel 55.iltapulu.fi Viasat History ! ##channel 56.iltapulu.fi Viasat Nature/Crime ! ##channel 57.iltapulu.fi Nickelodeon ! ##channel 58.iltapulu.fi TV7 ! ##channel 59.iltapulu.fi RTL #channel 5.iltapulu.fi Sub #channel 6.iltapulu.fi JIM #channel 7.iltapulu.fi Liv #channel 8.iltapulu.fi FOX ! #channel 9.iltapulu.fi YLE Teema ##channel al-jazeera.uutiset.telkku.com Al Jazeera ##channel animal-planet.dokumentit.telkku.com Animal Planet ##channel animal-planet-hd.dokumentit.telkku.com Animal Planet HD ! #channel AVA.fi.yle.fi AVA #channel ava.peruskanavat.telkku.com Ava ! #channel AVA.sv.yle.fi AVA ##channel barnkanalen.ruotsi.telkku.com Barnkanalen ##channel bbc-brit.muut.telkku.com BBC Brit --- 13,80 ---- # NOTE: ##channel are those channels that should not be unmasked during testing # ! #channel 10.iltapulu.fi AVA ! #channel 11.iltapulu.fi TV5 ! #channel 12.iltapulu.fi Kutonen ! #channel 13.iltapulu.fi Hero ! ##channel 14.iltapulu.fi FRII ! ##channel 15.iltapulu.fi TLC ! ##channel 16.iltapulu.fi National Geographic ! ##channel 17.iltapulu.fi MTV ! ##channel 18.iltapulu.fi Discovery Channel ! ##channel 19.iltapulu.fi Disney Channel channel 1.iltapulu.fi YLE TV1 ! ##channel 20.iltapulu.fi Eurosport ! ##channel 21.iltapulu.fi Eurosport 2 ! ##channel 22.iltapulu.fi MTV MAX ! ##channel 23.iltapulu.fi C More Juniori ! ##channel 24.iltapulu.fi C More Sport 1 ! ##channel 25.iltapulu.fi C More Sport 2 ! ##channel 26.iltapulu.fi C More First ! ##channel 27.iltapulu.fi C More Series ! ##channel 28.iltapulu.fi C More Hits ! ##channel 29.iltapulu.fi C More Stars channel 2.iltapulu.fi YLE TV2 ##channel 30.iltapulu.fi SF-kanalen ##channel 31.iltapulu.fi C More First HD ! ##channel 32.iltapulu.fi C More Golf HD ##channel 33.iltapulu.fi C More Hits HD ##channel 34.iltapulu.fi C More Series HD ! ##channel 35.iltapulu.fi Ruutu+ Lapset ! ##channel 36.iltapulu.fi Ruutu+ Leffat ja Sarjat ! ##channel 37.iltapulu.fi Ruutu+ Dokkarit ! ##channel 38.iltapulu.fi Ruutu+ Urheilu 1 ! ##channel 39.iltapulu.fi Ruutu+ Urheilu 2 channel 3.iltapulu.fi MTV3 ! ##channel 40.iltapulu.fi viasatsport SE ! ##channel 41.iltapulu.fi Viasat Golf ! ##channel 42.iltapulu.fi Viasat Hockey ! ##channel 43.iltapulu.fi Viasat Hockey Finland ! ##channel 44.iltapulu.fi Viasat Jalkapallo HD ! ##channel 45.iltapulu.fi Viasat Jaakiekko HD ! ##channel 46.iltapulu.fi Viasat Sport Premium ! ##channel 47.iltapulu.fi viasatfotboll SE ! ##channel 48.iltapulu.fi Viasat Film ! ##channel 49.iltapulu.fi Viasat Film Action #channel 4.iltapulu.fi Nelonen ! ##channel 50.iltapulu.fi Viasat Film Family ! ##channel 51.iltapulu.fi Viasat Film Comedy ! ##channel 52.iltapulu.fi Viasat Film Hits ! ##channel 53.iltapulu.fi Nickelodeon ! ##channel 54.iltapulu.fi TV7 ! ##channel 55.iltapulu.fi RTL #channel 5.iltapulu.fi Sub #channel 6.iltapulu.fi JIM #channel 7.iltapulu.fi Liv #channel 8.iltapulu.fi FOX ! #channel 9.iltapulu.fi Yle Teema & Fem ! ##channel AlfaTV.fi.yle.fi AlfaTV ! ##channel alfatv.muut.telkku.com AlfaTV ! ##channel AlfaTV.sv.yle.fi AlfaTV ##channel al-jazeera.uutiset.telkku.com Al Jazeera ##channel animal-planet.dokumentit.telkku.com Animal Planet ##channel animal-planet-hd.dokumentit.telkku.com Animal Planet HD ! #channel Ava.fi.yle.fi Ava #channel ava.peruskanavat.telkku.com Ava ! #channel Ava.sv.yle.fi Ava ##channel barnkanalen.ruotsi.telkku.com Barnkanalen ##channel bbc-brit.muut.telkku.com BBC Brit *************** *** 85,90 **** ##channel bloomberg-tv.uutiset.telkku.com Bloomberg TV ##channel cartoon-network.lapset.telkku.com Cartoon Network - ##channel cmore-action.elokuvat.telkku.com C More Action - ##channel cmore-emotion.elokuvat.telkku.com C More Emotion ##channel cmore-first.elokuvat.telkku.com C More First ##channel cmore-first-hd.elokuvat.telkku.com C More First HD --- 84,87 ---- *************** *** 94,97 **** --- 91,95 ---- ##channel cmore-series.elokuvat.telkku.com C More Series ##channel cmore-series-hd.elokuvat.telkku.com C More Series HD + ##channel cmore-stars.elokuvat.telkku.com C More Stars ##channel cmore-tennis.urheilu.telkku.com C More Tennis ##channel cnbc.uutiset.telkku.com CNBC *************** *** 111,128 **** ##channel extreme-sports.urheilu.telkku.com Extreme Sports ##channel fashion-tv.lifestyle.telkku.com Fashion TV #channel fox.peruskanavat.telkku.com Fox channel foxtv.fi FOX ##channel frii.peruskanavat.telkku.com Frii ##channel h2.dokumentit.telkku.com H2 #channel hero.peruskanavat.telkku.com Hero ##channel himlen-tv7.muut.telkku.com Himlen TV7 ##channel history-channel.dokumentit.telkku.com The History Channel ##channel iconcerts.musiikki.telkku.com iConcerts ##channel investigation-discovery.dokumentit.telkku.com Investigation Discovery ! ##channel Jim.fi.yle.fi Jim ##channel jim.peruskanavat.telkku.com Jim ! ##channel Jim.sv.yle.fi Jim ##channel kanal5.ruotsi.telkku.com Kanal5 #channel kutonen.peruskanavat.telkku.com Kutonen #channel Liv.fi.yle.fi Liv #channel liv.peruskanavat.telkku.com Liv --- 109,134 ---- ##channel extreme-sports.urheilu.telkku.com Extreme Sports ##channel fashion-tv.lifestyle.telkku.com Fashion TV + ##channel Fox.fi.yle.fi Fox #channel fox.peruskanavat.telkku.com Fox + ##channel Fox.sv.yle.fi Fox channel foxtv.fi FOX + ##channel Frii.fi.yle.fi Frii ##channel frii.peruskanavat.telkku.com Frii + ##channel Frii.sv.yle.fi Frii ##channel h2.dokumentit.telkku.com H2 + ##channel Hero.fi.yle.fi Hero #channel hero.peruskanavat.telkku.com Hero + ##channel Hero.sv.yle.fi Hero ##channel himlen-tv7.muut.telkku.com Himlen TV7 ##channel history-channel.dokumentit.telkku.com The History Channel ##channel iconcerts.musiikki.telkku.com iConcerts ##channel investigation-discovery.dokumentit.telkku.com Investigation Discovery ! ##channel JIM.fi.yle.fi JIM ##channel jim.peruskanavat.telkku.com Jim ! ##channel JIM.sv.yle.fi JIM ##channel kanal5.ruotsi.telkku.com Kanal5 + ##channel Kutonen.fi.yle.fi Kutonen #channel kutonen.peruskanavat.telkku.com Kutonen + ##channel Kutonen.sv.yle.fi Kutonen #channel Liv.fi.yle.fi Liv #channel liv.peruskanavat.telkku.com Liv *************** *** 133,146 **** channel MTV3.sv.yle.fi MTV3 ##channel mtv-dance.musiikki.telkku.com MTV Dance - ##channel mtv-fakta.mtv-total.telkku.com MTV Fakta ##channel mtv-finland.musiikki.telkku.com MTV Finland ! ##channel mtv-juniori.lapset.telkku.com MTV Juniori ##channel mtv-live-hd.musiikki.telkku.com MTV Live HD ! ##channel mtv-max.urheilu.telkku.com MTV Max ##channel mtv-rocks.musiikki.telkku.com MTV ROCKS ! ##channel mtv-sport-1.urheilu.telkku.com MTV Sport 1 ! ##channel mtv-sport-2.urheilu.telkku.com MTV Sport 2 ##channel nat-geo-wild-scandinavia.viasat-kulta.telkku.com Nat Geo Wild Scandinavia ! ##channel national-geographic.viasat-kulta.telkku.com National Geographic #channel Nelonen.fi.yle.fi Nelonen ##channel nelonen-maailma.nelonen-paketti.telkku.com Nelonen Maailma --- 139,153 ---- channel MTV3.sv.yle.fi MTV3 ##channel mtv-dance.musiikki.telkku.com MTV Dance ##channel mtv-finland.musiikki.telkku.com MTV Finland ! ##channel mtv-juniori.lapset.telkku.com C More Juniori ##channel mtv-live-hd.musiikki.telkku.com MTV Live HD ! ##channel mtv-max.urheilu.telkku.com C More Max ##channel mtv-rocks.musiikki.telkku.com MTV ROCKS ! ##channel mtv-sport-1.urheilu.telkku.com C More Sport 1 ! ##channel mtv-sport-2.urheilu.telkku.com C More Sport 2 ##channel nat-geo-wild-scandinavia.viasat-kulta.telkku.com Nat Geo Wild Scandinavia ! ##channel National-Geographic.fi.yle.fi National Geographic ! ##channel national-geographic.peruskanavat.telkku.com National Geographic ! ##channel National-Geographic.sv.yle.fi National Geographic #channel Nelonen.fi.yle.fi Nelonen ##channel nelonen-maailma.nelonen-paketti.telkku.com Nelonen Maailma *************** *** 152,163 **** #channel Nelonen.sv.yle.fi Nelonen ##channel nickelodeon.lapset.telkku.com Nickelodeon ##channel outdoor-channel.lifestyle.telkku.com Outdoor Channel ##channel playboy-tv.lifestyle.telkku.com Playboy TV ##channel rtl.muut.telkku.com RTL ! ##channel sf-kanalen.mtv-total.telkku.com SF-kanalen ##channel sky-news.uutiset.telkku.com Sky News ! #channel SUB.fi.yle.fi SUB #channel sub.peruskanavat.telkku.com Sub ! #channel SUB.sv.yle.fi SUB ##channel svt-1.ruotsi.telkku.com SVT 1 ##channel svt24.ruotsi.telkku.com SVT24 --- 159,171 ---- #channel Nelonen.sv.yle.fi Nelonen ##channel nickelodeon.lapset.telkku.com Nickelodeon + ##channel nick-jr.lapset.telkku.com Nick Jr ##channel outdoor-channel.lifestyle.telkku.com Outdoor Channel ##channel playboy-tv.lifestyle.telkku.com Playboy TV ##channel rtl.muut.telkku.com RTL ! ##channel sf-kanalen.c-more-total.telkku.com SF-kanalen ##channel sky-news.uutiset.telkku.com Sky News ! #channel Sub.fi.yle.fi Sub #channel sub.peruskanavat.telkku.com Sub ! #channel Sub.sv.yle.fi Sub ##channel svt-1.ruotsi.telkku.com SVT 1 ##channel svt24.ruotsi.telkku.com SVT24 *************** *** 165,179 **** ##channel svt-world.ruotsi.telkku.com SVT World ##channel tcm.elokuvat.telkku.com TCM ! ##channel tlc.lifestyle.telkku.com TLC ##channel travel-channel.lifestyle.telkku.com Travel Channel ##channel tv3.ruotsi.telkku.com TV3 ##channel tv4.ruotsi.telkku.com TV4 ##channel tv5-monde.muut.telkku.com TV5 Monde #channel tv5.peruskanavat.telkku.com TV5 ##channel tv6.ruotsi.telkku.com TV6 ##channel tv7.muut.telkku.com TV7 - ##channel tv-finland.fi.yle.fi TV Finland ##channel tv-finland.muut.telkku.com TV Finland - ##channel tv-finland.sv.yle.fi TV Finland ##channel vh1-classic.musiikki.telkku.com VH1 Classic ##channel vh1.musiikki.telkku.com VH1 --- 173,189 ---- ##channel svt-world.ruotsi.telkku.com SVT World ##channel tcm.elokuvat.telkku.com TCM ! ##channel tlc-finland.peruskanavat.telkku.com TLC ! ##channel TLC.fi.yle.fi TLC ! ##channel TLC.sv.yle.fi TLC ##channel travel-channel.lifestyle.telkku.com Travel Channel ##channel tv3.ruotsi.telkku.com TV3 ##channel tv4.ruotsi.telkku.com TV4 + ##channel TV5.fi.yle.fi TV5 ##channel tv5-monde.muut.telkku.com TV5 Monde #channel tv5.peruskanavat.telkku.com TV5 + ##channel TV5.sv.yle.fi TV5 ##channel tv6.ruotsi.telkku.com TV6 ##channel tv7.muut.telkku.com TV7 ##channel tv-finland.muut.telkku.com TV Finland ##channel vh1-classic.musiikki.telkku.com VH1 Classic ##channel vh1.musiikki.telkku.com VH1 *************** *** 184,187 **** --- 194,198 ---- ##channel viasat-film-family.elokuvat.telkku.com Viasat Film Family ##channel viasat-film-hits.viasat-kulta.telkku.com Viasat Film Hits + ##channel viasat-fotboll-hd.urheilu.telkku.com Viasat Fotboll HD ##channel viasat-golf.urheilu.telkku.com Viasat Golf ##channel viasat-history.viasat-kulta.telkku.com Viasat History *************** *** 194,212 **** ##channel viasat-sport.urheilu.telkku.com Viasat Sport ##channel viasat-sport-xtra.urheilu.telkku.com Viasat Sport Xtra ##channel viron-etv.muut.telkku.com Viron ETV ! ##channel yle-areena.fi.yle.fi Yle Areena ! ##channel yle-areena.sv.yle.fi Yle Areena ! #channel yle-fem.fi.yle.fi Yle Fem ! #channel yle-fem.peruskanavat.telkku.com Yle Fem ! #channel yle-fem.sv.yle.fi Yle Fem ! #channel yle-teema.fi.yle.fi Yle Teema ! #channel yle-teema.peruskanavat.telkku.com Yle Teema ! #channel yle-teema.sv.yle.fi Yle Teema ! channel yle-tv1.fi.yle.fi Yle TV1 channel yle-tv1.peruskanavat.telkku.com Yle TV1 ! channel yle-tv1.sv.yle.fi Yle TV1 ! channel yle-tv2.fi.yle.fi Yle TV2 channel yle-tv2.peruskanavat.telkku.com Yle TV2 ! channel yle-tv2.sv.yle.fi Yle TV2 # Title name mappings --- 205,221 ---- ##channel viasat-sport.urheilu.telkku.com Viasat Sport ##channel viasat-sport-xtra.urheilu.telkku.com Viasat Sport Xtra + ##channel viasat-ultra-hd.viasat-kulta.telkku.com Viasat Ultra HD ##channel viron-etv.muut.telkku.com Viron ETV ! ##channel Yle-Areena.fi.yle.fi Yle Areena ! ##channel Yle-Arenan.sv.yle.fi Yle Arenan ! #channel Yle-Teema-Fem.fi.yle.fi Yle Teema Fem ! #channel yle-teema-fem.peruskanavat.telkku.com Yle Teema Fem ! #channel Yle-Teema-Fem.sv.yle.fi Yle Teema Fem ! channel Yle-TV1.fi.yle.fi Yle TV1 channel yle-tv1.peruskanavat.telkku.com Yle TV1 ! channel Yle-TV1.sv.yle.fi Yle TV1 ! channel Yle-TV2.fi.yle.fi Yle TV2 channel yle-tv2.peruskanavat.telkku.com Yle TV2 ! channel Yle-TV2.sv.yle.fi Yle TV2 # Title name mappings |
|
From: Stefan B. <ste...@us...> - 2017-07-09 17:30:29
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6683 Modified Files: MANIFEST Makefile.PL Log Message: - remove grab/fi/fi/source/telvis.pm from MANIFEST and Makefile.PL Index: Makefile.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/Makefile.PL,v retrieving revision 1.471 retrieving revision 1.472 diff -C2 -d -r1.471 -r1.472 *** Makefile.PL 9 Jul 2017 17:24:06 -0000 1.471 --- Makefile.PL 9 Jul 2017 17:30:27 -0000 1.472 *************** *** 477,481 **** 'grab/fi/fi/source/iltapulu.pm', 'grab/fi/fi/source/telkku.pm', - 'grab/fi/fi/source/telvis.pm', 'grab/fi/fi/source/yle.pm', ], --- 477,480 ---- Index: MANIFEST =================================================================== RCS file: /cvsroot/xmltv/xmltv/MANIFEST,v retrieving revision 1.207 retrieving revision 1.208 diff -C2 -d -r1.207 -r1.208 *** MANIFEST 9 Mar 2017 10:05:35 -0000 1.207 --- MANIFEST 9 Jul 2017 17:30:27 -0000 1.208 *************** *** 129,133 **** grab/fi/fi/source/iltapulu.pm grab/fi/fi/source/telkku.pm - grab/fi/fi/source/telvis.pm grab/fi/fi/source/yle.pm grab/fi/get_latest_version.sh --- 129,132 ---- |
|
From: Stefan B. <ste...@us...> - 2017-07-09 17:24:09
|
Update of /cvsroot/xmltv/xmltv/grab/fi In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6379/grab/fi Modified Files: test.conf Log Message: - telvis: remove source, it no longer provides any valuable data - Makefile.PL: add dependency on JSON package Index: test.conf =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/fi/test.conf,v retrieving revision 2.16 retrieving revision 2.17 diff -C2 -d -r2.16 -r2.17 *** test.conf 20 Aug 2016 16:55:13 -0000 2.16 --- test.conf 9 Jul 2017 17:24:06 -0000 2.17 *************** *** 72,81 **** #channel 8.iltapulu.fi FOX #channel 9.iltapulu.fi YLE Teema - ##channel adultchannel.telvis.fi The Adult Channel ##channel al-jazeera.uutiset.telkku.com Al Jazeera ##channel animal-planet.dokumentit.telkku.com Animal Planet ##channel animal-planet-hd.dokumentit.telkku.com Animal Planet HD - ##channel animalplanethd.telvis.fi Animal Planet HD - ##channel animalplanet.telvis.fi Animal Planet #channel AVA.fi.yle.fi AVA #channel ava.peruskanavat.telkku.com Ava --- 72,78 ---- *************** *** 84,94 **** ##channel bbc-brit.muut.telkku.com BBC Brit ##channel bbc-earth.muut.telkku.com BBC Earth - ##channel bbchd.telvis.fi BBC HD ##channel bbc-knowledge.dokumentit.telkku.com BBC Knowledge - ##channel bbcknow.telvis.fi BBC Knowledge ##channel bbc-world-news.uutiset.telkku.com BBC World News ##channel bloomberg-tv.uutiset.telkku.com Bloomberg TV ##channel cartoon-network.lapset.telkku.com Cartoon Network - ##channel cartoon.telvis.fi Cartoon Network ##channel cmore-action.elokuvat.telkku.com C More Action ##channel cmore-emotion.elokuvat.telkku.com C More Emotion --- 81,88 ---- *************** *** 103,202 **** ##channel cnbc.uutiset.telkku.com CNBC ##channel cnn.viasat-kulta.telkku.com CNN - ##channel cp4.telvis.fi C More Series - ##channel cpa.telvis.fi Canal 69 - ##channel cpd.telvis.fi C More Sport HD - ##channel cpe.telvis.fi C More Extreme - ##channel cpnalfilm1.telvis.fi C More First - ##channel cpnalfilm2.telvis.fi C More Hits - ##channel cpnalfilm3.telvis.fi C More Action - ##channel cpnalhd.telvis.fi Canal+ Film HD - ##channel cpnalpannordic.telvis.fi C More Emotion - ##channel cpnalsport2.telvis.fi C More Tennis - ##channel cpnalsportfinlan.telvis.fi MTV Sport 1 ##channel deutsche-welle.uutiset.telkku.com Deutsche Welle ##channel discovery-channel.dokumentit.telkku.com Discovery Channel - ##channel discoverychannel.telvis.fi Discovery Channel - ##channel discoverycivilis.telvis.fi Discovery World ##channel discovery-hd-showcase.dokumentit.telkku.com Discovery HD Showcase - ##channel discoveryhd.telvis.fi Discovery HD ##channel discovery-science.dokumentit.telkku.com Discovery Science - ##channel discoveryscience.telvis.fi Discovery Science - ##channel discoverytlc.telvis.fi TLC ##channel discovery-world.dokumentit.telkku.com Discovery World ##channel disney-channel.lapset.telkku.com Disney Channel ##channel disney-junior.lapset.telkku.com Disney Junior ##channel disney-xd.lapset.telkku.com Disney XD - ##channel espneurope.telvis.fi ESPN Europe ##channel esportstv.urheilu.telkku.com esportstv ##channel euronews.uutiset.telkku.com EuroNews - ##channel eurosport2.telvis.fi Eurosport 2 ##channel eurosport-2.urheilu.telkku.com Eurosport 2 - ##channel eurosporthd.telvis.fi Eurosport HD ##channel eurosport.urheilu.telkku.com Eurosport ##channel extreme-sports.urheilu.telkku.com Extreme Sports ##channel fashion-tv.lifestyle.telkku.com Fashion TV #channel fox.peruskanavat.telkku.com Fox - #channel fox.telvis.fi Fox channel foxtv.fi FOX ##channel frii.peruskanavat.telkku.com Frii - #channel fst5.telvis.fi YLE FEM ##channel h2.dokumentit.telkku.com H2 #channel hero.peruskanavat.telkku.com Hero - ##channel hightv.telvis.fi HighTV ##channel himlen-tv7.muut.telkku.com Himlen TV7 ##channel history-channel.dokumentit.telkku.com The History Channel - ##channel historyhd.telvis.fi History Channel HD - ##channel history.telvis.fi History Channel ##channel iconcerts.musiikki.telkku.com iConcerts - ##channel im3sat.telvis.fi 3sat - ##channel imaljazeeraengli.telvis.fi Al Jazeera (English) - ##channel imartefrance.telvis.fi Arte - ##channel imbbcfood.telvis.fi BBC Lifestyle - ##channel imbbcprime.telvis.fi BBC Entertainment - ##channel imbbcworldeurope.telvis.fi BBC World - ##channel imbloombergtelev.telvis.fi Bloomberg Television - ##channel imcnninternation.telvis.fi CNN International - ##channel imdeutschewellet.telvis.fi Deutsche Welle - ##channel imdisneychannels.telvis.fi Disney Channel - ##channel imeentertainment.telvis.fi Entertainment Television - ##channel imeurosportinter.telvis.fi Eurosport - ##channel imfrance24uk.telvis.fi France 24 - ##channel immtveurope.telvis.fi MTV Europe - ##channel implayhousedisne.telvis.fi Disney Junior - ##channel imrai1.telvis.fi Rai Uno - ##channel imrtl2.telvis.fi RTL 2 - ##channel imrtltelevision.telvis.fi RTL Television - ##channel imsat1.telvis.fi Sat. 1 - ##channel imtoondisneyscan.telvis.fi XD Disney - ##channel imtravelchannelt.telvis.fi Travel Channel - ##channel imviva.telvis.fi Viva - ##channel imvox.telvis.fi VOX ##channel investigation-discovery.dokumentit.telkku.com Investigation Discovery ##channel Jim.fi.yle.fi Jim ##channel jim.peruskanavat.telkku.com Jim ##channel Jim.sv.yle.fi Jim - ##channel jim.telvis.fi JIM ##channel kanal5.ruotsi.telkku.com Kanal5 - ##channel kanal5.telvis.fi Kanal 5 - ##channel kinotv.telvis.fi Nelonen Kino - ##channel kunskapskanalen.telvis.fi Kunskapskanalen #channel kutonen.peruskanavat.telkku.com Kutonen - #channel kutonen.telvis.fi Kutonen #channel Liv.fi.yle.fi Liv #channel liv.peruskanavat.telkku.com Liv #channel Liv.sv.yle.fi Liv - #channel liv.telvis.fi Liv ##channel motors-tv.urheilu.telkku.com Motors TV - ##channel mtv2.telvis.fi MTV Two - #channel mtv3ava.telvis.fi AVA - ##channel mtv3fakta.telvis.fi MTV Fakta - ##channel mtv3faktaxl.telvis.fi MTV Fakta XL channel MTV3.fi.yle.fi MTV3 - ##channel mtv3leffa.telvis.fi MTV Leffa - ##channel mtv3max.telvis.fi MTV MAX channel mtv3.peruskanavat.telkku.com MTV3 channel MTV3.sv.yle.fi MTV3 - channel mtv3.telvis.fi MTV3 - ##channel mtvckelodeon.telvis.fi Nickelodeon ##channel mtv-dance.musiikki.telkku.com MTV Dance ##channel mtv-fakta.mtv-total.telkku.com MTV Fakta --- 97,135 ---- *************** *** 205,218 **** ##channel mtv-live-hd.musiikki.telkku.com MTV Live HD ##channel mtv-max.urheilu.telkku.com MTV Max - ##channel mtvmedycentral.telvis.fi Comedy Central ##channel mtv-rocks.musiikki.telkku.com MTV ROCKS ##channel mtv-sport-1.urheilu.telkku.com MTV Sport 1 ##channel mtv-sport-2.urheilu.telkku.com MTV Sport 2 - ##channel mtvvfinland.telvis.fi MTV Suomi - ##channel nasn.telvis.fi ESPN America - ##channel natgeohd.telvis.fi National Geographic HD ##channel nat-geo-wild-scandinavia.viasat-kulta.telkku.com Nat Geo Wild Scandinavia ##channel national-geographic.viasat-kulta.telkku.com National Geographic - ##channel nationalgeograph.telvis.fi National Geographic #channel Nelonen.fi.yle.fi Nelonen ##channel nelonen-maailma.nelonen-paketti.telkku.com Nelonen Maailma --- 138,146 ---- *************** *** 223,320 **** ##channel nelonen-pro-2.urheilu.telkku.com Nelonen Pro 2 #channel Nelonen.sv.yle.fi Nelonen - #channel nelonen.telvis.fi Nelonen - ##channel new.telvis.fi Nelonen Maailma ##channel nickelodeon.lapset.telkku.com Nickelodeon ##channel outdoor-channel.lifestyle.telkku.com Outdoor Channel ##channel playboy-tv.lifestyle.telkku.com Playboy TV - ##channel playboytv.telvis.fi Playboy TV ##channel rtl.muut.telkku.com RTL ##channel sf-kanalen.mtv-total.telkku.com SF-kanalen - ##channel showtime.telvis.fi Showtime - ##channel silverhd.telvis.fi Silver HD - ##channel silver.telvis.fi Silver ##channel sky-news.uutiset.telkku.com Sky News - ##channel spice.telvis.fi Spice - ##channel starweek.telvis.fi Star #channel SUB.fi.yle.fi SUB - ##channel subjuniori.telvis.fi MTV Juniori #channel sub.peruskanavat.telkku.com Sub #channel SUB.sv.yle.fi SUB - #channel sub.telvis.fi Sub ##channel svt-1.ruotsi.telkku.com SVT 1 - ##channel svt1.telvis.fi SVT 1 ##channel svt24.ruotsi.telkku.com SVT24 - ##channel svt24.telvis.fi SVT 24 ##channel svt-2.ruotsi.telkku.com SVT 2 - ##channel svt2.telvis.fi SVT 2 - ##channel svtbarnkanalen.telvis.fi SVT B - ##channel svthd.telvis.fi SVT HD ##channel svt-world.ruotsi.telkku.com SVT World - ##channel svtworld.telvis.fi SVT World ##channel tcm.elokuvat.telkku.com TCM - ##channel tcm.telvis.fi TCM - Turner Classic Movies ##channel tlc.lifestyle.telkku.com TLC ##channel travel-channel.lifestyle.telkku.com Travel Channel - channel tv1.telvis.fi YLE TV1 - channel tv2.telvis.fi YLE TV2 ##channel tv3.ruotsi.telkku.com TV3 - ##channel tv3.telvis.fi TV3 - ##channel tv400.telvis.fi TV11 - ##channel tv4fakta.telvis.fi TV4 Fakta - ##channel tv4film.telvis.fi TV4 Film - ##channel tv4guld.telvis.fi TV4 Guld - ##channel tv4komadi.telvis.fi TV4 Komedi - ##channel tv4plus.telvis.fi Sjuan ##channel tv4.ruotsi.telkku.com TV4 - ##channel tv4sport.telvis.fi TV4 Sport - ##channel tv4.telvis.fi TV4 ##channel tv5-monde.muut.telkku.com TV5 Monde - ##channel tv5monde.telvis.fi TV5 Monde #channel tv5.peruskanavat.telkku.com TV5 ##channel tv6.ruotsi.telkku.com TV6 - ##channel tv6.telvis.fi TV6 ##channel tv7.muut.telkku.com TV7 - ##channel tv7se.telvis.fi 7 - ##channel tv7.telvis.fi TV7 - ##channel tv8.telvis.fi TV8 ##channel tv-finland.fi.yle.fi TV Finland ##channel tv-finland.muut.telkku.com TV Finland ##channel tv-finland.sv.yle.fi TV Finland - ##channel tvfinland.telvis.fi TV Finland - #channel tvviisi.telvis.fi TV5 - ##channel urheilukanava.telvis.fi Nelonen Pro 2 - ##channel urheiluplusk.telvis.fi Nelonen Pro 1 - ##channel urho.telvis.fi Urho TV ##channel vh1-classic.musiikki.telkku.com VH1 Classic ##channel vh1.musiikki.telkku.com VH1 - ##channel vh1.telvis.fi VH1 - ##channel viasatactionhd.telvis.fi Viasat Film Action HD - ##channel viasatclassichd.telvis.fi Viasat Classic HD - ##channel viasatexplorer.telvis.fi Viasat Explorer ##channel viasat-explore.viasat-kulta.telkku.com Viasat Explore ##channel viasat-film-action.elokuvat.telkku.com Viasat Film Action - ##channel viasatfilmaction.telvis.fi Viasat Film Action - ##channel viasatfilmclassi.telvis.fi Viasat Film Classic ##channel viasat-film-comedy.elokuvat.telkku.com Viasat Film Comedy - ##channel viasatfilmdrama.telvis.fi Viasat Drama ##channel viasat-film.elokuvat.telkku.com Viasat Film Premiere ##channel viasat-film-family.elokuvat.telkku.com Viasat Film Family - ##channel viasatfilmfamily.telvis.fi Viasat Film Family ##channel viasat-film-hits.viasat-kulta.telkku.com Viasat Film Hits - ##channel viasatfilmnordic.telvis.fi Viasat Film Nordic - ##channel viasatfilm.telvis.fi Viasat Film - ##channel viasatgolf.telvis.fi Viasat Golf ##channel viasat-golf.urheilu.telkku.com Viasat Golf - ##channel viasathistory.telvis.fi Viasat History ##channel viasat-history.viasat-kulta.telkku.com Viasat History ##channel viasat-hockey-finland.urheilu.telkku.com Viasat Urheilu HD - ##channel viasathockey.telvis.fi Viasat Hockey ##channel viasat-hockey.urheilu.telkku.com Viasat Hockey ##channel viasat-jaakiekko-hd.urheilu.telkku.com Viasat Jääkiekko HD ##channel viasat-jalkapallo-hd.urheilu.telkku.com Viasat Jalkapallo HD ##channel viasat-nature-crime.viasat-kulta.telkku.com Viasat Nature/Crime - ##channel viasatnaturecrim.telvis.fi Viasat Nature/Crime - ##channel viasatnordichd.telvis.fi Viasat Film Nordic HD - ##channel viasatsport1.telvis.fi Viasat Sport ##channel viasat-sport-premium-hd.urheilu.telkku.com Viasat Sport Premium HD ##channel viasat-sport.urheilu.telkku.com Viasat Sport --- 151,194 ---- *************** *** 329,333 **** #channel yle-teema.peruskanavat.telkku.com Yle Teema #channel yle-teema.sv.yle.fi Yle Teema - #channel yleteema.telvis.fi YLE Teema channel yle-tv1.fi.yle.fi Yle TV1 channel yle-tv1.peruskanavat.telkku.com Yle TV1 --- 203,206 ---- *************** *** 336,340 **** channel yle-tv2.peruskanavat.telkku.com Yle TV2 channel yle-tv2.sv.yle.fi Yle TV2 - ##channel zonereality.telvis.fi Zone Reality # Title name mappings --- 209,212 ---- |
|
From: Gary B. <gt...@us...> - 2017-06-19 16:15:31
|
Update of /cvsroot/xmltv/xmltv/grab/zz_sdjson_sqlite In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23098/grab/zz_sdjson_sqlite Modified Files: tv_grab_zz_sdjson_sqlite Log Message: Sync grabber with upstream master Index: tv_grab_zz_sdjson_sqlite =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tv_grab_zz_sdjson_sqlite 26 Sep 2016 15:39:19 -0000 1.3 --- tv_grab_zz_sdjson_sqlite 19 Jun 2017 16:15:28 -0000 1.4 *************** *** 3,7 **** # tv_grab_zz_sdjson_sqlite # ! # Copyright (c) 2016 Gary Buhrmaster <gar...@gm...> # # This code is distributed under the GNU General Public License v2 (GPLv2) --- 3,7 ---- # tv_grab_zz_sdjson_sqlite # ! # Copyright (c) 2016, 2017 Gary Buhrmaster <gar...@gm...> # [...3030 lines suppressed...] my $responseContent = $response->decoded_content(); --- 7040,7044 ---- print (STDERR "DEBUG: HTTP response:\n" . Data::Dumper->new([$response])->Pad('DEBUG: ')->Useqq(1)->Dump) if ($self->{'Debug'}); ! my $responseCode = $response->code(); my $responseContent = $response->decoded_content(); *************** *** 6560,6564 **** { print (STDERR "DEBUG: (re)using current token\n") if ($self->{'Debug'}); ! $return = $self->{'_Token'}; print (STDERR "DEBUG: Returning from " . (caller(0))[3] . " with: \n" . Data::Dumper->new([$return])->Pad('DEBUG: ')->Useqq(1)->Dump) if ($self->{'Debug'}); return $return; --- 7159,7163 ---- { print (STDERR "DEBUG: (re)using current token\n") if ($self->{'Debug'}); ! $return = $self->{'_Token'}; print (STDERR "DEBUG: Returning from " . (caller(0))[3] . " with: \n" . Data::Dumper->new([$return])->Pad('DEBUG: ')->Useqq(1)->Dump) if ($self->{'Debug'}); return $return; |
|
From: Geoff <bil...@us...> - 2017-05-23 12:51:35
|
Update of /cvsroot/xmltv/xmltv/filter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4778 Modified Files: tv_imdb Log Message: Fix bug where write_programme breaks when film not in database Index: tv_imdb =================================================================== RCS file: /cvsroot/xmltv/xmltv/filter/tv_imdb,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** tv_imdb 12 Jul 2015 00:46:37 -0000 1.35 --- tv_imdb 23 May 2017 12:51:33 -0000 1.36 *************** *** 398,405 **** # IMDB::augmentProgram does not re-encode the data it adds, so the output file has invalid characters (bug #440). ! my $orig_prog; if (lc($encoding) ne 'iso-8859-1') { # decode the incoming programme - $orig_prog = $prog; $prog = XMLTV::Data::Recursive::Encode->decode($encoding, $prog); } --- 398,404 ---- # IMDB::augmentProgram does not re-encode the data it adds, so the output file has invalid characters (bug #440). ! my $orig_prog = $prog; if (lc($encoding) ne 'iso-8859-1') { # decode the incoming programme $prog = XMLTV::Data::Recursive::Encode->decode($encoding, $prog); } |
|
From: Nick M. <kno...@us...> - 2017-03-09 10:05:37
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3107 Modified Files: MANIFEST Log Message: Remove tv_grab_sd_json from MANIFEST Index: MANIFEST =================================================================== RCS file: /cvsroot/xmltv/xmltv/MANIFEST,v retrieving revision 1.206 retrieving revision 1.207 diff -C2 -d -r1.206 -r1.207 *** MANIFEST 25 Feb 2017 20:21:24 -0000 1.206 --- MANIFEST 9 Mar 2017 10:05:35 -0000 1.207 *************** *** 202,206 **** grab/re/test.conf grab/re/tv_grab_re - grab/sd_json/tv_grab_sd_json grab/se_swedb/.cvsignore grab/se_swedb/test.conf --- 202,205 ---- |
|
From: Robert E. <rm...@us...> - 2017-03-09 02:12:37
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9204 Modified Files: Makefile.PL Log Message: remove tv_grab_sd_json (renamed to zz_sdjson) Index: Makefile.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/Makefile.PL,v retrieving revision 1.469 retrieving revision 1.470 diff -C2 -d -r1.469 -r1.470 *** Makefile.PL 6 Mar 2017 14:33:39 -0000 1.469 --- Makefile.PL 9 Mar 2017 02:12:34 -0000 1.470 *************** *** 907,922 **** }, - { name => 'tv_grab_sd_json', - blurb => '$$ Grabber for schedulesDirect.org SD-JSON service (many countries)', - exes => [ 'grab/sd_json/tv_grab_sd_json' ], - prereqs => { 'DateTime' => 0, - 'Digest::SHA' => 0, - 'JSON' => 0, - 'LWP::Protocol::https' => 0, - 'LWP::UserAgent' => 0, - 'Storable' => 0, - 'Try::Tiny' => 0, }, - }, - { name => 'tv_grab_zz_sdjson', blurb => '$$ Grabber for schedulesDirect.org SD-JSON service (many countries)', --- 907,910 ---- *************** *** 932,936 **** { name => 'tv_grab_zz_sdjson_sqlite', ! blurb => '$$ Grabber for schedulesDirect.org SD-JSON service (many countries)', exes => [ 'grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite' ], prereqs => { 'Encode' => 0, --- 920,924 ---- { name => 'tv_grab_zz_sdjson_sqlite', ! blurb => '$$ Grabber for schedulesDirect.org SD-JSON service (many countries, using sqlite)', exes => [ 'grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite' ], prereqs => { 'Encode' => 0, |
|
From: Nick M. <kno...@us...> - 2017-03-06 14:33:42
|
Update of /cvsroot/xmltv/xmltv/grab/huro In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26750/grab/huro Modified Files: tv_grab_huro.in Log Message: Do not hardcode usage of JSON::XS when depending on JSON tv_grab_huro declares a runtime dependency on JSON, but hardcodes calls to JSON::XS in the actual code. JSON::XS is not declared as a build-time dependency so there is not guarantee is will be installed. Therefore, we declare a build-time dependency on JSON and change calls to use the JSON wrapper, which will use either JSON::PP or JSON::XS if available. Index: tv_grab_huro.in =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/huro/tv_grab_huro.in,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** tv_grab_huro.in 24 Jan 2017 00:44:44 -0000 1.59 --- tv_grab_huro.in 6 Mar 2017 14:33:39 -0000 1.60 *************** *** 783,787 **** $data =~ s/<\/?span[^>]{0,}>\s?//g; # remove html elements ! $json_data = (($DEFAULT_ENCODING !~ /utf\-?8/i) && ($COUNTRY eq 'hu')) ? JSON::XS->new->utf8(0)->decode(encode($DEFAULT_ENCODING,decode('utf-8', $data))) : JSON::XS->new->utf8(0)->decode($data) or die "could not fetch/parse $url (json structure)\n"; worker("base-parsing"); --- 783,787 ---- $data =~ s/<\/?span[^>]{0,}>\s?//g; # remove html elements ! $json_data = (($DEFAULT_ENCODING !~ /utf\-?8/i) && ($COUNTRY eq 'hu')) ? JSON->new->utf8(0)->decode(encode($DEFAULT_ENCODING,decode('utf-8', $data))) : JSON->new->utf8(0)->decode($data) or die "could not fetch/parse $url (json structure)\n"; worker("base-parsing"); *************** *** 1237,1241 **** binmode(STDOUT,":encoding(UTF-8)"); my $data = get_nice($url); ! my $json_data = (($DEFAULT_ENCODING !~ /utf\-?8/i) && ($COUNTRY eq 'hu')) ? JSON::XS->new->utf8(0)->decode(encode($DEFAULT_ENCODING,decode('utf-8', $data))) : JSON::XS->new->utf8(0)->decode($data) or die "could not fetch/parse $url (channel listing)"; worker("base-parsing"); --- 1237,1241 ---- binmode(STDOUT,":encoding(UTF-8)"); my $data = get_nice($url); ! my $json_data = (($DEFAULT_ENCODING !~ /utf\-?8/i) && ($COUNTRY eq 'hu')) ? JSON->new->utf8(0)->decode(encode($DEFAULT_ENCODING,decode('utf-8', $data))) : JSON->new->utf8(0)->decode($data) or die "could not fetch/parse $url (channel listing)"; worker("base-parsing"); |
|
From: Nick M. <kno...@us...> - 2017-03-06 14:33:41
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26750 Modified Files: Makefile.PL Log Message: Do not hardcode usage of JSON::XS when depending on JSON tv_grab_huro declares a runtime dependency on JSON, but hardcodes calls to JSON::XS in the actual code. JSON::XS is not declared as a build-time dependency so there is not guarantee is will be installed. Therefore, we declare a build-time dependency on JSON and change calls to use the JSON wrapper, which will use either JSON::PP or JSON::XS if available. Index: Makefile.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/Makefile.PL,v retrieving revision 1.468 retrieving revision 1.469 diff -C2 -d -r1.468 -r1.469 *** Makefile.PL 6 Mar 2017 12:55:16 -0000 1.468 --- Makefile.PL 6 Mar 2017 14:33:39 -0000 1.469 *************** *** 543,547 **** => [ 'grab/huro/tv_grab_huro.in' ] ], grab_need_share => [ 'huro' ], ! prereqs => { 'HTML::TreeBuilder' => 0 }, }, --- 543,548 ---- => [ 'grab/huro/tv_grab_huro.in' ] ], grab_need_share => [ 'huro' ], ! prereqs => { 'HTML::TreeBuilder' => 0, ! 'JSON' => 0, }, }, |
|
From: Nick M. <kno...@us...> - 2017-03-06 12:55:18
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21123 Modified Files: Makefile.PL Log Message: Allow building on Perl versions 5.24.1+ Perl versions 5.24.1+ no longer include '.' in @INC. However, we need access to XMLTV::Ask::Term at configuration time, so provide relative path to this library. Index: Makefile.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/Makefile.PL,v retrieving revision 1.467 retrieving revision 1.468 diff -C2 -d -r1.467 -r1.468 *** Makefile.PL 24 Jan 2017 04:59:45 -0000 1.467 --- Makefile.PL 6 Mar 2017 12:55:16 -0000 1.468 *************** *** 252,256 **** } else { ! require 'lib/Ask/Term.pm'; *ask = \&XMLTV::Ask::Term::ask_boolean; } --- 252,256 ---- } else { ! require './lib/Ask/Term.pm'; *ask = \&XMLTV::Ask::Term::ask_boolean; } |
|
From: Nick M. <kno...@us...> - 2017-03-05 20:07:22
|
Update of /cvsroot/xmltv/xmltv/grab/eu_egon In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26889 Modified Files: test.conf Log Message: Disable einsplus.ard.de in test config (no listings data) Index: test.conf =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/eu_egon/test.conf,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** test.conf 13 Jul 2015 10:13:01 -0000 1.10 --- test.conf 5 Mar 2017 20:07:20 -0000 1.11 *************** *** 15,19 **** channel!eins-extra.ard.de channel!einsfestival.ard.de ! channel=einsplus.ard.de channel!hardbase.fm channel=hd.arte.de --- 15,19 ---- channel!eins-extra.ard.de channel!einsfestival.ard.de ! channel!einsplus.ard.de channel!hardbase.fm channel=hd.arte.de |
|
From: Nick M. <kno...@us...> - 2017-03-05 20:05:43
|
Update of /cvsroot/xmltv/xmltv/grab/is In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26223 Modified Files: test.conf Log Message: Disable some working channels to speed up testing Index: test.conf =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/is/test.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test.conf 5 Mar 2017 20:03:52 -0000 1.5 --- test.conf 5 Mar 2017 20:05:41 -0000 1.6 *************** *** 2,14 **** #channel S1 Skjár 1 channel ST2 Stöð 2 ! channel ST2BIO Stöð 2 bÃó # channel ST2EXTRA Stöð 2 Extra channel ST2SPORT Stöð 2 Sport ! channel ST2SPORT2 Stöð 2 Sport 2 channel plus.RUV RÃkissjónvarpið+ #channel plus.S1 Skjár 1+ channel plus.ST2 Stöð 2+ ! channel plus.ST2BIO Stöð 2 bÃó+ # channel plus.ST2EXTRA Stöð 2 Extra+ channel plus.ST2SPORT Stöð 2 Sport+ ! channel plus.ST2SPORT2 Stöð 2 Sport 2+ --- 2,14 ---- #channel S1 Skjár 1 channel ST2 Stöð 2 ! # channel ST2BIO Stöð 2 bÃó # channel ST2EXTRA Stöð 2 Extra channel ST2SPORT Stöð 2 Sport ! # channel ST2SPORT2 Stöð 2 Sport 2 channel plus.RUV RÃkissjónvarpið+ #channel plus.S1 Skjár 1+ channel plus.ST2 Stöð 2+ ! # channel plus.ST2BIO Stöð 2 bÃó+ # channel plus.ST2EXTRA Stöð 2 Extra+ channel plus.ST2SPORT Stöð 2 Sport+ ! # channel plus.ST2SPORT2 Stöð 2 Sport 2+ |
|
From: Nick M. <kno...@us...> - 2017-03-05 20:03:54
|
Update of /cvsroot/xmltv/xmltv/grab/is In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25334 Modified Files: test.conf Log Message: Disable channels not providing any listings data Index: test.conf =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/is/test.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test.conf 12 Apr 2010 15:01:49 -0000 1.4 --- test.conf 5 Mar 2017 20:03:52 -0000 1.5 *************** *** 3,7 **** channel ST2 Stöð 2 channel ST2BIO Stöð 2 bÃó ! channel ST2EXTRA Stöð 2 Extra channel ST2SPORT Stöð 2 Sport channel ST2SPORT2 Stöð 2 Sport 2 --- 3,7 ---- channel ST2 Stöð 2 channel ST2BIO Stöð 2 bÃó ! # channel ST2EXTRA Stöð 2 Extra channel ST2SPORT Stöð 2 Sport channel ST2SPORT2 Stöð 2 Sport 2 *************** *** 10,14 **** channel plus.ST2 Stöð 2+ channel plus.ST2BIO Stöð 2 bÃó+ ! channel plus.ST2EXTRA Stöð 2 Extra+ channel plus.ST2SPORT Stöð 2 Sport+ channel plus.ST2SPORT2 Stöð 2 Sport 2+ --- 10,14 ---- channel plus.ST2 Stöð 2+ channel plus.ST2BIO Stöð 2 bÃó+ ! # channel plus.ST2EXTRA Stöð 2 Extra+ channel plus.ST2SPORT Stöð 2 Sport+ channel plus.ST2SPORT2 Stöð 2 Sport 2+ |
|
From: Nick M. <kno...@us...> - 2017-02-25 20:21:26
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16954 Modified Files: MANIFEST Added Files: .dockerignore .Dockerfile.centos-6 .Dockerfile.centos-7 .Dockerfile.debian-jessie .Dockerfile.debian-stretch .Dockerfile.debian-sid .Dockerfile.fedora-24 .Dockerfile.fedora-25 .Dockerfile.ubuntu-trusty .Dockerfile.ubuntu-xenial .Dockerfile.ubuntu-yakkety .travis.yml Log Message: Add support for build testing XMLTV using Travis CI Initial support tests builds on the following Linux distributions when XMLTV source is hosted on Github: - CentOS 6 - CentOS 7 - Debian 8 "Jessie" - Debian 9 "Stretch" - Debian Sid - Fedora 24 - Fedora 25 - Ubuntu 14.04 LTS "Trusty Tahr" - Ubuntu 16.04 LTS "Xenial Xerus" - Ubuntu 16.10 "Yakkety Yak" --- NEW FILE: .Dockerfile.fedora-25 --- # Dockerfile to generate Fedora 25 build container for XMLTV FROM fedora:25 MAINTAINER Nick Morrott <kno...@gm...> RUN yum -y install make RUN yum -y install perl-Archive-Zip \ perl-Carp \ perl-CGI \ perl-Data-Dump \ perl-Data-Dumper \ perl-Date-Manip \ perl-DateTime \ perl-DateTime-Format-ISO8601 \ perl-DateTime-Format-SQLite \ perl-DateTime-Format-Strptime \ perl-DBD-SQLite \ perl-DBI \ perl-Digest-SHA \ perl-Encode \ perl-Env \ perl-Exporter \ perl-ExtUtils-MakeMaker \ perl-File-HomeDir \ perl-File-Path \ perl-File-Slurp \ perl-File-Temp \ perl-File-Which \ perl-Getopt-Long \ perl-HTML-Form \ perl-HTML-Parser \ perl-HTML-TableExtract \ perl-HTML-Tree \ perl-HTTP-Cache-Transparent \ perl-HTTP-Cookies \ perl-HTTP-Message \ perl-IO-Compress \ perl-IO-stringy \ perl-JSON \ perl-JSON-PP \ perl-libwww-perl \ perl-Lingua-EN-Numbers-Ordinate \ perl-Lingua-Preferred \ perl-List-MoreUtils \ perl-Log-TraceMessages \ perl-LWP-Protocol-https \ perl-Memoize \ perl-Parse-RecDescent \ perl-PathTools \ perl-PathTools \ perl-Pod-Usage \ perl-Scalar-List-Utils \ perl-SOAP-Lite \ perl-Term-ProgressBar \ perl-TermReadKey \ perl-Text-Iconv \ perl-TimeDate \ perl-Time-HiRes \ perl-Time-Local \ perl-Time-Piece \ perl-Tk \ perl-Tk-TableMatrix \ perl-Try-Tiny \ perl-Unicode-String \ perl-URI \ perl-WWW-Mechanize \ perl-XML-DOM \ perl-XML-LibXML \ perl-XML-LibXSLT \ perl-XML-Parser \ perl-XML-Simple \ perl-XML-TreePP \ perl-XML-Twig \ perl-XML-Writer --- NEW FILE: .Dockerfile.fedora-24 --- # Dockerfile to generate Fedora 24 build container for XMLTV FROM fedora:24 MAINTAINER Nick Morrott <kno...@gm...> RUN yum -y install make RUN yum -y install perl-Archive-Zip \ perl-Carp \ perl-CGI \ perl-Data-Dump \ perl-Data-Dumper \ perl-Date-Manip \ perl-DateTime \ perl-DateTime-Format-ISO8601 \ perl-DateTime-Format-SQLite \ perl-DateTime-Format-Strptime \ perl-DBD-SQLite \ perl-DBI \ perl-Digest-SHA \ perl-Encode \ perl-Env \ perl-Exporter \ perl-ExtUtils-MakeMaker \ perl-File-HomeDir \ perl-File-Path \ perl-File-Slurp \ perl-File-Temp \ perl-File-Which \ perl-Getopt-Long \ perl-HTML-Form \ perl-HTML-Parser \ perl-HTML-TableExtract \ perl-HTML-Tree \ perl-HTTP-Cache-Transparent \ perl-HTTP-Cookies \ perl-HTTP-Message \ perl-IO-Compress \ perl-IO-stringy \ perl-JSON \ perl-JSON-PP \ perl-libwww-perl \ perl-Lingua-EN-Numbers-Ordinate \ perl-Lingua-Preferred \ perl-List-MoreUtils \ perl-Log-TraceMessages \ perl-LWP-Protocol-https \ perl-Memoize \ perl-Parse-RecDescent \ perl-PathTools \ perl-PathTools \ perl-Pod-Usage \ perl-Scalar-List-Utils \ perl-SOAP-Lite \ perl-Term-ProgressBar \ perl-TermReadKey \ perl-Text-Iconv \ perl-TimeDate \ perl-Time-HiRes \ perl-Time-Local \ perl-Time-Piece \ perl-Tk \ perl-Tk-TableMatrix \ perl-Try-Tiny \ perl-Unicode-String \ perl-URI \ perl-WWW-Mechanize \ perl-XML-DOM \ perl-XML-LibXML \ perl-XML-LibXSLT \ perl-XML-Parser \ perl-XML-Simple \ perl-XML-TreePP \ perl-XML-Twig \ perl-XML-Writer --- NEW FILE: .Dockerfile.centos-7 --- # Dockerfile to generate CentOS 7 build container for XMLTV FROM centos:7 MAINTAINER Nick Morrott <kno...@gm...> RUN yum -y install epel-release RUN yum -y install make RUN yum -y install perl-Archive-Zip \ perl-Carp \ perl-CGI \ perl-Data-Dump \ perl-Data-Dumper \ perl-Date-Manip \ perl-DateTime \ perl-DateTime-Format-ISO8601 \ perl-DateTime-Format-SQLite \ perl-DateTime-Format-Strptime \ perl-DBD-SQLite \ perl-DBI \ perl-Digest-SHA \ perl-Encode \ perl-Env \ perl-Exporter \ perl-ExtUtils-MakeMaker \ perl-File-HomeDir \ perl-File-Path \ perl-File-Slurp \ perl-File-Temp \ perl-File-Which \ perl-Getopt-Long \ perl-HTML-Form \ perl-HTML-Parser \ perl-HTML-TableExtract \ perl-HTML-Tree \ perl-HTTP-Cache-Transparent \ perl-HTTP-Cookies \ perl-HTTP-Message \ perl-IO-Compress \ perl-IO-stringy \ perl-JSON \ perl-JSON-PP \ perl-libwww-perl \ perl-Lingua-EN-Numbers-Ordinate \ perl-Lingua-Preferred \ perl-List-MoreUtils \ perl-Log-TraceMessages \ perl-LWP-Protocol-https \ perl-Parse-RecDescent \ perl-PathTools \ perl-Pod-Usage \ perl-Scalar-List-Utils \ perl-SOAP-Lite \ perl-Term-ProgressBar \ perl-TermReadKey \ perl-Text-Iconv \ perl-TimeDate \ perl-Time-HiRes \ perl-Time-Local \ perl-Time-Piece \ perl-Tk \ perl-Tk-TableMatrix \ perl-Try-Tiny \ perl-Unicode-String \ perl-URI \ perl-WWW-Mechanize \ perl-XML-DOM \ perl-XML-LibXML \ perl-XML-LibXSLT \ perl-XML-Parser \ perl-XML-Simple \ perl-XML-TreePP \ perl-XML-Twig \ perl-XML-Writer --- NEW FILE: .Dockerfile.centos-6 --- # Dockerfile to generate CentOS 6 build container for XMLTV FROM centos:6 MAINTAINER Nick Morrott <kno...@gm...> RUN yum -y install epel-release RUN yum -y install make RUN yum -y install perl-Archive-Zip \ perl-CGI \ perl-Crypt-SSLeay \ perl-Data-Dump \ perl-Date-Manip \ perl-DateTime \ perl-DateTime-Format-ISO8601 \ perl-DateTime-Format-SQLite \ perl-DateTime-Format-Strptime \ perl-DBD-SQLite \ perl-DBI \ perl-Digest-SHA \ perl-ExtUtils-MakeMaker \ perl-File-HomeDir \ perl-File-Slurp \ perl-File-Temp \ perl-File-Which \ perl-HTML-Parser \ perl-HTML-TableExtract \ perl-HTML-Tree \ perl-HTTP-Cache-Transparent \ perl-IO-Compress-Zlib \ perl-IO-stringy \ perl-JSON \ perl-libwww-perl \ perl-Lingua-EN-Numbers-Ordinate \ perl-Lingua-Preferred \ perl-List-MoreUtils \ perl-Log-TraceMessages \ perl-Parse-RecDescent \ perl-SOAP-Lite \ perl-Term-ProgressBar \ perl-TermReadKey \ perl-Text-Iconv \ perl-TimeDate \ perl-Time-HiRes \ perl-Time-Piece \ perl-Tk \ perl-Tk-TableMatrix \ perl-Try-Tiny \ perl-Unicode-String \ perl-URI \ perl-WWW-Mechanize \ perl-XML-DOM \ perl-XML-LibXML \ perl-XML-LibXSLT \ perl-XML-Parser \ perl-XML-Simple \ perl-XML-TreePP \ perl-XML-Twig \ perl-XML-Writer --- NEW FILE: .dockerignore --- .git .dockerignore .Dockerfile* Index: MANIFEST =================================================================== RCS file: /cvsroot/xmltv/xmltv/MANIFEST,v retrieving revision 1.205 retrieving revision 1.206 diff -C2 -d -r1.205 -r1.206 *** MANIFEST 24 Feb 2017 20:16:28 -0000 1.205 --- MANIFEST 25 Feb 2017 20:21:24 -0000 1.206 *************** *** 1,4 **** --- 1,16 ---- .cvsignore + .dockerignore .gitignore + .Dockerfile.centos-6 + .Dockerfile.centos-7 + .Dockerfile.debian-jessie + .Dockerfile.debian-sid + .Dockerfile.debian-stretch + .Dockerfile.fedora-24 + .Dockerfile.fedora-25 + .Dockerfile.ubuntu-trusty + .Dockerfile.ubuntu-xenial + .Dockerfile.ubuntu-yakkety + .travis.yml COPYING MANIFEST --- NEW FILE: .Dockerfile.ubuntu-xenial --- # Dockerfile to generate Ubuntu 16.04 LTS "Xenial Xerus" build container for XMLTV FROM ubuntu:xenial MAINTAINER Nick Morrott <kno...@gm...> RUN apt-get update RUN apt-get -y install make \ --no-install-recommends RUN apt-get -y install libarchive-zip-perl \ libcgi-pm-perl \ libdata-dump-perl \ libdate-manip-perl \ libdatetime-format-iso8601-perl \ libdatetime-format-sqlite-perl \ libdatetime-format-strptime-perl \ libdatetime-perl \ libdatetime-timezone-perl \ libdbd-sqlite3-perl \ libdbi-perl \ libfile-chdir-perl \ libfile-homedir-perl \ libfile-slurp-perl \ libfile-which-perl \ libhtml-parser-perl \ libhtml-tableextract-perl \ libhtml-tree-perl \ libhttp-cache-transparent-perl \ libio-compress-perl \ libio-stringy-perl \ libjson-perl \ liblingua-en-numbers-ordinate-perl \ liblingua-preferred-perl \ liblinux-dvb-perl \ liblist-moreutils-perl \ liblog-tracemessages-perl \ liblwp-protocol-https-perl \ libparse-recdescent-perl \ libsoap-lite-perl \ libterm-progressbar-perl \ libterm-readkey-perl \ libtext-bidi-perl \ libtext-iconv-perl \ libtext-kakasi-perl \ libtk-tablematrix-perl \ libtry-tiny-perl \ libunicode-string-perl \ libwww-mechanize-perl \ libwww-perl \ libxml-dom-perl \ libxml-libxml-perl \ libxml-libxslt-perl \ libxml-parser-perl \ libxml-simple-perl \ libxml-treepp-perl \ libxml-twig-perl \ libxml-writer-perl \ perl-tk \ --no-install-recommends --- NEW FILE: .Dockerfile.debian-stretch --- # Dockerfile to generate Debian 9 "Stretch" build container for XMLTV FROM debian:stretch MAINTAINER Nick Morrott <kno...@gm...> RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list RUN apt-get update RUN apt-get -y install make \ --no-install-recommends RUN apt-get -y install libarchive-zip-perl \ libcgi-pm-perl \ libdata-dump-perl \ libdate-manip-perl \ libdatetime-format-iso8601-perl \ libdatetime-format-sqlite-perl \ libdatetime-format-strptime-perl \ libdatetime-perl \ libdatetime-timezone-perl \ libdbd-sqlite3-perl \ libdbi-perl \ libfile-chdir-perl \ libfile-homedir-perl \ libfile-slurp-perl \ libfile-which-perl \ libhtml-parser-perl \ libhtml-tableextract-perl \ libhtml-tree-perl \ libhttp-cache-transparent-perl \ libio-compress-perl \ libio-stringy-perl \ libjson-perl \ liblingua-en-numbers-ordinate-perl \ liblingua-preferred-perl \ liblinux-dvb-perl \ liblist-moreutils-perl \ liblog-tracemessages-perl \ liblwp-protocol-https-perl \ libparse-recdescent-perl \ libsoap-lite-perl \ libterm-progressbar-perl \ libterm-readkey-perl \ libtext-bidi-perl \ libtext-iconv-perl \ libtext-kakasi-perl \ libtk-tablematrix-perl \ libtry-tiny-perl \ libunicode-string-perl \ libwww-mechanize-perl \ libwww-perl \ libxml-dom-perl \ libxml-libxml-perl \ libxml-libxslt-perl \ libxml-parser-perl \ libxml-simple-perl \ libxml-treepp-perl \ libxml-twig-perl \ libxml-writer-perl \ perl-tk \ --no-install-recommends --- NEW FILE: .Dockerfile.debian-jessie --- # Dockerfile to generate Debian 8 "Jessie" build container for XMLTV FROM debian:jessie MAINTAINER Nick Morrott <kno...@gm...> RUN echo "deb http://deb.debian.org/debian jessie main" > /etc/apt/sources.list RUN apt-get update RUN apt-get -y install make \ --no-install-recommends RUN apt-get -y install libarchive-zip-perl \ libcgi-pm-perl \ libdata-dump-perl \ libdate-manip-perl \ libdatetime-format-iso8601-perl \ libdatetime-format-sqlite-perl \ libdatetime-format-strptime-perl \ libdatetime-perl \ libdatetime-timezone-perl \ libdbd-sqlite3-perl \ libdbi-perl \ libfile-chdir-perl \ libfile-homedir-perl \ libfile-slurp-perl \ libfile-which-perl \ libhtml-parser-perl \ libhtml-tableextract-perl \ libhtml-tree-perl \ libhttp-cache-transparent-perl \ libio-compress-perl \ libio-stringy-perl \ libjson-perl \ liblingua-en-numbers-ordinate-perl \ liblingua-preferred-perl \ liblinux-dvb-perl \ liblist-moreutils-perl \ liblog-tracemessages-perl \ liblwp-protocol-https-perl \ libparse-recdescent-perl \ libsoap-lite-perl \ libterm-progressbar-perl \ libterm-readkey-perl \ libtext-bidi-perl \ libtext-iconv-perl \ libtext-kakasi-perl \ libtk-tablematrix-perl \ libtry-tiny-perl \ libunicode-string-perl \ libwww-mechanize-perl \ libwww-perl \ libxml-dom-perl \ libxml-libxml-perl \ libxml-libxslt-perl \ libxml-parser-perl \ libxml-simple-perl \ libxml-treepp-perl \ libxml-twig-perl \ libxml-writer-perl \ perl-tk \ --no-install-recommends --- NEW FILE: .Dockerfile.debian-sid --- # Dockerfile to generate Debian Sid build container for XMLTV FROM debian:sid MAINTAINER Nick Morrott <kno...@gm...> RUN echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list RUN apt-get update RUN apt-get -y install make \ --no-install-recommends RUN apt-get -y install libarchive-zip-perl \ libcgi-pm-perl \ libdata-dump-perl \ libdate-manip-perl \ libdatetime-format-iso8601-perl \ libdatetime-format-sqlite-perl \ libdatetime-format-strptime-perl \ libdatetime-perl \ libdatetime-timezone-perl \ libdbd-sqlite3-perl \ libdbi-perl \ libfile-chdir-perl \ libfile-homedir-perl \ libfile-slurp-perl \ libfile-which-perl \ libhtml-parser-perl \ libhtml-tableextract-perl \ libhtml-tree-perl \ libhttp-cache-transparent-perl \ libio-stringy-perl \ libjson-perl \ liblingua-en-numbers-ordinate-perl \ liblingua-preferred-perl \ liblinux-dvb-perl \ liblist-moreutils-perl \ liblog-tracemessages-perl \ liblwp-protocol-https-perl \ libparse-recdescent-perl \ libsoap-lite-perl \ libterm-progressbar-perl \ libterm-readkey-perl \ libtext-bidi-perl \ libtext-iconv-perl \ libtext-kakasi-perl \ libtk-tablematrix-perl \ libtry-tiny-perl \ libunicode-string-perl \ libwww-mechanize-perl \ libwww-perl \ libxml-dom-perl \ libxml-libxml-perl \ libxml-libxslt-perl \ libxml-parser-perl \ libxml-simple-perl \ libxml-treepp-perl \ libxml-twig-perl \ libxml-writer-perl \ perl-tk \ --no-install-recommends --- NEW FILE: .travis.yml --- --- notifications: email: recipients: - kno...@gm... on_success: always on_failure: always sudo: required language: bash env: - release: debian_8 distro: debian codename: jessie - release: debian_9 distro: debian codename: stretch - release: debian_sid distro: debian codename: sid - release: ubuntu_1404_lts distro: ubuntu codename: trusty - release: ubuntu_1604_lts distro: ubuntu codename: xenial - release: ubuntu_1610 distro: ubuntu codename: yakkety - release: centos_6 distro: centos codename: 6 - release: centos_7 distro: centos codename: 7 - release: fedora_24 distro: fedora codename: 24 - release: fedora_25 distro: fedora codename: 25 branches: only: - master services: - docker before_install: - env | sort - sudo apt-get update -qq install: - sudo docker build -f .Dockerfile.${distro}-${codename} -t xmltv-build-deps/${distro}-${codename} . - sudo docker run -t --detach -v $TRAVIS_BUILD_DIR:/src --name xmltv xmltv-build-deps/${distro}-${codename} /bin/bash - sudo docker ps -a script: - docker exec -it xmltv /bin/bash -c "cd /src && perl Makefile.PL --yes" - docker exec -it xmltv /bin/bash -c "cd /src && make" - docker exec -it xmltv /bin/bash -c "cd /src && make test" --- NEW FILE: .Dockerfile.ubuntu-trusty --- # Dockerfile to generate Ubuntu 14.04 LTS "Trusty Tahr" build container for XMLTV FROM ubuntu:trusty MAINTAINER Nick Morrott <kno...@gm...> RUN apt-get update RUN apt-get -y install make \ --no-install-recommends RUN apt-get -y install libarchive-zip-perl \ libcgi-pm-perl \ libdata-dump-perl \ libdate-manip-perl \ libdatetime-format-iso8601-perl \ libdatetime-format-sqlite-perl \ libdatetime-format-strptime-perl \ libdatetime-perl \ libdatetime-timezone-perl \ libdbd-sqlite3-perl \ libdbi-perl \ libfile-chdir-perl \ libfile-homedir-perl \ libfile-slurp-perl \ libfile-which-perl \ libhtml-parser-perl \ libhtml-tableextract-perl \ libhtml-tree-perl \ libhttp-cache-transparent-perl \ libio-compress-perl \ libio-stringy-perl \ libjson-perl \ liblingua-en-numbers-ordinate-perl \ liblingua-preferred-perl \ liblinux-dvb-perl \ liblist-moreutils-perl \ liblog-tracemessages-perl \ liblwp-protocol-https-perl \ libparse-recdescent-perl \ libsoap-lite-perl \ libterm-progressbar-perl \ libterm-readkey-perl \ libtext-bidi-perl \ libtext-iconv-perl \ libtext-kakasi-perl \ libtk-tablematrix-perl \ libtry-tiny-perl \ libunicode-string-perl \ libwww-mechanize-perl \ libwww-perl \ libxml-dom-perl \ libxml-libxml-perl \ libxml-libxslt-perl \ libxml-parser-perl \ libxml-simple-perl \ libxml-treepp-perl \ libxml-twig-perl \ libxml-writer-perl \ perl-tk \ --no-install-recommends --- NEW FILE: .Dockerfile.ubuntu-yakkety --- # Dockerfile to generate Ubuntu 16.10 "Yakkety Yak" build container for XMLTV FROM ubuntu:yakkety MAINTAINER Nick Morrott <kno...@gm...> RUN apt-get update RUN apt-get -y install make \ --no-install-recommends RUN apt-get -y install libarchive-zip-perl \ libcgi-pm-perl \ libdata-dump-perl \ libdate-manip-perl \ libdatetime-format-iso8601-perl \ libdatetime-format-sqlite-perl \ libdatetime-format-strptime-perl \ libdatetime-perl \ libdatetime-timezone-perl \ libdbd-sqlite3-perl \ libdbi-perl \ libfile-chdir-perl \ libfile-homedir-perl \ libfile-slurp-perl \ libfile-which-perl \ libhtml-parser-perl \ libhtml-tableextract-perl \ libhtml-tree-perl \ libhttp-cache-transparent-perl \ libio-compress-perl \ libio-stringy-perl \ libjson-perl \ liblingua-en-numbers-ordinate-perl \ liblingua-preferred-perl \ liblinux-dvb-perl \ liblist-moreutils-perl \ liblog-tracemessages-perl \ liblwp-protocol-https-perl \ libparse-recdescent-perl \ libsoap-lite-perl \ libterm-progressbar-perl \ libterm-readkey-perl \ libtext-bidi-perl \ libtext-iconv-perl \ libtext-kakasi-perl \ libtk-tablematrix-perl \ libtry-tiny-perl \ libunicode-string-perl \ libwww-mechanize-perl \ libwww-perl \ libxml-dom-perl \ libxml-libxml-perl \ libxml-libxslt-perl \ libxml-parser-perl \ libxml-simple-perl \ libxml-treepp-perl \ libxml-twig-perl \ libxml-writer-perl \ perl-tk \ --no-install-recommends |
|
From: Nick M. <kno...@us...> - 2017-02-24 22:36:00
|
Update of /cvsroot/xmltv/xmltv/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7075/lib Modified Files: XMLTV.pm.PL Log Message: Allow building on Perl versions 5.24.1+ Perl versions 5.24.1+ no longer include '.' in @INC. However, we need access to some libraries included in the XMLTV source at build time so "use lib '.'" for these specific instances. Index: XMLTV.pm.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/lib/XMLTV.pm.PL,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** XMLTV.pm.PL 3 Jun 2006 19:26:34 -0000 1.5 --- XMLTV.pm.PL 24 Feb 2017 22:35:58 -0000 1.6 *************** *** 10,14 **** --- 10,18 ---- my $out = shift @ARGV; die "no output file given" if not defined $out; my $in = 'lib/XMLTV.pm.in'; + + # Perl 5.24.1+ does not include '.' in @INC but we need some libs during build + use lib '.'; require $in; + open(IN_FH, $in) or die "cannot read $in: $!"; die if not @XMLTV::Channel_Handlers; die if not @XMLTV::Programme_Handlers; |
|
From: Nick M. <kno...@us...> - 2017-02-24 20:16:30
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17837 Modified Files: MANIFEST Log Message: Correct MANIFEST entry for tv_grab_zz_sdjson Index: MANIFEST =================================================================== RCS file: /cvsroot/xmltv/xmltv/MANIFEST,v retrieving revision 1.204 retrieving revision 1.205 diff -C2 -d -r1.204 -r1.205 *** MANIFEST 22 Jan 2017 20:38:18 -0000 1.204 --- MANIFEST 24 Feb 2017 20:16:28 -0000 1.205 *************** *** 246,250 **** grab/za/test.conf grab/za/tv_grab_za ! grab/zz_sdjson/tv_grab_sd_json grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite lib/.cvsignore --- 246,250 ---- grab/za/test.conf grab/za/tv_grab_za ! grab/zz_sdjson/tv_grab_zz_sdjson grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite lib/.cvsignore |
|
From: Geoff <bil...@us...> - 2017-02-16 15:36:01
|
Update of /cvsroot/xmltv/xmltv/grab In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3210 Modified Files: Get_nice.pm Log Message: Fix line endings from last commit :-( Index: Get_nice.pm =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/Get_nice.pm,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Get_nice.pm 16 Feb 2017 13:20:08 -0000 1.35 --- Get_nice.pm 16 Feb 2017 15:35:59 -0000 1.36 *************** *** 36,40 **** # 0.005066 : support unknown tags in HTML::TreeBuilder ($IncludeUnknownTags) # 0.005067 : new method post_nice_json() ! our $VERSION = 0.005067; use base 'Exporter'; --- 36,41 ---- # 0.005066 : support unknown tags in HTML::TreeBuilder ($IncludeUnknownTags) # 0.005067 : new method post_nice_json() ! # 0.005070 : skip get_nice sleep for cached pages ! our $VERSION = 0.005070; use base 'Exporter'; |
|
From: Geoff <bil...@us...> - 2017-02-16 13:20:10
|
Update of /cvsroot/xmltv/xmltv/grab In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27614 Modified Files: Get_nice.pm Log Message: Skip get_nice sleep for cached pages (credit Mike Parker) (patches #99) Index: Get_nice.pm =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/Get_nice.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Get_nice.pm 11 Aug 2015 09:16:09 -0000 1.34 --- Get_nice.pm 16 Feb 2017 13:20:08 -0000 1.35 *************** *** 131,138 **** my $last_get_time; sub get_nice_aux( $ ) { my $url = shift; ! if (defined $last_get_time) { # A page has already been retrieved recently. See if we need # to sleep for a while before getting the next page - being --- 131,139 ---- my $last_get_time; + my $last_get_from_cache; sub get_nice_aux( $ ) { my $url = shift; ! if (defined $last_get_time && (defined $last_get_from_cache && !$last_get_from_cache) ) { # A page has already been retrieved recently. See if we need # to sleep for a while before getting the next page - being *************** *** 158,161 **** --- 159,165 ---- $Response = $r; + # set flag if last fetch was from cache + $last_get_from_cache = (defined $r->{'_headers'}{'x-cached'} && $r->{'_headers'}{'x-cached'} == 1); + if ($r->is_error) { # At the moment download failures seem rare, so the script dies if |
|
From: Geoff <bil...@us...> - 2017-02-16 13:03:33
|
Update of /cvsroot/xmltv/xmltv/grab/uk_tvguide In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26892 Modified Files: tv_grab_uk_tvguide Log Message: Prevent memory leak with older versions TreeBuilder (credit Mike Parker) (patches #100) Index: tv_grab_uk_tvguide =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/uk_tvguide/tv_grab_uk_tvguide,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tv_grab_uk_tvguide 22 Jan 2017 22:01:26 -0000 1.21 --- tv_grab_uk_tvguide 16 Feb 2017 13:03:31 -0000 1.22 *************** *** 273,280 **** # Fetch the page ! # my $treedetail = XMLTV::Get_nice::get_nice_tree($url); ! my $treedetail = fetch_url($url); ! ! my $showdetail = $treedetail; # $showdetail->dump; --- 273,278 ---- # Fetch the page ! # my $showdetail = XMLTV::Get_nice::get_nice_tree($url); ! my $showdetail = fetch_url($url); # $showdetail->dump; *************** *** 415,418 **** --- 413,418 ---- } # end showdetail + + $showdetail->delete(); } *************** *** 633,636 **** --- 633,638 ---- } + + $tree->delete(); $bar->update if defined $bar; } |
|
From: Robert E. <rm...@us...> - 2017-01-24 04:59:48
|
Update of /cvsroot/xmltv/xmltv In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28092 Modified Files: Makefile.PL README Log Message: Prepare for 0.5.69 release Index: README =================================================================== RCS file: /cvsroot/xmltv/xmltv/README,v retrieving revision 1.180 retrieving revision 1.181 diff -C2 -d -r1.180 -r1.181 *** README 2 Jun 2016 05:05:01 -0000 1.180 --- README 24 Jan 2017 04:59:45 -0000 1.181 *************** *** 1,3 **** ! XMLTV 0.5.68 Gather television listings, process them and organize your viewing. --- 1,3 ---- ! XMLTV 0.5.69 Gather television listings, process them and organize your viewing. *************** *** 8,15 **** and xmltv.dtd for documentation on the file format. ! * Major Changes in this release (0.5.68) ! tv_grab_sd_json - new grabber for ScheduleDirect.org's ! SD-JSON service ($$) includes coverage for 50+ countries And lots of other changes (see ChangeLog for details) --- 8,27 ---- and xmltv.dtd for documentation on the file format. ! * Major Changes in this release (0.5.69) ! tv_grab_hr - removed broken grabber ! tv_grab_pt - removed broken grabber ! tv_grab_uk_atlas - removed due to new target site rules ! ! tv_grab_fi - major changes, need to run configure again ! ! tv_grab_sd_json/tv_grab_zz_sdjson - major speed improvements. ! This grabber is replicated as tv_grab_zz_sdjson and will ! only be available via the new name in the next release. ! Please switch to the new name. ! ! tv_grab_zz_sdjson_sqlite - additional grabber for Schedule ! Direct's fee-based SD-JSON service. Supports 50+ ! countries. http://www.schedulesdirect.org/regions And lots of other changes (see ChangeLog for details) *************** *** 125,128 **** users list with most problems. ! -- Robert Eden, rm...@ya..., 2016-06-02 $Id$ --- 137,140 ---- users list with most problems. ! -- Robert Eden, rm...@ya..., 2017-01-23 $Id$ Index: Makefile.PL =================================================================== RCS file: /cvsroot/xmltv/xmltv/Makefile.PL,v retrieving revision 1.466 retrieving revision 1.467 diff -C2 -d -r1.466 -r1.467 *** Makefile.PL 22 Jan 2017 22:06:08 -0000 1.466 --- Makefile.PL 24 Jan 2017 04:59:45 -0000 1.467 *************** *** 69,73 **** our $VERSION; ! $VERSION = '0.5.68'; # Fragment of Makefile text to give the directory where files should --- 69,73 ---- our $VERSION; ! $VERSION = '0.5.69'; # Fragment of Makefile text to give the directory where files should |
|
From: Robert E. <rm...@us...> - 2017-01-24 00:44:47
|
Update of /cvsroot/xmltv/xmltv/grab/huro In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16444/grab/huro Modified Files: tv_grab_huro.in Log Message: apply patches from Bug 512 by nz220 Index: tv_grab_huro.in =================================================================== RCS file: /cvsroot/xmltv/xmltv/grab/huro/tv_grab_huro.in,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** tv_grab_huro.in 26 Mar 2016 14:37:22 -0000 1.58 --- tv_grab_huro.in 24 Jan 2017 00:44:44 -0000 1.59 *************** *** 122,125 **** --- 122,126 ---- #------------------------------------------------------------------------------- + use utf8; use strict; use XMLTV::Version '$Id$'; *************** *** 134,137 **** --- 135,142 ---- use IO::File; use File::Basename; + use JSON; + use Encode; + use Time::Piece (); + use Time::Seconds; use XMLTV; *************** *** 199,203 **** minute => "minut", links => "Linky" }, ! hu => { episode => "rész", minute => "perc", links => "linkek" }, --- 204,208 ---- minute => "minut", links => "Linky" }, ! hu => { episode => "rész", minute => "perc", links => "linkek" }, *************** *** 205,220 **** minute => "minute", links => "Linkuri" }, ! sk => { episode => "Epizóda", ! minute => "minút", links => "Linky" } ) ; ! sub domain(); sub xid( $ ); sub xhead(); sub process_table( $$$$ ); sub parse_short_desc ( $ ); sub get_channels( ;$ ); sub get_infourl_data( $$ ); sub add_person ( $$$ ); sub extract_episode( $ ); --- 210,261 ---- minute => "minute", links => "Linkuri" }, ! sk => { episode => "Epizóda", ! minute => "minút", links => "Linky" } ) ; ! our $DEFAULT_ENCODING = 'ISO-8859-2'; ! our $rating_baseurl = 'http://media.port-network.com/page_elements/'; ! our %AGE_LIMITS = ( # Todo: insert cz & sk translations ! 'ageLimitList-1' => [{'hu' => 'korhatárra tekintet nélkül megtekinthetÅ', 'ro' => 'AudienÅ£Ä generalÄ'}, 'nmhh_akk/mobil_35x35/0_age_icon_mobil.png'], ! 'ageLimitList-5' => [{'hu' => '16 éven aluliak számára nem ajánlott', 'ro' => 'Acest program este interzis minorilor sub 16 ani'}, 'nmhh_akk/mobil_35x35/16_age_icon_mobil.png'], ! 'ageLimitList-3' => [{'hu' => '12 éven aluliak számára a megtekintése nagykorú felügyelete mellett ajánlott', 'ro' => 'Acest program este interzis minorilor sub 12 ani'}, 'nmhh_akk/mobil_35x35/12_age_icon_mobil.png'], ! 'ageLimitList-4' => [{'hu' => '14 éven alul nem ajánlott', 'ro' => 'Acest program este interzis minorilor sub 14 ani'}, 'm_14_age_mini_pix.png'], ! 'ageLimitList-6' => [{'hu' => '18 éven aluliak számára nem ajánlott', 'ro' => 'Acest program este interzis minorilor sub 18 ani'}, 'nmhh_akk/mobil_35x35/18_age_icon_mobil.png'], ! 'ageLimitList-8' => [{'hu' => '7 éven aluliak számára nem ajánlott', 'ro' => 'Acest program este interzis minorilor sub 7 ani'}, 'm_7_age_mini_pix.png'], ! 'ageLimitList-10' => [{'hu' => '6 éven aluliak számára nem ajánlott', 'ro' => 'Acest program este interzis minorilor sub 6 ani'}, 'nmhh_akk/mobil_35x35/6_age_icon_mobil.png'], ! 'ageLimitList-2' => [{'hu' => 'szülÅi engedéllyel', 'ro' => 'Recomandat acordul pÄrinÅ£ilor'}, 'm_parental_guidance_mini_pix_hu.png'], ! 'ageLimitList-7' => [{'hu' => '15 éven aluliak számára nem ajánlott', 'ro' => 'Acest program este interzis minorilor sub 15 ani'}, 'm_15_age_mini_pix.png']); ! our %PROGRAM_CATEGORIES = ( # Todo: insert cz & sk translations ! 'tvEventType-0' => {'hu' => 'egyéb', 'ro' => 'nedefinit'}, ! 'tvEventType-11' => {'hu' => 'vallási műsor', 'ro' => 'emisiune religioasÄ'}, ! 'tvEventType-4' => {'hu' => 'gyermek műsor', 'ro' => 'copii'}, ! 'tvEventType-10' => {'hu' => 'dokumentumfilm', 'ro' => 'documentar'}, ! 'tvEventType-12' => {'hu' => 'filmsorozat', 'ro' => 'serial'}, ! 'tvEventType-13' => {'hu' => 'szabadidÅs műsor', 'ro' => 'family'}, ! 'tvEventType-14' => {'hu' => 'zenei műsor', 'ro' => 'muzica'}, ! 'tvEventType-15' => {'hu' => 'hÃrműsor', 'ro' => 'Åtiri'}, ! 'tvEventType-1' => {'hu' => 'sportműsor', 'ro' => 'sport'}, ! 'tvEventType-3' => {'hu' => 'hÃr-, politikai műsor', 'ro' => 'tv show'}, ! 'tvEventType-7' => {'hu' => 'művészeti műsor', 'ro' => 'tv show'}, ! 'tvEventType-8' => {'hu' => 'ismeretterjesztÅ műsor', 'ro' => 'stiinta'}, ! 'tvEventType-9' => {'hu' => 'szappanopera', 'ro' => 'telenovelÄ'}, ! 'tvEventType-18' => {'hu' => 'gasztronómiai műsor', 'ro' => 'gastro'}, ! 'tvEventType-20' => {'hu' => 'életstÃlus', 'ro' => 'life style'}, ! 'tvEventType-2' => {'hu' => 'film', 'ro' => 'film'}, ! 'tvEventType-5' => {'hu' => 'szórakoztató műsor', 'ro' => 'reality show'}, ! 'tvEventType-6' => {'hu' => 'szolgáltató műsor', 'ro' => 'tv show'}, ! 'tvEventType-16' => {'hu' => 'divat', 'ro' => 'modÄ'}, ! 'tvEventType-17' => {'hu' => 'felnÅtt', 'ro' => 'pentru adulÅ£i'}, ! 'tvEventType-19' => {'hu' => 'reality', 'ro' => 'reality-show'}); sub domain(); sub xid( $ ); sub xhead(); sub process_table( $$$$ ); + sub process_json( $$$$ ); sub parse_short_desc ( $ ); sub get_channels( ;$ ); + sub get_channels_json( ;$ ); sub get_infourl_data( $$ ); + sub get_infourl_data_json( $$ ); sub add_person ( $$$ ); sub extract_episode( $ ); *************** *** 328,332 **** # if the grabber runs in eraly hours (e.g. 01:00, 02:00) port.hu returns # the yesterdays's program as today's program... so we have to check it, ! # example.hu: <span class="ctxt">Péntek (február 27.)</span> # example.ro: <span class="ctxt">Duminic\u0103 (26 februarie)</span> # if this failes, we construct the previous (or next?) day's url --- 369,373 ---- # if the grabber runs in eraly hours (e.g. 01:00, 02:00) port.hu returns # the yesterdays's program as today's program... so we have to check it, ! # example.hu: <span class="ctxt">Péntek (február 27.)</span> # example.ro: <span class="ctxt">Duminic\u0103 (26 februarie)</span> # if this failes, we construct the previous (or next?) day's url *************** *** 543,547 **** s/ +/ /g; s/[^\w]*putbox\(\"[0-9][0-9]\"\)[\s\n\r]*//g; ! s/Megvásárolható (DVD[ ]?-n|VHS[ ]?-en)//g; # strip leading   (and other spaces) s/^[ \t\xA0]*//g; --- 584,588 ---- s/ +/ /g; s/[^\w]*putbox\(\"[0-9][0-9]\"\)[\s\n\r]*//g; ! s/Megvásárolható (DVD[ ]?-n|VHS[ ]?-en)//g; # strip leading   (and other spaces) s/^[ \t\xA0]*//g; *************** *** 557,561 **** # support ticket #202 # get the rating if available ! # <img alt="(15)" title="nevhodné do 15ti let" class="age_limit_icon" src="http://media.port-network.com/page_elements/15_age_mini_pix.png"> if (my $img = $span[0]->parent()->look_down('_tag' => 'img', 'class' => 'age_limit_icon')) { t "age limit icon found"; --- 598,602 ---- # support ticket #202 # get the rating if available ! # <img alt="(15)" title="nevhodné do 15ti let" class="age_limit_icon" src="http://media.port-network.com/page_elements/15_age_mini_pix.png"> if (my $img = $span[0]->parent()->look_down('_tag' => 'img', 'class' => 'age_limit_icon')) { t "age limit icon found"; *************** *** 692,695 **** --- 733,1043 ---- } + #------------------------------------------------------------------------------ + # process_json + #------------------------------------------------------------------------------ + # desc : fetch a URL and process it + # arguments : 1- Date::Manip object, basedate/startdate of grabbing (e.g. 20060205) + # 2- xmltv id of channel + # 3- site id of channel + # 4- dayindex of the requested page on port.hu|ro + # returns : list of the programme hashes to write + #------------------------------------------------------------------------------ + sub process_json( $$$$ ) { + my ($basedate, $ch_xmltv_id, $ch_port_id, $baseday) = @_; + + # $basedate = UnixDate(DateCalc(parse_date($basedate),"- 1 day"), '%Q'); + $basedate = UnixDate(parse_date($basedate), '%Q'); + + my $days_to_request = $DAYSPERPAGE; + my $basedateday = UnixDate(parse_date($basedate), '%e'); + my $to_date = Time::Piece->strptime( $basedate, '%Y%m%d'); + $to_date += ONE_DAY * $days_to_request; + $ch_port_id =~ s/^0+//; + my $d = domain(); + my $urlfmt = "http://" . $d . (($COUNTRY eq 'hu') ? "/tvapi?channel_id=tvchannel-" : "/pls/w/tv_api.event_list?i_channel_id=").$ch_port_id. + "&i_datetime_from=%s&i_datetime_to=".$to_date->strftime('%Y-%m-%d'); + my $url = "$urlfmt"; + local $SIG{__WARN__} = sub { + warn "$url: $_[0]"; + }; + + my $json_data; + my $lang = $COUNTRY; + + # make (maximum) two loop to fetch program data: + # + # if the grabber runs in early hours (e.g. 01:00, 02:00) port.hu returns + # the yesterdays's program as today's program... so we have to check it, + # example.hu: <span class="ctxt">Péntek (február 27.)</span> + # example.ro: <span class="ctxt">Duminic\u0103 (26 februarie)</span> + # if this fails, we construct the previous (or next?) day's url + + my @daysonpage = (); + foreach (1, 2) { + $url = sprintf($urlfmt, UnixDate($basedate, '%Y-%m-%d')); + + t "fetching url: $url"; + worker("base-downloading"); + $XMLTV::Get_nice::FailOnError = 1; + my $data=get_nice($url); + $data =~ s/<\/?span[^>]{0,}>\s?//g; # remove html elements + + $json_data = (($DEFAULT_ENCODING !~ /utf\-?8/i) && ($COUNTRY eq 'hu')) ? JSON::XS->new->utf8(0)->decode(encode($DEFAULT_ENCODING,decode('utf-8', $data))) : JSON::XS->new->utf8(0)->decode($data) or + die "could not fetch/parse $url (json structure)\n"; + worker("base-parsing"); + + foreach my $act_secs (sort(keys(%{$json_data}))) { + my $wday = UnixDate(($COUNTRY eq 'hu') ? $json_data->{$act_secs}->{'date_from'} : $json_data->{$act_secs}->{'datetime_from'}, '%d'); + t "added founded date of the month on the grabbed page: $wday"; + push @daysonpage, $wday; + } + if (@daysonpage) { + # check date ... is the first founded date on the page the requested? + last if ($basedateday == $daysonpage[0]); + + t "requested from $basedate, but port.$COUNTRY returned programs from wrong day: $daysonpage[0]"; + if (UnixDate(DateCalc($basedate, "- 1 days"), '%e') == $daysonpage[0]) { + # port.hu returned the programms from yesterday + $FETCHOFFSET += 1 ; + } + elsif (UnixDate(DateCalc($basedate, "+ 1 days"), '%e') == $daysonpage[0]) { + # port.hu returned the programms from tommorrow + $FETCHOFFSET -= -1 ; + } + else { + t "fetched HTML page do not contain 0, +1 or -1 day of the reuested one"; + last; + } + t "global fetch offset was set to: $FETCHOFFSET"; + } + else { + warn "no date data found on the fetched HTML page, trying to continue"; + last; + } + } + + if (! defined($json_data)) { + warn "Could not found the requested day's data on the grabbed JSON structure, " . + "some programs on $ch_xmltv_id channel will be not fetched."; + return; + } + + my @programs; + + # JSON structure + # <date_in_secs_since_1970> => + # { + # 'date_from' => 'YYYY-MM-DDTHH:MM:SS+HH:MM' + # 'date_to' => 'YYYY-MM-DDTHH:MM:SS+HH:MM' + # 'channels' => [{ + # 'date' => 'YYYY-MM-DDTHH:MM:SS+HH:MM' (date of query) + # 'date_from' => 'YYYY-MM-DDTHH:MM:SS+HH:MM' + # 'date_until' => 'YYYY-MM-DDTHH:MM:SS+HH:MM' (equals with date_to) + # 'domain' => 'port.hu' + # 'id' => 'tvchannel-N' + # 'name' => 'Channel Name' + # ... + # 'programs' => [{ + # 'id' => 'event-t-NNNNNNNN' + # 'start_ts' => <date_in_secs_since_1970> + # 'start_datetime' => 'YYYY-MM-DDTHH:MM:SS+HH:MM' + # 'end_datetime' => 'YYYY-MM-DDTHH:MM:SS+HH:MM' + # 'start_time' => 'HH:MM' + # 'end_time' => 'HH:MM' + # 'title' => 'Show title' + # 'episode_title' => 'Ep title' or undef + # 'short_description' => 'Short desc.' or undef + # 'description' => 'Desc.' or undef + # 'film_url' => '/adatlap/film/tv/...' + # 'restriction' => { 'category' => 'tvEventType-N', 'age_limit' => 'ageLimitList-N' ] + # 'attributes_text' => '(ism.)' / '(élÅ)' / '(DS)' etc. or '' + # 'italics' => 'Feliratozva ...' or undef + # ... + # + # }] + # }] + # } + foreach my $act_secs (sort(keys(%{$json_data}))) { + my $all_prog_data = $json_data->{$act_secs}->{'channels'}[0]->{'programs'}; + foreach my $prog_data (@{$all_prog_data}) { + my %program; + $program{startdate} = UnixDate($prog_data->{'start_datetime'}, '%Q'); + my $currday = $program{startdate}; + $currday =~ s/^[0-9]{6}([0-9]{2})$/$1/; + $program{day} = $currday - $daysonpage[0] + 1; + # We skip those programs, that are out of the requested time frame + if ($program{day} != 1) { + next; + } + $program{time} = $prog_data->{'start_time'}; + $program{time} =~ s/^([012]?[0-9]):([0-5][0-9])$/$1$2/; + $program{enddate} = UnixDate($prog_data->{'end_datetime'}, '%Q') if (defined($prog_data->{'end_datetime'})); + t "--- missing end_time (".$prog_data->{'title'}.") ".d $prog_data if (!defined($prog_data->{'end_time'})); + $program{endtime} = $prog_data->{'end_time'}; + $program{endtime} =~ s/^([012]?[0-9]):([0-5][0-9])$/$1$2/ if (defined($program{endtime})); + $program{title} = (defined($prog_data->{'title'}) && $prog_data->{'title'} ne "") ? $prog_data->{'title'} : ' '; + if ($prog_data->{'short_description'}) { + $program{desc} = $prog_data->{'short_description'}; + } + elsif ($prog_data->{'description'}) { + $program{desc} = $prog_data->{'description'}; + } + # if ($prog_data->{'attributes_text'}) { + # $program{desc} = ($program{desc}) ? $program{desc}.', '.$prog_data->{'attributes_text'} : $prog_data->{'attributes_text'}; + # } + if ($prog_data->{'episode_title'}) { + if (($program{desc}) && ($program{desc} =~ /$WORDS{$COUNTRY}->{episode}/)) { + $program{desc} =~ s/($WORDS{$COUNTRY}->{episode})/$1, $prog_data->{'episode_title'}/; + } + else { + $program{desc} = ($program{desc}) ? $program{desc}.', '.$prog_data->{'episode_title'} : $prog_data->{'episode_title'}; + } + } + if ($program{desc}) { + $program{desc} =~ s/ +/ /g; + $program{desc} =~ s/Megvásárolható (DVD[ ]?-n|VHS[ ]?-en)//g; + } + if ($prog_data->{'film_url'}) { + my @url = ((($COUNTRY eq 'hu') ? 'http://'.domain() : '').$prog_data->{'film_url'}); + $program{infourl} = \@url; + } + + # support ticket #202 + # get the rating if available + my $actcat = ""; + if ($prog_data->{'restriction'}) { + $prog_data->{'restriction'}->{'age_limit'} =~ s/(\d+)/ageLimitList-$1/ if (($COUNTRY eq 'ro') && ($prog_data->{'restriction'}->{'age_limit'} !~ /ageLimitList/)); + $prog_data->{'restriction'}->{'category'} =~ s/(\d+)/tvEventType-$1/ if (($COUNTRY eq 'ro') && ($prog_data->{'restriction'}->{'category'} !~ /tvEventType/)); + if (($prog_data->{'restriction'}->{'age_limit'}) # 'ageLimitList-N' + && ($AGE_LIMITS{$prog_data->{'restriction'}->{'age_limit'}})) { + my $rating = ($DEFAULT_ENCODING !~ /utf\-?8/i) ? encode($DEFAULT_ENCODING, $AGE_LIMITS{$prog_data->{'restriction'}->{'age_limit'}}[0]->{$lang}) : $AGE_LIMITS{$prog_data->{'restriction'}->{'age_limit'}}[0]->{$lang}; + $program{rating} = [[ $rating, '', [{'src' => $rating_baseurl.$AGE_LIMITS{$prog_data->{'restriction'}->{'age_limit'}}[1] }] ]]; + } + if (($prog_data->{'restriction'}->{'category'}) # 'tvEventType-N' + && ($PROGRAM_CATEGORIES{$prog_data->{'restriction'}->{'category'}})) { + $actcat = ($DEFAULT_ENCODING !~ /utf\-?8/i) ? encode($DEFAULT_ENCODING, $PROGRAM_CATEGORIES{$prog_data->{'restriction'}->{'category'}}->{$lang}) : $PROGRAM_CATEGORIES{$prog_data->{'restriction'}->{'category'}}->{$lang}; + $program{desc} = ($program{desc}) ? $program{desc}.', '.$actcat : $actcat; # insert actual category - see parse_short_desc + } + } + # add all parsed info, as program{time, title, desc, category, date} + parse_short_desc(\%program); + if ((defined($program{desc})) && ($program{desc} =~ $actcat)) { # remove actual category + $program{desc} =~ s/[,\ ]{0,2}$actcat$//; + delete($program{desc}) if (!length($program{desc})); + } + + worker("slow-parsing"); + foreach my $infourl (@{$program{infourl}}) { + # always read data from linked page (in --slow mode) + # in --get-full-description mode read if description ends in '...' + if ( ($opt_slow) || + ( $opt_full_desc && ( ((defined $program{desc}) && + ($program{desc} =~ m/\.\.\.$/) ) || + ((!$program{desc}) && (!$program{category}) && ($actcat eq $PROGRAM_CATEGORIES{'tvEventType-2'}->{$lang})) ) ) ) { # program without desc & category + actcat = 'film'? + get_infourl_data_json(\%program, $infourl); + # parse_short_desc(\%program); + } + } + + t "pushing ".$program{title}; + + push @programs, \%program if (defined $program{time}) && (defined $program{title}); + } # foreach $prog_data + + } # foreach $json_data + + if (not @programs) { + warn "no programs found, skipping\n"; + return (); + } + + # make a sort on programs, short compare function: cmp startdate, time + # stringwise (this gives the same rsult as comapre datewise) + # Date_Cmp(UnixDate($left->{time},'%H:%M'),UnixDate($right->{time},'%H:%M'); + + # sub bytime { + # ($a->{startdate}.$a->{time}) cmp ($b->{startdate}.$b->{time}); + # } + @programs = sort {$a->{startdate}.$a->{time} cmp $b->{startdate}.$b->{time}} @programs; + + t "programs in sorted order:"; + t "program:" . d $_ foreach (@programs); + + my (@r, $prev); + # assume lang == country + # my $lang = $COUNTRY; + + foreach my $program (@programs) { + my $prog; + + $prog->{channel}=$ch_xmltv_id; + + $prog->{title}=[ [ $program->{title}, $lang ] ]; + + my $start=parse_local_date("$program->{startdate} $program->{time}", $TZ); + my ($start_base, $start_tz) = @{date_to_local($start, $TZ)}; + $prog->{start}=UnixDate($start_base, '%q') . " $start_tz"; + + if (defined($program->{enddate}) && defined($program->{endtime})) { + my $stop=parse_local_date("$program->{enddate} $program->{endtime}", $TZ); + my ($stop_base, $stop_tz) = @{date_to_local($stop, $TZ)}; + $prog->{stop}=UnixDate($stop_base, '%q') . " $stop_tz"; + } + else { + t "--- missing enddate + endtime - ch: ".$prog->{channel}.", title: ".$program->{title}; + } + + $prog->{desc} = [[ $program->{desc}, $lang ]] + if defined $program->{desc}; + $prog->{category} = $program->{category} + if (defined $program->{category}); + $prog->{date} = $program->{date} + if defined $program->{date}; + $prog->{qw(episode-num)} = $program->{qw(episode-num)} + if defined $program->{qw(episode-num)}; + $prog->{length} = $program->{length} + if defined $program->{length}; + $prog->{rating} = $program->{rating} + if defined $program->{rating}; # support #202 + + # Setting stop date for the previous program + # Last program in the grabbed list has no stop attribute, sorry. + # Port.hu uses a virtual program as the last program + # anyway + if ((defined($prev)) && ((!defined($prev->{stop})) || $prev->{stop} ne $prog->{start})) { + if ($prev->{start} ne $prog->{start}) { + $prev->{stop} = $prog->{start}; + } + else { + t "--- remove previous program: ".d @r; + pop(@r); + } + } + + worker("base-parsing"); + + push @r, $prog; + + # if ((defined($prev)) && $prev->{start} eq $prog->{start}) { + # starttime of previous and current programme is equal, + # therefore use clumpidx to express relation + # my $clumps_num = 2; + + # if (defined($r[-2]->{q(clumpidx)})) { + # previous programme already has a clumpidx arg assigned. + # ($clumps_num) = $r[-2]->{q(clumpidx)} =~ m|^\d+/(\d+)$|; + # } + + # okay, assign new clumpidx values ... + # for (0 .. ($clumps_num-1)) { + # $r[-$clumps_num+$_]->{q(clumpidx)} = "$_/$clumps_num"; + # } + # } + + $prev = $prog; + } + + return @r; + } #------------------------------------------------------------------------------- *************** *** 702,706 **** # and there should be attached the other newly found informations, # such as: ! # ( category => [ [Animals, en], [Természet, hu], [..], ... ] # date => 2001 ) # returns : none --- 1050,1054 ---- # and there should be attached the other newly found informations, # such as: ! # ( category => [ [Animals, en], [Természet, hu], [..], ... ] # date => 2001 ) # returns : none *************** *** 723,728 **** # examples: # Hegylako - A hollo (amerikai-francia-kanadai kalandfilmsorozat, 1998) ! # Lisa. Animációs sorozat. ! # Slayers - A kis boszorkány. (12). Japan animacios sorozat. # # sometimes only the proposed minimal age of watching person is --- 1071,1076 ---- # examples: # Hegylako - A hollo (amerikai-francia-kanadai kalandfilmsorozat, 1998) ! # Lisa. Animációs sorozat. ! # Slayers - A kis boszorkány. (12). Japan animacios sorozat. # # sometimes only the proposed minimal age of watching person is *************** *** 736,755 **** t "parse_short_desc: text: '$cont'"; $WORDS{$COUNTRY}->{episode}="zdontmatchz" unless exists $WORDS{$COUNTRY}->{episode}; # port.hu episode style with season (# patch #80) ! if (m/\s*([IVX]+\.\/[0-9]+)\. $WORDS{$COUNTRY}->{episode}/) { $episode = $1; } # port.hu episode style without season ! elsif (m/\s*([0-9\/]+)\. $WORDS{$COUNTRY}->{episode}/) { $episode = $1; } # port.ro episode style with season (# patch #74) ! elsif (m/$WORDS{$COUNTRY}->{episode} \s*([0-9]+, [A-Za-z]+ [0-9])/) { $episode = $1; } # port.cz/.sk episode style with season ! elsif (m/$WORDS{$COUNTRY}->{episode} \s*([0-9]+, [IVX]+)\./) { $episode = $1; } # port.cz/.sk episode style for two episodes back to back in one slot ! elsif (m/$WORDS{$COUNTRY}->{episode} \s*(\d+, \d+)/) { $episode = $1; } # port.cz/.sk/.ro episode style without season ! elsif (m/$WORDS{$COUNTRY}->{episode} \s*([0-9\/]+)/) { $episode = $1; } ! if (m/\s*(\d+)'/) { $minutes = $1; } ! if (m/\(.*?((?:19|20)[0-9]{2})/) { $year = $1 } # bug #448 ! t "found episode: '$episode'" if defined $episode; t "found minutes: '$minutes'" if defined $minutes; --- 1084,1104 ---- t "parse_short_desc: text: '$cont'"; $WORDS{$COUNTRY}->{episode}="zdontmatchz" unless exists $WORDS{$COUNTRY}->{episode}; + t "episode (country: $COUNTRY): ".(defined($WORDS{$COUNTRY}->{episode}) ? $WORDS{$COUNTRY}->{episode} : "undef"); # port.hu episode style with season (# patch #80) ! if ($cont =~ /\s*([IVX]+\.?\s?\/\s?[0-9]+)\. $WORDS{$COUNTRY}->{episode}/) { $episode = $1; } # port.hu episode style without season ! elsif ($cont =~ /\s*([0-9\/]+)\. $WORDS{$COUNTRY}->{episode}/) { $episode = $1; } # port.ro episode style with season (# patch #74) ! elsif ($cont =~ /$WORDS{$COUNTRY}->{episode} \s*([0-9]+, [A-Za-z]+ [0-9])/) { $episode = $1; } # port.cz/.sk episode style with season ! elsif ($cont =~ /$WORDS{$COUNTRY}->{episode} \s*([0-9]+, [IVX]+)\./) { $episode = $1; } # port.cz/.sk episode style for two episodes back to back in one slot ! elsif ($cont =~ /$WORDS{$COUNTRY}->{episode} \s*(\d+, \d+)/) { $episode = $1; } # port.cz/.sk/.ro episode style without season ! elsif ($cont =~ /$WORDS{$COUNTRY}->{episode} \s*([0-9\/]+)/) { $episode = $1; } ! if ($cont =~ /\s*(\d+)'/) { $minutes = $1; } ! if ($cont =~ /\(.*?((?:19|20)[0-9]{2})/) { $year = $1; } # bug #448 ! elsif ($cont =~ /$WORDS{$COUNTRY}->{episode},\s((?:19|20)[0-9]{2}),\s/) { $year = $1; } # ex.: '... II / 4. rész, 2016, ...' t "found episode: '$episode'" if defined $episode; t "found minutes: '$minutes'" if defined $minutes; *************** *** 866,869 **** --- 1215,1267 ---- #------------------------------------------------------------------------------- + # get_channels_json + #------------------------------------------------------------------------------- + # desc : get channel listing for a country + # arguments : none + # returns : sets global CHANNELS hash to the grabbed channels: + # ( '$channel_id' => + # ( 'display-name' => [ [ $channel_name, $COUNTRY ] ], + # 'id' => "$channel_id.$d", + # 'icon' => [ { src => $iconurl } ] ) + #------------------------------------------------------------------------------- + sub get_channels_json( ;$ ) { + my $mode = shift; + my $d = domain(); + my $bar = new XMLTV::ProgressBar('getting list of channels', 1) + if not $opt_quiet; + my $url="http://www.$d/".(($COUNTRY eq 'hu') ? "tvapi/init" : "pls/w/tv_api.init?i_page_id=1"); + + worker("base-downloading"); + t "fetching $url..."; + $XMLTV::Get_nice::FailOnError = 1; + binmode(STDOUT,":encoding(UTF-8)"); + my $data = get_nice($url); + my $json_data = (($DEFAULT_ENCODING !~ /utf\-?8/i) && ($COUNTRY eq 'hu')) ? JSON::XS->new->utf8(0)->decode(encode($DEFAULT_ENCODING,decode('utf-8', $data))) : JSON::XS->new->utf8(0)->decode($data) or + die "could not fetch/parse $url (channel listing)"; + worker("base-parsing"); + + foreach my $ch (@{$json_data->{'channels'}}) { + my $channel_id = $ch->{'id'}; + $channel_id =~ s/^[^0-9]+//; # 'tvchannel-N' -> 'N' + $channel_id = sprintf("%03d", $channel_id); # 'N' -> '00N' + my @urls = (($COUNTRY eq 'hu') ? 'http://'.domain() : '').$ch->{'link'}; + my %channel = ( + 'display-name' => [ [ $ch->{'name'}, $COUNTRY ] ], + 'id' => "$channel_id.$d", + 'url' => \@urls + ); + if ($ch->{'logo'}) { + $channel{'icon'} = [ { src => $ch->{'logo'} } ]; + } + $CHANNELS{$channel_id} = \%channel; + } + die "no CHANNELS could be found" if not %CHANNELS; + update $bar if not $opt_quiet; + $bar->finish() if not $opt_quiet; + t "CHANNELS:" . d \%CHANNELS; + } + + + #------------------------------------------------------------------------------- # add_person #------------------------------------------------------------------------------- *************** *** 995,999 **** # anchor point: # the programme image will be tagged as follows: ! # <div class="random-media-wrapper"><img class="object_picture" src="http://media.port-network.com/picture/instance_2/92418_2.jpg" width="250" height="221" style="float:" alt="Închisoarea îngerilor - Tim Robbins" border="0" /> t "programme icon parsing ..."; --- 1393,1397 ---- # anchor point: # the programme image will be tagged as follows: ! # <div class="random-media-wrapper"><img class="object_picture" src="http://media.port-network.com/picture/instance_2/92418_2.jpg" width="250" height="221" style="float:" alt="Ãnchisoarea îngerilor - Tim Robbins" border="0" /> t "programme icon parsing ..."; *************** *** 1212,1217 **** # duration, year, category # possibilitys ! # 1: amerikai filmdráma sorozat, 90 perc, 2000, 2. rész ! # 12 éven aluliak számára .... # added 2004-04-07 : # (ro) Coreea de Sud, 2009, serial de aventuri, episodul 5 --- 1610,1615 ---- # duration, year, category # possibilitys ! # 1: amerikai filmdráma sorozat, 90 perc, 2000, 2. rész ! # 12 éven aluliak számára .... # added 2004-04-07 : # (ro) Coreea de Sud, 2009, serial de aventuri, episodul 5 *************** *** 1241,1245 **** # we will add # the person(s) as: # <actor> some_job: Foo Bar, Dummy Name, ...<actor> ! # note: \b(.+): do not match to " író: ", because í is not # part of \b --- 1639,1643 ---- # we will add # the person(s) as: # <actor> some_job: Foo Bar, Dummy Name, ...<actor> ! # note: \b(.+): do not match to " Ãró: ", because à is not # part of \b *************** *** 1323,1326 **** --- 1721,1808 ---- } + #------------------------------------------------------------------------------- + # get_infourl_data_json + #------------------------------------------------------------------------------- + # desc : merge data from linked info page into programme hash + # arguments : 1- reference to the program, whom detailed descr should be grabbed + # 2- url to fetch + # returns : none + #------------------------------------------------------------------------------- + sub get_infourl_data_json( $$ ) { + my $prog = shift; + my $d = domain(); + my $url = shift; + + # add port.hu/port.ro base url only if url is not contains the "://" uri separator + if (! ($url =~ "://")) { + $url = "http://www.$d" . $url; + } + + # no info, so don't add it to anywhere + # -> calendar.event_popup + if ($url =~ "calendar\.event_popup") { + t "SKIP fetching of slow url: $url"; + return; + } + + # do not grab: + # -> pictures: ... pls/me/picture.popup?i_area_id + # -> dvd rent links page: ... pls/w/logging.page_log?i_page_id=20... + # -> sample movie ... video.link_popup?i_object_id=18822 + # -> dvd sales page: www.divido.hu... + # -> bet on a sport event -> sprotingbet + # -> general advert links: adverticum + + if ($url =~ "(picture.popup|logging.page_log|video.link_popup|www\.divido\.hu|sportingbet|adverticum\.net)") { + # add this url to the program + push @{$prog->{q(url)}}, $url; + t "SKIP fetching of slow url: $url"; + return; + } + + t "fetching slow url" . d $url; + + worker("slow-downloading"); + t "fetching $url..."; + $XMLTV::Get_nice::FailOnError = 0; + my $data; + if (! defined($data = get_nice($url))) { + worker("slow-parsing"); + warn "Could not get URL: $url, the detailed description for the program [" . + $prog->{channel} . ", " . $prog->{title} . ", " . $prog->{start} . + "] will be not available. Error message: " . error_msg($url) . "." ; + return; + } + else { + if ($data =~ /<!\-\-\ title\ \-\->/) { + my $orig_title = substr($data, index($data, '<!-- title -->')+14, index($data, '<!-- /title -->', index($data, '<!-- title -->'))-(index($data, '<!-- title -->')+14)); + $orig_title =~ s/<[^>]+>//g; + $orig_title =~ s/^\s+|\s+$//g; # trim spaces + $orig_title =~ s/^[^\n]+\n//g; # remove translated title + $orig_title =~ s/^[^\/]+\/(.*)\/$/($1)/g; + $orig_title = encode($DEFAULT_ENCODING, decode('utf-8', $orig_title)) if ($DEFAULT_ENCODING !~ /utf\-?8/i); + $prog->{q(desc)} = (defined($prog->{q(desc)}) && $prog->{q(desc)} ne "") ? $prog->{q(desc)}.' '.$orig_title : $orig_title; + } + if ($data =~ /<!\-\-\ summary\ \-\->/) { + my $sum = substr($data, index($data, '<!-- summary -->')+16, index($data, '<!-- /summary -->', index($data, '<!-- summary -->'))-(index($data, '<!-- summary -->')+16)); + $sum =~ s/<[^>]+>//g; + $sum =~ s/^\s+|\s+$//g; # trim spaces + $sum =~ s/magyarul\ besz..l..\,\ //g; + $sum = encode($DEFAULT_ENCODING, decode('utf-8', $sum)) if ($DEFAULT_ENCODING !~ /utf\-?8/i); + $prog->{q(desc)} = (defined($prog->{q(desc)}) && $prog->{q(desc)} ne "") ? $prog->{q(desc)}.' '.$sum : $sum; + } + if ($data =~ /<div\ class="description">/) { + $data = substr($data, index($data, '<div class="description">')+25, index($data, '</div>', index($data, '<div class="description">'))-(index($data, '<div class="description">')+25)); + $data =~ s/<\/?article>//ig; + $data =~ s/<br\/?>/ /ig; + $data =~ s/<strong>[^\<]+<\/strong>//ig; # <strong>Feliratozva a teletext ...</strong> + $data =~ s/<b>.*//ig; # <b>Forgalmazó:</> ... / <b>Bemutató dátuma:</b> ... + $data =~ s/^\s+|\s+$//g; # trim spaces + $data = encode($DEFAULT_ENCODING, decode('utf-8', $data)) if ($DEFAULT_ENCODING !~ /utf\-?8/i); + $prog->{q(desc)} = (defined($prog->{q(desc)}) && $prog->{q(desc)} ne "") ? $prog->{q(desc)}.', '.$data : $data; + } + worker("slow-parsing"); + } + } #------------------------------------------------------------------------------- *************** *** 1782,1786 **** # Ask about each channel. ! get_channels(); # sets %CHANNELS my @portids = sort keys %CHANNELS; my @names = map { $CHANNELS{$_}->{qw(display-name)}->[0][0] } @portids; --- 2264,2268 ---- # Ask about each channel. ! (($COUNTRY) && (($COUNTRY eq 'hu') || ($COUNTRY eq 'ro'))) ? get_channels_json() : get_channels; # sets %CHANNELS my @portids = sort keys %CHANNELS; my @names = map { $CHANNELS{$_}->{qw(display-name)}->[0][0] } @portids; *************** *** 1809,1812 **** --- 2291,2295 ---- # Options to be used for XMLTV::Writer. my %w_args; + $w_args{encoding} = $DEFAULT_ENCODING; if (defined $opt_output) { my $fh = new IO::File(">$opt_output"); *************** *** 1814,1818 **** $w_args{OUTPUT} = $fh; } - $w_args{encoding} = 'ISO-8859-2'; #------------------------------------------------------------------------------- --- 2297,2300 ---- *************** *** 1835,1839 **** $writer->start(xhead()); worker("base-parsing"); ! get_channels(); # sets %CHANNELS # sort channels based on their portid my @portids = sort keys %CHANNELS; --- 2317,2321 ---- $writer->start(xhead()); worker("base-parsing"); ! (($COUNTRY) && (($COUNTRY eq 'hu') || ($COUNTRY eq 'ro'))) ? get_channels_json() : get_channels(); # sets %CHANNELS # sort channels based on their portid my @portids = sort keys %CHANNELS; *************** *** 1859,1863 **** # sets %CHANNELS ! get_channels($mode); worker("xml-writing"); --- 2341,2345 ---- # sets %CHANNELS ! (($COUNTRY) && (($COUNTRY eq 'hu') || ($COUNTRY eq 'ro'))) ? get_channels_json($mode) : get_channels($mode); worker("xml-writing"); *************** *** 1890,1894 **** worker("base-parsing"); ! if (my @churls = get_channel_urls( $ch_did )) { $channel{'url'} = \@churls; } --- 2372,2376 ---- worker("base-parsing"); ! if (($COUNTRY) && ($COUNTRY ne 'hu') && ($COUNTRY ne 'ro') && (my @churls = get_channel_urls( $ch_did ))) { $channel{'url'} = \@churls; } *************** *** 1901,1917 **** $bar->finish() if not $opt_quiet; ! # The grabber's source allows requests of more than one day per page. This can ! # be done by specifying the i_xday argument with the GET request. ! # ! # To not load their server too much (requesting e.g. 14 channels in one shot ! # should 'cause quite some traffic to the SQL server) I think we shouldn't ! # query for more then 5 channels per page. With the default of requesting data ! # for 8 days this leads to 2 requests per channel and grab ... ! $DAYSPERPAGE = int($opt_days / 5) + (($opt_days % 5) ? 1 : 0); ! $DAYSPERPAGE = int($opt_days / $DAYSPERPAGE); ! # We have to request at minimum of four days ! $DAYSPERPAGE = 4 if ($DAYSPERPAGE<4); t "requesting $DAYSPERPAGE days per scraped webpage ..."; --- 2383,2404 ---- $bar->finish() if not $opt_quiet; ! if (!defined($COUNTRY) || (($COUNTRY ne 'hu') && ($COUNTRY ne 'ro'))) { # old, HTML based pages ! # The grabber's source allows requests of more than one day per page. This can ! # be done by specifying the i_xday argument with the GET request. ! # ! # To not load their server too much (requesting e.g. 14 channels in one shot ! # should 'cause quite some traffic to the SQL server) I think we shouldn't ! # query for more then 5 channels per page. With the default of requesting data ! # for 8 days this leads to 2 requests per channel and grab ... ! $DAYSPERPAGE = int($opt_days / 5) + (($opt_days % 5) ? 1 : 0); ! $DAYSPERPAGE = int($opt_days / $DAYSPERPAGE); ! # We have to request at minimum of four days ! $DAYSPERPAGE = 4 if ($DAYSPERPAGE<4); ! } ! else { # JSON ! $DAYSPERPAGE = 1; ! } t "requesting $DAYSPERPAGE days per scraped webpage ..."; *************** *** 1975,1979 **** next; } ! my @ps = process_table($idate, xid($ch_did), $ch_did, $iday); $some_success = 1 if @ps; worker("xml-writing"); --- 2462,2466 ---- next; } ! my @ps = (($COUNTRY) && (($COUNTRY eq 'hu') || ($COUNTRY eq 'ro'))) ? process_json($idate, xid($ch_did), $ch_did, $iday) : process_table($idate, xid($ch_did), $ch_did, $iday); $some_success = 1 if @ps; worker("xml-writing"); |
|
From: Robert E. <rm...@us...> - 2017-01-24 00:41:10
|
Update of /cvsroot/xmltv/xmltv/grab/zz_sdjson In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16216 Added Files: tv_grab_zz_sdjson Log Message: forgot to add renamed tv_grab_zz_sdjson grabber --- NEW FILE: tv_grab_zz_sdjson --- #!/usr/bin/perl -w my $grabber_cvs_id = '$Id: tv_grab_zz_sdjson,v 1.1 2017/01/24 00:41:08 rmeden Exp $'; =head1 NAME tv_grab_zz_sdjson - Grab TV listings from Schedules Direct SD-JSON service. =head1 SYNOPSIS tv_grab_zz_sdjson --help tv_grab_zz_sdjson --info tv_grab_zz_sdjson --version tv_grab_zz_sdjson --capabilities tv_grab_zz_sdjson --description [...1475 lines suppressed...] # write channels for my $channel (@{$channels}) { write_channel($w, $channel_index{$channel}, $channel_map{$channel}); } # write programs for my $channel (@{$channels}) { my $schedules = $cache_schedules->{$channel}; for my $day (sort(keys %{$schedules})) { for my $program (@{$schedules->{$day}->{'programs'}}) { write_programme($w, $channel_index{$channel}, $program, $cache_programs->{$program->{'programID'}}); } } } $w->end(); print STDERR "Done\n" unless $quiet; } grab_listings($conf); |
203 messages has been excluded from this view by a project administrator.
![http://media.port-network.com/page_elements/15_age_mini_pix.png">](http://media.port-network.com/page_elements/15_age_mini_pix.png">){kind=link}
![http://media.port-network.com/picture/instance_2/92418_2.jpg"](http://media.port-network.com/picture/instance_2/92418_2.jpg"){kind=link}