Author: jerome
Date: 2009-04-08 11:18:14 +0200 (Wed, 08 Apr 2009)
New Revision: 4408
Removed:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/belgian/
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/french/
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/spanish/
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/unitedKingdom/
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/unitedStates/
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/ptv_main.java
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/GadgetProgramTV.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/gadget/GadgetProgramsTvBeFr.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
Log:
* Refactored the project.
* Make use of the same url to get tv programs ( except for US one ).
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-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -25,7 +25,7 @@
public class Configuration extends SimpleGadgetConfiguration{
- private String channel = "BBC1";
+ private String channel = "EEN";
private boolean giveProgramDescription = true;
private boolean giveMorning = true;
private boolean giveAfternoon = true;
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -26,7 +26,6 @@
import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
import com.kysoh.tvPrograms.Program;
import com.kysoh.tvPrograms.programs.SimplePrograms;
-import com.kysoh.tvPrograms.programs.belgian.BelgianDutch;
public class GadgetProgramTV {
@@ -92,7 +91,7 @@
//Give now playing program.
if(configuration.getGiveNowPlaying())
{
- Program nowPlaying =
BelgianDutch.getNowPlaying(programme);
+ Program nowPlaying =
SimplePrograms.getNowPlaying(programme);
gadget.throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
}
}
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-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -26,7 +26,7 @@
import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
import com.kysoh.tvPrograms.Program;
import com.kysoh.tvPrograms.ProgramLoadListener;
-import com.kysoh.tvPrograms.programs.belgian.BelgianDutch;
+import com.kysoh.tvPrograms.programs.SimplePrograms;
public class GadgetProgramsTvBeDu extends SimpleGadget<Configuration>
implements ProgramLoadListener{
@@ -35,15 +35,14 @@
/**
* Getting programs.
*/
- @SuppressWarnings("unused")
- private BelgianDutch duPrograms;
+ SimplePrograms duPrograms;
@Override
protected void start() throws Throwable
{
- BelgianDutch.addProgramLoadListener(this);
- duPrograms = new
BelgianDutch(this.configuration().getChannel());
+ SimplePrograms.addProgramLoadListener(this);
+ duPrograms = new SimplePrograms(SimplePrograms.BEDU,
this.configuration().getChannel());
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
2009-04-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -26,11 +26,11 @@
import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
import com.kysoh.tvPrograms.Program;
import com.kysoh.tvPrograms.ProgramLoadListener;
-import com.kysoh.tvPrograms.programs.belgian.BelgianFrench;
+import com.kysoh.tvPrograms.programs.SimplePrograms;
public class GadgetProgramsTvBeFr extends SimpleGadget<Configuration>
implements ProgramLoadListener{
- BelgianFrench frPrograms;
+ SimplePrograms frPrograms;
/**
* Start the gadget.
@@ -38,8 +38,8 @@
@Override
protected void start() throws Throwable
{
- BelgianFrench.addProgramLoadListener(this);
- frPrograms = new
BelgianFrench(this.configuration().getChannel());
+ SimplePrograms.addProgramLoadListener(this);
+ frPrograms = new SimplePrograms(SimplePrograms.BEFR,
this.configuration().getChannel());
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
2009-04-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -26,11 +26,11 @@
import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
import com.kysoh.tvPrograms.Program;
import com.kysoh.tvPrograms.ProgramLoadListener;
-import com.kysoh.tvPrograms.programs.spanish.SpanishPrograms;
+import com.kysoh.tvPrograms.programs.SimplePrograms;
public class GadgetProgramsTvEs extends SimpleGadget<Configuration> implements
ProgramLoadListener{
- SpanishPrograms spPrograms;
+ SimplePrograms spPrograms;
/**
* Gadget entry point.
@@ -38,8 +38,8 @@
@Override
protected void start() throws Throwable
{
- SpanishPrograms.addProgramLoadListener(this);
- spPrograms = new
SpanishPrograms(this.configuration().getChannel());
+ SimplePrograms.addProgramLoadListener(this);
+ spPrograms = new SimplePrograms(SimplePrograms.SP,
this.configuration().getChannel());
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -26,11 +26,11 @@
import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
import com.kysoh.tvPrograms.Program;
import com.kysoh.tvPrograms.ProgramLoadListener;
-import com.kysoh.tvPrograms.programs.french.FrenchPrograms;
+import com.kysoh.tvPrograms.programs.SimplePrograms;
public class GadgetProgramsTvFr extends SimpleGadget<Configuration> implements
ProgramLoadListener{
- FrenchPrograms french;
+ SimplePrograms french;
/**
* Constructor.
@@ -38,8 +38,8 @@
@Override
protected void start() throws Throwable
{
- FrenchPrograms.addProgramLoadListener(this);
- french = new FrenchPrograms(this.configuration().getChannel());
+ SimplePrograms.addProgramLoadListener(this);
+ french = new SimplePrograms(SimplePrograms.FR,
this.configuration().getChannel());
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
2009-04-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -26,11 +26,11 @@
import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
import com.kysoh.tvPrograms.Program;
import com.kysoh.tvPrograms.ProgramLoadListener;
-import com.kysoh.tvPrograms.programs.unitedKingdom.UnitedKingdomPrograms;
+import com.kysoh.tvPrograms.programs.SimplePrograms;
public class GadgetProgramsTvUk extends SimpleGadget<Configuration> implements
ProgramLoadListener{
- UnitedKingdomPrograms ukPrograms;
+ SimplePrograms ukPrograms;
/**
* Gadget entry point.
@@ -38,8 +38,8 @@
@Override
protected void start() throws Throwable
{
- UnitedKingdomPrograms.addProgramLoadListener(this);
- ukPrograms = new
UnitedKingdomPrograms(this.configuration().getChannel());
+ SimplePrograms.addProgramLoadListener(this);
+ ukPrograms = new SimplePrograms(SimplePrograms.UK,
this.configuration().getChannel());
}
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-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -24,25 +24,21 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
+import java.util.Hashtable;
import java.util.Vector;
+import com.kysoh.tvPrograms.HTMLUtils;
import com.kysoh.tvPrograms.Program;
import com.kysoh.tvPrograms.ProgramLoadListener;
public class SimplePrograms extends Object{
- protected String maintener;
- protected String maintenerUrl;
+ protected final String maintener = "eurotv";
+ protected final String maintenerUrl = "http://www.eurotv.com";;
- public String channel;
- public String url;
+ public String url = "http://www.eurotv.com/%s";;
- protected static String[] channels;
-
- //The complete program.
- protected Vector<Program> program = new Vector<Program>();
-
protected static Collection<ProgramLoadListener> listeners = new
ArrayList<ProgramLoadListener>();
@@ -50,26 +46,47 @@
private static final int AFTERNOON = 1;
private static final int EVENING = 2;
+ public static final String BEFR = "scripts/gridbefr.htm";
+ public static final String BEDU = "scripts/gridbedu.htm";
+ public static final String FR = "scripts/gridfrall.htm";
+ public static final String SP = "scripts/gridsp.htm";
+ public static final String Nl = "scripts/gridnl.htm";
+ public static final String UK = "scripts/griduk.htm";
+ public static final String GE = "scripts/gridge.htm";
+ public static final String LU = "scripts/gridlu.htm";
+ public static final String IT = "scripts/gridit.htm";
+ public static final String US = null;
+
+ //The complete program.
+ private Hashtable<String, String> channelsMap = new Hashtable<String,
String>();
+ protected Vector<Program> program = new Vector<Program>();
+ private String channel;
+ private String country;
- public SimplePrograms(String maintener, String maintenerWebsite, String
baseUrl, String channel)
+
+ public SimplePrograms(String country, String channel)
{
- this.maintener = maintener;
- this.maintenerUrl = maintenerWebsite;
- this.url = baseUrl;
this.channel = channel;
+ this.country = country;
+
+ if(country != null)
+ {
+ //Getting the complete available list.
+ String availables =
HTMLUtils.getPage("http://www.eurotv.com/scripts/eutvprog.cfm";, "");
+ availables =
availables.substring(availables.indexOf("Alphabetical list </A> of all
channels") +
+ "Alphabetical
list </A> of all channels".length());
+ channelsMap = this.getChannelsLinkByCountry(country,
availables);
+
+ this.triggerLoaded();
+ }
+ else
+ {
+ this.triggerError();
+ }
}
/**
- * Sets availables channel.
- */
- public void setChannels(String[] aChannels)
- {
- channels = aChannels;
- }
-
-
- /**
* Trigger error event.
*/
protected void triggerError()
@@ -94,6 +111,30 @@
}
+ /**
+ * Return the channels list with their url (dinamic to prevent link
changes).
+ * @param country
+ * @return
+ */
+ private Hashtable<String, String> getChannelsLinkByCountry(final String
country, String page)
+ {
+ Hashtable hash = new Hashtable<String, String>();
+ System.out.println(page);
+
+ return hash;
+ }
+
+
+ /**
+ * Parse retreived page.
+ * @param text
+ */
+ private void parsePage(String text)
+ {
+ System.out.println(text);
+ }
+
+
/*********************************************************************/
/*********** User functions *********************/
@@ -107,16 +148,7 @@
}
- /**
- * Return the complete list of availables channels.
- * @return
- */
- public static String[] getAvailablesChannels()
- {
- return channels;
- }
-
/**
* Return the mainteners for the tv program.
* @return
@@ -168,25 +200,7 @@
}
- /**
- * Return true if the channel exists for buld child.
- * @param aChannel
- * @return
- */
- public static boolean isValidChannel(String aChannel)
- {
- for(String channel : SimplePrograms.channels)
- {
- if(channel.equals(aChannel))
- {
- return true;
- }
- }
- return false;
- }
-
-
/**
* Sort the program vector.
* @return
Deleted:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/ptv_main.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/ptv_main.java
2009-04-07 17:13:10 UTC (rev 4407)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/ptv_main.java
2009-04-08 09:18:14 UTC (rev 4408)
@@ -1,138 +0,0 @@
-/* This file is part of "tuxdroid programs tv".
- * Copyright 2009, kysoh
- * Author : Conan Jerome
- * eMail : jerome.conan AT kysoh.com
- *
- * "tuxdroid programs tv" is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * "tuxdroid programs tv" is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with "tuxdroid programs tv"; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-import java.util.Vector;
-
-import com.kysoh.tvPrograms.Program;
-import com.kysoh.tvPrograms.ProgramLoadListener;
-import com.kysoh.tvPrograms.programs.belgian.BelgianDutch;
-import com.kysoh.tvPrograms.programs.belgian.BelgianFrench;
-import com.kysoh.tvPrograms.programs.belgian.BelgianPrograms;
-import com.kysoh.tvPrograms.programs.french.FrenchPrograms;
-import com.kysoh.tvPrograms.programs.unitedKingdom.UnitedKingdomPrograms;
-
-
-public class ptv_main implements ProgramLoadListener{
-
-
- /**
- * Class consructor.
- */
- public ptv_main(String country)
- {
- /**
- * Global belgian tests.
- */
- if(country.equalsIgnoreCase("BE"))
- {
-
- BelgianPrograms test = new BelgianPrograms("RTL TVI");
-
- for(com.kysoh.tvPrograms.Program programme :
test.getProgram())
- {
- System.out.println("Title: " +
programme.getTitle() + " Start Time: " + programme.getStartTime() );
- }
- }
-
-
- /**
- * Belgian french tv's tests.
- */
- else if(country.equalsIgnoreCase("BEFR"))
- {
- BelgianFrench.addProgramLoadListener(this);
- BelgianFrench test = new BelgianFrench("LA DEUX");
-
- for(com.kysoh.tvPrograms.Program programme :
test.getProgram())
- {
- System.out.println("Title: " +
programme.getTitle() + " Channel: " + programme.getChannel());
- }
- }
-
-
-
- /**
- * Belgian Dutch tv's tests.
- */
- else if(country.equalsIgnoreCase("BEDU"))
- {
- BelgianDutch.addProgramLoadListener(this);
- BelgianDutch test = new BelgianDutch("Ketnet");
-
- for(com.kysoh.tvPrograms.Program programme :
test.getProgram())
- {
- System.out.println("Title: " +
programme.getTitle() + " Channel: " + programme.getChannel());
- }
- }
-
-
- /**
- * Frenchs tv tests.
- */
- else if(country.equalsIgnoreCase("FR"))
- {
- FrenchPrograms.addProgramLoadListener(this);
- FrenchPrograms french = new FrenchPrograms("eurosport");
- for(com.kysoh.tvPrograms.Program program :
french.getProgram())
- {
- System.out.println("Title: " +
program.getTitle() + " Channel: " + program.getChannel() + " Description:
" + program.getDescription());
- }
- }
-
-
- /**
- * United Kingdom tv tests.
- */
- else if(country.equalsIgnoreCase("UK"))
- {
- UnitedKingdomPrograms.addProgramLoadListener(this);
- UnitedKingdomPrograms program = new
UnitedKingdomPrograms("Channel 4");
- for(com.kysoh.tvPrograms.Program programme :
program.getProgram())
- {
- System.out.println("Start Time: " +
programme.getStartTime() + " Title: " + programme.getTitle() + " Channel: "
+ programme.getChannel() + " Description: " + programme.getDescription());
- }
- }
- }
-
-
- @Override
- public void loadError(String url)
- {
- System.out.println("Error getting file at: " + url);
- }
-
-
- @Override
- public void loaded(Vector<Program> completeProgram)
- {
- System.out.println("load succesfull");
- }
-
-
- /**
- * Main entry point.anotherString
- * @param args
- */
- public static void main(String[] args)
- {
- new ptv_main("UK");
- }
-}
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
