diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2010-07-08 12:10:46 +0200 |
|---|---|---|
| committer | Arnel A. Borja <arnelborja@src.gnome.org> | 2013-08-31 00:56:45 +0800 |
| commit | c5ba4bc5c2a558a9918cf3bb963eecc96b9f9683 (patch) | |
| tree | b7eb477702398d1bfd36ed6aa78f142e6fac1cef | |
| parent | 4522e442692124b3345d08b47b4f8d3df67a382b (diff) | |
| download | libmediaart-c5ba4bc5c2a558a9918cf3bb963eecc96b9f9683.tar.gz | |
libtracker-miner, storage: if mount without volume, don't rely on is_blank
| -rw-r--r-- | src/libtracker-miner/tracker-storage.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/libtracker-miner/tracker-storage.c b/src/libtracker-miner/tracker-storage.c index 20550bf..896ed40 100644 --- a/src/libtracker-miner/tracker-storage.c +++ b/src/libtracker-miner/tracker-storage.c @@ -576,8 +576,12 @@ mount_add (TrackerStorage *storage, "content type is '%s'", content_type); } else { - g_debug (" Being ignored because mount is music/video/blank, content type is '%s'", - content_type); + g_debug (" Being ignored because mount with volume is music/video/blank " + "(content type:%s, optical:%s, multimedia:%s, blank:%s)", + content_type, + is_optical ? "yes" : "no", + is_multimedia ? "yes" : "no", + is_blank ? "yes" : "no"); } g_free (content_type); @@ -614,18 +618,19 @@ mount_add (TrackerStorage *storage, content_type = mount_guess_content_type (root, volume, &is_optical, &is_multimedia, &is_blank); - if (!is_multimedia && !is_blank) { + /* Note: for GMounts without GVolume, is_blank should NOT be considered, + * as it may give unwanted results... */ + if (!is_multimedia) { uuid = g_compute_checksum_for_string (G_CHECKSUM_MD5, mount_path, -1); g_debug (" No UUID, generated:'%s' (based on mount path)", uuid); } else { - g_debug (" Being ignored because mount is music/video/blank " - "(content type:%s, optical:%s, multimedia:%s, blank:%s)", + g_debug (" Being ignored because mount is music/video " + "(content type:%s, optical:%s, multimedia:%s)", content_type, is_optical ? "yes" : "no", - is_multimedia ? "yes" : "no", - is_blank ? "yes" : "no"); + is_multimedia ? "yes" : "no"); } g_free (content_type); |