[banshee] Fixup: remove unnecessary dependencies
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Fixup: remove unnecessary dependencies
- Date: Tue, 27 May 2014 00:12:26 +0000 (UTC)
commit 30ac3595dfe4d9460d688583d6401d337e750296
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Tue May 27 02:12:17 2014 +0200
Fixup: remove unnecessary dependencies
Banshee.Fixup didn't really need these two assembly dependencies:
a) MusicBrainz: probably added by mistake
b) Migo: to remove this one, two classes from it which were not
specific to Migo.Syndication were moved to Hyena.
build/build.environment.mk | 2 +-
build/pkg-config/banshee-fixup.pc.in | 2 +-
.../Banshee.Fixup/Banshee.Fixup/Problem.cs | 12 +--
src/Hyena | 2 +-
src/Libraries/Migo/Makefile.am | 2 -
src/Libraries/Migo/Migo.Syndication/Feed.cs | 14 +--
.../Migo/Migo.Syndication/FeedEnclosure.cs | 5 +-
src/Libraries/Migo/Migo.Syndication/FeedItem.cs | 6 +-
src/Libraries/Migo/Migo.Syndication/MigoItem.cs | 54 ---------
.../Migo/Migo.Syndication/MigoModelProvider.cs | 115 --------------------
src/Libraries/Migo/Migo.csproj | 2 -
11 files changed, 13 insertions(+), 203 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index f91f849..938e356 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -141,7 +141,7 @@ REF_EXTENSION_MEDIAPANEL = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEDIAPANEL = -r:$(DIR_BIN)/Banshee.MediaPanel.dll $(REF_EXTENSION_MEDIAPANEL)
REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
-REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
+REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
diff --git a/build/pkg-config/banshee-fixup.pc.in b/build/pkg-config/banshee-fixup.pc.in
index 0227481..5df9323 100644
--- a/build/pkg-config/banshee-fixup.pc.in
+++ b/build/pkg-config/banshee-fixup.pc.in
@@ -7,5 +7,5 @@ Name: Banshee Metadata Fixup
Description: Metadata Fixup extension for Banshee
Version: @VERSION@
Requires: banshee-thickclient
-Libs: -r:${bansheedir}/Extensions/Banshee.Fixup.dll -r:${bansheedir}/Migo.dll
+Libs: -r:${bansheedir}/Extensions/Banshee.Fixup.dll
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs
b/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs
index 5550360..b18c0d3 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs
@@ -26,24 +26,20 @@
using System;
using System.Linq;
-using System.Collections.Generic;
-using Hyena;
using Hyena.Data.Sqlite;
-using Migo.Syndication;
-
using Banshee.ServiceStack;
namespace Banshee.Fixup
{
- public class Problem : MigoItem<Problem>, IEquatable<Problem>
+ public class Problem : CacheableItem<Problem>, IEquatable<Problem>
{
- private static MigoModelProvider<Problem> provider;
- public static MigoModelProvider<Problem> Provider {
+ private static CacheableSqliteModelProvider<Problem> provider;
+ public static CacheableSqliteModelProvider<Problem> Provider {
get {
return provider ?? (provider =
- new MigoModelProvider<Problem> (ServiceManager.DbConnection, "MetadataProblems", false));
+ new CacheableSqliteModelProvider<Problem> (ServiceManager.DbConnection,
"MetadataProblems", false));
}
}
diff --git a/src/Hyena b/src/Hyena
index 8ba4370..7b464ec 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit 8ba43709ae757a44fca45e94492495ecaf58dccf
+Subproject commit 7b464ecc93537314c5ddfc1fedd140cb0a25b2f1
diff --git a/src/Libraries/Migo/Makefile.am b/src/Libraries/Migo/Makefile.am
index a7ef2f0..406124d 100644
--- a/src/Libraries/Migo/Makefile.am
+++ b/src/Libraries/Migo/Makefile.am
@@ -38,8 +38,6 @@ SOURCES = \
Migo.Syndication/Migo.Syndication.Data/TablesManagers/EnclosuresTableManager.cs \
Migo.Syndication/Migo.Syndication.Data/TablesManagers/FeedsTableManager.cs \
Migo.Syndication/Migo.Syndication.Data/TablesManagers/ItemsTableManager.cs \
- Migo.Syndication/MigoItem.cs \
- Migo.Syndication/MigoModelProvider.cs \
Migo.Syndication/OpmlParser.cs \
Migo.Syndication/Rfc822DateTime.cs \
Migo.Syndication/RssParser.cs \
diff --git a/src/Libraries/Migo/Migo.Syndication/Feed.cs b/src/Libraries/Migo/Migo.Syndication/Feed.cs
index 1396f5a..0c7f998 100644
--- a/src/Libraries/Migo/Migo.Syndication/Feed.cs
+++ b/src/Libraries/Migo/Migo.Syndication/Feed.cs
@@ -28,22 +28,12 @@
using System;
using System.IO;
-using System.Net;
-using System.Threading;
-
-using System.Collections;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using Mono.Unix;
-using Hyena;
using Hyena.Data.Sqlite;
-using Migo.Net;
-using Migo.TaskCore;
-using Migo.DownloadCore;
-
namespace Migo.Syndication
{
public enum FeedAutoDownload : int
@@ -63,7 +53,7 @@ namespace Migo.Syndication
None = 6
}
- public class FeedProvider : MigoModelProvider<Feed>
+ public class FeedProvider : CacheableSqliteModelProvider<Feed>
{
public FeedProvider (HyenaSqliteConnection connection) : base (connection, "PodcastSyndications")
{
@@ -98,7 +88,7 @@ namespace Migo.Syndication
}
}
- public class Feed : MigoItem<Feed>
+ public class Feed : CacheableItem<Feed>
{
private static FeedProvider provider;
public static FeedProvider Provider {
diff --git a/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs
b/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs
index bf13b9c..b3ddf6b 100644
--- a/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs
+++ b/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs
@@ -31,12 +31,11 @@
using System;
using System.IO;
-using Hyena;
using Hyena.Data.Sqlite;
namespace Migo.Syndication
{
- public class FeedEnclosure : MigoItem<FeedEnclosure>
+ public class FeedEnclosure : CacheableItem<FeedEnclosure>
{
private static SqliteModelProvider<FeedEnclosure> provider;
public static SqliteModelProvider<FeedEnclosure> Provider {
@@ -44,7 +43,7 @@ namespace Migo.Syndication
}
public static void Init () {
- provider = new MigoModelProvider<FeedEnclosure> (FeedsManager.Instance.Connection,
"PodcastEnclosures");
+ provider = new CacheableSqliteModelProvider<FeedEnclosure> (FeedsManager.Instance.Connection,
"PodcastEnclosures");
}
private string mimetype;
diff --git a/src/Libraries/Migo/Migo.Syndication/FeedItem.cs b/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
index 89f6911..35679ac 100644
--- a/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
+++ b/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
@@ -29,21 +29,19 @@
//
using System;
-using System.Collections.Generic;
-using Hyena;
using Hyena.Data.Sqlite;
namespace Migo.Syndication
{
- public class FeedItemProvider : MigoModelProvider<FeedItem>
+ public class FeedItemProvider : CacheableSqliteModelProvider<FeedItem>
{
public FeedItemProvider (HyenaSqliteConnection connection) : base (connection, "PodcastItems")
{
}
}
- public class FeedItem : MigoItem<FeedItem>
+ public class FeedItem : CacheableItem<FeedItem>
{
private static SqliteModelProvider<FeedItem> provider;
public static SqliteModelProvider<FeedItem> Provider {
diff --git a/src/Libraries/Migo/Migo.csproj b/src/Libraries/Migo/Migo.csproj
index 9a253e2..ce26320 100644
--- a/src/Libraries/Migo/Migo.csproj
+++ b/src/Libraries/Migo/Migo.csproj
@@ -104,8 +104,6 @@
<Compile Include="Migo.Syndication\FeedManager.cs" />
<Compile Include="Migo.Syndication\FeedsManager.cs" />
<Compile Include="Migo.Syndication\FeedUpdateTask.cs" />
- <Compile Include="Migo.Syndication\MigoItem.cs" />
- <Compile Include="Migo.Syndication\MigoModelProvider.cs" />
<Compile Include="Migo.Syndication\OpmlParser.cs" />
<Compile Include="Migo.Syndication\Rfc822DateTime.cs" />
<Compile Include="Migo.Syndication\RssParser.cs" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]