diff options
| -rw-r--r-- | dist/epgdata2xmltv/epgdata2xmltv.cpp | 25 | ||||
| -rw-r--r-- | dist/epgdata2xmltv/epgdata2xmltv.dist | 35 | ||||
| -rw-r--r-- | source.cpp | 5 |
3 files changed, 40 insertions, 25 deletions
diff --git a/dist/epgdata2xmltv/epgdata2xmltv.cpp b/dist/epgdata2xmltv/epgdata2xmltv.cpp index bde5557..535e934 100644 --- a/dist/epgdata2xmltv/epgdata2xmltv.cpp +++ b/dist/epgdata2xmltv/epgdata2xmltv.cpp @@ -150,12 +150,12 @@ int cepgdata2xmltv::Fetch(const char *dest, const char *pin, int day) if (asprintf (&filename, "%i&pin=%s",day,pin)==-1) { - esyslog("failed to allocate string"); + esyslog("failed to allocate string (%i)",day); return 1; } if (asprintf (&url, EPGDATA2XMLTV_URL, filename) == -1) { - esyslog("failed to allocate string"); + esyslog("failed to allocate string (%i)",day); free(filename); return 1; } @@ -164,7 +164,7 @@ int cepgdata2xmltv::Fetch(const char *dest, const char *pin, int day) data.fd=open(dest,O_CREAT|O_TRUNC|O_WRONLY,0664); if (data.fd==-1) { - esyslog("failed to open %s",dest); + esyslog("failed to open %s (%i)",dest,day); return 1; } @@ -181,38 +181,38 @@ int cepgdata2xmltv::Fetch(const char *dest, const char *pin, int day) // -22 not found if (ret==-40) { - esyslog("fatal curl error"); + esyslog("fatal curl error (%i)",day); return 1; } if (ret==-28) { - esyslog("timeout"); + esyslog("timeout (%i)",day); return 1; } if (ret==-10) { - esyslog("wrong proxy auth"); + esyslog("wrong proxy auth (%i)",day); return 1; } if (ret==-7) { - esyslog("failed to connect"); + esyslog("failed to connect (%i)",day); return 2; } if (ret==-6) { - esyslog("failed to resolve host"); + esyslog("failed to resolve host (%i)",day); return 2; } if (ret==-22) { - esyslog("wrong pin"); + esyslog("wrong pin (%i)",day); return 1; } if (ret==-63) { - esyslog("filesize exceeded, please report this!"); + esyslog("filesize exceeded, please report this! (%i)",day); return 1; } return 0; @@ -282,6 +282,7 @@ int cepgdata2xmltv::Process(int argc, char *argv[]) time_t t=time(NULL); int carg=3; + if (!strcmp(argv[3],"1") || !strcmp(argv[3],"0")) carg++; for (int day=0; day<=daysinadvance; day++) { @@ -470,7 +471,6 @@ int cepgdata2xmltv::Process(int argc, char *argv[]) } if (!strcmp(argv[3],"1")) { - carg++; int entries=zip_get_num_files(zip); for (int i=0; i<entries; i++) { @@ -479,7 +479,6 @@ int cepgdata2xmltv::Process(int argc, char *argv[]) char *destjpg; if (asprintf(&destjpg,"/var/lib/epgsources/epgdata2xmltv-img/%s",name)!=-1) { - //FILE *f=fopen("/var/lib/epgsources/epgdata2xmltv","r"); struct stat statbuf; if (stat(destjpg,&statbuf)==-1) { struct zip_file *zfile=zip_fopen_index(zip,i,0); @@ -508,8 +507,6 @@ int cepgdata2xmltv::Process(int argc, char *argv[]) } } } - } else { - if (!strcmp(argv[3],"0")) carg++; } zip_close(zip); diff --git a/dist/epgdata2xmltv/epgdata2xmltv.dist b/dist/epgdata2xmltv/epgdata2xmltv.dist index 4c61f34..c9a95b9 100644 --- a/dist/epgdata2xmltv/epgdata2xmltv.dist +++ b/dist/epgdata2xmltv/epgdata2xmltv.dist @@ -2,7 +2,9 @@ pipe;00:00;1;1 17 13th-street.de;471 3sat.de;56 +animal-planet.de;1183 animax.de;539 +anixe.de;537 ard.de;71 arte.de;58 atvplus.at;115 @@ -13,40 +15,45 @@ bibeltv.de;280 bloombergtv.de;127 boomerang-tv.de;493 br-alpha.de;104 -cartoon-network.de;132 classica.de;133 cnn.de;69 das-vierte.de;486 discovery-channel.de;138 disney-channel.de;139 +disney-cinemagic.de;630 +disney-xd.de;657 dmax.de;507 dsf.de;64 einsextra.de;100 einsfestival.de;146 einsmuxx.de;475 -espn-classic-sport.com;591 +espn-classic-sport.com;473 euronews.de;68 eurosport-2.de;504 eurosport.de;65 fashiontv.fr;455 -focus-gesundheit.de;476 fox-channel.de;565 goldstar-tv.de;152 gotv.at;391 +gute-laune-tv.de;487 heimatkanal.de;154 hessen3.de;49 +hh1.de;153 history-channel.de;452 hse24.de;159 +imusic1.de;635 junior.de;160 kabel1.de;44 kabel-eins-classics.de;492 kika.de;57 kinowelt-tv.de;450 +lust-pur.de;634 mdr.de;48 -mgm.de;630 +mgm.de;1196 motorvision-tv.de;627 +mtv-dance.uk;465 mtv.de;70 -mtv-entertainment.de;553 +mtv-hits.uk;466 n24.de;175 national-geographic.de;453 national-geographic-wild.de;626 @@ -56,19 +63,25 @@ ntv.de;66 orf1.at;54 orf2.at;55 phoenix.de;194 +planet.de;195 playhouse-disney.de;460 prosieben.de;40 qvc.de;208 rbb.de;52 +rhein-neckar-fernsehen.de;211 romance-tv.de;552 rtl2.de;41 rtl-crime.de;527 rtl.de;38 rtl-living.de;528 +rtl-nitro.de;763 rtl-passion.de;529 sat1-comedy.de;491 sat1.de;39 sci-fi.de;472 +sf1.ch;59 +sf2.ch;60 +silverline-tv.de;451 sixx.de;694 sky-action.de;613 sky-cinema-1.de;611 @@ -77,11 +90,15 @@ sky-cinema.de;610 sky-cinema-hits.de;618 sky-comedy.de;617 sky-emotion.de;616 +sky-fussball-bundesliga.de;623 sky-krimi.de;615 sky-nostalgie.de;614 sky-select.de;628 +sky-sport-1.de;619 +sky-sport-2.de;620 sky-sport-austria.at;622 spiegel-geschichte.de;625 +sportdigitaltv.de;564 superrtl.de;43 swr.de;50 tele5.de;277 @@ -89,12 +106,14 @@ the-biography-channel.de;536 timm.de;588 tnt-film.de;633 tnt-serie.de;590 -tw1.at;265 -vh1-classic.eu;496 +tv-berlin.de;1192 +tv-muenchen.de;262 +vh1-classic.eu;296 viva.de;266 vox.de;42 wdr.de;46 zdf.de;37 zdfinfo.de;276 -zdfkultur.de;275 zdfneo.de;659 +zdfkultur.de;275 +zdf-theaterkanal.de;275 @@ -84,11 +84,10 @@ void cEPGExecutor::Action() } } - int ret=1; if (forceimportsrc>=0) { cEPGSource *epgs=sources->Get(forceimportsrc); - if (epgs) ret=epgs->Import(*this); + if (epgs) epgs->Import(*this); } else { @@ -96,7 +95,7 @@ void cEPGExecutor::Action() { if (!epgs->LastRetCode()) { - ret=epgs->Import(*this); + epgs->Import(*this); break; // only import from the first successful source! } } |