Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [905] trunk/plugins/OnlineVideos
|
From: <gre...@us...> - 2007-09-07 23:59:28
|
Revision: 905
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=905&view=rev
Author: gregmac45
Date: 2007-09-07 16:59:25 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Added LiveVideo, break, and rocketboom support
Added more info on the trailer page
Modified Paths:
--------------
trunk/plugins/OnlineVideos/OnlineVideoSites.xml
trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml
trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml
trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos.sln
Modified: trunk/plugins/OnlineVideos/OnlineVideoSites.xml
===================================================================
--- trunk/plugins/OnlineVideos/OnlineVideoSites.xml 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/OnlineVideoSites.xml 2007-09-07 23:59:25 UTC (rev 905)
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<settings>
+<settings>
<sites>
<site>
<name>YouTube</name>
<id>1</id>
- <user></user>
- <password></password>
+ <user>
+ </user>
+ <password>
+ </password>
<confirm>no</confirm>
<enabled>yes</enabled>
<rss name="Top Rated"><![CDATA[http://youtube.com/rss/global/top_rated.rss]]></rss>
@@ -24,8 +26,10 @@
<site>
<name>Google Video</name>
<id>2</id>
- <user></user>
- <password></password>
+ <user>
+ </user>
+ <password>
+ </password>
<confirm>no</confirm>
<enabled>yes</enabled>
<rss name="Popular"><![CDATA[http://video.google.com/videofeed?type=popular&num=100&output=rss]]></rss>
@@ -229,10 +233,6 @@
<enabled>yes</enabled>
<rss name="All Trailers"><![CDATA[%]]></rss>
<rss name="New Trailers"><![CDATA[http://www.apple.com/moviesxml/h/view1_all.xml]]></rss>
- <rss name="Weekend Box Office"><![CDATA[http://www.apple.com/moviesxml/h/boxoffice_include.xml]]></rss>
- <rss name="Opening This Week"><![CDATA[http://www.apple.com/moviesxml/h/openings_include.xml]]></rss>
- <rss name="Exclusives"><![CDATA[http://www.apple.com/moviesxml/h/view1a_include.xml]]></rss>
- <rss name="Featured HD"><![CDATA[http://www.apple.com/moviesxml/h/view3a_include.xml]]></rss>
<rss name="Action and Adventure"><![CDATA[http://movies.apple.com/moviesxml/g/action_and_adventure_1.xml]]></rss>
<rss name="Comedy"><![CDATA[http://movies.apple.com/moviesxml/g/comedy_1.xml]]></rss>
<rss name="Documentary"><![CDATA[http://movies.apple.com/moviesxml/g/documentary_1.xml]]></rss>
@@ -269,6 +269,13 @@
<rss name="Search"><![CDATA[%{0}]]></rss>
</site>
<site>
+ <name>RocketBoom</name>
+ <id>17</id>
+ <enabled>yes</enabled>
+ <rss name="Daily(wmv)"><![CDATA[http://www.rocketboom.com/vlog/win_media_player_daily_enclosures.xml]]></rss>
+ <rss name="Daily(mov)"><![CDATA[http://www.rocketboom.com/vlog/index.xml]]></rss>
+ </site>
+ <site>
<name>Stage6</name>
<id>18</id>
<user>
@@ -289,6 +296,42 @@
<rss name="G4TV"><![CDATA[http://stage6.divx.com/rss/channel/channel:G4TV]]></rss>
<rss name="CommandN"><![CDATA[http://stage6.divx.com/rss/channel/channel:commandN]]></rss>
</site>
+ <site>
+ <id>21</id>
+ <name>Live Video</name>
+ <enabled>yes</enabled>
+ <rss name="Featured Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=Featured]]></rss>
+ <rss name="New Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=Newest]]></rss>
+ <rss name="Most Viewed Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostViewed]]></rss>
+ <rss name="Most Discussed Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostDiscussed]]></rss>
+ <rss name="Most Hit Votes Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostHit]]></rss>
+ <rss name="Most Miss Votes Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostMiss]]></rss>
+ <rss name="Arts & Animation"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=1]]></rss>
+ <rss name="Auto & Vehicles"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=6]]></rss>
+ <rss name="Comedy"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=7]]></rss>
+ <rss name="Entertainment"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=8]]></rss>
+ <rss name="Extreme"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=3]]></rss>
+ <rss name="Music"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=9]]></rss>
+ <rss name="News"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=10]]></rss>
+ <rss name="People"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=11]]></rss>
+ <rss name="Pets & Animals"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=12]]></rss>
+ <rss name="Science & Technology"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=13]]></rss>
+ <rss name="Sports"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=5]]></rss>
+ <rss name="Travel & Places"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=14]]></rss>
+ <rss name="Video Blogs"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=17]]></rss>
+ <rss name="Video Comments"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=18]]></rss>
+ <rss name="Video Games"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=15]]></rss>
+ </site>
+ <site>
+ <name>Break</name>
+ <id>22</id>
+ <enabled>yes</enabled>
+ <rss name="Home Page"><![CDATA[http://rss.break.com/channel/homepage/]]></rss>
+ <rss name="Movies"><![CDATA[http://rss.break.com/channel/movies/]]></rss>
+ <rss name="Top Rated"><![CDATA[http://rss.break.com/channel/topratedupdates/]></rss>
+ <rss name="Weeds"><![CDATA[http://rss.break.com/channel/weeds/]]></rss>
+ <rss name="Search"><![CDATA[http://rss.break.com/tag/{0}/]]></rss>
+ </site>
<site>
<name>Generic</name>
<id>50</id>
@@ -299,17 +342,6 @@
<confirm>no</confirm>
<enabled>no</enabled>
<rss name="MSDN"><![CDATA[http://channel9.msdn.com/rss.aspx?ShowID=1]]></rss>
- </site>
- <site>
- <name>Downloaded Videos</name>
- <id>99</id>
- <user>
- </user>
- <password>
- </password>
- <confirm>no</confirm>
- <enabled>yes</enabled>
- <rss name="Downloads"><![CDATA[C:\FlashVideos\]]></rss>
</site>
</sites>
</settings>
\ No newline at end of file
Modified: trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml
===================================================================
--- trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml 2007-09-07 23:59:25 UTC (rev 905)
@@ -6,6 +6,72 @@
<controls>
<import>common.window.xml</import>
<import>common.facade.xml</import>
+ <control>
+ <type>label</type>
+ <description>Runtime txt</description>
+ <id>54</id>
+ <posX>250</posX>
+ <posY>230</posY>
+ <label>172</label>
+ <visible>no</visible>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>year value</description>
+ <id>55</id>
+ <posX>380</posX>
+ <posY>230</posY>
+ <label>#releasedate</label>
+ <visible>no</visible>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Genre txt</description>
+ <id>56</id>
+ <posX>250</posX>
+ <posY>255</posY>
+ <label>174</label>
+ <visible>no</visible>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>genre value</description>
+ <id>57</id>
+ <posX>315</posX>
+ <posY>255</posY>
+ <label>#genre</label>
+ <visible>no</visible>
+ <disabledcolor>ff808080</disabledcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Plot txt</description>
+ <id>58</id>
+ <posX>250</posX>
+ <posY>280</posY>
+ <visible>no</visible>
+ <label>Plot:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>textboxscrollup</type>
+ <description>Plot value</description>
+ <id>59</id>
+ <posX>250</posX>
+ <posY>303</posY>
+ <width>440</width>
+ <height>200</height>
+ <colordiffuse>ffffffff</colordiffuse>
+ <visible>no</visible>
+ <font>font13</font>
+ <label>#plot</label>
+ <textcolor>FFFFFFFF</textcolor>
+ </control>
+
<control>
<type>button</type>
<description>View button</description>
@@ -19,12 +85,41 @@
<label>101</label>
</control>
<control>
+ <type>button</type>
+ <description>Next button</description>
+ <id>3</id>
+ <posX>60</posX>
+ <posY>127</posY>
+ <onleft>3</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Next Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>Previous button</description>
+ <id>4</id>
+ <posX>60</posX>
+ <posY>157</posY>
+ <onleft>4</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Previous Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
<type>label</type>
<description>Title txt</description>
<id>11</id>
<posX>20</posX>
- <posY>180</posY>
- <visible>yes</visible>
+ <posY>185</posY>
+ <visible>no</visible>
<label>Title:</label>
<textcolor>ffb2d4f5</textcolor>
</control>
@@ -34,7 +129,7 @@
<description>Title txt</description>
<id>111</id>
<posX>60</posX>
- <posY>180</posY>
+ <posY>185</posY>
<visible>no</visible>
<width>160</width>
<label>#videotitle</label>
@@ -45,7 +140,7 @@
<description>Tags txt</description>
<id>12</id>
<posX>20</posX>
- <posY>200</posY>
+ <posY>205</posY>
<visible>no</visible>
<label>Tags:</label>
<textcolor>ffb2d4f5</textcolor>
@@ -56,7 +151,7 @@
<description>Tags txt</description>
<id>121</id>
<posX>65</posX>
- <posY>200</posY>
+ <posY>205</posY>
<width>160</width>
<visible>no</visible>
<label>#tags</label>
@@ -67,7 +162,7 @@
<description>Length txt</description>
<id>13</id>
<posX>20</posX>
- <posY>220</posY>
+ <posY>225</posY>
<visible>no</visible>
<label>Length:</label>
<textcolor>ffb2d4f5</textcolor>
@@ -78,7 +173,7 @@
<description>length txt</description>
<id>131</id>
<posX>80</posX>
- <posY>220</posY>
+ <posY>225</posY>
<width>145</width>
<visible>no</visible>
<label>#length</label>
@@ -89,7 +184,7 @@
<description>Length txt</description>
<id>14</id>
<posX>20</posX>
- <posY>240</posY>
+ <posY>245</posY>
<visible>no</visible>
<label>Description:</label>
<textcolor>ffb2d4f5</textcolor>
@@ -100,12 +195,32 @@
<type>textboxscrollup</type>
<id>141</id>
<posX>20</posX>
- <posY>260</posY>
+ <posY>265</posY>
<width>200</width>
<height>140</height>
<label>#desc</label>
<visible>no</visible>
</control>
-
+ <control>
+ <type>image</type>
+ <description>movie border</description>
+ <id>23</id>
+ <posX>96</posX>
+ <posY>208</posY>
+ <width>120</width>
+ <height>184</height>
+ <visible>no</visible>
+ <texture>playback_background.png</texture>
+ </control>
+ <control>
+ <type>image</type>
+ <description>movie poster</description>
+ <id>24</id>
+ <posX>104</posX>
+ <posY>222</posY>
+ <width>101</width>
+ <height>150</height>
+ <texture>#movieposter</texture>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml
===================================================================
--- trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml 2007-09-07 23:59:25 UTC (rev 905)
@@ -7,249 +7,265 @@
<define>#selecteditem:-</define>
<define>#selecteditem2:-</define>
<controls>
- <import>common.window2.xml</import>
- <import>common.facade.xml</import>
- <control>
+ <import>common.window2.xml</import>
+ <import>common.facade.xml</import>
+
+ <control>
<type>label</type>
- <description>Runtime txt</description>
+ <description>release date txt</description>
<id>54</id>
<posX>474</posX>
- <posY>340</posY>
+ <posY>306</posY>
<label>172</label>
<visible>no</visible>
<textcolor>ff6b7487</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
+ </control>
+
+ <control>
<type>label</type>
- <description>Runtime value</description>
- <id>53</id>
+ <description>release date value</description>
+ <id>55</id>
<posX>1050</posX>
<posY>306</posY>
- <label>#runtime</label>
+ <label>#releasedate</label>
+ <visible>no</visible>
<textcolor>ffffffff</textcolor>
<align>right</align>
- <visible>no</visible>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
+ </control>
+
+ <control>
<type>label</type>
- <description>Runtime txt</description>
- <id>52</id>
- <posX>474</posX>
- <posY>306</posY>
- <label>299</label>
- <textcolor>ff6b7487</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
- <type>label</type>
<description>Genre txt</description>
- <id>51</id>
+ <id>56</id>
<posX>474</posX>
- <posY>373</posY>
+ <posY>340</posY>
<label>174</label>
<visible>no</visible>
<textcolor>ff6b7487</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
- <control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>genre value</description>
+ <id>57</id>
+ <posX>1050</posX>
+ <posY>340</posY>
+ <label>#genre</label>
+ <disabledcolor>ff808080</disabledcolor>
+ <width>400</width>
+ <align>right</align>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
<type>label</type>
<description>Plot txt</description>
<id>58</id>
<posX>474</posX>
- <posY>406</posY>
+ <posY>373</posY>
<label>Plot:</label>
<visible>no</visible>
<textcolor>ff6b7487</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
+
+ <control>
+ <description>textarea</description>
+ <type>textboxscrollup</type>
+ <id>59</id>
+ <posX>474</posX>
+ <posY>404</posY>
+ <width>882</width>
+ <height>206</height>
+ <label>#trailerdesc</label>
+ <visible>yes</visible>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>View button</description>
+ <id>2</id>
+ <posX>10</posX>
+ <posY>128</posY>
+ <onleft>2</onleft>
+ <onright>50</onright>
+ <onup>17</onup>
+ <ondown>3</ondown>
+ <label>101</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
<control>
- <type>button</type>
- <description>View button</description>
- <id>2</id>
- <posX>10</posX>
- <posY>128</posY>
- <onleft>2</onleft>
- <onright>50</onright>
- <onup>17</onup>
- <ondown>3</ondown>
- <label>101</label>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <type>button</type>
+ <description>Next button</description>
+ <id>3</id>
+ <posX>10</posX>
+ <posY>159</posY>
+ <onleft>3</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Next Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
</control>
- <control>
- <type>button</type>
- <description>Next button</description>
- <id>3</id>
- <posX>10</posX>
- <posY>159</posY>
- <onleft>3</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>4</ondown>
- <label>Next Page</label>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+
+ <control>
+ <type>button</type>
+ <description>Previous button</description>
+ <id>4</id>
+ <posX>10</posX>
+ <posY>189</posY>
+ <onleft>4</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Previous Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
</control>
+
<control>
- <type>button</type>
- <description>Previous button</description>
- <id>4</id>
- <posX>10</posX>
- <posY>189</posY>
- <onleft>4</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>4</ondown>
- <label>Previous Page</label>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <type>label</type>
+ <description>Title txt</description>
+ <id>11</id>
+ <posX>20</posX>
+ <posY>220</posY>
+ <visible>yes</visible>
+ <label>Title:</label>
+ <textcolor>ffb2d4f5</textcolor>
</control>
+
<control>
- <type>label</type>
- <description>Title txt</description>
- <id>11</id>
- <posX>20</posX>
- <posY>220</posY>
- <visible>yes</visible>
- <label>Title:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
-
- <control>
- <type>fadelabel</type>
- <description>Title txt</description>
- <id>111</id>
- <posX>78</posX>
- <posY>220</posY>
- <visible>yes</visible>
- <width>200</width>
- <label>#videotitle</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
- <control>
- <type>label</type>
- <description>Tags txt</description>
- <id>12</id>
- <posX>20</posX>
- <posY>250</posY>
- <visible>yes</visible>
- <label>Tags:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
+ <type>fadelabel</type>
+ <description>Title txt</description>
+ <id>111</id>
+ <posX>78</posX>
+ <posY>220</posY>
+ <visible>yes</visible>
+ <width>200</width>
+ <label>#videotitle</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Tags txt</description>
+ <id>12</id>
+ <posX>20</posX>
+ <posY>250</posY>
+ <visible>yes</visible>
+ <label>Tags:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
- <control>
- <type>fadelabel</type>
- <description>Tags txt</description>
- <id>121</id>
- <posX>85</posX>
- <posY>250</posY>
- <width>200</width>
- <visible>no</visible>
- <label>#tags</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
- <control>
- <type>label</type>
- <description>Length txt</description>
- <id>13</id>
- <posX>20</posX>
- <posY>280</posY>
- <visible>no</visible>
- <label>Length:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Tags txt</description>
+ <id>121</id>
+ <posX>85</posX>
+ <posY>250</posY>
+ <width>200</width>
+ <visible>no</visible>
+ <label>#tags</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Length txt</description>
+ <id>13</id>
+ <posX>20</posX>
+ <posY>280</posY>
+ <visible>no</visible>
+ <label>Length:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
- <control>
- <type>label</type>
- <description>length txt</description>
- <id>131</id>
- <posX>105</posX>
- <posY>280</posY>
- <width>145</width>
- <visible>no</visible>
- <label>#length</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
- <control>
- <type>label</type>
- <description>Desc label</description>
- <id>14</id>
- <posX>20</posX>
- <posY>310</posY>
- <visible>no</visible>
- <label>Description:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
+ <control>
+ <type>label</type>
+ <description>length txt</description>
+ <id>131</id>
+ <posX>105</posX>
+ <posY>280</posY>
+ <width>145</width>
+ <visible>no</visible>
+ <label>#length</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Desc label</description>
+ <id>14</id>
+ <posX>20</posX>
+ <posY>310</posY>
+ <visible>no</visible>
+ <label>Description:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
- <control>
- <description>textarea</description>
- <type>textboxscrollup</type>
- <id>141</id>
- <posX>20</posX>
- <posY>335</posY>
- <width>200</width>
- <height>220</height>
- <label>#desc</label>
- <visible>no</visible>
+ <control>
+ <description>textarea</description>
+ <type>textboxscrollup</type>
+ <id>141</id>
+ <posX>20</posX>
+ <posY>335</posY>
+ <width>200</width>
+ <height>220</height>
+ <label>#desc</label>
+ <visible>no</visible>
</control>
+
<control>
- <description>textarea</description>
- <type>textboxscrollup</type>
- <id>59</id>
- <posX>474</posX>
- <posY>437</posY>
- <width>882</width>
- <height>173</height>
- <label>#trailerdesc</label>
- <visible>yes</visible>
+ <type>fadelabel</type>
+ <description>Movie Title value</description>
+ <id>25</id>
+ <posX>85</posX>
+ <posY>58</posY>
+ <width>685</width>
+ <label>#movietitle</label>
+ <font>font18</font>
+ <disabledcolor>ff808080</disabledcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
</control>
+
<control>
- <type>fadelabel</type>
- <description>Movie Title value</description>
- <id>25</id>
- <posX>85</posX>
- <posY>58</posY>
- <width>685</width>
- <label>#movietitle</label>
- <font>font18</font>
- <disabledcolor>ff808080</disabledcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <type>image</type>
+ <description>movie border</description>
+ <id>23</id>
+ <posX>10</posX>
+ <posY>320</posY>
+ <texture>status_panel.png</texture>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ <visible>no</visible>
</control>
+
<control>
- <type>image</type>
- <description>movie border</description>
- <id>23</id>
- <posX>10</posX>
- <posY>320</posY>
- <texture>status_panel.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- <visible>no</visible>
+ <type>image</type>
+ <description>movie poster</description>
+ <id>24</id>
+ <posX>20</posX>
+ <posY>330</posY>
+ <width>270</width>
+ <height>270</height>
+ <texture>#movieposter</texture>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ <visible>no</visible>
</control>
- <control>
- <type>image</type>
- <description>movie poster</description>
- <id>24</id>
- <posX>20</posX>
- <posY>330</posY>
- <width>270</width>
- <height>270</height>
- <texture>#movieposter</texture>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- <visible>no</visible>
- </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -25,18 +25,22 @@
}
protected override String getUrl(String fsId)
- {
+ { String lsUrl = "";
String lsHtml = getHTMLData(fsId);
//Log.Write("html to parse to get url = \n{0}",lsHtml);
- Regex loPathRegex = new Regex("sGlobalFileName='([^']*)';[^;]*;sGlobalContentFilePath='([^']*)'");
- Regex loUrlRegex = new Regex("so.addVariable\\('sVidLoc', '([^']*)");
-
- String lsUrl = loUrlRegex.Match(lsHtml).Groups[1].Value;
- Match loMatch = loPathRegex.Match(lsHtml);
- String lsFileName = loMatch.Groups[1].Value;
- String lsPathName = loMatch.Groups[2].Value;
- lsUrl = lsUrl+lsPathName+"/"+lsFileName+".flv";
- Log.Info("break flv url = {0}",lsUrl);
+ Regex loPathRegex = new Regex("sGlobalFileName='([^']*)';[^;]*;.+sGlobalContentFilePath='([^']*)'");
+ Regex loUrlRegex = new Regex(@"so.addVariable\('videoPath',\s'([^']*)");
+ Match urlField = loUrlRegex.Match(lsHtml);
+ if(urlField.Success){
+ lsUrl = urlField.Groups[1].Value;
+ Match loMatch = loPathRegex.Match(lsHtml);
+ if(loMatch.Success){
+ String lsFileName = loMatch.Groups[1].Value;
+ String lsPathName = loMatch.Groups[2].Value;
+ lsUrl = lsUrl+lsPathName+"/"+lsFileName+".flv";
+ Log.Info("break flv url = {0}",lsUrl);
+ }
+ }
return lsUrl;
}
public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -764,6 +764,7 @@
liIdx++;
loVideoInfo.Description = cleanString(loVideoInfo.Description);
moSelectedVideo.Description = loVideoInfo.Description;
+ moSelectedVideo.Other = loVideoInfo.Other;
loListItem = new GUIListItem(loVideoInfo.Title);
loListItem.Label2 = loVideoInfo.Title2;
loListItem.Path = loVideoInfo.VideoUrl;
@@ -806,6 +807,13 @@
else{
DisplayVideoInfo(moCurrentVideoList[item.ItemId-1]);
}
+ if(currentView == View.FilmStrip){
+ GUIFilmstripControl filmstrip = parent as GUIFilmstripControl;
+ if (filmstrip == null)
+ return;
+ filmstrip.InfoImageFileName = item.ThumbnailImage;
+ }
+
}
@@ -920,6 +928,12 @@
GUIControl.HideControl(GetID, 23);
GUIControl.HideControl(GetID, 24);
GUIControl.HideControl(GetID, 25);
+// GUIControl.HideControl(GetID, 52);
+// GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
GUIControl.HideControl(GetID, 58);
GUIControl.HideControl(GetID, 59);
DisplayVideoInfo(null);
@@ -932,6 +946,12 @@
GUIControl.HideControl(GetID, 23);
GUIControl.HideControl(GetID, 24);
GUIControl.HideControl(GetID, 25);
+// GUIControl.HideControl(GetID, 52);
+// GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
GUIControl.HideControl(GetID, 58);
GUIControl.HideControl(GetID, 59);
DisplayVideoInfo(null);
@@ -943,6 +963,12 @@
GUIControl.HideControl(GetID, 23);
GUIControl.HideControl(GetID, 24);
GUIControl.HideControl(GetID, 25);
+// GUIControl.HideControl(GetID, 52);
+// GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
GUIControl.HideControl(GetID, 58);
GUIControl.HideControl(GetID, 59);
@@ -977,9 +1003,19 @@
GUIPropertyManager.SetProperty("#movieposter", ImageDownloader.downloadPoster(moSelectedVideo.ImageUrl.Replace("_m", "_l"),moSelectedVideo.Title,OnlineVideoSettings.getInstance().msThumbLocation));
GUIPropertyManager.SetProperty("#movietitle", moSelectedVideo.Title);
GUIPropertyManager.SetProperty("#trailerdesc", moSelectedVideo.Description);
+ ITMSClient.TrailerInfo info= (ITMSClient.TrailerInfo)moSelectedVideo.Other;
+ GUIPropertyManager.SetProperty("#genre", info.Genre);
+ GUIPropertyManager.SetProperty("#releasedate", info.Release);
+
//Log.Info("trailer desc:{0}", moSelectedVideo.Description);
GUIControl.ShowControl(GetID, 24);
GUIControl.ShowControl(GetID, 25);
+// GUIControl.ShowControl(GetID, 52);
+// GUIControl.ShowControl(GetID, 53);
+ GUIControl.ShowControl(GetID, 54);
+ GUIControl.ShowControl(GetID, 55);
+ GUIControl.ShowControl(GetID, 56);
+ GUIControl.ShowControl(GetID, 57);
GUIControl.ShowControl(GetID, 58);
GUIControl.ShowControl(GetID, 59);
@@ -1069,7 +1105,7 @@
strLine = GUILocalizeStrings.Get(100);
break;
case View.LargeIcons:
- facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+ facadeView.View = GUIFacadeControl.ViewMode.AlbumView;
strLine = GUILocalizeStrings.Get(417);
break;
case View.FilmStrip:
@@ -1082,7 +1118,7 @@
}
private void DisplayVideoInfo(VideoInfo foVideo){
- if(foVideo==null){
+ if(foVideo==null || msSelectedSiteId == "15"){
GUIPropertyManager.SetProperty("#videotitle", String.Empty);
GUIPropertyManager.SetProperty("#tags", String.Empty);
GUIPropertyManager.SetProperty("#length", String.Empty);
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -56,6 +56,15 @@
trailerInfo.Overview = field.Groups["overview"].Value.Replace("\r\n", " ").Replace('\u0092', '\'').Replace('\u0093', '"').Replace('\u0094', '"');
//Log.Info("got the movie overview {0}", trailerInfo.Overview);
}
+ field = RegexParsers.moviedetailsRegex2.Match(infoPage.Xml);
+ if(field.Success){
+ Log.Info("movie details 2 regex successful");
+ trailerInfo.Release = field.Groups["release"].Value.Replace("\r\n"," ");
+ trailerInfo.Genre = field.Groups["genre"].Value;
+ }
+ else{
+ Log.Info("movie details 2 regex unsuccessful");
+ }
String name;
String url;
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -76,7 +76,7 @@
//+ @"Rating:\s*(?<rating>.+?)\s*<.+?"
//+ @"(<TextView[^>]*>\s*(?<cast>[^<]*?)\s*</TextView>.+?){0,}</VBoxView>.+?"
// @"(<GotoURL[^>]+url=""(?<urls>/moviesxml/[^>]+?/index.xml)"">\s*<TextView.+?){0,}</Document>",
- "<GotoURL[^>]+url=\"(?<urls>/moviesxml/[^\"]+)[^>]*>\\s*<TextView",
+ @"<b>In\sTheaters:</b>(?<release>[^<]*)\s*<.+?Genre:[^>]*>(?<genre>[^<]*)",
RegexOptions.Singleline
| RegexOptions.ExplicitCapture
| RegexOptions.Compiled
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -64,7 +64,7 @@
video.Description = rssItem.mediaDescription;
video.ImageUrl = rssItem.mediaThumbnail;
video.Title = rssItem.title;
- video.Length = rssItem.contentList[0].duration;
+ //video.Length = rssItem.contentList[0].duration;
video.VideoUrl = rssItem.link;
loVideoList.Add(video);
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -136,9 +136,11 @@
settings.ProhibitDtd = false;
//doc.Load(XmlReader.Create(fsUrl,settings));
- WebClient client =new WebClient();
- String xml = client.DownloadString(fsUrl);
- doc.LoadXml(xml);
+ //WebClient client =new WebClient();
+ //String xml = client.DownloadString(fsUrl);
+ //doc.LoadXml(xml);
+ XmlTextReader reader = new XmlTextReader(fsUrl);
+ doc.Load(reader);
XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
expr.AddNamespace("media", "http://search.yahoo.com/mrss");
expr.AddNamespace("exInfo","http://www.gametrailers.com/rssexplained.php");
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos.sln
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos.sln 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos.sln 2007-09-07 23:59:25 UTC (rev 905)
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-# SharpDevelop 2.2.0.2595
+# SharpDevelop 2.2.1.2648
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnlineVideos", "OnlineVideos\OnlineVideos.csproj", "{E0D9D390-CDD6-4B98-86F3-6EB04A958882}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Runner", "OnlineVideos\Runner.csproj", "{EFABB07B-B050-45AD-A93F-C5047F15512F}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
