From: Jan-Pascal van Best Date: Mon, 20 Jan 2014 21:16:19 +0000 (+0100) Subject: RTL: do not fetch programmes for dates earlier than requested X-Git-Tag: v1.6.2~4 X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=5697d9df93d78c51610c744b6de59f8d768839ad;p=tv_grab_nl_java RTL: do not fetch programmes for dates earlier than requested --- diff --git a/src/main/java/org/vanbest/xmltv/RTL.java b/src/main/java/org/vanbest/xmltv/RTL.java index 0a84a4a..c1a9808 100644 --- a/src/main/java/org/vanbest/xmltv/RTL.java +++ b/src/main/java/org/vanbest/xmltv/RTL.java @@ -12,6 +12,7 @@ import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.GregorianCalendar; import java.util.Collections; import java.util.Comparator; import java.util.Date; @@ -249,6 +250,15 @@ public class RTL extends AbstractEPGSource implements EPGSource { if (c.enabled && c.source.equals(getName())) channelMap.put(c.id, c); } + + GregorianCalendar now = new GregorianCalendar(); + GregorianCalendar date = new GregorianCalendar(now.get(Calendar.YEAR), + now.get(Calendar.MONTH), + now.get(Calendar.DAY_OF_MONTH)); + date.add(Calendar.DAY_OF_MONTH, day); + + // Note: this fetches all programmes up to and including the + // requested date! URL url = programmeUrl(0, day); JSONObject json = fetchJSON(url); @@ -268,7 +278,8 @@ public class RTL extends AbstractEPGSource implements EPGSource { logger.trace("Skipping programmes for channel " + station); continue; } - result.add(createProgramme(schedule, channelMap)); + Programme prog = createProgramme(schedule, channelMap); + if(!prog.startTime.before(date.getTime())) result.add(prog); } return result;