refactor(contacts): port to TinySPARQL

build-aux/docker/Dockerfile

@@ -22,6 +22,7 @@ RUN dnf install -y \
         libphonenumber-devel          libphonenumber-debuginfo \
         libportal-devel               libportal-debuginfo \
         libportal-gtk4-devel          libportal-gtk4-debuginfo \
+        libtracker-sparql             libtracker-sparql-debuginfo \
         pipewire-devel                pipewire-debuginfo \
         pulseaudio-libs-devel         pulseaudio-libs-debuginfo \
         sqlite-devel                  sqlite-debuginfo \

src/libvalent/contacts/data/sparql/get-contact-list.rq

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: Andy Holmes <[email protected]>
+
+# Inputs: iri
+# Outputs: contact, uid, vcardData
+SELECT
+  ?contact
+  ?uid
+  ?vcardData
+WHERE {
+  GRAPH <valent:contacts> {
+    BIND(IRI(xsd:string(~iri)) AS ?contactList)
+    ?contactList rdf:type nco:ContactList ;
+                 nco:containsContact ?contact .
+    OPTIONAL {
+      ?contact rdf:type nco:Contact ;
+               nco:contactUID ?uid ;
+               nie:plainTextContent ?vcardData .
+    }
+  }
+}
+GROUP BY ?contact
+

src/libvalent/contacts/data/sparql/get-contact-lists.rq

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: Andy Holmes <[email protected]>
+
+# Inputs: iri
+# Outputs: contactList
+SELECT
+  ?contactList
+WHERE {
+  GRAPH <valent:contacts> {
+    ?contactList rdf:type nco:ContactList .
+  }
+}
+

src/libvalent/contacts/data/sparql/get-contact.rq

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: Andy Holmes <[email protected]>
+
+# Inputs: iri
+# Outputs: contact, uid, vcardData
+SELECT
+  ?contact
+  ?uid
+  ?vcardData
+WHERE {
+  GRAPH <valent:contacts> {
+    BIND(IRI(xsd:string(~iri)) AS ?contact)
+    ?contact rdf:type nco:Contact ;
+             nco:contactUID ?uid ;
+             nie:plainTextContent ?vcardData .
+  }
+}
+LIMIT 1
+

src/libvalent/contacts/data/sparql/search-contacts.rq

@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: Andy Holmes <[email protected]>
+
+# Inputs: query
+# Outputs: contact, uid, vcardData
+SELECT
+  ?contact
+  ?uid
+  ?vcardData
+WHERE {
+  GRAPH <valent:contacts> {
+    ?contact rdf:type nco:Contact ;
+             nco:contactUID ?uid ;
+             nie:plainTextContent ?vcardData ;
+             fts:match ~query^^xsd:string .
+  }
+}
+GROUP BY ?contact
+ORDER BY DESC(fts:rank(?contact))
+LIMIT 10
+

src/libvalent/contacts/libvalent-contacts.gresource.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<!-- SPDX-FileCopyrightText: Andy Holmes <[email protected]> -->
+
+<gresources>
+  <gresource prefix="/ca/andyholmes/Valent/sparql">
+    <file alias="get-contact.rq">data/sparql/get-contact.rq</file>
+    <file alias="get-contact-list.rq">data/sparql/get-contact-list.rq</file>
+    <file alias="get-contact-lists.rq">data/sparql/get-contact-lists.rq</file>
+    <file alias="search-contacts.rq">data/sparql/search-contacts.rq</file>
+  </gresource>
+</gresources>
+

src/libvalent/contacts/libvalent-contacts.h

@@ -6,7 +6,6 @@
 G_BEGIN_DECLS
 
 #include "valent-contacts.h"
-#include "valent-contact-store.h"
 #include "valent-contacts-adapter.h"
 #include "valent-eds.h"
 

src/libvalent/contacts/meson.build

@@ -11,12 +11,11 @@ libvalent_contacts_generated_sources = []
 libvalent_contacts_public_headers = [
   'valent-contacts.h',
   'valent-contacts-adapter.h',
-  'valent-contact-store.h',
   'valent-eds.h',
 ]
 
 libvalent_contacts_private_headers = [
-  'valent-contact-cache-private.h',
+  'valent-contact-list.h',
 ]
 
 libvalent_contacts_enum_headers = [
@@ -31,11 +30,19 @@ install_headers(libvalent_contacts_public_headers,
 libvalent_contacts_public_sources = [
   'valent-contacts.c',
   'valent-contacts-adapter.c',
-  'valent-contact-cache.c',
-  'valent-contact-store.c',
+  'valent-contact-list.c',
 ]
 
 
+# GResources
+libvalent_contacts_resources = gnome.compile_resources('libvalent-contacts-resources',
+                                                       'libvalent-contacts.gresource.xml',
+  c_name: 'valent_contacts',
+)
+libvalent_contacts_generated_sources += libvalent_contacts_resources
+libvalent_contacts_generated_headers += [libvalent_contacts_resources[1]]
+
+
 # Dependencies
 libvalent_deps += [
   libebook_dep,