libmediaart: Merged utils.[ch] into cache.[ch]

8 files changed, 312 insertions, 380 deletions

diff --git a/libmediaart/Makefile.am b/libmediaart/Makefile.am
index 023846b..766a3bb 100644
--- a/libmediaart/Makefile.am
+++ b/libmediaart/Makefile.am
@@ -15,8 +15,6 @@ libmediaartincludedir=$(includedir)/libmediaart-$(LIBMEDIAART_API_VERSION)/
 libmediaart_@LIBMEDIAART_API_VERSION@_la_SOURCES = \
 	cache.c \
 	cache.h \
-	utils.c \
-	utils.h \
 	extract.c \
 	extract.h \
 	extractgeneric.h \
@@ -25,7 +23,6 @@ libmediaart_@LIBMEDIAART_API_VERSION@_la_SOURCES = \
 libmediaartinclude_HEADERS = \
 	mediaart.h \
 	cache.h
-	utils.h \
 	extract.h \
 	extractgeneric.h
 
diff --git a/libmediaart/cache.c b/libmediaart/cache.c
index da518de..93acd48 100644
--- a/libmediaart/cache.c
+++ b/libmediaart/cache.c
@@ -19,12 +19,13 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <gio/gio.h>
 
-#include <libtracker-sparql/tracker-sparql.h>
-
-#include "utils.h"
+#include "cache.h"
 
 /**
  * SECTION:cache
@@ -33,6 +34,295 @@
  * @include: libmediaart/mediaart.h
  **/
 
+static gboolean
+media_art_strip_find_next_block (const gchar    *original,
+                                 const gunichar  open_char,
+                                 const gunichar  close_char,
+                                 gint           *open_pos,
+                                 gint           *close_pos)
+{
+	const gchar *p1, *p2;
+
+	if (open_pos) {
+		*open_pos = -1;
+	}
+
+	if (close_pos) {
+		*close_pos = -1;
+	}
+
+	p1 = g_utf8_strchr (original, -1, open_char);
+	if (p1) {
+		if (open_pos) {
+			*open_pos = p1 - original;
+		}
+
+		p2 = g_utf8_strchr (g_utf8_next_char (p1), -1, close_char);
+		if (p2) {
+			if (close_pos) {
+				*close_pos = p2 - original;
+			}
+
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+/**
+ * media_art_strip_invalid_entities:
+ * @original: original string
+ *
+ * Strip a albumname or artistname string to prepare it for calculating the
+ * media art path with it. Certain characters and charactersets will be stripped
+ * and a newly allocated string returned which you must free with g_free().
+ *
+ * Returns: copy of original but then stripped
+ *
+ * Since: 0.2.0
+ */
+gchar *
+media_art_strip_invalid_entities (const gchar *original)
+{
+	GString *str_no_blocks;
+	gchar **strv;
+	gchar *str;
+	gboolean blocks_done = FALSE;
+	const gchar *p;
+	const gchar *invalid_chars = "()[]<>{}_!@#$^&*+=|\\/\"'?~";
+	const gchar *invalid_chars_delimiter = "*";
+	const gchar *convert_chars = "\t";
+	const gchar *convert_chars_delimiter = " ";
+	const gunichar blocks[5][2] = {
+		{ '(', ')' },
+		{ '{', '}' },
+		{ '[', ']' },
+		{ '<', '>' },
+		{  0,   0  }
+	};
+
+	str_no_blocks = g_string_new ("");
+
+	p = original;
+
+	while (!blocks_done) {
+		gint pos1, pos2, i;
+
+		pos1 = -1;
+		pos2 = -1;
+
+		for (i = 0; blocks[i][0] != 0; i++) {
+			gint start, end;
+
+			/* Go through blocks, find the earliest block we can */
+			if (media_art_strip_find_next_block (p, blocks[i][0], blocks[i][1], &start, &end)) {
+				if (pos1 == -1 || start < pos1) {
+					pos1 = start;
+					pos2 = end;
+				}
+			}
+		}
+
+		/* If either are -1 we didn't find any */
+		if (pos1 == -1) {
+			/* This means no blocks were found */
+			g_string_append (str_no_blocks, p);
+			blocks_done = TRUE;
+		} else {
+			/* Append the test BEFORE the block */
+			if (pos1 > 0) {
+				g_string_append_len (str_no_blocks, p, pos1);
+			}
+
+			p = g_utf8_next_char (p + pos2);
+
+			/* Do same again for position AFTER block */
+			if (*p == '\0') {
+				blocks_done = TRUE;
+			}
+		}
+	}
+
+	/* Now convert chars to lower case */
+	str = g_utf8_strdown (str_no_blocks->str, -1);
+	g_string_free (str_no_blocks, TRUE);
+
+	/* Now strip invalid chars */
+	g_strdelimit (str, invalid_chars, *invalid_chars_delimiter);
+	strv = g_strsplit (str, invalid_chars_delimiter, -1);
+	g_free (str);
+	str = g_strjoinv (NULL, strv);
+	g_strfreev (strv);
+
+	/* Now convert chars */
+	g_strdelimit (str, convert_chars, *convert_chars_delimiter);
+	strv = g_strsplit (str, convert_chars_delimiter, -1);
+	g_free (str);
+	str = g_strjoinv (convert_chars_delimiter, strv);
+	g_strfreev (strv);
+
+	while (g_strrstr (str, "  ") != NULL) {
+		/* Now remove double spaces */
+		strv = g_strsplit (str, "  ", -1);
+		g_free (str);
+		str = g_strjoinv (" ", strv);
+		g_strfreev (strv);
+	}
+
+	/* Now strip leading/trailing white space */
+	g_strstrip (str);
+
+	return str;
+}
+
+static gchar *
+media_art_checksum_for_data (GChecksumType  checksum_type,
+                             const guchar  *data,
+                             gsize          length)
+{
+	GChecksum *checksum;
+	gchar *retval;
+
+	checksum = g_checksum_new (checksum_type);
+	if (!checksum) {
+		return NULL;
+	}
+
+	g_checksum_update (checksum, data, length);
+	retval = g_strdup (g_checksum_get_string (checksum));
+	g_checksum_free (checksum);
+
+	return retval;
+}
+
+/**
+ * media_art_get_path:
+ * @artist: the artist
+ * @title: the title
+ * @prefix: For example "album"
+ * @uri: NULL or the uri of the file
+ * @path: the location to store the local path
+ * @local_uri: the location to store the local uri or NULL
+ *
+ * Get the path to media art for a given resource. Newly allocated data in
+ * @path and @local_uri must be freed with g_free().
+ *
+ * Since: 0.2.0
+ */
+void
+media_art_get_path (const gchar  *artist,
+                    const gchar  *title,
+                    const gchar  *prefix,
+                    const gchar  *uri,
+                    gchar       **path,
+                    gchar       **local_uri)
+{
+	const gchar *space_checksum = "7215ee9c7d9dc229d2921a40e899ec5f";
+	const gchar *a, *b;
+
+	gchar *art_filename;
+	gchar *dir;
+	gchar *artist_down, *title_down;
+	gchar *artist_stripped, *title_stripped;
+	gchar *artist_norm, *title_norm;
+	gchar *artist_checksum = NULL, *title_checksum = NULL;
+
+	/* http://live.gnome.org/MediaArtStorageSpec */
+
+	if (path) {
+		*path = NULL;
+	}
+
+	if (local_uri) {
+		*local_uri = NULL;
+	}
+
+	if (!artist && !title) {
+		return;
+	}
+
+	if (artist) {
+		artist_stripped = media_art_strip_invalid_entities (artist);
+		artist_norm = g_utf8_normalize (artist_stripped, -1, G_NORMALIZE_NFKD);
+		artist_down = g_utf8_strdown (artist_norm, -1);
+		artist_checksum = media_art_checksum_for_data (G_CHECKSUM_MD5,
+		                                               (const guchar *) artist_down,
+		                                               strlen (artist_down));
+	}
+
+	if (title) {
+		title_stripped = media_art_strip_invalid_entities (title);
+		title_norm = g_utf8_normalize (title_stripped, -1, G_NORMALIZE_NFKD);
+		title_down = g_utf8_strdown (title_norm, -1);
+		title_checksum = media_art_checksum_for_data (G_CHECKSUM_MD5,
+		                                              (const guchar *) title_down,
+		                                              strlen (title_down));
+	}
+
+	dir = g_build_filename (g_get_user_cache_dir (),
+	                        "media-art",
+	                        NULL);
+
+	if (!g_file_test (dir, G_FILE_TEST_EXISTS)) {
+		g_mkdir_with_parents (dir, 0770);
+	}
+
+	if (artist) {
+		a = artist_checksum;
+		b = title ? title_checksum : space_checksum;
+	} else {
+		a = title_checksum;
+		b = space_checksum;
+	}
+
+	art_filename = g_strdup_printf ("%s-%s-%s.jpeg", prefix ? prefix : "album", a, b);
+
+	if (artist) {
+		g_free (artist_checksum);
+		g_free (artist_stripped);
+		g_free (artist_down);
+		g_free (artist_norm);
+	}
+
+	if (title) {
+		g_free (title_checksum);
+		g_free (title_stripped);
+		g_free (title_down);
+		g_free (title_norm);
+	}
+
+	if (path) {
+		*path = g_build_filename (dir, art_filename, NULL);
+	}
+
+	if (local_uri) {
+		gchar *local_dir;
+		GFile *file, *parent;
+
+		if (strstr (uri, "://")) {
+			file = g_file_new_for_uri (uri);
+		} else {
+			file = g_file_new_for_path (uri);
+		}
+
+		parent = g_file_get_parent (file);
+		if (parent) {
+			local_dir = g_file_get_uri (parent);
+
+			/* This is a URI, don't use g_build_filename here */
+			*local_uri = g_strdup_printf ("%s/.mediaartlocal/%s", local_dir, art_filename);
+
+			g_free (local_dir);
+			g_object_unref (parent);
+		}
+		g_object_unref (file);
+	}
+
+	g_free (dir);
+	g_free (art_filename);
+}
+
 /**
  * media_art_remove:
  * @artist: Artist the media art belongs to
diff --git a/libmediaart/cache.h b/libmediaart/cache.h
index 83b7551..6fc185e 100644
--- a/libmediaart/cache.h
+++ b/libmediaart/cache.h
@@ -28,9 +28,17 @@
 
 G_BEGIN_DECLS
 
-gboolean
-media_art_remove (const gchar *artist,
-                  const gchar *album);
+gchar *  media_art_strip_invalid_entities (const gchar          *original);
+
+void     media_art_get_path               (const gchar          *artist,
+                                           const gchar          *title,
+                                           const gchar          *prefix,
+                                           const gchar          *uri,
+                                           gchar               **path,
+                                           gchar               **local_uri);
+
+gboolean media_art_remove                 (const gchar          *artist,
+                                           const gchar          *album);
 
 G_END_DECLS
 
diff --git a/libmediaart/extract.c b/libmediaart/extract.c
index 5d5a38f..8afc3f7 100644
--- a/libmediaart/extract.c
+++ b/libmediaart/extract.c
@@ -26,7 +26,7 @@
 #include <gio/gio.h>
 
 #include "extract.h"
-#include "utils.h"
+#include "cache.h"
 
 #define ALBUMARTER_SERVICE    "com.nokia.albumart"
 #define ALBUMARTER_PATH       "/com/nokia/albumart/Requester"
diff --git a/libmediaart/extract.h b/libmediaart/extract.h
index 18ceb03..1f4854f 100644
--- a/libmediaart/extract.h
+++ b/libmediaart/extract.h
@@ -48,13 +48,13 @@ typedef enum {
 gboolean media_art_init     (void);
 void     media_art_shutdown (void);
 
-gboolean media_art_process  (const unsigned char *buffer,
-                             size_t               len,
-                             const gchar         *mime,
-                             MediaArtType         type,
-                             const gchar         *artist,
-                             const gchar         *title,
-                             const gchar         *uri);
+gboolean media_art_process  (const unsigned char  *buffer,
+                             size_t                len,
+                             const gchar          *mime,
+                             MediaArtType          type,
+                             const gchar          *artist,
+                             const gchar          *title,
+                             const gchar          *uri);
 
 G_END_DECLS
 
diff --git a/libmediaart/mediaart.h b/libmediaart/mediaart.h
index 8610a27..0f12652 100644
--- a/libmediaart/mediaart.h
+++ b/libmediaart/mediaart.h
@@ -25,7 +25,6 @@
 #include <libmediaart/extract.h>
 #include <libmediaart/extractgeneric.h>
 #include <libmediaart/cache.h>
-#include <libmediaart/utils.h>
 
 #undef __LIBMEDIAART_H_INSIDE__
 
diff --git a/libmediaart/utils.c b/libmediaart/utils.c
deleted file mode 100644
index fe151ec..0000000
--- a/libmediaart/utils.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (C) 2008, Nokia <ivan.frade@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <gio/gio.h>
-
-/**
- * SECTION:utils
- * @title: Utilities
- * @short_description: Functions to look up cached media art
- * @include: libmediaart/mediaart.h
- **/
-
-static gboolean
-media_art_strip_find_next_block (const gchar    *original,
-                                const gunichar  open_char,
-                                const gunichar  close_char,
-                                gint           *open_pos,
-                                gint           *close_pos)
-{
-	const gchar *p1, *p2;
-
-	if (open_pos) {
-		*open_pos = -1;
-	}
-
-	if (close_pos) {
-		*close_pos = -1;
-	}
-
-	p1 = g_utf8_strchr (original, -1, open_char);
-	if (p1) {
-		if (open_pos) {
-			*open_pos = p1 - original;
-		}
-
-		p2 = g_utf8_strchr (g_utf8_next_char (p1), -1, close_char);
-		if (p2) {
-			if (close_pos) {
-				*close_pos = p2 - original;
-			}
-
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-/**
- * media_art_strip_invalid_entities:
- * @original: original string
- *
- * Strip a albumname or artistname string to prepare it for calculating the
- * media art path with it. Certain characters and charactersets will be stripped
- * and a newly allocated string returned which you must free with g_free().
- *
- * Returns: copy of original but then stripped
- *
- * Since: 0.2.0
- */
-gchar *
-media_art_strip_invalid_entities (const gchar *original)
-{
-	GString *str_no_blocks;
-	gchar **strv;
-	gchar *str;
-	gboolean blocks_done = FALSE;
-	const gchar *p;
-	const gchar *invalid_chars = "()[]<>{}_!@#$^&*+=|\\/\"'?~";
-	const gchar *invalid_chars_delimiter = "*";
-	const gchar *convert_chars = "\t";
-	const gchar *convert_chars_delimiter = " ";
-	const gunichar blocks[5][2] = {
-		{ '(', ')' },
-		{ '{', '}' },
-		{ '[', ']' },
-		{ '<', '>' },
-		{  0,   0  }
-	};
-
-	str_no_blocks = g_string_new ("");
-
-	p = original;
-
-	while (!blocks_done) {
-		gint pos1, pos2, i;
-
-		pos1 = -1;
-		pos2 = -1;
-
-		for (i = 0; blocks[i][0] != 0; i++) {
-			gint start, end;
-
-			/* Go through blocks, find the earliest block we can */
-			if (media_art_strip_find_next_block (p, blocks[i][0], blocks[i][1], &start, &end)) {
-				if (pos1 == -1 || start < pos1) {
-					pos1 = start;
-					pos2 = end;
-				}
-			}
-		}
-
-		/* If either are -1 we didn't find any */
-		if (pos1 == -1) {
-			/* This means no blocks were found */
-			g_string_append (str_no_blocks, p);
-			blocks_done = TRUE;
-		} else {
-			/* Append the test BEFORE the block */
-			if (pos1 > 0) {
-				g_string_append_len (str_no_blocks, p, pos1);
-			}
-
-			p = g_utf8_next_char (p + pos2);
-
-			/* Do same again for position AFTER block */
-			if (*p == '\0') {
-				blocks_done = TRUE;
-			}
-		}
-	}
-
-	/* Now convert chars to lower case */
-	str = g_utf8_strdown (str_no_blocks->str, -1);
-	g_string_free (str_no_blocks, TRUE);
-
-	/* Now strip invalid chars */
-	g_strdelimit (str, invalid_chars, *invalid_chars_delimiter);
-	strv = g_strsplit (str, invalid_chars_delimiter, -1);
-	g_free (str);
-	str = g_strjoinv (NULL, strv);
-	g_strfreev (strv);
-
-	/* Now convert chars */
-	g_strdelimit (str, convert_chars, *convert_chars_delimiter);
-	strv = g_strsplit (str, convert_chars_delimiter, -1);
-	g_free (str);
-	str = g_strjoinv (convert_chars_delimiter, strv);
-	g_strfreev (strv);
-
-	while (g_strrstr (str, "  ") != NULL) {
-		/* Now remove double spaces */
-		strv = g_strsplit (str, "  ", -1);
-		g_free (str);
-		str = g_strjoinv (" ", strv);
-		g_strfreev (strv);
-	}
-
-	/* Now strip leading/trailing white space */
-	g_strstrip (str);
-
-	return str;
-}
-
-static gchar *
-media_art_checksum_for_data (GChecksumType  checksum_type,
-                             const guchar  *data,
-                             gsize          length)
-{
-	GChecksum *checksum;
-	gchar *retval;
-
-	checksum = g_checksum_new (checksum_type);
-	if (!checksum) {
-		return NULL;
-	}
-
-	g_checksum_update (checksum, data, length);
-	retval = g_strdup (g_checksum_get_string (checksum));
-	g_checksum_free (checksum);
-
-	return retval;
-}
-
-/**
- * media_art_get_path:
- * @artist: the artist
- * @title: the title
- * @prefix: For example "album"
- * @uri: NULL or the uri of the file
- * @path: the location to store the local path
- * @local_uri: the location to store the local uri or NULL
- *
- * Get the path to media art for a given resource. Newly allocated data in
- * @path and @local_uri must be freed with g_free().
- *
- * Since: 0.2.0
- */
-void
-media_art_get_path (const gchar  *artist,
-                    const gchar  *title,
-                    const gchar  *prefix,
-                    const gchar  *uri,
-                    gchar       **path,
-                    gchar       **local_uri)
-{
-	const gchar *space_checksum = "7215ee9c7d9dc229d2921a40e899ec5f";
-	const gchar *a, *b;
-
-	gchar *art_filename;
-	gchar *dir;
-	gchar *artist_down, *title_down;
-	gchar *artist_stripped, *title_stripped;
-	gchar *artist_norm, *title_norm;
-	gchar *artist_checksum = NULL, *title_checksum = NULL;
-
-	/* http://live.gnome.org/MediaArtStorageSpec */
-
-	if (path) {
-		*path = NULL;
-	}
-
-	if (local_uri) {
-		*local_uri = NULL;
-	}
-
-	if (!artist && !title) {
-		return;
-	}
-
-	if (artist) {
-		artist_stripped = media_art_strip_invalid_entities (artist);
-		artist_norm = g_utf8_normalize (artist_stripped, -1, G_NORMALIZE_NFKD);
-		artist_down = g_utf8_strdown (artist_norm, -1);
-		artist_checksum = media_art_checksum_for_data (G_CHECKSUM_MD5,
-		                                               (const guchar *) artist_down,
-		                                               strlen (artist_down));
-	}
-
-	if (title) {
-		title_stripped = media_art_strip_invalid_entities (title);
-		title_norm = g_utf8_normalize (title_stripped, -1, G_NORMALIZE_NFKD);
-		title_down = g_utf8_strdown (title_norm, -1);
-		title_checksum = media_art_checksum_for_data (G_CHECKSUM_MD5,
-		                                              (const guchar *) title_down,
-		                                              strlen (title_down));
-	}
-
-	dir = g_build_filename (g_get_user_cache_dir (),
-	                        "media-art",
-	                        NULL);
-
-	if (!g_file_test (dir, G_FILE_TEST_EXISTS)) {
-		g_mkdir_with_parents (dir, 0770);
-	}
-
-	if (artist) {
-		a = artist_checksum;
-		b = title ? title_checksum : space_checksum;
-	} else {
-		a = title_checksum;
-		b = space_checksum;
-	}
-
-	art_filename = g_strdup_printf ("%s-%s-%s.jpeg", prefix ? prefix : "album", a, b);
-
-	if (artist) {
-		g_free (artist_checksum);
-		g_free (artist_stripped);
-		g_free (artist_down);
-		g_free (artist_norm);
-	}
-
-	if (title) {
-		g_free (title_checksum);
-		g_free (title_stripped);
-		g_free (title_down);
-		g_free (title_norm);
-	}
-
-	if (path) {
-		*path = g_build_filename (dir, art_filename, NULL);
-	}
-
-	if (local_uri) {
-		gchar *local_dir;
-		GFile *file, *parent;
-
-		if (strstr (uri, "://")) {
-			file = g_file_new_for_uri (uri);
-		} else {
-			file = g_file_new_for_path (uri);
-		}
-
-		parent = g_file_get_parent (file);
-		if (parent) {
-			local_dir = g_file_get_uri (parent);
-
-			/* This is a URI, don't use g_build_filename here */
-			*local_uri = g_strdup_printf ("%s/.mediaartlocal/%s", local_dir, art_filename);
-
-			g_free (local_dir);
-			g_object_unref (parent);
-		}
-		g_object_unref (file);
-	}
-
-	g_free (dir);
-	g_free (art_filename);
-}
diff --git a/libmediaart/utils.h b/libmediaart/utils.h
deleted file mode 100644
index 861d73f..0000000
--- a/libmediaart/utils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia <ivan.frade@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#ifndef __LIBMEDIAART_UTILS_H__
-#define __LIBMEDIAART_UTILS_H__
-
-#include <glib.h>
-
-#if !defined (__LIBMEDIAART_INSIDE__) && !defined (LIBMEDIAART_COMPILATION)
-#error "Only <libmediaart/mediaart.h> must be included directly."
-#endif
-
-G_BEGIN_DECLS
-
-gchar * media_art_strip_invalid_entities (const gchar  *original);
-void    media_art_get_path               (const gchar  *artist,
-                                          const gchar  *title,
-                                          const gchar  *prefix,
-                                          const gchar  *uri,
-                                          gchar       **path,
-                                          gchar       **local_uri);
-
-
-G_END_DECLS
-
-#endif /* __LIBMEDIAART_UTILS_H__ */