tracker r2702 - in trunk: . src/tracker-extract
- From: pvanhoof svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2702 - in trunk: . src/tracker-extract
- Date: Mon, 15 Dec 2008 09:32:48 +0000 (UTC)
Author: pvanhoof
Date: Mon Dec 15 09:32:48 2008
New Revision: 2702
URL: http://svn.gnome.org/viewvc/tracker?rev=2702&view=rev
Log:
2008-12-15 Philip Van Hoof <philip codeminded be>
* src/tracker-extract/tracker-albumart.c: Filenames for
album-art
Modified:
trunk/ChangeLog
trunk/src/tracker-extract/tracker-albumart.c
Modified: trunk/src/tracker-extract/tracker-albumart.c
==============================================================================
--- trunk/src/tracker-extract/tracker-albumart.c (original)
+++ trunk/src/tracker-extract/tracker-albumart.c Mon Dec 15 09:32:48 2008
@@ -553,11 +553,10 @@
gchar **path,
gchar **local)
{
-
gchar *art_filename;
gchar *dir;
- gchar *str;
- gchar *down;
+ gchar *down1, *down2;
+ gchar *str1 = NULL, *str2 = NULL;
gchar *f_a = NULL, *f_b = NULL;
/* http://live.gnome.org/MediaArtStorageSpec */
@@ -568,48 +567,36 @@
return;
}
- if (a)
+ if (a && strlen (a) > 1)
f_a = strip_characters (a);
+ else
+ f_a = g_strdup (" ");
- if (b)
+ if (b && strlen (b) > 1)
f_b = strip_characters (b);
+ else
+ f_b = g_strdup (" ");
- str = g_strconcat (a ? f_a : "",
- " ",
- b ? f_b : "",
- NULL);
+
+ down1 = g_utf8_strdown (f_a, -1);
+ down2 = g_utf8_strdown (f_b, -1);
g_free (f_a);
g_free (f_b);
- down = g_utf8_strdown (str, -1);
- g_free (str);
-
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);
}
- str = g_compute_checksum_for_string (G_CHECKSUM_MD5, down, -1);
- g_free (down);
+ str1 = g_compute_checksum_for_string (G_CHECKSUM_MD5, down1, -1);
+ str2 = g_compute_checksum_for_string (G_CHECKSUM_MD5, down2, -1);
- art_filename = g_strdup_printf ("%s-%s.jpeg", prefix?prefix:"album", str);
- g_free (str);
+ g_free (down1);
+ g_free (down2);
- if (local && uri) {
- gchar *uri_t = g_strdup (uri);
- gchar *ptr = strrchr (uri_t, '/');
-
- if (ptr)
- *ptr = '\0';
-
- /* g_build_filename can't be used here, it's a URI */
-
- *local = g_strdup_printf ("%s/.mediaartlocal/%s",
- uri_t, art_filename);
- g_free (uri_t);
- }
+ art_filename = g_strdup_printf ("%s-%s-%s.jpeg", prefix?prefix:"album", str1, str2);
*path = g_build_filename (dir, art_filename, NULL);
g_free (dir);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]