Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2749] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-03-29 12:10:38
|
Revision: 2749
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2749&view=rev
Author: saamand
Date: 2009-03-29 12:10:32 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Actionext.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyrDB.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs
Removed Paths:
-------------
trunk/plugins/MyLyrics/Skin/BlueTwo/
trunk/plugins/MyLyrics/Skin/BlueTwo wide/
trunk/plugins/MyLyrics/Skin/Xface/
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Actionext.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Actionext.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Actionext.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -73,7 +73,7 @@
try
{
reply = (Stream)e.Result;
- sr = new StreamReader(reply);
+ sr = new StreamReader(reply, Encoding.Default);
string line = "";
int noOfLinesCount = 0;
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -127,7 +127,7 @@
try
{
reply = (Stream)e.Result;
- sr = new StreamReader(reply);
+ sr = new StreamReader(reply, Encoding.Default);
string line = "";
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyrDB.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyrDB.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyrDB.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -76,7 +76,7 @@
try
{
reply = (Stream)e.Result;
- sr = new StreamReader(reply);
+ sr = new StreamReader(reply, Encoding.Default);
string result = sr.ReadToEnd();
@@ -138,10 +138,12 @@
try
{
reply = (Stream)e.Result;
- sr = new StreamReader(reply);
+ sr = new StreamReader(reply, Encoding.Default);
lyric = sr.ReadToEnd().Trim();
+ lyric = lyric.Replace("*", "");
+
//lyricTemp.Replace("<br>", Environment.NewLine);
//lyricTemp.Replace(",<br />", Environment.NewLine);
//lyricTemp.Replace("<br />", Environment.NewLine);
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -69,7 +69,7 @@
try
{
reply = (Stream)e.Result;
- sr = new StreamReader(reply);
+ sr = new StreamReader(reply, Encoding.Default);
string line = sr.ReadToEnd();
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -54,6 +54,8 @@
title = title.Replace("\xC6", "");
title = title.Replace("\xD8", "");
title = title.Replace("\xC5", "");
+ title = title.Replace("\xF6", "");
+ title = title.Replace("\xD6", "");
title = title.ToLower();
@@ -105,7 +107,7 @@
try
{
reply = (Stream)e.Result;
- sr = new StreamReader(reply);
+ sr = new StreamReader(reply, Encoding.Default);
string line = "";
int noOfLinesCount = 0;
@@ -147,6 +149,7 @@
lyricTemp.Replace("<p><font size=\"2\" face=\"Verdana\">", " \r\n");
lyricTemp.Replace("<i>", "");
lyricTemp.Replace("</i>", "");
+ lyricTemp.Replace("*", "");
lyricTemp.Replace("?s", "'s");
lyricTemp.Replace("?t", "'t");
lyricTemp.Replace("?m", "'m");
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -107,7 +107,7 @@
try
{
reply = (Stream)e.Result;
- sr = new StreamReader(reply);
+ sr = new StreamReader(reply, Encoding.Default);
string line = sr.ReadToEnd();
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -15,7 +15,7 @@
private string title = "";
private int noOfTries;
public static bool Abort;
- LyricSearch lyricSearch ;
+ LyricSearch lyricSearch;
private string[] commonReplacementsLyricWiki = new string[18] { "<br>", "", "<br/>", "", "<BR>", "", "?d", "'d", "?s", "'s", "?t", "'t", "?v", "'v", "?e", "'e", "?r", "'r" };
private string[] commonRemoveFromLyricWiki = new string[2] { "[[category", "[[Category" };
@@ -42,6 +42,10 @@
else if (ar.AsyncWaitHandle.WaitOne(0, true))
{
lyricsResult = del.EndInvoke(ar);
+
+ string lyric = lyricsResult.lyrics;
+ Encoding iso8859 = Encoding.GetEncoding("ISO-8859-1");
+ lyricsResult.lyrics = Encoding.UTF8.GetString(iso8859.GetBytes(lyricsResult.lyrics));
break;
}
else
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2009-03-29 11:25:14 UTC (rev 2748)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2009-03-29 12:10:32 UTC (rev 2749)
@@ -42,6 +42,7 @@
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.tbLyrics = new System.Windows.Forms.TextBox();
this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.cbLyrDB = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbActionext = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.btCancel = new System.Windows.Forms.Button();
this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -51,7 +52,6 @@
this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.btClose = new System.Windows.Forms.Button();
this.btUpdate = new System.Windows.Forms.Button();
- this.cbLyrDB = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.gbSearchInfo.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -148,7 +148,7 @@
// cbResult
//
this.cbResult.Text = "Result";
- this.cbResult.Width = 58;
+ this.cbResult.Width = 52;
//
// chLyric
//
@@ -193,6 +193,19 @@
this.gbLyricSites.TabStop = false;
this.gbLyricSites.Text = "Lyric sites to search";
//
+ // cbLyrDB
+ //
+ this.cbLyrDB.AutoSize = true;
+ this.cbLyrDB.Checked = true;
+ this.cbLyrDB.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbLyrDB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbLyrDB.Location = new System.Drawing.Point(111, 44);
+ this.cbLyrDB.Name = "cbLyrDB";
+ this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
+ this.cbLyrDB.TabIndex = 18;
+ this.cbLyrDB.Text = "LyrDB";
+ this.cbLyrDB.UseVisualStyleBackColor = true;
+ //
// cbActionext
//
this.cbActionext.AutoSize = true;
@@ -302,19 +315,6 @@
this.btUpdate.UseVisualStyleBackColor = true;
this.btUpdate.Click += new System.EventHandler(this.btUpdate_Click);
//
- // cbLyrDB
- //
- this.cbLyrDB.AutoSize = true;
- this.cbLyrDB.Checked = true;
- this.cbLyrDB.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbLyrDB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrDB.Location = new System.Drawing.Point(111, 44);
- this.cbLyrDB.Name = "cbLyrDB";
- this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
- this.cbLyrDB.TabIndex = 18;
- this.cbLyrDB.Text = "LyrDB";
- this.cbLyrDB.UseVisualStyleBackColor = true;
- //
// FindLyric
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
