tracker r2207 - in branches/indexer-split: . src/tracker-extract

[mottela svn gnome org]

Author: mottela
Date: Tue Sep  9 11:28:54 2008
New Revision: 2207
URL: http://svn.gnome.org/viewvc/tracker?rev=2207&view=rev

Log:
Audio extractors changed to check for a minimum set of metadata, setting missing ones to tracker:unknown

Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c
   branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c

Modified: branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c	Tue Sep  9 11:28:54 2008
@@ -736,6 +736,22 @@
 
 	extract_metadata (extractor, metadata);
 
+	/* Check that we have the minimum data. FIXME We should not need to do this */
+	if (!g_hash_table_lookup (metadata, "Audio:Title")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Title"), g_strdup ("tracker:unknown"));	
+	}
+
+	if (!g_hash_table_lookup (metadata, "Audio:Album")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Album"), g_strdup ("tracker:unknown"));	
+	}
+
+	if (!g_hash_table_lookup (metadata, "Audio:Artist")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Artist"), g_strdup ("tracker:unknown"));	
+	}
+
+	if (!g_hash_table_lookup (metadata, "Audio:Genre")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Genre"), g_strdup ("tracker:unknown"));	
+	}
 
 	/* also clean up */
 	gst_element_set_state (extractor->playbin, GST_STATE_NULL);

Modified: branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c	Tue Sep  9 11:28:54 2008
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* Tracker Extract - extracts embedded metadata from files
  * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
  *
@@ -1074,7 +1075,23 @@
 	/* get mp3 stream info */
 	mp3_parse (buffer, size, metadata);
 
+	/* Check that we have the minimum data. FIXME We should not need to do this */
+	if (!g_hash_table_lookup (metadata, "Audio:Title")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Title"), g_strdup ("tracker:unknown"));	
+	}
+
+	if (!g_hash_table_lookup (metadata, "Audio:Album")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Album"), g_strdup ("tracker:unknown"));	
+	}
 
+	if (!g_hash_table_lookup (metadata, "Audio:Artist")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Artist"), g_strdup ("tracker:unknown"));	
+	}
+
+	if (!g_hash_table_lookup (metadata, "Audio:Genre")) {
+		g_hash_table_insert (metadata, g_strdup ("Audio:Genre"), g_strdup ("tracker:unknown"));	
+	}
+		
 #ifndef OS_WIN32
   	munmap (buffer, size);
 #endif