Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [368] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2007-05-01 15:59:20
|
Revision: 368
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=368&view=rev
Author: saamand
Date: 2007-05-01 08:59:15 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
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/LyricsSites/Wiki.cs
trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs
trunk/plugins/MyLyrics/MyLyrics.suo
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -33,7 +33,6 @@
ManualResetEvent m_EventStopped_LyricController;
private string[] lyricsSites;
- internal static bool ALLOW_ALL_TO_SEARCH;
public LyricsController(ILyricForm mainForm,
ManualResetEvent eventStopThread,
@@ -46,29 +45,22 @@
noOfLyricsFound = 0;
noOfLyricsNotFound = 0;
- ALLOW_ALL_TO_SEARCH = allowAllToSearch;
ArrayList easySitesArrayList = new ArrayList();
// If search all, then include all
- if (allowAllToSearch)
+ foreach (string site in lyricSites)
{
- this.lyricsSites = lyricSites;
- }
- else
- {
- foreach (string site in lyricSites)
+ if (Setup.IsMember(site))
{
- if (Setup.IsMember(site))
- {
- easySitesArrayList.Add(site);
- }
+ easySitesArrayList.Add(site);
}
- this.lyricsSites = (string[])easySitesArrayList.ToArray(typeof(string));
}
+ this.lyricsSites = (string[])easySitesArrayList.ToArray(typeof(string));
+
LyricSearch.LyricsSites = lyricsSites;
-
+
m_EventStop_LyricController = eventStopThread;
m_EventStopped_LyricController = new ManualResetEvent(false);
@@ -172,7 +164,7 @@
m_Form.UpdateStatus = new Object[] { noOfLyricsToSearch, noOfLyricsSearched, noOfLyricsFound, noOfLyricsNotFound };
- if ((noOfLyricsSearched >= noOfLyricsToSearch) && ALLOW_ALL_TO_SEARCH == false)
+ if ((noOfLyricsSearched >= noOfLyricsToSearch))
{
FinishThread(artist, title, "All songs have been searched!", site);
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -4,6 +4,7 @@
using System.IO;
using System.Diagnostics;
using System.Net;
+using System.Threading;
namespace LyricsEngine.LyricSites
{
@@ -17,7 +18,7 @@
get { return lyric; }
}
- public EvilLabs(string artist, string title)
+ public EvilLabs(string artist, string title, ManualResetEvent m_EventStop_SiteSearches)
{
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "EvilLabs(" + artist + ", " + title + ")");
@@ -37,7 +38,14 @@
while (complete == false)
{
- System.Threading.Thread.Sleep(100);
+ if (m_EventStop_SiteSearches.WaitOne(1, true))
+ {
+ complete = true;
+ }
+ else
+ {
+ System.Threading.Thread.Sleep(100);
+ }
}
}
@@ -98,8 +106,8 @@
{
reply.Close();
}
+ complete = true;
}
- complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -4,20 +4,21 @@
using System.IO;
using System.Diagnostics;
using System.Net;
+using System.Threading;
namespace LyricsEngine.LyricSites
{
class HotLyrics
{
string lyric = "";
- bool complete;
+ private bool complete;
public string Lyric
{
get { return lyric; }
}
- public HotLyrics(string artist, string title)
+ public HotLyrics(string artist, string title, ManualResetEvent m_EventStop_SiteSearches)
{
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")");
@@ -101,7 +102,14 @@
while (complete == false)
{
- System.Threading.Thread.Sleep(100);
+ if (m_EventStop_SiteSearches.WaitOne(1, true))
+ {
+ complete = true;
+ }
+ else
+ {
+ System.Threading.Thread.Sleep(100);
+ }
}
}
@@ -189,8 +197,8 @@
{
reply.Close();
}
+ complete = true;
}
- complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -4,6 +4,7 @@
using System.IO;
using System.Diagnostics;
using System.Net;
+using System.Threading;
namespace LyricsEngine.LyricSites
{
@@ -17,7 +18,7 @@
get { return lyric; }
}
- public Lyrics007(string artist, string title)
+ public Lyrics007(string artist, string title, ManualResetEvent m_EventStop_SiteSearches)
{
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "Lyrics007(" + artist + ", " + title + ")");
@@ -40,7 +41,14 @@
while (complete == false)
{
- System.Threading.Thread.Sleep(100);
+ if (m_EventStop_SiteSearches.WaitOne(1, true))
+ {
+ complete = true;
+ }
+ else
+ {
+ System.Threading.Thread.Sleep(100);
+ }
}
}
@@ -135,8 +143,8 @@
{
reply.Close();
}
+ complete = true;
}
- complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -4,6 +4,7 @@
using System.IO;
using System.Diagnostics;
using System.Net;
+using System.Threading;
namespace LyricsEngine.LyricSites
{
@@ -17,7 +18,7 @@
get { return lyric; }
}
- public LyricsOnDemand(string artist, string title)
+ public LyricsOnDemand(string artist, string title, ManualResetEvent m_EventStop_SiteSearches)
{
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "LyricsOnDemand(" + artist + ", " + title + ")");
@@ -70,7 +71,14 @@
while (complete == false)
{
- System.Threading.Thread.Sleep(100);
+ if (m_EventStop_SiteSearches.WaitOne(1, true))
+ {
+ complete = true;
+ }
+ else
+ {
+ System.Threading.Thread.Sleep(100);
+ }
}
}
@@ -160,8 +168,8 @@
{
reply.Close();
}
+ complete = true;
}
- complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -4,6 +4,7 @@
using System.IO;
using System.Diagnostics;
using System.Net;
+using System.Threading;
namespace LyricsEngine.LyricSites
{
@@ -17,7 +18,7 @@
get { return lyric; }
}
- public SeekLyrics(string artist, string title)
+ public SeekLyrics(string artist, string title, ManualResetEvent m_EventStop_SiteSearches)
{
if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")");
@@ -75,7 +76,14 @@
while (complete == false)
{
- System.Threading.Thread.Sleep(100);
+ if (m_EventStop_SiteSearches.WaitOne(1, true))
+ {
+ complete = true;
+ }
+ else
+ {
+ System.Threading.Thread.Sleep(100);
+ }
}
}
@@ -174,8 +182,8 @@
{
reply.Close();
}
+ complete = true;
}
- complete = true;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -47,7 +47,7 @@
else
{
// if we don't allow this pause of 2 sec the webservice behaves in a strange maneur
- Thread.Sleep(1500);
+ Thread.Sleep(2000);
}
++noOfTries;
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -6,14 +6,14 @@
{
public static class Setup
{
- public static string[] BatchSearchSites = new string[4]
+ public static string[] BatchSearchSites = new string[6]
{
"LyricWiki",
"Lyrics007",
"LyricsOnDemand",
- "HotLyrics"/*,
+ "HotLyrics",
"EvilLabs",
- "SeekLyrics"*/
+ "SeekLyrics"
};
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -610,6 +610,10 @@
if (m_SearchOnlyMarkedSongs == false)
{
+
+ //System.IO.Directory.SetCurrentDirectory(@"C:\Program Files\Team MediaPortal\MediaPortal");
+ //string test = System.IO.Directory.GetCurrentDirectory();
+
MusicDatabase dbs = new MusicDatabase();
dbs.GetArtists(ref artists);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs 2007-05-01 14:40:37 UTC (rev 367)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs 2007-05-01 15:59:15 UTC (rev 368)
@@ -15,7 +15,7 @@
static void Main()
{
//Config.Dir.Config = @"C:\Program Files\Team MediaPortal\MediaPortal";
- System.IO.Directory.SetCurrentDirectory(@"C:\Program Files\Team MediaPortal\MediaPortal");
+ System.IO.Directory.SetCurrentDirectory(@"C:\Documents and Settings\Administrator\My Documents\Visual Studio 2005\Projects\MP-plugins\MyLyrics\My Lyrics\bin\Debug");
System.Windows.Forms.Application.Run(new MyLyricsSetup());
//System.Windows.Forms.Application.Run(new MySeriaTest());
}
Modified: trunk/plugins/MyLyrics/MyLyrics.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
