stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix problems with XMLTV time processing.

Browse source
This commit is contained in:
Adam Sutton 2012-10-11 11:04:54 +01:00
parent ce019c896d
commit a13f3b8119
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/epggrab/module/xmltv.c
View file

@ -59,28 +59,46 @@ static epggrab_channel_t *_xmltv_channel_find
/** /**
* *
*/ */
static time_t _xmltv_str2time(const char *str) static time_t _xmltv_str2time(const char *in)
{ {
struct tm tm; struct tm tm;
int tz, r; int tz = 0, r;
int sp = 0;
char str[32];
memset(&tm, 0, sizeof(tm)); memset(&tm, 0, sizeof(tm));
strcpy(str, in);
r = sscanf(str, "%04d%02d%02d%02d%02d%02d %d", /* split tz */
while (str[sp] && str[sp] != ' ')
sp++;
/* parse tz */
// TODO: handle string TZ?
if (str[sp]) {
sscanf(str+sp+1, "%d", &tz);
tz = (tz % 100) + (tz / 100) * 3600; // Convert from HHMM to seconds
str[sp] = 0;
sp = 1;
} else {
sp = 0;
}
/* parse time */
r = sscanf(str, "%04d%02d%02d%02d%02d%02d",
&tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_year, &tm.tm_mon, &tm.tm_mday,
&tm.tm_hour, &tm.tm_min, &tm.tm_sec, &tm.tm_hour, &tm.tm_min, &tm.tm_sec);
&tz);
/* adjust */
tm.tm_mon -= 1; tm.tm_mon -= 1;
tm.tm_year -= 1900; tm.tm_year -= 1900;
tm.tm_isdst = -1; tm.tm_isdst = -1;
tz = (tz % 100) + (tz / 100) * 60; // Convert from HHMM to minutes if (r >= 5) {
if(sp)
if(r == 6) { return timegm(&tm) - tz;
return mktime(&tm); else
} else if(r == 7) { return mktime(&tm);
return timegm(&tm) - tz * 60;
} else { } else {
return 0; return 0;
} }