GNOME.org
 

banshee r4681 - in trunk/banshee: . build src/Core src/Core/Banshee.CollectionIndexer src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.Collection.Indexer src/Core/Banshee.Services/Banshee.Collection.Indexer.RemoteHelper

Author: abock
Date: Thu Oct  9 20:46:38 2008
New Revision: 4681
URL: http://svn.gnome.org/viewvc/banshee?rev=4681&view=rev

Log:
* banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs:
  Update to reflect clensing of the interfaces

* banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper:
  Moved the collection indexer remote helper into a standalone assembly
  suitable for including in other projects

* banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs:
  Fix indexing bug, was using the wrong index for fetching items from
  the model

* banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs:
* banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs:
* banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs:
  Ensure the interfaces are fully standalone and do not depend on any
  Banshee API

* banshee/Banshee.sln:
* banshee/configure.ac:
* banshee/build/build.environment.mk:
* banshee/src/Core/Banshee.CollectionIndexer/Makefile.am:
* banshee/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj:
  Build stuff for moving the collection indexer helper API into its own
  light weight and standalone assembly

Added:
   trunk/banshee/src/Core/Banshee.CollectionIndexer/
   trunk/banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/   (props changed)
      - copied from r4679, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer.RemoteHelper/
   trunk/banshee/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
   trunk/banshee/src/Core/Banshee.CollectionIndexer/Makefile.am
Removed:
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer.RemoteHelper/
Modified:
   trunk/banshee/Banshee.sln
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.environment.mk
   trunk/banshee/configure.ac
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Services.csproj
   trunk/banshee/src/Core/Banshee.Services/Makefile.am
   trunk/banshee/src/Core/Makefile.am

Modified: trunk/banshee/Banshee.sln
==============================================================================
--- trunk/banshee/Banshee.sln	(original)
+++ trunk/banshee/Banshee.sln	Thu Oct  9 20:46:38 2008
@@ -30,6 +30,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.ThickClient", "src\Core\Banshee.ThickClient\Banshee.ThickClient.csproj", "{AC839523-7BDF-4AB6-8115-E17921B96EC6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.CollectionIndexer", "src\Core\Banshee.CollectionIndexer\Banshee.CollectionIndexer.csproj", "{CE2AB4B9-F618-4CCA-8805-E1603741147E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{A03B194F-F644-4E95-A602-87200029240D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.GStreamer", "src\Backends\Banshee.GStreamer\Banshee.GStreamer.csproj", "{6171E5DE-5B36-4AE4-8707-F6BEE0AD945B}"
@@ -193,6 +195,8 @@
 		{C9E904B1-1141-49F4-BE84-85222A8E8A79}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA8BAD3C-1545-4B04-AF6B-4105DFD3A9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CA8BAD3C-1545-4B04-AF6B-4105DFD3A9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE2AB4B9-F618-4CCA-8805-E1603741147E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE2AB4B9-F618-4CCA-8805-E1603741147E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9103829-67D5-446E-B248-FA6F5D5BF7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9103829-67D5-446E-B248-FA6F5D5BF7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0E10333-9B05-4463-8A15-6738C186BF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -222,6 +226,7 @@
 		{B28354F0-BA87-44E8-989F-B864A3C7C09F} = {48EA1A64-29EE-4555-9E79-49453EB51976}
 		{2ADB831A-A050-47D0-B6B9-9C19D60233BB} = {48EA1A64-29EE-4555-9E79-49453EB51976}
 		{AC839523-7BDF-4AB6-8115-E17921B96EC6} = {48EA1A64-29EE-4555-9E79-49453EB51976}
+		{CE2AB4B9-F618-4CCA-8805-E1603741147E} = {48EA1A64-29EE-4555-9E79-49453EB51976}
 		{6171E5DE-5B36-4AE4-8707-F6BEE0AD945B} = {A03B194F-F644-4E95-A602-87200029240D}
 		{CA8BAD3C-1545-4B04-AF6B-4105DFD3A9A1} = {A03B194F-F644-4E95-A602-87200029240D}
 		{C1065582-4F64-4810-8C35-E7EB2D2A432C} = {A03B194F-F644-4E95-A602-87200029240D}

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Thu Oct  9 20:46:38 2008
@@ -100,6 +100,7 @@
 REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS)
+REF_BANSHEE_COLLECTIONINDEXER = $(LINK_SYSTEM) $(LINK_DBUS)
 
 # Dap
 REF_DAP = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Thu Oct  9 20:46:38 2008
@@ -147,6 +147,7 @@
 src/Clients/Nereid/Makefile
 
 src/Core/Makefile
+src/Core/Banshee.CollectionIndexer/Makefile
 src/Core/Banshee.Core/Makefile
 src/Core/Banshee.Services/Makefile
 src/Core/Banshee.ThickClient/Makefile

Added: trunk/banshee/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj	Thu Oct  9 20:46:38 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <OutputType>Library</OutputType>
+    <UseParentDirectoryAsNamespace>true</UseParentDirectoryAsNamespace>
+    <AssemblyName>Banshee.CollectionIndexer</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CE2AB4B9-F618-4CCA-8805-E1603741147E}</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Deployment.LinuxDeployData generateScript="false" />
+        <GtkDesignInfo />
+        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
+          <BuildFilesVar Sync="true" Name="SOURCES" />
+          <DeployFilesVar />
+          <ResourcesVar />
+          <OthersVar />
+          <GacRefVar />
+          <AsmRefVar />
+          <ProjectRefVar />
+        </MonoDevelop.Autotools.MakefileInfo>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <Compile Include="Banshee.Collection.Indexer.RemoteHelper\IndexerClient.cs" />
+    <Compile Include="Banshee.Collection.Indexer.RemoteHelper\SimpleIndexerClient.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

Added: trunk/banshee/src/Core/Banshee.CollectionIndexer/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Core/Banshee.CollectionIndexer/Makefile.am	Thu Oct  9 20:46:38 2008
@@ -0,0 +1,8 @@
+ASSEMBLY = Banshee.CollectionIndexer
+TARGET = library
+LINK = $(REF_BANSHEE_COLLECTIONINDEXER)
+SOURCES =  \
+	Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs \
+	Banshee.Collection.Indexer.RemoteHelper/SimpleIndexerClient.cs 
+include $(top_srcdir)/build/build.mk
+

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs	Thu Oct  9 20:46:38 2008
@@ -213,8 +213,7 @@
                     throw new IndexOutOfRangeException ("itemIndex");
                 }
                 
-                Log.DebugFormat ("GETTING ITEM {0} FROM MODEL {1}", itemIndex, modelIndex);
-                return model[modelIndex].GenerateExportable (export_fields);
+                return model[itemIndex].GenerateExportable (export_fields);
             }
         }
         

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs	Thu Oct  9 20:46:38 2008
@@ -48,11 +48,11 @@
         private string [] available_export_fields;
         private int open_indexers;
         
-        public event Hyena.Action CollectionChanged;
-        public event Hyena.Action CleanupAndShutdown;
+        public event ActionHandler CollectionChanged;
+        public event ActionHandler CleanupAndShutdown;
         
-        private Hyena.Action shutdown_handler;
-        public Hyena.Action ShutdownHandler {
+        private ActionHandler shutdown_handler;
+        public ActionHandler ShutdownHandler {
             get { return shutdown_handler; }
             set { shutdown_handler = value; }
         }
@@ -225,7 +225,7 @@
         
         public void RequestCleanupAndShutdown ()
         {
-            Hyena.Action handler = CleanupAndShutdown;
+            ActionHandler handler = CleanupAndShutdown;
             if (handler != null) {
                 handler ();
             }
@@ -233,7 +233,7 @@
         
         private void OnCollectionChanged ()
         {
-            Hyena.Action handler = CollectionChanged;
+            ActionHandler handler = CollectionChanged;
             if (handler != null) {
                 handler ();
             }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs	Thu Oct  9 20:46:38 2008
@@ -30,8 +30,6 @@
 using System.Collections.Generic;
 using NDesk.DBus;
 
-using Banshee.ServiceStack;
-
 namespace Banshee.Collection.Indexer
 {
     public delegate void SaveToXmlFinishedHandler (bool success, string path);

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs	Thu Oct  9 20:46:38 2008
@@ -29,15 +29,15 @@
 using System;
 using NDesk.DBus;
 
-using Banshee.ServiceStack;
-
 namespace Banshee.Collection.Indexer
 {
+    public delegate void ActionHandler ();
+
     [Interface ("org.bansheeproject.CollectionIndexer.Service")]
-    public interface ICollectionIndexerService : IService
+    public interface ICollectionIndexerService
     {
-        event Hyena.Action CollectionChanged;
-        event Hyena.Action CleanupAndShutdown;
+        event ActionHandler CollectionChanged;
+        event ActionHandler CleanupAndShutdown;
         
         void Hello ();
         void Shutdown ();

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs	Thu Oct  9 20:46:38 2008
@@ -29,12 +29,10 @@
 using System;
 using NDesk.DBus;
 
-using Banshee.ServiceStack;
-
 namespace Banshee.Collection.Indexer
 {
     [Interface ("org.bansheeproject.CollectionIndexer.Client")]
-    public interface IIndexerClient : IDBusExportable
+    public interface IIndexerClient
     {
         void Hello ();
         void RebootWhenFinished (string [] args);

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.csproj
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.csproj	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.csproj	Thu Oct  9 20:46:38 2008
@@ -234,8 +234,6 @@
     <Compile Include="Banshee.Configuration\DefaultApplicationHelper.cs" />
     <Compile Include="Banshee.Collection.Indexer\IIndexerClient.cs" />
     <Compile Include="Banshee.Collection\RescanPipeline.cs" />
-    <Compile Include="Banshee.Collection.Indexer.RemoteHelper\IndexerClient.cs" />
-    <Compile Include="Banshee.Collection.Indexer.RemoteHelper\SimpleIndexerClient.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Banshee.Services.addin.xml" />

Modified: trunk/banshee/src/Core/Banshee.Services/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Makefile.am	Thu Oct  9 20:46:38 2008
@@ -22,8 +22,6 @@
 	Banshee.Collection.Database/IDatabaseTrackModelCache.cs \
 	Banshee.Collection.Database/IDatabaseTrackModelProvider.cs \
 	Banshee.Collection.Database/QueryFilterInfo.cs \
-	Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs \
-	Banshee.Collection.Indexer.RemoteHelper/SimpleIndexerClient.cs \
 	Banshee.Collection.Indexer/CollectionIndexer.cs \
 	Banshee.Collection.Indexer/CollectionIndexerService.cs \
 	Banshee.Collection.Indexer/ICollectionIndexer.cs \

Modified: trunk/banshee/src/Core/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Makefile.am	(original)
+++ trunk/banshee/src/Core/Makefile.am	Thu Oct  9 20:46:38 2008
@@ -1,4 +1,5 @@
 SUBDIRS = \
+	Banshee.CollectionIndexer \
 	Banshee.Core \
 	Banshee.Services \
 	Banshee.Widgets \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]