Attachment 660796 Details for Bug 885687 – dmapd-cache.patch

[patch] dmapd-cache.patch

dmapd-cache.patch (text/plain), 1.55 KB, created by Tim Waugh on 2012-12-10 12:30:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Waugh

Created: 2012-12-10 12:30:40 UTC

Size: 1.55 KB

patch

obsolete

>diff -up dmapd-0.0.48/src/dmapd-dmap-db-ghashtable.c.cache dmapd-0.0.48/src/dmapd-dmap-db-ghashtable.c
>--- dmapd-0.0.48/src/dmapd-dmap-db-ghashtable.c.cache	2012-03-30 21:00:16.000000000 +0100
>+++ dmapd-0.0.48/src/dmapd-dmap-db-ghashtable.c	2012-12-10 11:54:09.332082252 +0000
>@@ -31,6 +31,7 @@ static guint nextid = G_MAXINT; /* NOTE:
> 
> struct DmapdDMAPDbGHashTablePrivate {
> 	GHashTable *db;
>+	gboolean enable_cache;
> 	gchar *db_dir;
> 	DMAPRecordFactory *record_factory;
> 	GSList *acceptable_formats;
>@@ -202,6 +203,7 @@ cache_store (const gchar *db_dir, const
> static guint
> dmapd_dmap_db_ghashtable_add (DMAPDb *db, DMAPRecord *record)
> {
>+	gboolean cache = DMAPD_DMAP_DB_GHASHTABLE (db)->priv->enable_cache;
> 	gchar *db_dir = NULL;
> 	GByteArray *blob;
> 	gchar *location;
>@@ -211,7 +213,7 @@ dmapd_dmap_db_ghashtable_add (DMAPDb *db
> 	blob = dmap_record_to_blob (record);
> 	g_object_get (record, "location", &location, NULL);
> 	g_object_get (db, "db-dir", &db_dir, NULL);
>-	if (db_dir != NULL)
>+	if (db_dir != NULL && cache)
> 		cache_store (db_dir, location, blob);
> 	g_free (location);
> 	g_free (db_dir);
>@@ -277,10 +279,12 @@ dmapd_dmap_db_ghashtable_constructor (GT
> 
> 	g_object_get (object, "db-dir", &db_dir, "record-factory", &factory, NULL);
> 	/* NOTE: Don't load cache when used for DmapdDMAPContainerRecord: */
>+	DMAPD_DMAP_DB_GHASHTABLE (object)->priv->enable_cache = FALSE;
> 	if (db_dir && factory) {
> 		load_cached_records (DMAP_DB (object), db_dir, factory);
> 	}
> 	g_free (db_dir);
>+	DMAPD_DMAP_DB_GHASHTABLE (object)->priv->enable_cache = TRUE;
> 
> 	return object;
> }

Actions: View | Diff

Attachments on bug 885687: 660796