[gnome-photos/wip/rishi/misc-fixes: 7/18] query-builder: Skip exported URIs

[Debarshi Ray <debarshir src gnome org>]

commit 6354c026674ec93bcd018f9f1720e41241eefaab
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Dec 14 15:06:30 2015 +0100

    query-builder: Skip exported URIs
    
    http://bugzilla.gnome.org/show_bug.cgi?id=759363

 src/photos-query-builder.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
index e8d48b0..4d930a1 100644
--- a/src/photos-query-builder.c
+++ b/src/photos-query-builder.c
@@ -355,6 +355,8 @@ photos_query_builder_filter_local (void)
   GString *tracker_filter;
   gchar *desktop_uri;
   gchar *download_uri;
+  gchar *export_path;
+  gchar *export_uri;
   gchar *filter;
   const gchar *path;
   gchar *pictures_uri;
@@ -387,19 +389,26 @@ photos_query_builder_filter_local (void)
   path = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
   pictures_uri = photos_utils_convert_path_to_uri (path);
 
-  filter = g_strdup_printf ("(fn:contains (nie:url (?urn), '%s')"
-                            " || fn:contains (nie:url (?urn), '%s')"
-                            " || fn:contains (nie:url (?urn), '%s')"
-                            "%s"
+  export_path = g_build_filename (path, PHOTOS_EXPORT_SUBPATH, NULL);
+  export_uri = photos_utils_convert_path_to_uri (export_path);
+
+  filter = g_strdup_printf ("(((fn:contains (nie:url (?urn), '%s')"
+                            "   || fn:contains (nie:url (?urn), '%s')"
+                            "   || fn:contains (nie:url (?urn), '%s')"
+                            "   %s)"
+                            "  && !fn:contains (nie:url (?urn), '%s'))"
                             " || fn:starts-with (nao:identifier (?urn), '%s')"
                             " || (?urn = nfo:image-category-screenshot))",
                             desktop_uri,
                             download_uri,
                             pictures_uri,
                             tracker_filter->str,
+                            export_uri,
                             PHOTOS_QUERY_LOCAL_COLLECTIONS_IDENTIFIER);
   g_free (desktop_uri);
   g_free (download_uri);
+  g_free (export_path);
+  g_free (export_uri);
   g_free (pictures_uri);
   g_strfreev (tracker_dirs);
   g_string_free (tracker_filter, TRUE);