Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [216] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2007-03-24 10:39:57
|
Revision: 216
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=216&view=rev
Author: saamand
Date: 2007-03-24 03:39:53 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
Version 0.18
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.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/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/Properties/AssemblyInfo.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -33,19 +33,24 @@
private int noOfLyricsNotFound;
private bool m_StopSearches = false;
- public static event EventHandler StopTheSearchAndAbort = null;
ArrayList threadList = new ArrayList();
+ ArrayList suspendedThreadList = new ArrayList();
// Main thread sets this event to stop LyricController
ManualResetEvent m_EventStop_LyricController;
+ // The LyricController sets this when all lyricSearch threads have been aborted
+ ManualResetEvent m_EventStopped_LyricController;
+
private string[] lyricsSites;
internal static bool ALLOW_ALL_TO_SEARCH = false;
+
+
public LyricsController(ILyricForm mainForm,
ManualResetEvent eventStopThread,
string[] lyricSites, bool allowAllToSearch)
@@ -59,6 +64,8 @@
ALLOW_ALL_TO_SEARCH = allowAllToSearch;
+ ArrayList easySitesArrayList = new ArrayList();
+
// If search all, then include all
if (allowAllToSearch)
{
@@ -66,20 +73,20 @@
}
else
{
- ArrayList tempArrayList = new ArrayList();
foreach (string site in lyricSites)
{
if (Setup.IsMember(site))
{
- tempArrayList.Add(site);
+ easySitesArrayList.Add(site);
}
}
- this.lyricsSites = (string[])tempArrayList.ToArray(typeof(string));
+ this.lyricsSites = (string[])easySitesArrayList.ToArray(typeof(string));
}
LyricSearch.LyricsSites = lyricsSites;
m_EventStop_LyricController = eventStopThread;
+ m_EventStopped_LyricController = new ManualResetEvent(false);
LyricSearch.Abort = false;
}
@@ -90,10 +97,10 @@
// check if thread is cancelled
while (true)
{
- Thread.Sleep(500);
+ Thread.Sleep(100);
// check if thread is cancelled
- if (m_EventStop_LyricController.WaitOne(0, true))
+ if (m_EventStop_LyricController.WaitOne())
{
// clean-up operations may be placed here
for (int i=0; i<threadList.Count; i++)
@@ -111,6 +118,8 @@
stillThreadsAlive = true;
}
}
+
+ m_EventStopped_LyricController.Set();
break;
}
}
@@ -135,9 +144,6 @@
stillThreadsAlive = true;
}
}
-
- Thread.Sleep(100);
-
finishThread("", "", "The search has ended.", "");
}
@@ -146,15 +152,14 @@
if (lyricsSites.Length > 0)
{
// create worker thread instance
- ThreadStart siteThreadInstance = delegate
+ ThreadStart easySitesThreadInstance = delegate
{
- LyricSearch lyricSearch = new LyricSearch(this);
- lyricSearch.setLyricInfo(artist, title);
- lyricSearch.Run();
+ LyricSearch lyricSearch_EasySites = new LyricSearch(this, artist, title);
+ lyricSearch_EasySites.Run();
};
- Thread lyricSearchThread = new Thread(siteThreadInstance);
- lyricSearchThread.Name = "BasicSearch for " + artist + " - " + title;
+ Thread lyricSearchThread = new Thread(easySitesThreadInstance);
+ lyricSearchThread.Name = "BasicSearch for " + artist + " - " + title; // looks nice in Output window
lyricSearchThread.IsBackground = true;
lyricSearchThread.Start();
threadList.Add(lyricSearchThread);
@@ -170,6 +175,7 @@
internal void statusUpdate(string artist, string title, string site, bool lyricFound)
{
+ //LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + artist + " - " + title + " - " + site + " - " +lyricFound.ToString() );
if (lyricFound)
++noOfLyricsFound;
else
@@ -206,7 +212,13 @@
public void finishThread(String artist, String title, String message, String site)
{
+ m_StopSearches = true;
m_EventStop_LyricController.Set();
+
+ while (!m_EventStopped_LyricController.WaitOne(Timeout.Infinite, true))
+ {
+ Thread.Sleep(50);
+ }
m_Form.ThreadFinished = new Object[] { artist, title, message, site };
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-24 10:39:53 UTC (rev 216)
@@ -125,7 +125,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>::copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent>
+ <PostBuildEvent>copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -3,28 +3,24 @@
using System.Text;
using System.IO;
using System.Diagnostics;
+using System.Net;
namespace LyricsEngine.LyricSites
{
class EvilLabs
{
string lyric = "";
- LyricSearch lyricSearch = null;
+ bool complete = false;
public string Lyric
{
get { return lyric; }
}
- public EvilLabs(LyricSearch lyricSearch, string artist, string title)
+ public EvilLabs(string artist, string title)
{
- this.lyricSearch = lyricSearch;
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "EvilLabs(" + artist + ", " + title + ")");
- bool thisMayBeTheCorrectLyric = true;
- System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
- string lyricTemp = "";
-
artist = LyricUtil.removeFeatComment(artist);
LyricUtil.trimForParenthesis(ref artist);
artist = artist.Replace(" ", "+");
@@ -33,39 +29,36 @@
title = title.Replace(" ", "+");
string urlString = "http://www.evillabs.sk/lyrics/" + artist + "+-+" + title;
- System.Net.WebClient client = new System.Net.WebClient();
- System.Byte[] bytes = null;
+ WebClient client = new WebClient();
+ Uri uri = new Uri(urlString);
+ client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod);
+ client.OpenReadAsync(uri);
- try
+ while (complete == false)
{
- bytes = client.DownloadData(urlString);
+ System.Threading.Thread.Sleep(100);
}
- catch (System.Net.WebException)
- {
- //return false;
- }
- finally
- {
- client.Dispose();
- }
+ }
- int byteIndex = 0;
- while (byteIndex < bytes.Length && lyricSearch.SearchHasEnded == false)
+ private void callbackMethod(object sender, OpenReadCompletedEventArgs e)
+ {
+ bool thisMayBeTheCorrectLyric = true;
+ System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
+ StringBuilder lyricTemp = new StringBuilder();
+
+ WebClient client = (WebClient)sender;
+ Stream reply = null;
+ StreamReader sr = null;
+
+ try
{
- lyricTemp += System.Char.ConvertFromUtf32(bytes[byteIndex]);
- ++byteIndex;
- }
+ reply = (Stream)e.Result;
+ sr = new StreamReader(reply);
- MemoryStream memoryStream = new MemoryStream(System.Text.Encoding.Default.GetBytes(lyricTemp));
-
- if (memoryStream != null)
- {
string line = "";
int noOfLinesCount = 0;
- System.IO.StreamReader sr = new System.IO.StreamReader(memoryStream);
-
while (line.IndexOf("</style>") == -1)
{
if (sr.EndOfStream || ++noOfLinesCount > 300)
@@ -91,6 +84,23 @@
}
}
}
+ catch (System.Reflection.TargetInvocationException)
+ {
+ lyric = "Not found";
+ }
+ finally
+ {
+ if (sr != null)
+ {
+ sr.Close();
+ }
+
+ if (reply != null)
+ {
+ reply.Close();
+ }
+ }
+ complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -3,28 +3,24 @@
using System.Text;
using System.IO;
using System.Diagnostics;
+using System.Net;
namespace LyricsEngine.LyricSites
{
class HotLyrics
{
string lyric = "";
- LyricSearch lyricSearch = null;
+ bool complete = false;
public string Lyric
{
get { return lyric; }
}
- public HotLyrics(LyricSearch lyricSearch, string artist, string title)
+ public HotLyrics(string artist, string title)
{
- this.lyricSearch = lyricSearch;
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")");
- bool thisMayBeTheCorrectLyric = true;
- System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
- StringBuilder lyricTemp = new StringBuilder();
-
artist = LyricUtil.removeFeatComment(artist);
LyricUtil.trimForParenthesis(ref artist);
artist = LyricUtil.capatalizeString(artist);
@@ -97,30 +93,36 @@
string urlString = "http://www.hotlyrics.net/lyrics/" + firstLetter + "/" + artist + "/" + title + ".html";
- System.Net.WebClient client = new System.Net.WebClient();
- Stream stream = null;
+ WebClient client = new WebClient();
- try
+ Uri uri = new Uri(urlString);
+ client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod);
+ client.OpenReadAsync(uri);
+
+ while (complete == false)
{
- stream = client.OpenRead(urlString);
+ System.Threading.Thread.Sleep(100);
}
- catch (System.Net.WebException)
- {
- //return false;
- }
- finally
- {
- client.Dispose();
- }
+ }
+ private void callbackMethod(object sender, OpenReadCompletedEventArgs e)
+ {
+ bool thisMayBeTheCorrectLyric = true;
+ System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
+ StringBuilder lyricTemp = new StringBuilder();
- if (stream != null)
+ WebClient client = (WebClient)sender;
+ Stream reply = null;
+ StreamReader sr = null;
+
+ try
{
+ reply = (Stream)e.Result;
+ sr = new StreamReader(reply);
+
string line = "";
+ int noOfLinesCount = 0;
- System.IO.StreamReader sr = new System.IO.StreamReader(stream);
- //sr.BaseStream.Position = 18000;
-
while (line.IndexOf("GOOGLE END") == -1)
{
if (sr.EndOfStream)
@@ -173,8 +175,24 @@
lyric = "Not found";
}
}
- sr.Close();
}
+ catch (System.Reflection.TargetInvocationException)
+ {
+ lyric = "Not found";
+ }
+ finally
+ {
+ if (sr != null)
+ {
+ sr.Close();
+ }
+
+ if (reply != null)
+ {
+ reply.Close();
+ }
+ }
+ complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -3,28 +3,24 @@
using System.Text;
using System.IO;
using System.Diagnostics;
+using System.Net;
namespace LyricsEngine.LyricSites
{
class Lyrics007
{
string lyric = "";
- LyricSearch lyricSearch = null;
+ bool complete = false;
public string Lyric
{
get { return lyric; }
}
- public Lyrics007(LyricSearch lyricSearch, string artist, string title)
+ public Lyrics007(string artist, string title)
{
- this.lyricSearch = lyricSearch;
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "Lyrics007(" + artist + ", " + title + ")");
- bool thisMayBeTheCorrectLyric = true;
- System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
- StringBuilder lyricTemp = new StringBuilder();
-
artist = LyricUtil.removeFeatComment(artist);
LyricUtil.trimForParenthesis(ref artist);
artist = artist.Replace("#", "");
@@ -36,31 +32,37 @@
string urlString = "http://www.lyrics007.com/" + artist + " Lyrics/" + title + " Lyrics.html";
- System.Net.WebClient client = new System.Net.WebClient();
- Stream stream = null;
+ WebClient client = new WebClient();
- try
+ Uri uri = new Uri(urlString);
+ client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod);
+ client.OpenReadAsync(uri);
+
+ while (complete == false)
{
- stream = client.OpenRead(urlString);
+ System.Threading.Thread.Sleep(100);
}
- catch (System.Net.WebException)
- {
- //return false;
- }
- finally
- {
- client.Dispose();
- }
+ }
- if (stream != null)
+ private void callbackMethod(object sender, OpenReadCompletedEventArgs e)
+ {
+ bool thisMayBeTheCorrectLyric = true;
+ System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
+ StringBuilder lyricTemp = new StringBuilder();
+
+ WebClient client = (WebClient)sender;
+ Stream reply = null;
+ StreamReader sr = null;
+
+ try
{
+ reply = (Stream)e.Result;
+ sr = new StreamReader(reply);
+
string line = "";
int noOfLinesCount = 0;
- System.IO.StreamReader sr = new System.IO.StreamReader(stream);
-
- // 1. Find beginning of lyric
while (line.IndexOf("<td>Song: <strong>") == -1 && line.IndexOf("polyphonic ringtone to your cell phone") == -1)
{
if (sr.EndOfStream || ++noOfLinesCount > 300)
@@ -74,7 +76,6 @@
}
}
- // 2. If start of lyric found, then continue with work
if (thisMayBeTheCorrectLyric)
{
lyricTemp = new StringBuilder();
@@ -119,8 +120,24 @@
lyric = "Not found";
}
}
- sr.Close();
}
+ catch (System.Reflection.TargetInvocationException)
+ {
+ lyric = "Not found";
+ }
+ finally
+ {
+ if (sr != null)
+ {
+ sr.Close();
+ }
+
+ if (reply != null)
+ {
+ reply.Close();
+ }
+ }
+ complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -3,28 +3,24 @@
using System.Text;
using System.IO;
using System.Diagnostics;
+using System.Net;
namespace LyricsEngine.LyricSites
{
class LyricsOnDemand
{
string lyric = "";
- LyricSearch lyricSearch = null;
+ bool complete = false;
public string Lyric
{
get { return lyric; }
}
- public LyricsOnDemand(LyricSearch lyricSearch, string artist, string title)
+ public LyricsOnDemand(string artist, string title)
{
- this.lyricSearch = lyricSearch;
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "LyricsOnDemand(" + artist + ", " + title + ")");
- bool thisMayBeTheCorrectLyric = true;
- System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
- StringBuilder lyricTemp = new StringBuilder();
-
artist = LyricUtil.removeFeatComment(artist);
LyricUtil.trimForParenthesis(ref artist);
LyricUtil.deleteSpecificChars(ref artist);
@@ -67,30 +63,36 @@
string urlString = "http://www.lyricsondemand.com/" + firstLetter + "/" + artist + "lyrics/" + title + "lyrics.html";
- System.Net.WebClient client = new System.Net.WebClient();
- System.Byte[] bytes = null;
- Stream stream = null;
+ WebClient client = new WebClient();
- try
+ Uri uri = new Uri(urlString);
+ client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod);
+ client.OpenReadAsync(uri);
+
+ while (complete == false)
{
- stream = client.OpenRead(urlString);
+ System.Threading.Thread.Sleep(100);
}
- catch (System.Net.WebException)
+ }
+
+ private void callbackMethod(object sender, OpenReadCompletedEventArgs e)
+ {
+ bool thisMayBeTheCorrectLyric = true;
+ System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
+ StringBuilder lyricTemp = new StringBuilder();
+
+ WebClient client = (WebClient)sender;
+ Stream reply = null;
+ StreamReader sr = null;
+
+ try
{
- //return false;
- }
- finally
- {
- client.Dispose();
- }
+ reply = (Stream)e.Result;
+ sr = new StreamReader(reply);
- if (stream != null)
- {
string line = "";
int noOfLinesCount = 0;
- System.IO.StreamReader sr = new System.IO.StreamReader(stream);
-
while (line.IndexOf(@"<font size=""2"" face=""Verdana"">") == -1)
{
if (sr.EndOfStream || ++noOfLinesCount > 300)
@@ -144,8 +146,24 @@
lyric = "Not found";
}
}
- sr.Close();
}
+ catch (System.Reflection.TargetInvocationException)
+ {
+ lyric = "Not found";
+ }
+ finally
+ {
+ if (sr != null)
+ {
+ sr.Close();
+ }
+
+ if (reply != null)
+ {
+ reply.Close();
+ }
+ }
+ complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -3,28 +3,24 @@
using System.Text;
using System.IO;
using System.Diagnostics;
+using System.Net;
namespace LyricsEngine.LyricSites
{
class SeekLyrics
{
string lyric = "";
- LyricSearch lyricSearch = null;
+ bool complete = false;
public string Lyric
{
get { return lyric; }
}
- public SeekLyrics(LyricSearch lyricSearch, string artist, string title)
+ public SeekLyrics(string artist, string title)
{
- this.lyricSearch = lyricSearch;
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")");
- bool thisMayBeTheCorrectLyric = true;
- System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
- StringBuilder lyricTemp = new StringBuilder();
-
artist = LyricUtil.removeFeatComment(artist);
LyricUtil.trimForParenthesis(ref artist);
artist = artist.Replace(" ", "-");
@@ -71,43 +67,36 @@
string urlString = "http://www.seeklyrics.com/lyrics/" + artist + "/" + title + ".html";
- System.Net.WebClient client = new System.Net.WebClient();
- System.Byte[] bytes = null;
+ WebClient client = new WebClient();
- try
+ Uri uri = new Uri(urlString);
+ client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod);
+ client.OpenReadAsync(uri);
+
+ while (complete == false)
{
- bytes = client.DownloadData(urlString);
+ System.Threading.Thread.Sleep(100);
}
- catch (System.Net.WebException)
- {
- //return false;
- }
- finally
- {
- client.Dispose();
- }
+ }
+ private void callbackMethod(object sender, OpenReadCompletedEventArgs e)
+ {
+ bool thisMayBeTheCorrectLyric = true;
+ System.Collections.ArrayList strLyric = new System.Collections.ArrayList();
+ StringBuilder lyricTemp = new StringBuilder();
+
+ WebClient client = (WebClient)sender;
+ Stream reply = null;
+ StreamReader sr = null;
-
- if (bytes != null)
+ try
{
- int byteIndex = 3900;
+ reply = (Stream)e.Result;
+ sr = new StreamReader(reply);
- while (byteIndex < bytes.Length && lyricSearch.SearchHasEnded == false)
- {
- lyricTemp.Append(System.Char.ConvertFromUtf32(bytes[byteIndex]));
- ++byteIndex;
- }
+ string line = "";
+ int noOfLinesCount = 0;
- MemoryStream memoryStream = new MemoryStream(System.Text.Encoding.Default.GetBytes(lyricTemp.ToString()));
-
- if (memoryStream != null)
- {
- string line = "";
- int noOfLinesCount = 0;
-
- System.IO.StreamReader sr = new System.IO.StreamReader(memoryStream);
-
while (line.IndexOf("<pre>") == -1)
{
if (sr.EndOfStream || ++noOfLinesCount > 300)
@@ -170,8 +159,24 @@
lyric = "Not found";
}
}
+ }
+ catch (System.Reflection.TargetInvocationException)
+ {
+ lyric = "Not found";
+ }
+ finally
+ {
+ if (sr != null)
+ {
+ sr.Close();
}
+
+ if (reply != null)
+ {
+ reply.Close();
+ }
}
+ complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -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("0.17")]
+[assembly: AssemblyVersion("0.18")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -9,11 +9,11 @@
public static string[] BatchSearchSites = new string[4]
{
"LyricWiki",
- //"EvilLabs",
"Lyrics007",
"LyricsOnDemand",
- "HotLyrics"
- //"SeekLyrics"
+ "HotLyrics"/*,
+ "EvilLabs",
+ "SeekLyrics"*/
};
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-24 03:36:12 UTC (rev 215)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-24 10:39:53 UTC (rev 216)
@@ -35,28 +35,35 @@
this.tbPluginName = new MediaPortal.UserInterface.Controls.MPTextBox();
this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbEvilLabs = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbSeekLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.trackBar = new System.Windows.Forms.TrackBar();
+ this.lbSpeed = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.rdDefault = new System.Windows.Forms.RadioButton();
+ this.rbUserDefined = new System.Windows.Forms.RadioButton();
this.tbNote = new MediaPortal.UserInterface.Controls.MPLabel();
- this.cbSeekLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbEvilLabs = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageDatabase = new MediaPortal.UserInterface.Controls.MPTabPage();
- this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.btImportAll = new MediaPortal.UserInterface.Controls.MPButton();
- this.btCancel = new MediaPortal.UserInterface.Controls.MPButton();
- this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbGenerel = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.tbLimit = new MediaPortal.UserInterface.Controls.MPTextBox();
+ this.lbSongsLimit = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.lbSongsLimitNote = new MediaPortal.UserInterface.Controls.MPLabel();
this.cbSearchOnlyForMarkedSongs = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbDisregardSongWithLyricInTag = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbDisregardVariousArtist = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbDisregardSongsWithNoLyric = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbMarkSongsWithNoLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbDisconsiderTitlesWithLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.lbSongsLimitNote = new MediaPortal.UserInterface.Controls.MPLabel();
- this.tbLimit = new MediaPortal.UserInterface.Controls.MPTextBox();
- this.lbSongsLimit = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btImportAll = new MediaPortal.UserInterface.Controls.MPButton();
+ this.btCancel = new MediaPortal.UserInterface.Controls.MPButton();
+ this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbMessages = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.lbMessage = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbProgress = new MediaPortal.UserInterface.Controls.MPGroupBox();
@@ -91,9 +98,12 @@
this.tabPageSetup.SuspendLayout();
this.mpGroupBox2.SuspendLayout();
this.gbLyricSites.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit();
this.tabPageDatabase.SuspendLayout();
+ this.gbGenerel.SuspendLayout();
this.mpGroupBox1.SuspendLayout();
- this.gbGenerel.SuspendLayout();
this.gbMessages.SuspendLayout();
this.gbProgress.SuspendLayout();
this.gbMusicDBSearchStats.SuspendLayout();
@@ -107,7 +117,7 @@
this.tabControl.Location = new System.Drawing.Point(7, 12);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(534, 494);
+ this.tabControl.Size = new System.Drawing.Size(557, 494);
this.tabControl.TabIndex = 1;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
@@ -116,7 +126,7 @@
this.tabPageLyricsDatabase.Location = new System.Drawing.Point(4, 22);
this.tabPageLyricsDatabase.Name = "tabPageLyricsDatabase";
this.tabPageLyricsDatabase.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageLyricsDatabase.Size = new System.Drawing.Size(526, 468);
+ this.tabPageLyricsDatabase.Size = new System.Drawing.Size(549, 468);
this.tabPageLyricsDatabase.TabIndex = 1;
this.tabPageLyricsDatabase.Text = "Lyrics database";
this.tabPageLyricsDatabase.UseVisualStyleBackColor = true;
@@ -128,9 +138,9 @@
this.tabPageSetup.Location = new System.Drawing.Point(4, 22);
this.tabPageSetup.Name = "tabPageSetup";
this.tabPageSetup.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageSetup.Size = new System.Drawing.Size(526, 468);
+ this.tabPageSetup.Size = new System.Drawing.Size(549, 468);
this.tabPageSetup.TabIndex = 2;
- this.tabPageSetup.Text = "General setup";
+ this.tabPageSetup.Text = "Settings";
this.tabPageSetup.UseVisualStyleBackColor = true;
//
// mpGroupBox2
@@ -139,12 +149,12 @@
this.mpGroupBox2.Controls.Add(this.tbPluginName);
this.mpGroupBox2.Controls.Add(this.lbPluginName);
this.mpGroupBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.mpGroupBox2.Location = new System.Drawing.Point(4, 6);
+ this.mpGroupBox2.Location = new System.Drawing.Point(5, 5);
this.mpGroupBox2.Name = "mpGroupBox2";
- this.mpGroupBox2.Size = new System.Drawing.Size(510, 63);
+ this.mpGroupBox2.Size = new System.Drawing.Size(538, 63);
this.mpGroupBox2.TabIndex = 29;
this.mpGroupBox2.TabStop = false;
- this.mpGroupBox2.Text = "Lyric sites to search";
+ this.mpGroupBox2.Text = "Basic settings";
//
// tbPluginName
//
@@ -167,192 +177,256 @@
//
// gbLyricSites
//
- this.gbLyricSites.AutoSize = true;
- this.gbLyricSites.Controls.Add(this.cbHotLyrics);
+ this.gbLyricSites.Controls.Add(this.groupBox2);
+ this.gbLyricSites.Controls.Add(this.groupBox1);
+ this.gbLyricSites.Controls.Add(this.rdDefault);
+ this.gbLyricSites.Controls.Add(this.rbUserDefined);
this.gbLyricSites.Controls.Add(this.tbNote);
- this.gbLyricSites.Controls.Add(this.cbSeekLyrics);
- this.gbLyricSites.Controls.Add(this.cbLyricsOnDemand);
- this.gbLyricSites.Controls.Add(this.cbLyrics007);
- this.gbLyricSites.Controls.Add(this.cbEvilLabs);
- this.gbLyricSites.Controls.Add(this.cbLyricWiki);
this.gbLyricSites.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbLyricSites.Location = new System.Drawing.Point(4, 75);
+ this.gbLyricSites.Location = new System.Drawing.Point(5, 74);
this.gbLyricSites.Name = "gbLyricSites";
- this.gbLyricSites.Size = new System.Drawing.Size(510, 125);
+ this.gbLyricSites.Size = new System.Drawing.Size(538, 202);
this.gbLyricSites.TabIndex = 28;
this.gbLyricSites.TabStop = false;
- this.gbLyricSites.Text = "Lyric sites to search";
+ this.gbLyricSites.Text = "Lyrics sites settings";
//
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.cbLyrics007);
+ this.groupBox2.Controls.Add(this.cbLyricWiki);
+ this.groupBox2.Controls.Add(this.cbEvilLabs);
+ this.groupBox2.Controls.Add(this.cbLyricsOnDemand);
+ this.groupBox2.Controls.Add(this.cbHotLyrics);
+ this.groupBox2.Controls.Add(this.cbSeekLyrics);
+ this.groupBox2.Location = new System.Drawing.Point(272, 72);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(258, 100);
+ this.groupBox2.TabIndex = 28;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "User specific mode";
+ //
+ // cbLyrics007
+ //
+ this.cbLyrics007.AutoSize = true;
+ this.cbLyrics007.Checked = true;
+ this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbLyrics007.Location = new System.Drawing.Point(17, 48);
+ this.cbLyrics007.Name = "cbLyrics007";
+ this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
+ this.cbLyrics007.TabIndex = 4;
+ this.cbLyrics007.Text = "Lyrics 007";
+ this.cbLyrics007.UseVisualStyleBackColor = true;
+ //
+ // cbLyricWiki
+ //
+ this.cbLyricWiki.AutoSize = true;
+ this.cbLyricWiki.Checked = true;
+ this.cbLyricWiki.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbLyricWiki.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbLyricWiki.Location = new System.Drawing.Point(17, 71);
+ this.cbLyricWiki.Name = "cbLyricWiki";
+ this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
+ this.cbLyricWiki.TabIndex = 2;
+ this.cbLyricWiki.Text = "LyricWiki";
+ this.cbLyricWiki.UseVisualStyleBackColor = true;
+ //
+ // cbEvilLabs
+ //
+ this.cbEvilLabs.AutoSize = true;
+ this.cbEvilLabs.Checked = true;
+ this.cbEvilLabs.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbEvilLabs.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbEvilLabs.Location = new System.Drawing.Point(145, 71);
+ this.cbEvilLabs.Name = "cbEvilLabs";
+ this.cbEvilLabs.Size = new System.Drawing.Size(67, 17);
+ this.cbEvilLabs.TabIndex = 3;
+ this.cbEvilLabs.Text = "Evil Labs";
+ this.cbEvilLabs.UseVisualStyleBackColor = true;
+ //
+ // cbLyricsOnDemand
+ //
+ this.cbLyricsOnDemand.AutoSize = true;
+ this.cbLyricsOnDemand.Checked = true;
+ this.cbLyricsOnDemand.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbLyricsOnDemand.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbLyricsOnDemand.Location = new System.Drawing.Point(17, 26);
+ this.cbLyricsOnDemand.Name = "cbLyricsOnDemand";
+ this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17);
+ this.cbLyricsOnDemand.TabIndex = 5;
+ this.cbLyricsOnDemand.Text = "Lyrics OnDemand";
+ this.cbLyricsOnDemand.UseVisualStyleBackColor = true;
+ //
// cbHotLyrics
//
this.cbHotLyrics.AutoSize = true;
this.cbHotLyrics.Checked = true;
this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbHotLyrics.Location = new System.Drawing.Point(148, 21);
+ this.cbHotLyrics.Location = new System.Drawing.Point(145, 26);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
this.cbHotLyrics.TabIndex = 7;
this.cbHotLyrics.Text = "Hot Lyrics";
this.cbHotLyrics.UseVisualStyleBackColor = true;
//
- // tbNote
- //
- this.tbNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbNote.Location = new System.Drawing.Point(13, 91);
- this.tbNote.Name = "tbNote";
- this.tbNote.Size = new System.Drawing.Size(377, 18);
- this.tbNote.TabIndex = 19;
- this.tbNote.Text = "(Seek Lyrics and Evil Labs are currently disabled due to instable servers)";
- //
// cbSeekLyrics
//
this.cbSeekLyrics.AutoSize = true;
this.cbSeekLyrics.Checked = true;
this.cbSeekLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbSeekLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbSeekLyrics.Location = new System.Drawing.Point(148, 43);
+ this.cbSeekLyrics.Location = new System.Drawing.Point(145, 48);
this.cbSeekLyrics.Name = "cbSeekLyrics";
this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17);
this.cbSeekLyrics.TabIndex = 6;
this.cbSeekLyrics.Text = "Seek Lyrics";
this.cbSeekLyrics.UseVisualStyleBackColor = true;
//
- // cbLyricsOnDemand
+ // groupBox1
//
- this.cbLyricsOnDemand.AutoSize = true;
- this.cbLyricsOnDemand.Checked = true;
- this.cbLyricsOnDemand.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbLyricsOnDemand.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricsOnDemand.Location = new System.Drawing.Point(16, 43);
- this.cbLyricsOnDemand.Name = "cbLyricsOnDemand";
- this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17);
- this.cbLyricsOnDemand.TabIndex = 5;
- this.cbLyricsOnDemand.Text = "Lyrics OnDemand";
- this.cbLyricsOnDemand.UseVisualStyleBackColor = true;
+ this.groupBox1.Controls.Add(this.mpLabel2);
+ this.groupBox1.Controls.Add(this.trackBar);
+ this.groupBox1.Controls.Add(this.lbSpeed);
+ this.groupBox1.Location = new System.Drawing.Point(6, 72);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(260, 100);
+ this.groupBox1.TabIndex = 27;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Default mode";
//
- // cbLyrics007
+ // mpLabel2
//
- this.cbLyrics007.AutoSize = true;
- this.cbLyrics007.Checked = true;
- this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrics007.Location = new System.Drawing.Point(16, 66);
- this.cbLyrics007.Name = "cbLyrics007";
- this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
- this.cbLyrics007.TabIndex = 4;
- this.cbLyrics007.Text = "Lyrics 007";
- this.cbLyrics007.UseVisualStyleBackColor = true;
+ this.mpLabel2.AutoSize = true;
+ this.mpLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.mpLabel2.Location = new System.Drawing.Point(187, 25);
+ this.mpLabel2.Name = "mpLabel2";
+ this.mpLabel2.Size = new System.Drawing.Size(43, 13);
+ this.mpLabel2.TabIndex = 26;
+ this.mpLabel2.Text = "Hit ratio";
//
- // cbEvilLabs
+ // trackBar
//
- this.cbEvilLabs.AutoSize = true;
- this.cbEvilLabs.Checked = true;
- this.cbEvilLabs.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbEvilLabs.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbEvilLabs.Location = new System.Drawing.Point(148, 66);
- this.cbEvilLabs.Name = "cbEvilLabs";
- this.cbEvilLabs.Size = new System.Drawing.Size(67, 17);
- this.cbEvilLabs.TabIndex = 3;
- this.cbEvilLabs.Text = "Evil Labs";
- this.cbEvilLabs.UseVisualStyleBackColor = true;
+ this.trackBar.BackColor = System.Drawing.SystemColors.Control;
+ this.trackBar.LargeChange = 3;
+ this.trackBar.Location = new System.Drawing.Point(36, 42);
+ this.trackBar.Maximum = 3;
+ this.trackBar.Name = "trackBar";
+ this.trackBar.Size = new System.Drawing.Size(185, 45);
+ this.trackBar.TabIndex = 25;
+ this.trackBar.TickStyle = System.Windows.Forms.TickStyle.Both;
+ this.trackBar.Value = 2;
+ this.trackBar.Scroll += new System.EventHandler(this.trackBar_Scroll);
//
- // cbLyricWiki
+ // lbSpeed
//
- this.cbLyricWiki.AutoSize = true;
- this.cbLyricWiki.Checked = true;
- this.cbLyricWiki.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbLyricWiki.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricWiki.Location = new System.Drawing.Point(16, 21);
- this.cbLyricWiki.Name = "cbLyricWiki";
- this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
- this.cbLyricWiki.TabIndex = 2;
- this.cbLyricWiki.Text = "LyricWiki";
- this.cbLyricWiki.UseVisualStyleBackColor = true;
+ this.lbSpeed.AutoSize = true;
+ this.lbSpeed.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbSpeed.Location = new System.Drawing.Point(29, 25);
+ this.lbSpeed.Name = "lbSpeed";
+ this.lbSpeed.Size = new System.Drawing.Size(38, 13);
+ this.lbSpeed.TabIndex = 24;
+ this.lbSpeed.Text = "Speed";
//
+ // rdDefault
+ //
+ this.rdDefault.AutoSize = true;
+ this.rdDefault.Location = new System.Drawing.Point(16, 23);
+ this.rdDefault.Name = "rdDefault";
+ this.rdDefault.Size = new System.Drawing.Size(88, 17);
+ this.rdDefault.TabIndex = 23;
+ this.rdDefault.Text = "Default mode";
+ this.rdDefault.UseVisualStyleBackColor = true;
+ this.rdDefault.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
+ //
+ // rbUserDefined
+ //
+ this.rbUserDefined.AutoSize = true;
+ this.rbUserDefined.Location = new System.Drawing.Point(16, 46);
+ this.rbUserDefined.Name = "rbUserDefined";
+ this.rbUserDefined.Size = new System.Drawing.Size(115, 17);
+ this.rbUserDefined.TabIndex = 22;
+ this.rbUserDefined.Text = "User specific mode";
+ this.rbUserDefined.UseVisualStyleBackColor = true;
+ //
+ // tbNote
+ //
+ this.tbNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNote.Location = new System.Drawing.Point(13, 178);
+ this.tbNote.Margin = new System.Windows.Forms.Padding(0);
+ this.tbNote.Name = "tbNote";
+ this.tbNote.Size = new System.Drawing.Size(377, 18);
+ this.tbNote.TabIndex = 19;
+ this.tbNote.Text = "Seek Lyrics and Evil Labs should currently not be used due to instable servers";
+ //
// tabPageDatabase
//
+ this.tabPageDatabase.Controls.Add(this.gbGenerel);
this.tabPageDatabase.Controls.Add(this.mpGroupBox1);
- this.tabPageDatabase.Controls.Add(this.gbGenerel);
this.tabPageDatabase.Controls.Add(this.gbMessages);
this.tabPageDatabase.Controls.Add(this.gbProgress);
this.tabPageDatabase.Controls.Add(this.gbMusicDBSearchStats);
this.tabPageDatabase.Location = new System.Drawing.Point(4, 22);
this.tabPageDatabase.Name = "tabPageDatabase";
this.tabPageDatabase.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageDatabase.Size = new System.Drawing.Size(526, 468);
+ this.tabPageDatabase.Size = new System.Drawing.Size(549, 468);
this.tabPageDatabase.TabIndex = 2;
- this.tabPageDatabase.Text = "Search music database";
+ this.tabPageDatabase.Text = "Music database search";
this.tabPageDatabase.UseVisualStyleBackColor = true;
//
- // mpGroupBox1
- //
- this.mpGroupBox1.Controls.Add(this.btImportAll);
- this.mpGroupBox1.Controls.Add(this.btCancel);
- this.mpGroupBox1.Controls.Add(this.mpLabel3);
- this.mpGroupBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.mpGroupBox1.Location = new System.Drawing.Point(2, 133);
- this.mpGroupBox1.Name = "mpGroupBox1";
- this.mpGroupBox1.Size = new System.Drawing.Size(509, 53);
- this.mpGroupBox1.TabIndex = 32;
- this.mpGroupBox1.TabStop = false;
- this.mpGroupBox1.Text = "Search music database";
- //
- // btImportAll
- //
- this.btImportAll.Location = new System.Drawing.Point(338, 19);
- this.btImportAll.Name = "btImportAll";
- this.btImportAll.Size = new System.Drawing.Size(78, 23);
- this.btImportAll.TabIndex = 32;
- this.btImportAll.Text = "Start";
- this.btImportAll.UseVisualStyleBackColor = true;
- this.btImportAll.Click += new System.EventHandler(this.btImportAll_Click);
- //
- // btCancel
- //
- this.btCancel.Enabled = false;
- this.btCancel.Location = new System.Drawing.Point(422, 19);
- this.btCancel.Name = "btCancel";
- this.btCancel.Size = new System.Drawing.Size(78, 23);
- this.btCancel.TabIndex = 33;
- this.btCancel.Text = "Stop";
- this.btCancel.UseVisualStyleBackColor = true;
- this.btCancel.Click += new System.EventHandler(this.btCancel_Click);
- //
- // mpLabel3
- //
- this.mpLabel3.AutoSize = true;
- this.mpLabel3.Location = new System.Drawing.Point(12, 16);
- this.mpLabel3.Name = "mpLabel3";
- this.mpLabel3.Size = new System.Drawing.Size(304, 26);
- this.mpLabel3.TabIndex = 12;
- this.mpLabel3.Text = "Press \'Start\' to fetch lyrics matching content of music database.\r\nPress \'Stop\' t" +
- "o stop an ongoing lyrics search.";
- //
// gbGenerel
//
+ this.gbGenerel.Controls.Add(this.tbLimit);
+ this.gbGenerel.Controls.Add(this.lbSongsLimit);
+ this.gbGenerel.Controls.Add(this.lbSongsLimitNote);
this.gbGenerel.Controls.Add(this.cbSearchOnlyForMarkedSongs);
this.gbGenerel.Controls.Add(this.cbDisregardSongWithLyricInTag);
this.gbGenerel.Controls.Add(this.cbDisregardVariousArtist);
this.gbGenerel.Controls.Add(this.cbDisregardSongsWithNoLyric);
this.gbGenerel.Controls.Add(this.cbMarkSongsWithNoLyrics);
this.gbGenerel.Controls.Add(this.cbDisconsiderTitlesWithLyrics);
- this.gbGenerel.Controls.Add(this.lbSongsLimitNote);
- this.gbGenerel.Controls.Add(this.tbLimit);
- this.gbGenerel.Controls.Add(this.lbSongsLimit);
this.gbGenerel.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbGenerel.Location = new System.Drawing.Point(3, 6);
+ this.gbGenerel.Location = new System.Drawing.Point(5, 5);
this.gbGenerel.Name = "gbGenerel";
- this.gbGenerel.Size = new System.Drawing.Size(509, 121);
- this.gbGenerel.TabIndex = 32;
+ this.gbGenerel.Size = new System.Drawing.Size(538, 121);
+ this.gbGenerel.TabIndex = 35;
this.gbGenerel.TabStop = false;
this.gbGenerel.Text = "Music database search setup";
//
+ // tbLimit
+ //
+ this.tbLimit.BorderColor = System.Drawing.Color.Empty;
+ this.tbLimit.Location = new System.Drawing.Point(162, 21);
+ this.tbLimit.MaxLength = 6;
+ this.tbLimit.Name = "tbLimit";
+ this.tbLimit.Size = new System.Drawing.Size(44, 20);
+ this.tbLimit.TabIndex = 37;
+ this.tbLimit.Text = "1000";
+ this.tbLimit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+ //
+ // lbSongsLimit
+ //
+ this.lbSongsLimit.AutoSize = true;
+ this.lbSongsLimit.Location = new System.Drawing.Point(16, 24);
+ this.lbSongsLimit.Name = "lbSongsLimit";
+ this.lbSongsLimit.Size = new System.Drawing.Size(139, 13);
+ this.lbSongsLimit.TabIndex = 38;
+ this.lbSongsLimit.Text = "Top limit of songs to search:";
+ //
+ // lbSongsLimitNote
+ //
+ this.lbSongsLimitNote.AutoSize = true;
+ this.lbSongsLimitNote.Location = new System.Drawing.Point(212, 24);
+ this.lbSongsLimitNote.Name = "lbSongsLimitNote";
+ this.lbSongsLimitNote.Size = new System.Drawing.Size(82, 13);
+ this.lbSongsLimitNote.TabIndex = 39;
+ this.lbSongsLimitNote.Text = "(1000 is default)";
+ //
// cbSearchOnlyForMarkedSongs
//
this.cbSearchOnlyForMarkedSongs.AutoSize = true;
this.cbSearchOnlyForMarkedSongs.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbSearchOnlyForMarkedSongs.Location = new System.Drawing.Point(245, 91);
+ this.cbSearchOnlyForMarkedSongs.Location = new System.Drawing.Point(270, 97);
this.cbSearchOnlyForMarkedSongs.Name = "cbSearchOnlyForMarkedSongs";
this.cbSearchOnlyForMarkedSongs.Size = new System.Drawing.Size(232, 17);
this.cbSearchOnlyForMarkedSongs.TabIndex = 19;
@@ -366,7 +440,7 @@
this.cbDisregardSongWithLyricInTag.Checked = true;
this.cbDisregardSongWithLyricInTag.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbDisregardSongWithLyricInTag.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisregardSongWithLyricInTag.Location = new System.Drawing.Point(15, 68);
+ this.cbDisregardSongWithLyricInTag.Location = new System.Drawing.Point(15, 74);
this.cbDisregardSongWithLyricInTag.Name = "cbDisregardSongWithLyricInTag";
this.cbDisregardSongWithLyricInTag.Size = new System.Drawing.Size(202, 17);
this.cbDisregardSongWithLyricInTag.TabIndex = 18;
@@ -379,7 +453,7 @@
this.cbDisregardVariousArtist.Checked = true;
this.cbDisregardVariousArtist.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbDisregardVariousArtist.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisregardVariousArtist.Location = new System.Drawing.Point(15, 91);
+ this.cbDisregardVariousArtist.Location = new System.Drawing.Point(15, 97);
this.cbDisregardVariousArtist.Name = "cbDisregardVariousArtist";
this.cbDisregardVariousArtist.Size = new System.Drawing.Size(191, 17);
this.cbDisregardVariousArtist.TabIndex = 17;
@@ -392,7 +466,7 @@
this.cbDisregardSongsWithNoLyric.Checked = true;
this.cbDisregardSongsWithNoLyric.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbDisregardSongsWithNoLyric.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisregardSongsWithNoLyric.Location = new System.Drawing.Point(245, 68);
+ this.cbDisregardSongsWithNoLyric.Location = new System.Drawing.Point(270, 74);
this.cbDisregardSongsWithNoLyric.Name = "cbDisregardSongsWithNoLyric";
this.cbDisregardSongsWithNoLyric.Size = new System.Drawing.Size(246, 17);
this.cbDisregardSongsWithNoLyric.TabIndex = 16;
@@ -405,7 +479,7 @@
this.cbMarkSongsWithNoLyrics.Checked = true;
this.cbMarkSongsWithNoLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbMarkSongsWithNoLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbMarkSongsWithNoLyrics.Location = new System.Drawing.Point(245, 45);
+ this.cbMarkSongsWithNoLyrics.Location = new System.Drawing.Point(270, 51);
this.cbMarkSongsWithNoLyrics.Name = "cbMarkSongsWithNoLyrics";
this.cbMarkSongsWithNoLyrics.Size = new System.Drawing.Size(224, 17);
this.cbMarkSongsWithNoLyrics.TabIndex = 15;
@@ -418,58 +492,73 @@
this.cbDisconsiderTitlesWithLyrics.Checked = true;
this.cbDisconsiderTitlesWithLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbDisconsiderTitlesWithLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisconsiderTitlesWithLyrics.Location = new System.Drawing.Point(15, 45);
+ this.cbDisconsiderTitlesWithLyrics.Location = new System.Drawing.Point(15, 51);
this.cbDisconsiderTitlesWithLyrics.Name = "cbDisconsiderTitlesWithLyrics";
this.cbDisconsiderTitlesWithLyrics.Size = new System.Drawing.Size(201, 17);
this.cbDisconsiderTitlesWithLyrics.TabIndex...
[truncated message content] |
