Author: jerome
Date: 2009-04-05 12:37:48 +0200 (Sun, 05 Apr 2009)
New Revision: 4338
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/belgian/BelgianPrograms.java
Log:
* Added programs sorter.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-04 07:00:38 UTC (rev 4337)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-05 10:37:48 UTC (rev 4338)
@@ -25,11 +25,11 @@
public class Configuration extends SimpleGadgetConfiguration{
- private String channel = "Ketnet";
+ private String channel = "LA UNE";
private boolean giveProgramDescription = true;
- private boolean giveMorning = true;
- private boolean giveAfternoon = true;
- private boolean giveEvening = true;
+ private boolean giveMorning = false;
+ private boolean giveAfternoon = false;
+ private boolean giveEvening = false;
private boolean giveNowPlaying = true;
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-04 07:00:38 UTC (rev 4337)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-05 10:37:48 UTC (rev 4338)
@@ -75,15 +75,60 @@
@Override
public void loaded(Vector<Program> completeProgram)
{
- for (Program program : completeProgram)
+
+ if(this.configuration().getGiveMorning())
{
- throwMessage("{0} , {1}",
program.getStartTime().replace(".", "h"), program.getTitle());
+ Vector<Program> morning =
BelgianDutch.sortMorning(completeProgram);
- if(this.configuration().getGiveProgramDescription())
+ for(Program oneProgram : morning)
{
- throwMessage("Description is : {0}",
program.getDescription());
+
if(!this.configuration().getGiveProgramDescription())
+ {
+ throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle());
+ }
+ else
+ {
+ throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle() + " " +
oneProgram.getDescription());
+ }
}
}
+
+ if (this.configuration().getGiveAfternoon())
+ {
+ Vector<Program> afternoon =
BelgianDutch.sortAfternoon(completeProgram);
+ for(Program oneProgram : afternoon)
+ {
+
if(!this.configuration().getGiveProgramDescription())
+ {
+ throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle());
+ }
+ else
+ {
+ throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle() + " " +
oneProgram.getDescription());
+ }
+ }
+ }
+
+ if(this.configuration().getGiveEvening())
+ {
+ Vector<Program> evening =
BelgianDutch.sortEvening(completeProgram);
+ for(Program oneProgram : evening)
+ {
+
if(!this.configuration().getGiveProgramDescription())
+ {
+ throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle());
+ }
+ else
+ {
+ throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle() + " " +
oneProgram.getDescription());
+ }
+ }
+ }
+
+ if(this.configuration().getGiveNowPlaying())
+ {
+
System.out.println(BelgianDutch.getNowPlaying(completeProgram));
+ }
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-04 07:00:38 UTC (rev 4337)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-05 10:37:48 UTC (rev 4338)
@@ -22,6 +22,7 @@
package com.kysoh.tvPrograms.programs;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collection;
import java.util.Vector;
@@ -45,6 +46,11 @@
protected static Collection<ProgramLoadListener> listeners = new
ArrayList<ProgramLoadListener>();
+ private static final int MORNING = 0;
+ private static final int AFTERNOON = 1;
+ private static final int EVENING = 2;
+
+
public SimplePrograms(String maintener, String maintenerWebsite, String
baseUrl, String channel)
{
this.maintener = maintener;
@@ -178,5 +184,125 @@
}
return false;
}
+
+
+
+ /**
+ * Sort the program vector.
+ * @return
+ */
+ private static Vector<Program> sortPrograms(Vector<Program> program,
int time)
+ {
+ Vector<Program> sorted = new Vector<Program>();
+
+ switch(time)
+ {
+ //Morning sort.
+ case SimplePrograms.MORNING:
+ {
+ for(Program p : program)
+ {
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() <= 12)
+ {
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() >= 6)
+ {
+ sorted.add(p);
+ }
+ }
+ }
+ }
+
+ //Afternoon sort.
+ case SimplePrograms.AFTERNOON:
+ {
+ for(Program p : program)
+ {
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() <= 18)
+ {
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() >= 13)
+ {
+ sorted.add(p);
+ }
+ }
+ }
+ }
+
+ //Evening sort.
+ case SimplePrograms.EVENING:
+ {
+ for(Program p : program)
+ {
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() <= 23)
+ {
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() >= 19)
+ {
+ sorted.add(p);
+ }
+ }
+
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() <= 5)
+ {
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() >= 0)
+ {
+ sorted.add(p);
+ }
+ }
+ }
+ }
+ }
+ return sorted;
+ }
+
+
+ /**
+ * Sort the given program for a morning use.
+ * @param program
+ * @return
+ */
+ public static Vector<Program> sortMorning(Vector<Program> program)
+ {
+ return SimplePrograms.sortPrograms(program,
SimplePrograms.MORNING);
+ }
+
+ /**
+ * Sort the given program for an afternoon use.
+ * @param program
+ * @return
+ */
+ public static Vector<Program> sortAfternoon(Vector<Program> program)
+ {
+ return SimplePrograms.sortPrograms(program,
SimplePrograms.AFTERNOON);
+ }
+
+
+ /**
+ * Sort the given program for an evening use.
+ * @param program
+ * @return
+ */
+ public static Vector<Program> sortEvening(Vector<Program> program)
+ {
+ return SimplePrograms.sortPrograms(program,
SimplePrograms.EVENING);
+ }
+
+
+ /**
+ * Return the program that is now playing.
+ * @param program
+ * @return
+ */
+ public static Program getNowPlaying(Vector<Program> program)
+ {
+ int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+ int minutes = Calendar.getInstance().get(Calendar.MINUTE);
+
+ for( int i = 0 ; i < program.size(); i++ )
+ {
+ //TODO
+ }
+
+ return null;
+ }
+
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/belgian/BelgianPrograms.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/belgian/BelgianPrograms.java
2009-04-04 07:00:38 UTC (rev 4337)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/belgian/BelgianPrograms.java
2009-04-05 10:37:48 UTC (rev 4338)
@@ -55,7 +55,7 @@
*/
public BelgianPrograms(String channel)
{
- super("Cine Télé revue", "www.cinetelerevue.be",
"http://www.telemoustique.be/tm/programme_tele_chaine.html?channel=%s";,
+ super("Télémoustique", "www.telemoustique.be",
"http://www.telemoustique.be/tm/programme_tele_chaine.html?channel=%s";,
channel.replace(" ", "%20"));
this.initialize(channel);
}
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
