|
From: <moi...@us...> - 2007-06-06 23:20:42
|
Revision: 491
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=491&view=rev
Author: moiristo
Date: 2007-06-06 16:20:39 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
Update of the RTLGemist section
Modified Paths:
--------------
trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs
Added Paths:
-----------
trunk/plugins/UitzendingGemist/Readme.txt
Removed Paths:
-------------
trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak
trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak
trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak
trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak
Added: trunk/plugins/UitzendingGemist/Readme.txt
===================================================================
--- trunk/plugins/UitzendingGemist/Readme.txt (rev 0)
+++ trunk/plugins/UitzendingGemist/Readme.txt 2007-06-06 23:20:39 UTC (rev 491)
@@ -0,0 +1,64 @@
+MediaPortal UitzendingGemist plugin
+by Moiristo
+
+
+This plugin for MediaPortal makes it possible to browse and watch the
+internet streams provided by uitzendinggemist.nl and www.rtl.nl.
+
+This plugin is a frontend to the website and allows the user watch these streams from within Mediaportal.
+
+
+installation:
+
+- Unpack
+- Use Dukus's MPInstaller utility (available in the plugins/utilities download section) to install the plugin. Be sure to use the 0.2.2_SVN MPI when you are using the latest MP snapshot.
+
+bugs needed to be fixed
+- After an emission finishes, MP isn't notified and will not go back to the menu.
+(you have to stop the playback manually)
+
+
+thanks:
+
+A big thanks to ZipperZip for letting me use his Uitzending_Gemist Plugin code.
+
+0.8
+- Fixed the TopTen screen of RTLGemist
+- Recompiled against the latest SVN
+
+0.7
+- Changed the plugin name to 'TV Gemist' (A lot of plugins disliked the long name)
+- NLGemist now shows all available emissions, not the last five
+- Fixed wrong url regex for emission logo, now it properly shows the logo that belongs to the emission
+- Fixed NLGemist not going in fullscreen when clicking an emission
+- Added a widescreen skin file (nothing fancy yet though)
+- No progression on the Tien plugin however :)
+
+0.6
+- Fixed NLGemist section not working because of changed website (Now everything can be found in XML documents o/)
+- Started with the Tien plugin (no functionality yet)
+
+0.5
+- Fixed NLGemist section not working because of changed website (It requires a cookie)
+- Fixed stream regexes
+- Improved skin files
+
+TODO:
+
+- Support for Tien (I contacted them for this, not much support yet though)
+- Mepo Skin (I like mepo :))
+
+0.4
+- Created custom skin files for Project Mayhem 3
+
+0.3
+- Added a frontend to RTLGemist
+- Added an UitGemist-MP-puppet
+- Added a frontend to UitzendingGemist and RTLGemist
+- Improvement: Focus the facadeview after loading new entries
+
+0.2
+- Fixed some bugs in the original code
+
+0.1
+- Initial version from ZipperZip
\ No newline at end of file
Modified: trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs
===================================================================
--- trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs 2007-06-06 21:53:56 UTC (rev 490)
+++ trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs 2007-06-06 23:20:39 UTC (rev 491)
@@ -449,46 +449,38 @@
string url = host + @"/experience/media/context/index.xml";
string result = wc.GetXML(url);
- try
- {
- XPathDocument document = new XPathDocument(new System.IO.StringReader(result));
- XPathNavigator navigator = document.CreateNavigator();
- XPathExpression programs = XPathExpression.Compile("//li/a"); //returns nodeset
- XPathNodeIterator nodes = navigator.Select(programs);
+ //StreamWriter sw = new StreamWriter("d:/test.log");
+ //sw.Write(result);
+ //sw.Close();
- int i = 0;
- while (nodes.MoveNext())
- {
- //Log.Info("UitGemist: Found node '" + nodes.Current.ToString() + "'");
+ int i = 0;
+ MatchCollection mc = Regex.Matches(result, @"target=._parent.*?href=.(?<url>.*?.xml).*?>(?<name>.*?)</a>");
+ if (mc.Count == 0) Log.Info("UitGemist: No emissions found");
+ foreach (Match m1 in mc)
+ {
+ Log.Info("UitGemist: Found program '" + m1.Groups["name"].Value + "'");
- Names.Add(@nodes.Current.ToString());
- Names[i] = MakeFirstUpper(ConvertString(Names[i]));
- Urls.Add(@nodes.Current.GetAttribute("href", "").ToString());
- Urls[i] = ConvertString(Urls[i]);
- i++;
- }
+ Names.Add(@m1.Groups["name"].Value);
+ Names[i] = MakeFirstUpper(ConvertString(Names[i]));
+ Urls.Add(@m1.Groups["url"].Value);
+ Urls[i] = ConvertString(Urls[i]);
+ i++;
+ }
- // Show the results!
+ // Show the results!
- facadeview.View = GUIFacadeControl.ViewMode.List;
- facadeview.Clear();
+ facadeview.View = GUIFacadeControl.ViewMode.List;
+ facadeview.Clear();
- for (i = 0; i < Names.Count; i++)
- {
- string label = Names[i];
- GUIListItem item = new GUIListItem();
- item.Label = label;
- item.IsFolder = false;
- Util.Utils.SetDefaultIcons(item);
- facadeview.Add(item);
- }
- }
- catch (XmlException e)
+ for (i = 0; i < Names.Count; i++)
{
- Log.Info("UitGemist: Invalid xml document '" + url + "'. Details follow.");
- Log.Info("UitGemist: Line number: " + e.LineNumber + ":");
- Log.Info(e.StackTrace);
+ string label = Names[i];
+ GUIListItem item = new GUIListItem();
+ item.Label = label;
+ item.IsFolder = false;
+ Util.Utils.SetDefaultIcons(item);
+ facadeview.Add(item);
}
}
Deleted: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak
===================================================================
--- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak 2007-06-06 21:53:56 UTC (rev 490)
+++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak 2007-06-06 23:20:39 UTC (rev 491)
@@ -1,52 +0,0 @@
-<window>
- <id>6802</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:RTLGemist</define>
-<controls>
- <import>common.window.xml</import>
- <control>
- <type>image</type>
- <description>BackGround</description>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background3.png</texture>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromLeft</animation>
- <layout>StackLayout</layout>
- <posX>5</posX>
- <posY>125</posY>
- <control>
- <description>Favorieten</description>
- <type>button</type>
- <id>2</id>
- <label>Favorieten</label>
- <onup>17</onup>
- <ondown>3</ondown>
- </control>
- <control>
- <description>Top Tien</description>
- <type>button</type>
- <id>3</id>
- <label>Top Tien</label>
- <onup>2</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <description>Programma's</description>
- <type>button</type>
- <id>4</id>
- <label>Programma's</label>
- <onup>3</onup>
- <ondown>2</ondown>
- </control>
- </control>
- <import>common.facade.xml</import>
-</controls>
-</window>
\ No newline at end of file
Deleted: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak
===================================================================
--- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak 2007-06-06 21:53:56 UTC (rev 490)
+++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak 2007-06-06 23:20:39 UTC (rev 491)
@@ -1,127 +0,0 @@
-<window>
- <id>6800</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:UitGemist</define>
-<controls>
- <import>common.window.xml</import>
- <control>
- <type>image</type>
- <description>BackGround</description>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background3.png</texture>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromLeft</animation>
- <layout>StackLayout</layout>
- <posX>5</posX>
- <posY>125</posY>
- <control>
- <description>Favorieten</description>
- <type>button</type>
- <id>2</id>
- <label>Favorieten</label>
- <onup>17</onup>
- <ondown>3</ondown>
- </control>
- <control>
- <type>selectbutton</type>
- <description>Letter button</description>
- <id>3</id>
- <label>Titel</label>
- <onup>2</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <type>selectbutton</type>
- <description>Letter button</description>
- <id>4</id>
- <label>Dag</label>
- <onup>3</onup>
- <ondown>5</ondown>
- </control>
- <control>
- <type>selectbutton</type>
- <description>Letter button</description>
- <id>5</id>
- <label>Net/zender</label>
- <onup>4</onup>
- <ondown>6</ondown>
- </control>
- <control>
- <type>selectbutton</type>
- <description>Letter button</description>
- <id>6</id>
- <label>Omroep</label>
- <onup>5</onup>
- <ondown>7</ondown>
- </control>
- <control>
- <type>selectbutton</type>
- <description>Letter button</description>
- <id>7</id>
- <label>Genre</label>
- <onup>6</onup>
- <ondown>8</ondown>
- </control>
- <control>
- <description>Moet je Zien</description>
- <type>button</type>
- <id>8</id>
- <label>Moet je zien</label>
- <onup>7</onup>
- <onright>50</onright>
- <ondown>50</ondown>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <control>
- <type>imagelist</type>
- <id>11</id>
- <posX>550</posX>
- <posY>350</posY>
- <width>100</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>star.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#rating</percentage>
- </control>
- <control>
- <type>textboxscrollup</type>
- <description>Programma-info</description>
- <id>12</id>
- <posX>260</posX>
- <posY>380</posY>
- <width>375</width>
- <height>100</height>
- <label>#plot</label>
- <textcolor>ffffffff</textcolor>
- <font>font12</font>
- </control>
- <control>
- <description>Bekeken</description>
- <type>label</type>
- <id>13</id>
- <posX>260</posX>
- <posY>350</posY>
- <label>#votes keer bekeken</label>
- <textcolor>ffffffff</textcolor>
- </control>
- </control>
- </control>
- <import>common.facade.xml</import>
-</controls>
-</window>
\ No newline at end of file
Deleted: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak
===================================================================
--- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak 2007-06-06 21:53:56 UTC (rev 490)
+++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak 2007-06-06 23:20:39 UTC (rev 491)
@@ -1,136 +0,0 @@
-<window>
- <id>6801</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:Programma</define>
- <controls>
- <import>common.window.xml</import>
- <control>
- <type>image</type>
- <description>BackGround</description>
- <id>9</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromTop</animation>
- <control>
- <type>image</type>
- <description>Program image</description>
- <id>3</id>
- <posX>60</posX>
- <posY>125</posY>
- <width>100</width>
- <height>75</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>Naam van gekozen programma</description>
- <type>label</type>
- <id>2</id>
- <posX>170</posX>
- <posY>105</posY>
- <label>#title</label>
- </control>
- <control>
- <description>Genre</description>
- <type>label</type>
- <id>0</id>
- <posX>555</posX>
- <posY>120</posY>
- <label>Genre</label>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>Display wich genre</description>
- <type>label</type>
- <id>4</id>
- <posX>555</posX>
- <posY>138</posY>
- <label>#genre</label>
- </control>
- <control>
- <description>Omroep</description>
- <type>label</type>
- <id>8</id>
- <posX>555</posX>
- <posY>162</posY>
- <label>Omroep</label>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>Display which omroep</description>
- <type>label</type>
- <id>5</id>
- <posX>555</posX>
- <posY>180</posY>
- <label>#credits</label>
- </control>
- <control>
- <type>imagelist</type>
- <id>7</id>
- <posX>555</posX>
- <posY>205</posY>
- <width>100</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>star.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#rating</percentage>
- </control>
- <control>
- <type>textboxscrollup</type>
- <description>Programma-info</description>
- <id>6</id>
- <posX>170</posX>
- <posY>125</posY>
- <width>375</width>
- <height>105</height>
- <label>#plot</label>
- <font>font12</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>afleveringen</description>
- <type>listcontrol</type>
- <id>10</id>
- <posX>170</posX>
- <posY>240</posY>
- <width>485</width>
- <height>200</height>
- <textXOff>10</textXOff>
- <textYOff>2</textYOff>
- <textXOff2>420</textXOff2>
- <textYOff2>2</textYOff2>
- <spaceBetweenItems>5</spaceBetweenItems>
- <textureHeight>25</textureHeight>
- <keepaspectratio>no</keepaspectratio>
- <font2>font10</font2>
- <font3>font10</font3>
- <onup>17</onup>
- </control>
- <control>
- <type>textboxscrollup</type>
- <description>Programma-info</description>
- <id>1</id>
- <posX>170</posX>
- <posY>400</posY>
- <width>375</width>
- <height>100</height>
- <label>#plotoutline</label>
- <font>font12</font>
- <textcolor>ffffffff</textcolor>
- </control>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak
===================================================================
--- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak 2007-06-06 21:53:56 UTC (rev 490)
+++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak 2007-06-06 23:20:39 UTC (rev 491)
@@ -1,58 +0,0 @@
-<window>
- <id>6799</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:UitzendingGemist</define>
- <define>#header.image:</define>
- <define>#header.hover:hover_uitgemist.png</define>
-
- <controls>
- <import>common.window.xml</import>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <texture>background.png</texture>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="250" start="-300,0">WindowOpen</animation>
- <animation effect="slide" time="500" end="0,-300">WindowClose</animation>
- <layout>StackLayout</layout>
- <posX>80</posX>
- <posY>120</posY>
-
- <!-- topmost item needs an onup with a value of 17 for topbar to work -->
- <control>
- <description>UitzendingGemist.nl</description>
- <type>button</type>
- <id>2</id>
- <width>575</width>
- <height>90</height>
- <textureNoFocus>nlgemist.png</textureNoFocus>
- <textureFocus>hover_nlgemist.png</textureFocus>
- <onup>17</onup>
- </control>
-
- <!-- last item needs an ondown with a value of 2 to support wraparound -->
- <control>
- <description>RTL Gemist</description>
- <type>button</type>
- <id>3</id>
- <width>575</width>
- <height>90</height>
- <textXOff>10</textXOff>
- <textYOff>5</textYOff>
- <textureNoFocus>rtlgemist.png</textureNoFocus>
- <textureFocus>hover_rtlgemist.png</textureFocus>
- <ondown>2</ondown>
- </control>
-
- </control>
- </controls>
-</window>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|