[rygel/wip/tracker-3.0] tracker3: Fix insertion query
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel/wip/tracker-3.0] tracker3: Fix insertion query
- Date: Sun, 7 Jun 2020 16:13:54 +0000 (UTC)
commit de5dbed31520b1b4d98b08c280dde7e90baf5453
Author: Jens Georg <mail jensge org>
Date: Sun Jun 7 17:34:32 2020 +0200
tracker3: Fix insertion query
.../tracker3/rygel-tracker-insertion-query.vala | 55 ++++++++++------------
.../tracker3/rygel-tracker-metadata-values.vala | 1 -
.../tracker3/rygel-tracker-query-triplets.vala | 2 +-
.../tracker3/rygel-tracker-selection-query.vala | 2 +-
4 files changed, 28 insertions(+), 32 deletions(-)
---
diff --git a/src/plugins/tracker3/rygel-tracker-insertion-query.vala
b/src/plugins/tracker3/rygel-tracker-insertion-query.vala
index 4d5323a6..ef21d83f 100644
--- a/src/plugins/tracker3/rygel-tracker-insertion-query.vala
+++ b/src/plugins/tracker3/rygel-tracker-insertion-query.vala
@@ -34,13 +34,7 @@ public class Rygel.Tracker.InsertionQuery : Query {
private const string MINER_SERVICE = "org.freedesktop.Tracker1.Miner.Files.Index";
private const string MINER_PATH = "/org/freedesktop/Tracker1/Miner/Files/Index";
- // We need to add the size in the miner's graph so that the miner will
- // update it and correct a (possibly wrong) size we got via CreateItem
- // (DLNA requirement 7.3.128.7)
- // FIXME: Use constant from libtracker-miner once we port to
- // libtracker-sparql
- private const string MINER_GRAPH =
- "urn:uuid:472ed0cc-40ff-4e37-9c0c-062d78656540";
+ private const string MINER_GRAPH = "tracker:FileSystem";
private const string RESOURCE_ID_QUERY_TEMPLATE =
"SELECT ?resource WHERE { ?resource a nie:DataObject; nie:url '%s' }";
@@ -54,45 +48,44 @@ public class Rygel.Tracker.InsertionQuery : Query {
private string uri;
public InsertionQuery (MediaFileItem item, string category) {
- var type = "nie:DataObject";
+ var type = "nie:InformationElement";
var file = File.new_for_uri (item.get_primary_uri ());
+ var urn = "<%s>".printf(item.get_primary_uri ());
if (!file.is_native ()) {
type = "nfo:RemoteDataObject";
}
var triplets = new QueryTriplets ();
- triplets.add (new QueryTriplet (QUERY_ID, "a", category));
- triplets.add (new QueryTriplet (QUERY_ID, "a", type));
- triplets.add (new QueryTriplet (QUERY_ID, "nmm:uPnPShared", "true"));
- triplets.add (new QueryTriplet (QUERY_ID, "tracker:available", "true"));
- triplets.add (new QueryTriplet (QUERY_ID,
+ triplets.add (new QueryTriplet.with_graph ("Tracker:Audio", QUERY_ID, "a", category));
+ triplets.add (new QueryTriplet.with_graph ("Tracker:Audio", QUERY_ID, "a", type));
+ // triplets.add (new QueryTriplet (QUERY_ID, "nmm:uPnPShared", "true"));
+ triplets.add (new QueryTriplet.with_graph ("Tracker:Audio", QUERY_ID,
"nie:generator",
"\"rygel\""));
- triplets.add (new QueryTriplet (QUERY_ID,
+ triplets.add (new QueryTriplet.with_graph ("Tracker:Audio", QUERY_ID,
"nie:title",
"\"" + item.title + "\""));
- triplets.add (new QueryTriplet.with_graph
- (MINER_GRAPH,
- QUERY_ID,
- "nie:mimeType",
- "\"" + item.mime_type + "\""));
var dlna_profile = "";
if (item.dlna_profile != null) {
dlna_profile = item.dlna_profile;
}
+ triplets.add (new QueryTriplet.with_graph ("Tracker:Audio", QUERY_ID,
+ "nmm:dlnaProfile",
+ "\"" + dlna_profile + "\""));
+
triplets.add (new QueryTriplet.with_graph
- (MINER_GRAPH,
- QUERY_ID,
- "nmm:dlnaProfile",
- "\"" + dlna_profile + "\""));
+ ("Tracker:Audio",
+ QUERY_ID,
+ "nie:mimeType",
+ "\"" + item.mime_type + "\""));
+
- triplets.add (new QueryTriplet (QUERY_ID,
- "nie:url",
- "\"" + item.get_primary_uri () + "\""));
+ triplets.add (new QueryTriplet.with_graph ("Tracker:Audio", QUERY_ID,
+ "nie:isStoredAs", urn));
string date;
if (item.date == null) {
var now = new GLib.DateTime.now_utc ();
@@ -101,14 +94,18 @@ public class Rygel.Tracker.InsertionQuery : Query {
// Rygel core makes sure that this is a valid ISO8601 date.
date = item.date;
}
- triplets.add (new QueryTriplet (QUERY_ID,
+ triplets.add (new QueryTriplet.with_graph ("Tracker:Audio", QUERY_ID,
"nie:contentCreated",
- "\"" + date + "\""));
+ "\"" + date + "\"^^xsd:dateTime"));
+
+ triplets.add (new QueryTriplet.with_graph (MINER_GRAPH, urn, "a", "nie:DataObject"));
+ triplets.add (new QueryTriplet.with_graph (MINER_GRAPH, urn, "nie:interpretedAs", QUERY_ID));
+ triplets.add (new QueryTriplet.with_graph (MINER_GRAPH, urn, "tracker:available", "true"));
if (item.size > 0) {
triplets.add (new QueryTriplet.with_graph
(MINER_GRAPH,
- QUERY_ID,
+ urn,
"nie:byteSize",
"\"" + item.size.to_string () + "\""));
}
diff --git a/src/plugins/tracker3/rygel-tracker-metadata-values.vala
b/src/plugins/tracker3/rygel-tracker-metadata-values.vala
index 8bebb3cf..72de3897 100644
--- a/src/plugins/tracker3/rygel-tracker-metadata-values.vala
+++ b/src/plugins/tracker3/rygel-tracker-metadata-values.vala
@@ -66,7 +66,6 @@ public abstract class Rygel.Tracker.MetadataValues : MetadataContainer {
null,
this.item_factory.graph,
"?x");
- critical(q.to_string());
return q;
}
diff --git a/src/plugins/tracker3/rygel-tracker-query-triplets.vala
b/src/plugins/tracker3/rygel-tracker-query-triplets.vala
index 92a39de7..cb8e5e55 100644
--- a/src/plugins/tracker3/rygel-tracker-query-triplets.vala
+++ b/src/plugins/tracker3/rygel-tracker-query-triplets.vala
@@ -44,7 +44,7 @@ public class Rygel.Tracker.QueryTriplets : ArrayList<QueryTriplet> {
for (int i = 0; i < this.size; i++) {
if (this[i].graph != null && include_subject) {
- str += "GRAPH <%s> {".printf (this[i].graph);
+ str += "GRAPH %s {".printf (this[i].graph);
}
str += this[i].to_string (include_subject);
diff --git a/src/plugins/tracker3/rygel-tracker-selection-query.vala
b/src/plugins/tracker3/rygel-tracker-selection-query.vala
index 31f079a3..da7bef64 100644
--- a/src/plugins/tracker3/rygel-tracker-selection-query.vala
+++ b/src/plugins/tracker3/rygel-tracker-selection-query.vala
@@ -151,7 +151,7 @@ public class Rygel.Tracker.SelectionQuery : Query {
DBusError {
var str = this.to_string ();
- critical ("Executing SPARQL query: %s", str);
+ debug ("Executing SPARQL query: %s", str);
result = yield resources.query_async (str);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]