beagle r4563 - in branches/beagle-win32-branch/src/Beagle.Filters: . Beagle.Filters

[llipka svn gnome org]

Author: llipka
Date: Fri Feb 29 09:35:29 2008
New Revision: 4563
URL: http://svn.gnome.org/viewvc/beagle?rev=4563&view=rev

Log:
Get Beagle.Filters building and clean things up.

Added:
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/Filter.cs
      - copied, changed from r4561, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/Filter.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterFactory.cs
      - copied, changed from r4561, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/FilterFactory.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterFlavor.cs
      - copied, changed from r4561, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/Flavor.cs
Modified:
   branches/beagle-win32-branch/src/Beagle.Filters/AssemblyInfo.cs.in
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAbiword.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterArchive.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAudio.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterEmpathyLog.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterExternal.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterHtml.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterImage.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKCal.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKopeteLog.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterLabyrinth.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterM3U.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMPlayerVideo.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMail.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMan.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterOpenOffice.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPackage.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPdf.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPidginLog.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPls.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterRTF.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterScribus.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSource.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSvg.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTeX.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterText.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTotem.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterVideo.cs
   branches/beagle-win32-branch/src/Beagle.Filters/Makefile.am

Modified: branches/beagle-win32-branch/src/Beagle.Filters/AssemblyInfo.cs.in
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/AssemblyInfo.cs.in	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/AssemblyInfo.cs.in	Fri Feb 29 09:35:29 2008
@@ -11,7 +11,7 @@
 [assembly: AssemblyTitle ("Beagle.Filters")]
 
 // All filter types have to be listed here to be loaded.
-[assembly: Beagle.Daemon.FilterTypes (
+[assembly: FilterTypes (
 	 typeof(FilterAbiWord),
 	 typeof(FilterApplication),
 	 typeof(FilterArchive),

Copied: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/Filter.cs (from r4561, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/Filter.cs)
==============================================================================
--- /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/Filter.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/Filter.cs	Fri Feb 29 09:35:29 2008
@@ -34,7 +34,7 @@
 
 using Beagle.Util;
 
-namespace Beagle.Daemon {
+namespace Beagle.Filters {
 
 	public class Filter {
 

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAbiword.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAbiword.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAbiword.cs	Fri Feb 29 09:35:29 2008
@@ -39,7 +39,7 @@
 
 namespace Beagle.Filters {
     
-	public class FilterAbiWord : Beagle.Daemon.Filter {
+	public class FilterAbiWord : Filter {
 
 		Hashtable hotStyles;
 		bool is_gzipped;

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterArchive.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterArchive.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterArchive.cs	Fri Feb 29 09:35:29 2008
@@ -40,7 +40,7 @@
 
 namespace Beagle.Filters {
 
-	public class FilterArchive : Beagle.Daemon.Filter {
+	public class FilterArchive : Filter {
 
 		internal delegate ArchiveEntry GetNextEntry ();
 

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAudio.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAudio.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterAudio.cs	Fri Feb 29 09:35:29 2008
@@ -32,7 +32,7 @@
 
 namespace Beagle.Filters {
 
-	public class FilterAudio : Beagle.Daemon.Filter {
+	public class FilterAudio : Filter {
 
 		public FilterAudio ()
 		{

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterEmpathyLog.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterEmpathyLog.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterEmpathyLog.cs	Fri Feb 29 09:35:29 2008
@@ -31,11 +31,10 @@
 using System.Collections.Generic;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 namespace Beagle.Filters {
 
-	public class FilterEmpathyLog : Beagle.Daemon.Filter {
+	public class FilterEmpathyLog : Filter {
 
 		public FilterEmpathyLog ()
 		{
@@ -52,36 +51,39 @@
 		{
 			AddProperty (Beagle.Property.NewUnsearched ("fixme:client", "Empathy"));
 
-
 			XmlTextReader reader = new XmlTextReader (base.TextReader);
+
 			XPathDocument xdoc = new XPathDocument(reader);
 			XPathNavigator xnav = xdoc.CreateNavigator();
 			XPathNodeIterator xiter =  xnav.Select("//message");
+
 			bool have_identity = false;
 			List<string> speakingtoids = new List<string>();
-			//FIXME: GetStarts and Finishs
-//			DateTime start = DateTime.MinValue;
-//			DateTime end = DateTime.MinValue;
+
+			// FIXME: GetStarts and Finishs
+			// DateTime start = DateTime.MinValue;
+			// DateTime end = DateTime.MinValue;
+
 			xiter.MoveNext();
-			while(xiter.MoveNext()){
 
-				this.AppendText (xiter.Current.Value.ToString());
+			while (xiter.MoveNext ()) {
+
+				AppendText (xiter.Current.Value.ToString ());
 				AppendWhiteSpace ();
 				
-				if(xiter.Current.GetAttribute ("isuser",String.Empty) == "true"&& !have_identity){
-					AddProperty (Beagle.Property.NewUnsearched ("fixme:identity",xiter.Current.GetAttribute("id",String.Empty)));
+				if (xiter.Current.GetAttribute ("isuser", String.Empty) == "true" && !have_identity) {
+					AddProperty (Beagle.Property.NewUnsearched ("fixme:identity", xiter.Current.GetAttribute ("id", String.Empty)));
 					have_identity = true;
-				}else{
-					if(!speakingtoids.Contains (xiter.Current.GetAttribute("id",String.Empty))){ 
+				} else {
+					if (!speakingtoids.Contains (xiter.Current.GetAttribute ("id",String.Empty))) { 
 						AddProperty (Beagle.Property.New ("fixme:speakingto", xiter.Current.GetAttribute ("id", String.Empty)));
 						AddProperty (Beagle.Property.New ("fixme:speakingto_alias", xiter.Current.GetAttribute ("name", String.Empty)));
-						speakingtoids.Add (xiter.Current.GetAttribute("id",String.Empty));
+						speakingtoids.Add (xiter.Current.GetAttribute ("id",String.Empty));
 					}
 				}
 			}
 			
 		}
-
 		
 	}
 }

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterExternal.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterExternal.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterExternal.cs	Fri Feb 29 09:35:29 2008
@@ -35,7 +35,6 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-using Beagle.Daemon;
 using Beagle.Util;
 
 namespace Beagle.Filters {
@@ -61,7 +60,7 @@
 		public ExternalFilterInfo [] Items;
 	}
 
-	public class FilterExternal : Beagle.Daemon.Filter {
+	public class FilterExternal : Filter {
 
 		private ExternalFilterInfo [] filters = null;
 

Copied: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterFactory.cs (from r4561, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/FilterFactory.cs)
==============================================================================
--- /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/FilterFactory.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterFactory.cs	Fri Feb 29 09:35:29 2008
@@ -2,6 +2,7 @@
 // FilterFactory.cs
 //
 // Copyright (C) 2004 Novell, Inc.
+// Copyright (C) 2008 Lukas Lipka <lukaslipka gmail com>
 //
 
 //
@@ -36,7 +37,7 @@
 
 using Beagle.Util;
 
-namespace Beagle.Daemon {
+namespace Beagle.Filters {
 
 	public class FilterFactory {
 
@@ -210,160 +211,6 @@
 
 		/////////////////////////////////////////////////////////////////////////
 
-		static private bool ShouldWeFilterThis (Indexable indexable)
-		{
-			if (indexable.Filtering == IndexableFiltering.Never
-			    || indexable.NoContent)
-				return false;
-
-			if (indexable.Filtering == IndexableFiltering.Always)
-				return true;
-
-			// Our default behavior is to try to filter non-transient file
-			// indexable and indexables with a specific mime type attached.
-			if (indexable.IsNonTransient || indexable.MimeType != null)
-				return true;
-			
-			return false;
-		}
-
-		static public bool FilterIndexable (Indexable indexable, TextCache text_cache, out Filter filter)
-		{
-			filter = null;
-			ICollection filters = null;
-
-			if (indexable.Filtering == IndexableFiltering.AlreadyFiltered)
-				return false;
-
-			if (! ShouldWeFilterThis (indexable)) {
-				indexable.NoContent = true;
-				return false;
-			}
-
-			string path = null;
-
-			// First, figure out which filter we should use to deal with
-			// the indexable.
-
-			// If a specific mime type is specified, try to index as that type.
-			if (indexable.MimeType != null)
-				filters = CreateFiltersFromMimeType (indexable.MimeType);
-
-			if (indexable.ContentUri.IsFile) {
-				path = indexable.ContentUri.LocalPath;
-
-				// Otherwise, set the mime type for a directory,
-				// or sniff it from the file.
-				if (indexable.MimeType == null) {
-					if (Directory.Exists (path)) {
-						indexable.MimeType = "inode/directory";
-						indexable.NoContent = true;
-					} else if (File.Exists (path)) {
-						indexable.MimeType = XdgMime.GetMimeType (path);
-					} else {
-						Log.Warn ("Unable to filter {0}.  {1} not found.", indexable.DisplayUri, path);
-						return false;
-					}
-				}
-
-				// Set the timestamp to the last write time, if it isn't
-				// set by the backend.
-				if (! indexable.ValidTimestamp && indexable.IsNonTransient)
-					indexable.Timestamp = FileSystem.GetLastWriteTimeUtc (path);
-
-				// Check the timestamp to make sure the file hasn't
-				// disappeared from underneath us.
-				if (! FileSystem.ExistsByDateTime (indexable.Timestamp)) {
-					Log.Warn ("Unable to filter {0}.  {1} appears to have disappeared from underneath us", indexable.DisplayUri, path);
-					return false;
-				}
-
-				if (filters == null || filters.Count == 0) {
-					filters = CreateFiltersFromIndexable (indexable);
-				}
-			}
-
-			// We don't know how to filter this, so there is nothing else to do.
-			if (filters.Count == 0) {
-				if (! indexable.NoContent) {
-					indexable.NoContent = true;
-
-					Logger.Log.Debug ("No filter for {0} ({1}) [{2}]", indexable.DisplayUri, path, indexable.MimeType);
-					return false;
-				}
-				
-				return true;
-			}
-
-			foreach (Filter candidate_filter in filters) {
-				if (Debug)
-					Logger.Log.Debug ("Testing filter: {0}", candidate_filter);
-				
-				// Hook up the snippet writer.
-				if (candidate_filter.SnippetMode && text_cache != null) {
-					if (candidate_filter.OriginalIsText && indexable.IsNonTransient) {
-						text_cache.MarkAsSelfCached (indexable.Uri);
-					} else if (indexable.CacheContent) {
-						TextWriter writer = text_cache.GetWriter (indexable.Uri);
-						candidate_filter.AttachSnippetWriter (writer);
-					}
-				}
-
-				// Set the indexable on the filter.
-				candidate_filter.Indexable = indexable;
-
-				// Open the filter, copy the file's properties to the indexable,
-				// and hook up the TextReaders.
-
-				bool successful_open = false;
-				TextReader text_reader;
-				Stream binary_stream;
-
-				if (path != null)
-					successful_open = candidate_filter.Open (path);
-				else if ((text_reader = indexable.GetTextReader ()) != null)
-					successful_open = candidate_filter.Open (text_reader);
-				else if ((binary_stream = indexable.GetBinaryStream ()) != null)
-					successful_open = candidate_filter.Open (binary_stream);
-					
-				if (successful_open) {
-					// Set FileType
-					indexable.AddProperty (Property.NewKeyword ("beagle:FileType", candidate_filter.FileType));
-
-					indexable.SetTextReader (candidate_filter.GetTextReader ());
-					indexable.SetHotTextReader (candidate_filter.GetHotTextReader ());
-
-					if (Debug)
-						Logger.Log.Debug ("Successfully filtered {0} with {1}", path, candidate_filter);
-
-					filter = candidate_filter;
-					return true;
-				} else {
-					Log.Warn ("Error in filtering {0} with {1}, falling back", path, candidate_filter);
-					candidate_filter.Cleanup ();
-				}
-			}
-
-			if (Debug)
-				Logger.Log.Debug ("None of the matching filters could process the file: {0}", path);
-			
-			return false;
-		}
-
-		static public bool FilterIndexable (Indexable indexable, out Filter filter)
-		{
-			return FilterIndexable (indexable, null, out filter);
-		}
-
-		static public bool FilterIndexable (Indexable indexable)
-		{
-			Filter filter = null;
-
-			return FilterIndexable (indexable, null, out filter);
-		}
-
-		/////////////////////////////////////////////////////////////////////////
-
 		private static Dictionary<string, int> filter_versions_by_name = new Dictionary<string, int> ();
 
 		static private int ScanAssemblyForFilters (Assembly assembly, FilterCache filter_cache)

Copied: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterFlavor.cs (from r4561, /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/Flavor.cs)
==============================================================================
--- /branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/Flavor.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterFlavor.cs	Fri Feb 29 09:35:29 2008
@@ -1,5 +1,5 @@
 //
-// Flavor.cs
+// FilterFlavor.cs
 //
 // Copyright (C) 2004 Novell, Inc.
 //
@@ -30,7 +30,7 @@
 
 using Beagle.Util;
 
-namespace Beagle.Daemon {
+namespace Beagle.Filters {
 
 	public class FilterFlavor {
 

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterHtml.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterHtml.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterHtml.cs	Fri Feb 29 09:35:29 2008
@@ -39,7 +39,7 @@
 
 namespace Beagle.Filters {
 
-	public class FilterHtml : Beagle.Daemon.Filter {
+	public class FilterHtml : Filter {
 
 		// When see <b> push "b" in the stack
 		// When see </b> pop from the stack

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterImage.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterImage.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterImage.cs	Fri Feb 29 09:35:29 2008
@@ -35,7 +35,7 @@
 
 namespace Beagle.Filters {
 
-	public abstract class FilterImage : Beagle.Daemon.Filter {
+	public abstract class FilterImage : Filter {
 
 		// 1: Base
 		// 2: Added fspot:IsIndexed field, added width & height properties

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKCal.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKCal.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKCal.cs	Fri Feb 29 09:35:29 2008
@@ -35,12 +35,12 @@
 using System.Text;
 using System.Globalization;
 
-using Beagle.Daemon;
 using Beagle.Util;
 
 namespace Beagle.Filters {
 
-	public abstract class FilterKCal : Beagle.Daemon.Filter {
+	public abstract class FilterKCal : Filter {
+
 		protected Hashtable KCalNamePropertyMapping;
 
 		protected enum KCalType {

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKopeteLog.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKopeteLog.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterKopeteLog.cs	Fri Feb 29 09:35:29 2008
@@ -29,11 +29,10 @@
 using System.Xml;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 namespace Beagle.Filters {
 
-	public class FilterKopeteLog : Beagle.Daemon.Filter {
+	public class FilterKopeteLog : Filter {
 
 		public FilterKopeteLog ()
 		{

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterLabyrinth.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterLabyrinth.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterLabyrinth.cs	Fri Feb 29 09:35:29 2008
@@ -23,18 +23,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
+
 using System;
 using System.IO;
 using System.Text;
 using System.Xml;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 namespace Beagle.Filters {
 	
-	public class FilterLabyrinth : Beagle.Daemon.Filter {
-
+	public class FilterLabyrinth : Filter {
 
 		public FilterLabyrinth ()
 		{
@@ -47,11 +46,11 @@
 			AddSupportedFlavor (FilterFlavor.NewFromMimeType ("x-beagle/x-labyrinth-note"));
 		}
 
-
 		protected override void DoPullProperties ()
 		{
 			StreamReader reader = new StreamReader (FileInfo.FullName, System.Text.Encoding.UTF8);
 			XmlTextReader doc = new XmlTextReader (reader);
+
 			try {
 				 do {
 					// FIXME: Extract more information than mere text from the tags in note-content
@@ -68,15 +67,15 @@
 						continue;
 					}
 				} while (doc.Read ());
+
 				Finished();
 			} catch (Exception e) {
 				Log.Warn (e, "Unable to index Labyrinth Note {0}", FileInfo.FullName);
 				Error ();
 			} 
+
 			doc.Close();					
 			
 		}
-
-
 	}
 }

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterM3U.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterM3U.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterM3U.cs	Fri Feb 29 09:35:29 2008
@@ -25,14 +25,15 @@
 using System;
 using System.IO;
 
-using Beagle.Daemon;
-
 namespace Beagle.Filters {
-	public class FilterM3U : Beagle.Daemon.Filter {
+
+	public class FilterM3U : Filter {
+
 		public FilterM3U ()
 		{
 			SnippetMode = false;
 			OriginalIsText = true;
+
 			SetFileType ("audio");
 		}
 
@@ -44,6 +45,7 @@
 		protected override void DoOpen (FileInfo file)
 		{
 			string line = TextReader.ReadLine ();
+
 			if (line != "#EXTM3U")
 				Error ();
 		}
@@ -51,8 +53,10 @@
 		override protected void DoPull ()
 		{
 			bool pull = false;
+
 			do {
 				string line = TextReader.ReadLine ();
+
 				if (line == null) {
 					Finished ();
 					return;
@@ -63,6 +67,7 @@
 				//	Path
 				if (line [0] == '#') {
 					int index = line.IndexOf (',');
+
 					if (index != -1 && index < (line.Length - 1))
 						pull = AppendLine (line.Substring (index + 1));
 				} else {

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMPlayerVideo.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMPlayerVideo.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMPlayerVideo.cs	Fri Feb 29 09:35:29 2008
@@ -30,11 +30,10 @@
 using System.Globalization;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 namespace Beagle.Filters {
 
-	public class FilterMPlayerVideo : Beagle.Daemon.Filter {
+	public class FilterMPlayerVideo : Filter {
 	
 		private int width = -1;
 		private int height = -1;

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMail.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMail.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMail.cs	Fri Feb 29 09:35:29 2008
@@ -33,12 +33,11 @@
 using GMime;
 
 using Beagle;
-using Beagle.Daemon;
 using Beagle.Util;
 
 namespace Beagle.Filters {
 
-	public class FilterMail : Beagle.Daemon.Filter, IDisposable {
+	public class FilterMail : Filter, IDisposable {
 
 		private static bool gmime_initialized = false;
 		private static bool gmime_broken = false;

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMan.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMan.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterMan.cs	Fri Feb 29 09:35:29 2008
@@ -31,7 +31,6 @@
 using System.Text.RegularExpressions;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 using ICSharpCode.SharpZipLib.GZip;
 using ICSharpCode.SharpZipLib.BZip2;
@@ -43,7 +42,7 @@
 	//   .so man3/strcpy.3
 	// Which is in strncpy.3.gz and points to strcpy.3.gz
 
-	public class FilterMan : Beagle.Daemon.Filter {
+	public class FilterMan : Filter {
 
 		// The regular expression for a complete man header line is built to allow a suite of 
 		// non-spaces, or words separated by spaces which are encompassed in quotes

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterOpenOffice.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterOpenOffice.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterOpenOffice.cs	Fri Feb 29 09:35:29 2008
@@ -24,7 +24,6 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
-
 using System;
 using System.Collections;
 using System.IO;
@@ -32,13 +31,12 @@
 using System.Xml;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 using ICSharpCode.SharpZipLib.Zip;
 
 namespace Beagle.Filters {
     
-	public class FilterOpenOffice : Beagle.Daemon.Filter {
+	public class FilterOpenOffice : Filter {
 
 		private Hashtable hotStyles;
 

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPackage.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPackage.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPackage.cs	Fri Feb 29 09:35:29 2008
@@ -30,26 +30,23 @@
 
 namespace Beagle.Filters {
 
-	public abstract class FilterPackage : Beagle.Daemon.Filter {
-
-		// 1. Store packager information as a single field
-		//    Store packager as dc:creator
-		//    Store license as dc:rights
-		//    Store homepage as searchable
-		private int version = 1;
+	public abstract class FilterPackage : Filter {
 
 		public FilterPackage ()
 		{
+			// 1. Store packager information as a single field
+			//    Store packager as dc:creator
+			//    Store license as dc:rights
+			//    Store homepage as searchable
+			base.SetVersion (1);
+
 			SnippetMode = true;
 			SetFileType ("package");
-
-			base.SetVersion (version);
 		}
 
 		protected new void SetVersion (int version)
 		{
-			this.version += version;
-			base.SetVersion (version);
+			base.SetVersion (base.Version + version);
 		}
 
 		protected abstract bool PullPackageProperties ();

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPdf.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPdf.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPdf.cs	Fri Feb 29 09:35:29 2008
@@ -1,10 +1,7 @@
 //
 // FilterPdf.cs: Very simplistic PDF filter
 //
-// Author:
-//   Christopher Orr <dashboard protactin co uk>
-//
-// Copyright 2004 by Christopher Orr
+// Copyright (C) 2004 Christopher Orr <dashboard protactin co uk>
 //
 
 using System;
@@ -12,13 +9,18 @@
 using System.Diagnostics;
 
 using Beagle.Util;
-using Beagle.Daemon;
 using Beagle.Util.Xmp;
 using SemWeb;
 
 namespace Beagle.Filters {
 
-	public class FilterPdf : Beagle.Daemon.Filter {
+	public class FilterPdf : Filter {
+
+		// FIXME: we should have a reasonable failure mode if pdftotext is
+		// not installed.
+
+		private SafeProcess pc = null;
+		private StreamReader pout = null;
 
 		public FilterPdf ()
 		{
@@ -31,12 +33,6 @@
 			AddSupportedFlavor (FilterFlavor.NewFromMimeType ("application/pdf"));
 		}
 
-		// FIXME: we should have a reasonable failure mode if pdftotext is
-		// not installed.
-
-		SafeProcess pc = null;
-		StreamReader pout = null;
-
 		protected override void DoPullProperties ()
 		{
 			// create new external process

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPidginLog.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPidginLog.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPidginLog.cs	Fri Feb 29 09:35:29 2008
@@ -28,11 +28,10 @@
 using System.IO;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 namespace Beagle.Filters {
 
-	public class FilterPidginLog : Beagle.Daemon.Filter {
+	public class FilterPidginLog : Filter {
 
 		public FilterPidginLog ()
 		{

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPls.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPls.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterPls.cs	Fri Feb 29 09:35:29 2008
@@ -27,14 +27,15 @@
 using System;
 using System.IO;
 
-using Beagle.Daemon;
-
 namespace Beagle.Filters {
-	public class FilterPls : Beagle.Daemon.Filter {
+
+	public class FilterPls : Filter {
+
 		public FilterPls ()
 		{
 			SnippetMode = false;
 			OriginalIsText = true;
+
 			SetFileType ("audio");
 		}
 
@@ -46,6 +47,7 @@
 		protected override void DoOpen (FileInfo file)
 		{
 			string line = TextReader.ReadLine ();
+
 			if (line != "[Playlist]")
 				Error ();
 		}
@@ -53,8 +55,10 @@
 		override protected void DoPull ()
 		{
 			bool pull = false;
+
 			do {
 				string line = TextReader.ReadLine ();
+
 				if (line == null) {
 					Finished ();
 					return;
@@ -64,9 +68,9 @@
 				//	FileX=<path>
 				//	TitleX=<title>
 				//	other lines
-				if (line.StartsWith ("File") ||
-				    line.StartsWith ("Title")) {
+				if (line.StartsWith ("File") || line.StartsWith ("Title")) {
 					int index = line.IndexOf ('=');
+
 					if (index != -1 && index < (line.Length - 1))
 						pull = AppendLine (line.Substring (index + 1));
 				}

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterRTF.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterRTF.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterRTF.cs	Fri Feb 29 09:35:29 2008
@@ -36,10 +36,10 @@
 
 namespace Beagle.Filters {
 
-	public class FilterRTF : Beagle.Daemon.Filter {
+	public class FilterRTF : Filter {
 		
-		int		skip_width;
-		int		skip_count;
+		int skip_width;
+		int skip_count;
 
 		static TextMap text_map = null;
 

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterScribus.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterScribus.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterScribus.cs	Fri Feb 29 09:35:29 2008
@@ -30,10 +30,11 @@
 using System.Text;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 namespace Beagle.Filters {
-	public class FilterScribus : Beagle.Daemon.Filter {
+
+	public class FilterScribus : Filter {
+
 		// These two arrays contain the mapping from attributes in a scribus
 		// file to actual beagle property names
 		private static string[] scribus_attributes = { "TITLE", "KEYWORDS", "COMMENTS", "DOCSOURCE", "DOCCONTRIB", "DOCRELATION", "DOCIDENT", "PUBLISHER", "AUTHOR", "DOCCOVER", "DOCRIGHTS" };

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSource.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSource.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSource.cs	Fri Feb 29 09:35:29 2008
@@ -31,7 +31,7 @@
 using System.Text;
 namespace Beagle.Filters {
 
-	public abstract class FilterSource : Beagle.Daemon.Filter {
+	public abstract class FilterSource : Filter {
 
 		protected enum LangType {
 			None,
@@ -54,14 +54,15 @@
 			StringConstant
 		};
 		
-		LineType SrcLineType;
-		string StrConstIdentifier;
-		StringBuilder token;
-
-		private int version = 0;
+		private LineType SrcLineType;
+		private string StrConstIdentifier;
+		private StringBuilder token;
 
 		public FilterSource ()
 		{
+			// 0: Base
+			base.SetVersion (0);
+
 			// Initialize the linetype member.
 			SrcLineType = LineType.None;
 			SrcLangType = LangType.None;
@@ -75,8 +76,7 @@
 
 		protected new void SetVersion (int version)
 		{
-			this.version += version;
-			base.SetVersion (version);
+			base.SetVersion (base.Version + version);
 		}
 
 		protected abstract Dictionary<string, bool> KeyWordsHash {

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSvg.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSvg.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterSvg.cs	Fri Feb 29 09:35:29 2008
@@ -30,10 +30,11 @@
 using System.Text;
 
 using Beagle.Util;
-using Beagle.Daemon;
 
 namespace Beagle.Filters {
-	public class FilterSvg : Beagle.Daemon.Filter {
+
+	public class FilterSvg : Filter {
+
 		private StringBuilder sb = new StringBuilder ();
 
 		// List of keys that should be ignored when adding to content.

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTeX.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTeX.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTeX.cs	Fri Feb 29 09:35:29 2008
@@ -43,7 +43,7 @@
 
 namespace Beagle.Filters {
 
-	public class FilterTeX : Beagle.Daemon.Filter {
+	public class FilterTeX : Filter {
 
 		private class TeXControlWordType {
 

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterText.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterText.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterText.cs	Fri Feb 29 09:35:29 2008
@@ -27,16 +27,17 @@
 using System;
 using System.IO;
 
-using Beagle.Daemon;
-
 namespace Beagle.Filters {
 
-	public class FilterText : Beagle.Daemon.Filter {
+	public class FilterText : Filter {
+
+		private const long LENGTH_CUTOFF = 5 * 1024 * 1024; // 5 Mb
 
 		public FilterText ()
 		{
 			SnippetMode = true;
 			OriginalIsText = true;
+
 			SetFileType ("document");
 		}
 
@@ -51,8 +52,6 @@
 			AddSupportedFlavor (FilterFlavor.NewFromMimeType ("text/x-copying"));
 		}
 
-		const long LENGTH_CUTOFF = 5 * 1024 * 1024; // 5 Mb
-
 		override protected void DoOpen (FileInfo file)
 		{
 			// Extremely large files of type text/plain are usually log files,

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTotem.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTotem.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterTotem.cs	Fri Feb 29 09:35:29 2008
@@ -35,7 +35,7 @@
 
 namespace Beagle.Filters {
 
-	public class FilterTotem : Beagle.Daemon.Filter {
+	public class FilterTotem : Filter {
 
 		static bool Debug = false;
 

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterVideo.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterVideo.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Beagle.Filters/FilterVideo.cs	Fri Feb 29 09:35:29 2008
@@ -13,7 +13,7 @@
 
 namespace Beagle.Filters {
 
-	public class FilterVideo : Beagle.Daemon.Filter {
+	public class FilterVideo : Filter {
 	
 		public FilterVideo ()
 		{

Modified: branches/beagle-win32-branch/src/Beagle.Filters/Makefile.am
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Filters/Makefile.am	(original)
+++ branches/beagle-win32-branch/src/Beagle.Filters/Makefile.am	Fri Feb 29 09:35:29 2008
@@ -1,178 +1,165 @@
-
-FILTERDIR = $(pkglibdir)/Filters
 CSC = $(MCS) -debug
+CSFLAGS = -target:library $(BEAGLE_DEFINES)
 
-TARGET = Filters.dll
+ASSEMBLY_NAME = Beagle.Filters
+ASSEMBLY = $(ASSEMBLY_NAME).dll
 
-CSFLAGS = -target:library $(BEAGLE_DEFINES)
+FILTERDIR = $(pkglibdir)/Filters
 
-# Found at http://sharptoolbox.madgeek.com/
-HAP_CSFILES =						\
-	$(srcdir)/HtmlAgilityPack/crc32.cs		\
-	$(srcdir)/HtmlAgilityPack/Header.cs		\
-	$(srcdir)/HtmlAgilityPack/HtmlAttribute.cs	\
-	$(srcdir)/HtmlAgilityPack/HtmlDocument.cs	\
-	$(srcdir)/HtmlAgilityPack/HtmlEntity.cs		\
-	$(srcdir)/HtmlAgilityPack/HtmlNode.cs		\
-	$(srcdir)/HtmlAgilityPack/HtmlNodeNavigator.cs	\
-	$(srcdir)/HtmlAgilityPack/MixedCodeDocument.cs	\
-	$(srcdir)/HtmlAgilityPack/tools.cs
+# HtmlAgilityPack found at http://sharptoolbox.madgeek.com/
+# RTF is a local copy of http://svn.myrealbox.com/viewcvs/trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/
 
 include TagLib/TagLib.sources
-
 include 7zip/7zip.sources
 
-# Local copy of http://svn.myrealbox.com/viewcvs/trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/
-SWF_RTF_CSFILES =						\
-	$(srcdir)/System.Windows.Forms.RTF/Charcode.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/Charset.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/CharsetFlags.cs	\
-	$(srcdir)/System.Windows.Forms.RTF/CharsetType.cs	\
-	$(srcdir)/System.Windows.Forms.RTF/ClassDelegate.cs	\
-	$(srcdir)/System.Windows.Forms.RTF/Color.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/DestinationDelegate.cs \
-	$(srcdir)/System.Windows.Forms.RTF/Font.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/KeysInit.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/KeyStruct.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/Major.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/Minor.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/RTF.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/RTFException.cs	\
-	$(srcdir)/System.Windows.Forms.RTF/StandardCharCode.cs	\
-	$(srcdir)/System.Windows.Forms.RTF/StandardCharName.cs	\
-	$(srcdir)/System.Windows.Forms.RTF/Style.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/StyleElement.cs	\
-	$(srcdir)/System.Windows.Forms.RTF/StyleType.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/TextMap.cs		\
-	$(srcdir)/System.Windows.Forms.RTF/TokenClass.cs
-
-CSFILES = 				\
-	$(srcdir)/AssemblyInfo.cs	\
-	$(HAP_CSFILES)			\
-	$(SWF_RTF_CSFILES)		\
-	$(7ZIP_CSFILES)			\
-	$(srcdir)/FilterAbiword.cs	\
-	$(srcdir)/FilterArchive.cs	\
-	$(srcdir)/FilterAudio.cs	\
-	$(srcdir)/FilterBmp.cs		\
-	$(srcdir)/FilterBoo.cs		\
-	$(srcdir)/FilterC.cs		\
-	$(srcdir)/FilterCSharp.cs	\
-	$(srcdir)/FilterCpp.cs		\
-	$(srcdir)/FilterDeb.cs		\
-	$(srcdir)/FilterDesktop.cs	\
-	$(srcdir)/FilterDocbook.cs	\
-	$(srcdir)/FilterEbuild.cs	\
-	$(srcdir)/FilterExternal.cs	\
-	$(srcdir)/FilterEmpathyLog.cs	\
-	$(srcdir)/FilterFortran.cs	\
-	$(srcdir)/FilterGif.cs		\
-	$(srcdir)/FilterHtml.cs		\
-	$(srcdir)/FilterIgnore.cs	\
-	$(srcdir)/FilterImage.cs	\
-	$(srcdir)/FilterJava.cs		\
-	$(srcdir)/FilterJpeg.cs		\
-	$(srcdir)/FilterJs.cs		\
-	$(srcdir)/FilterKAddressBook.cs \
-	$(srcdir)/FilterKCal.cs		\
-	$(srcdir)/FilterKNotes.cs	\
-	$(srcdir)/FilterKOrganizer.cs	\
-	$(srcdir)/FilterKonqHistory.cs	\
-	$(srcdir)/FilterKopeteLog.cs	\
-	$(srcdir)/FilterLabyrinth.cs	\
-	$(srcdir)/FilterLisp.cs		\
-	$(srcdir)/FilterM3U.cs		\
-	$(srcdir)/FilterMPlayerVideo.cs	\
-	$(srcdir)/FilterMail.cs		\
-	$(srcdir)/FilterMan.cs		\
-	$(srcdir)/FilterMatlab.cs	\
-	$(srcdir)/FilterMonodoc.cs	\
-	$(srcdir)/FilterOpenOffice.cs	\
-	$(srcdir)/FilterPackage.cs	\
-	$(srcdir)/FilterPascal.cs	\
-	$(srcdir)/FilterPdf.cs		\
-	$(srcdir)/FilterPerl.cs		\
-	$(srcdir)/FilterPhp.cs		\
-	$(srcdir)/FilterPidginLog.cs	\
-	$(srcdir)/FilterPls.cs		\
-	$(srcdir)/FilterPng.cs		\
-	$(srcdir)/FilterPython.cs	\
-	$(srcdir)/FilterRPM.cs		\
-	$(srcdir)/FilterRTF.cs		\
-	$(srcdir)/FilterRuby.cs		\
-	$(srcdir)/FilterScilab.cs	\
-	$(srcdir)/FilterScribus.cs	\
-	$(srcdir)/FilterShellscript.cs	\
-	$(srcdir)/FilterSource.cs	\
-	$(srcdir)/FilterSpreadsheet.cs	\
-	$(srcdir)/FilterSvg.cs		\
-	$(srcdir)/FilterTeX.cs		\
-	$(srcdir)/FilterText.cs	        \
-	$(srcdir)/FilterTiff.cs		\
-	$(srcdir)/FilterTotem.cs	\
-	$(srcdir)/FilterVideo.cs	\
-	$(srcdir)/FilterXslt.cs
+ASSEMBLY_SOURCES = \
+	AssemblyInfo.cs	\
+	Beagle.Filters/Filter.cs	\
+	Beagle.Filters/FilterFlavor.cs	\
+	Beagle.Filters/FilterFactory.cs	\
+	Beagle.Filters/FilterAbiword.cs	\
+	Beagle.Filters/FilterArchive.cs	\
+	Beagle.Filters/FilterAudio.cs	\
+	Beagle.Filters/FilterBmp.cs		\
+	Beagle.Filters/FilterBoo.cs		\
+	Beagle.Filters/FilterC.cs		\
+	Beagle.Filters/FilterCSharp.cs	\
+	Beagle.Filters/FilterCpp.cs		\
+	Beagle.Filters/FilterDeb.cs		\
+	Beagle.Filters/FilterDesktop.cs	\
+	Beagle.Filters/FilterDocbook.cs	\
+	Beagle.Filters/FilterEbuild.cs	\
+	Beagle.Filters/FilterExternal.cs	\
+	Beagle.Filters/FilterEmpathyLog.cs	\
+	Beagle.Filters/FilterFortran.cs	\
+	Beagle.Filters/FilterGif.cs		\
+	Beagle.Filters/FilterHtml.cs		\
+	Beagle.Filters/FilterIgnore.cs	\
+	Beagle.Filters/FilterImage.cs	\
+	Beagle.Filters/FilterJava.cs		\
+	Beagle.Filters/FilterJpeg.cs		\
+	Beagle.Filters/FilterJs.cs		\
+	Beagle.Filters/FilterKAddressBook.cs \
+	Beagle.Filters/FilterKCal.cs		\
+	Beagle.Filters/FilterKNotes.cs	\
+	Beagle.Filters/FilterKOrganizer.cs	\
+	Beagle.Filters/FilterKonqHistory.cs	\
+	Beagle.Filters/FilterKopeteLog.cs	\
+	Beagle.Filters/FilterLabyrinth.cs	\
+	Beagle.Filters/FilterLisp.cs		\
+	Beagle.Filters/FilterM3U.cs		\
+	Beagle.Filters/FilterMPlayerVideo.cs	\
+	Beagle.Filters/FilterMail.cs		\
+	Beagle.Filters/FilterMan.cs		\
+	Beagle.Filters/FilterMatlab.cs	\
+	Beagle.Filters/FilterMonodoc.cs	\
+	Beagle.Filters/FilterOpenOffice.cs	\
+	Beagle.Filters/FilterPackage.cs	\
+	Beagle.Filters/FilterPascal.cs	\
+	Beagle.Filters/FilterPdf.cs		\
+	Beagle.Filters/FilterPerl.cs		\
+	Beagle.Filters/FilterPhp.cs		\
+	Beagle.Filters/FilterPidginLog.cs	\
+	Beagle.Filters/FilterPls.cs		\
+	Beagle.Filters/FilterPng.cs		\
+	Beagle.Filters/FilterPython.cs	\
+	Beagle.Filters/FilterRPM.cs		\
+	Beagle.Filters/FilterRTF.cs		\
+	Beagle.Filters/FilterRuby.cs		\
+	Beagle.Filters/FilterScilab.cs	\
+	Beagle.Filters/FilterScribus.cs	\
+	Beagle.Filters/FilterShellscript.cs	\
+	Beagle.Filters/FilterSource.cs	\
+	Beagle.Filters/FilterSpreadsheet.cs	\
+	Beagle.Filters/FilterSvg.cs		\
+	Beagle.Filters/FilterTeX.cs		\
+	Beagle.Filters/FilterText.cs	        \
+	Beagle.Filters/FilterTiff.cs		\
+	Beagle.Filters/FilterTotem.cs	\
+	Beagle.Filters/FilterVideo.cs	\
+	Beagle.Filters/FilterXslt.cs \
+	HtmlAgilityPack/crc32.cs		\
+	HtmlAgilityPack/Header.cs		\
+	HtmlAgilityPack/HtmlAttribute.cs	\
+	HtmlAgilityPack/HtmlDocument.cs	\
+	HtmlAgilityPack/HtmlEntity.cs		\
+	HtmlAgilityPack/HtmlNode.cs		\
+	HtmlAgilityPack/HtmlNodeNavigator.cs	\
+	HtmlAgilityPack/MixedCodeDocument.cs	\
+	HtmlAgilityPack/tools.cs \
+	System.Windows.Forms.RTF/Charcode.cs		\
+	System.Windows.Forms.RTF/Charset.cs		\
+	System.Windows.Forms.RTF/CharsetFlags.cs	\
+	System.Windows.Forms.RTF/CharsetType.cs	\
+	System.Windows.Forms.RTF/ClassDelegate.cs	\
+	System.Windows.Forms.RTF/Color.cs		\
+	System.Windows.Forms.RTF/DestinationDelegate.cs \
+	System.Windows.Forms.RTF/Font.cs		\
+	System.Windows.Forms.RTF/KeysInit.cs		\
+	System.Windows.Forms.RTF/KeyStruct.cs		\
+	System.Windows.Forms.RTF/Major.cs		\
+	System.Windows.Forms.RTF/Minor.cs		\
+	System.Windows.Forms.RTF/RTF.cs		\
+	System.Windows.Forms.RTF/RTFException.cs	\
+	System.Windows.Forms.RTF/StandardCharCode.cs	\
+	System.Windows.Forms.RTF/StandardCharName.cs	\
+	System.Windows.Forms.RTF/Style.cs		\
+	System.Windows.Forms.RTF/StyleElement.cs	\
+	System.Windows.Forms.RTF/StyleType.cs		\
+	System.Windows.Forms.RTF/TextMap.cs		\
+	System.Windows.Forms.RTF/TokenClass.cs \
+	$(7ZIP_CSFILES)
 
 if ENABLE_GSF_SHARP
-CSFILES += 				\
-	$(srcdir)/FilterOle.cs		\
-	$(srcdir)/FilterPPT.cs
+ASSEMBLY_SOURCES += FilterOle.cs FilterPPT.cs
 
 if ENABLE_WV1
-CSFILES += \
-	$(srcdir)/FilterDOC.cs		
+ASSEMBLY_SOURCES += FilterDOC.cs		
 endif
 endif
 
 if HAS_LIBCHM
-CSFILES += 				\
-	$(srcdir)/FilterChm.cs
+ASSEMBLY_SOURCES += FilterChm.cs
 endif
 
-
-LOCAL_ASSEMBLIES =				\
-	../Util/Util.dll			\
-	../BeagleClient/Beagle.dll		\
-	../beagled/BeagleDaemonPlugins.dll
-
-ASSEMBLIES =				\
-	$(BEAGLED_LIBS)			\
-	$(SHARPZIPLIB_LIBS)		\
-	-r:Mono.Posix			\
-	-r:System.Web			\
-	$(LOCAL_ASSEMBLIES:%=-r:%)
-
-RESOURCES =
+ASSEMBLY_REFERENCES = \
+	-r:../Beagle.Util/Beagle.Util.dll \
+	-r:../Beagle/Beagle.dll \
+	$(BEAGLED_LIBS) \
+	$(SHARPZIPLIB_LIBS) \
+	-r:Mono.Posix \
+	-r:System.Web
 
 if INTERNAL_TAGLIB
-CSFILES += $(TAGLIB_CSFILES)
+ASSEMBLY_SOURCES += $(TAGLIB_CSFILES)
 else
-ASSEMBLIES += $(TAGLIB_SHARP_LIBS)
+ASSEMBLY_REFERENCES += $(TAGLIB_SHARP_LIBS)
 endif
 
-$(TARGET): $(CSFILES) $(LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(ASSEMBLY_SOURCES)
+	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLY_SOURCES) $(ASSEMBLY_REFERENCES)
 
-all: $(TARGET)
+all: $(ASSEMBLY)
 
-install-data-local: $(TARGET)
+install-data-local: $(ASSEMBLY)
 	$(mkinstalldirs) $(DESTDIR)$(FILTERDIR)
-	$(INSTALL_DATA) $(TARGET) $(TARGET).mdb $(DESTDIR)$(FILTERDIR)
+	$(INSTALL_DATA) $(ASSEMBLY) $(ASSEMBLY).mdb $(DESTDIR)$(FILTERDIR)
 
 uninstall-local:
-	rm -f $(DESTDIR)$(FILTERDIR)/$(TARGET)
-	rm -f $(DESTDIR)$(FILTERDIR)/$(TARGET).mdb
+	rm -f $(DESTDIR)$(FILTERDIR)/$(ASSEMBLY)
+	rm -f $(DESTDIR)$(FILTERDIR)/$(ASSEMBLY).mdb
 
 COND_CS_FILES = \
-	$(srcdir)/FilterOle.cs		\
-	$(srcdir)/FilterPPT.cs		\
-	$(srcdir)/FilterDOC.cs		\
-	$(srcdir)/FilterChm.cs
+	Beagle.Filters/FilterOle.cs \
+	Beagle.Filters/FilterPPT.cs \
+	Beagle.Filters/FilterDOC.cs \
+	Beagle.Filters/FilterChm.cs
 
-EXTRA_DIST =			\
-	$(CSFILES)		\
+EXTRA_DIST = \
+	$(ASSEMBLY_SOURCES) \
 	$(COND_CS_FILES)
 
-CLEANFILES =		\
-	$(TARGET)	\
-	$(TARGET).mdb
+CLEANFILES = \
+	$(ASSEMBLY) \
+	$(ASSEMBLY).mdb
+