Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3070] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-08-26 13:17:16
|
Revision: 3070
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3070&view=rev
Author: saamand
Date: 2009-08-26 13:17:00 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricWiki.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings
trunk/plugins/MyLyrics/LyricsEngine/app.config
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-08-26 13:17:00 UTC (rev 3070)
@@ -83,20 +83,6 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <None Include="Web References\org.lyricwiki\LyricsResult.datasource">
- <DependentUpon>Reference.map</DependentUpon>
- </None>
- <None Include="Web References\org.lyricwiki\Reference.map">
- <Generator>MSDiscoCodeGenerator</Generator>
- <LastGenOutput>Reference.cs</LastGenOutput>
- </None>
- <None Include="Web References\org.lyricwiki\server.wsdl" />
- <None Include="Web References\org.lyricwiki\SongResult.datasource">
- <DependentUpon>Reference.map</DependentUpon>
- </None>
- <None Include="Web References\org.lyricwiki\SOTDResult.datasource">
- <DependentUpon>Reference.map</DependentUpon>
- </None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
@@ -108,11 +94,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon>
</Compile>
- <Compile Include="Web References\org.lyricwiki\Reference.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Reference.map</DependentUpon>
- </Compile>
<Compile Include="LyricsSites\LyricWiki.cs" />
</ItemGroup>
<ItemGroup>
@@ -130,17 +111,6 @@
<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
<CachedSettingsPropName>LyricsEngine_lrcfinder_LrcFinder</CachedSettingsPropName>
</WebReferenceUrl>
- <WebReferenceUrl Include="http://lyricwiki.org/server.php%3fwsdl">
- <UrlBehavior>Dynamic</UrlBehavior>
- <RelPath>Web References\org.lyricwiki\</RelPath>
- <UpdateFromURL>http://lyricwiki.org/server.php%3fwsdl</UpdateFromURL>
- <ServiceLocationURL>
- </ServiceLocationURL>
- <CachedDynamicPropName>
- </CachedDynamicPropName>
- <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
- <CachedSettingsPropName>LyricsEngine_org_lyricwiki_LyricWiki</CachedSettingsPropName>
- </WebReferenceUrl>
</ItemGroup>
<ItemGroup>
<None Include="Web References\lrcfinder\LrcFinder.disco" />
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricWiki.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricWiki.cs 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricWiki.cs 2009-08-26 13:17:00 UTC (rev 3070)
@@ -28,47 +28,13 @@
artist = LyricUtil.RemoveFeatComment(artist);
artist = LyricUtil.CapatalizeString(artist);
-
artist = artist.Replace(" ", "_");
title = LyricUtil.TrimForParenthesis(title);
title = LyricUtil.CapatalizeString(title);
-
title = title.Replace(" ", "_");
+ title = title.Replace("?", "%3F");
- // German letters
- artist = artist.Replace("ü", "");
- artist = artist.Replace("Ü", "");
- artist = artist.Replace("ä", "");
- artist = artist.Replace("Ä", "");
- artist = artist.Replace("ö", "");
- artist = artist.Replace("Ö", "");
- artist = artist.Replace("ß", "");
- title = title.Replace("ü", "");
- title = title.Replace("Ü", "");
- title = title.Replace("ä", "");
- title = title.Replace("Ä", "");
- title = title.Replace("ö", "");
- title = title.Replace("Ö", "");
- title = title.Replace("ß", "");
-
- // Danish letters
- artist = artist.Replace("æ", "%C3%A6");
- artist = artist.Replace("ø", "");
- artist = artist.Replace("Ø", "%C3%98");
- artist = artist.Replace("å", "");
- artist = artist.Replace("Å", "");
- title = title.Replace("æ", "%C3%A6");
- title = title.Replace("ø", "");
- title = title.Replace("Ø", "%C3%98");
- title = title.Replace("å", "");
- title = title.Replace("Å", "");
-
- // French letters
- artist = artist.Replace("é", "");
- title = title.Replace("é", "");
-
-
if (string.IsNullOrEmpty(artist) || string.IsNullOrEmpty(title))
{
return;
@@ -146,10 +112,14 @@
lyric = Encoding.UTF8.GetString(iso8859.GetBytes(lyric));
lyric = lyric.Replace("<br />", "\r\n");
+ lyric = lyric.Replace("<i>", "");
+ lyric = lyric.Replace("</i>", "");
+ lyric = lyric.Replace("<b>", "");
+ lyric = lyric.Replace("</b>", "");
lyric = lyric.Trim();
- if (lyric.Contains("<td"))
+ if (lyric.Contains("<"))
{
lyric = "Not found";
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-08-26 13:17:00 UTC (rev 3070)
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.34")]
+[assembly: AssemblyVersion("1.35")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2009-08-26 13:17:00 UTC (rev 3070)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1434
+// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -25,16 +25,6 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
- [global::System.Configuration.DefaultSettingValueAttribute("http://lyricwiki.org/server.php")]
- public string LyricsEngine_org_lyricwiki_LyricWiki {
- get {
- return ((string)(this["LyricsEngine_org_lyricwiki_LyricWiki"]));
- }
- }
-
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://api.google.com/search/beta2")]
public string Google_GoogleSearchService {
get {
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings 2009-08-26 13:17:00 UTC (rev 3070)
@@ -2,9 +2,6 @@
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="LyricsEngine.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
- <Setting Name="LyricsEngine_org_lyricwiki_LyricWiki" Type="(Web Service URL)" Scope="Application">
- <Value Profile="(Default)">http://lyricwiki.org/server.php</Value>
- </Setting>
<Setting Name="Google_GoogleSearchService" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://api.google.com/search/beta2</Value>
</Setting>
Modified: trunk/plugins/MyLyrics/LyricsEngine/app.config
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/app.config 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/LyricsEngine/app.config 2009-08-26 13:17:00 UTC (rev 3070)
@@ -7,9 +7,12 @@
</configSections>
<applicationSettings>
<LyricsEngine.Properties.Settings>
- <setting name="LyricsEngine_org_lyricwiki_LyricWiki" serializeAs="String">
- <value>http://lyricwiki.org/server.php</value>
+ <setting name="Google_GoogleSearchService" serializeAs="String">
+ <value>http://api.google.com/search/beta2</value>
</setting>
+ <setting name="MyLyrics_Google_GoogleSearchService" serializeAs="String">
+ <value>http://api.google.com/search/beta2</value>
+ </setting>
<setting name="LyricsEngine_lrcfinder_LrcFinder" serializeAs="String">
<value>http://lrcfinder.profiler.nl/LrcFinder.asmx</value>
</setting>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-08-26 13:17:00 UTC (rev 3070)
@@ -80,7 +80,7 @@
this.lbInfo1.Name = "lbInfo1";
this.lbInfo1.Size = new System.Drawing.Size(197, 18);
this.lbInfo1.TabIndex = 3;
- this.lbInfo1.Text = "MyLyrics plugin, version 1.34";
+ this.lbInfo1.Text = "MyLyrics plugin, version 1.35";
//
// label2
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-08-26 13:17:00 UTC (rev 3070)
@@ -5,7 +5,7 @@
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid>
- <OutputType>WinExe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyLyrics</RootNamespace>
<AssemblyName>MyLyrics</AssemblyName>
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-08-26 13:17:00 UTC (rev 3070)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.34")]
-[assembly: AssemblyFileVersion("1.34")]
+[assembly: AssemblyVersion("1.35")]
+[assembly: AssemblyFileVersion("1.35")]
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-08-26 12:17:58 UTC (rev 3069)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-08-26 13:17:00 UTC (rev 3070)
@@ -37,6 +37,7 @@
Simple copy the content of the zip-file into your MP library (typical C:\Program Files\Team MediaPortal\MediaPortal).
Noteworthy changes since version 1.34:
-- Fix: The LyricWiki fixed (webservice always returned information text instead of lyric).
+- Fix: The LyricWiki entry fixed (webservice always returned information text instead of lyric.).
- Fix: Toogle between cover and artist art were deactivated, so artist art was never shown.
- Add: Album art also shown in editor mode
+- Fix: Fix LyricsPlugin unicode (thanks to yoavain!)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
