[tracker/wip/sam/resource-rebase-1] squash! Use TrackerResource instead of TrackerSparqlBuilder in all extractors
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/sam/resource-rebase-1] squash! Use TrackerResource instead of TrackerSparqlBuilder in all extractors
- Date: Thu, 30 Jun 2016 01:29:46 +0000 (UTC)
commit a993f5828c0144c6b787790b9b1bd672c90a45cc
Author: Sam Thursfield <sam afuera me uk>
Date: Thu Jun 30 02:20:25 2016 +0100
squash! Use TrackerResource instead of TrackerSparqlBuilder in all extractors
Following a comment in miners/fs/tracker-miner-files.c:process_file_cb()
which notes that we don't remove rdf:type statements inserted by the
miner ever (in case it causes the loss of user data), don't cause the
removal of rdf:type statements.
This fixes a few extraction issues, because extractors were generating
SPARQL that removed the nfo:FileDataObject type annotation added by the
FS miner, which in some cases then made the rest of the update invalid.
src/tracker-extract/tracker-extract-abw.c | 4 ++--
src/tracker-extract/tracker-extract-bmp.c | 2 +-
src/tracker-extract/tracker-extract-dvi.c | 2 +-
src/tracker-extract/tracker-extract-epub.c | 2 +-
src/tracker-extract/tracker-extract-flac.c | 2 +-
src/tracker-extract/tracker-extract-gif.c | 2 +-
src/tracker-extract/tracker-extract-gstreamer.c | 8 ++++----
src/tracker-extract/tracker-extract-html.c | 2 +-
src/tracker-extract/tracker-extract-icon.c | 2 +-
src/tracker-extract/tracker-extract-iso.c | 2 +-
src/tracker-extract/tracker-extract-jpeg.c | 2 +-
src/tracker-extract/tracker-extract-libav.c | 4 ++--
src/tracker-extract/tracker-extract-mp3.c | 2 +-
src/tracker-extract/tracker-extract-msoffice-xml.c | 2 +-
src/tracker-extract/tracker-extract-msoffice.c | 6 +++---
src/tracker-extract/tracker-extract-oasis.c | 2 +-
src/tracker-extract/tracker-extract-pdf.c | 4 ++--
src/tracker-extract/tracker-extract-playlist.c | 2 +-
src/tracker-extract/tracker-extract-png.c | 2 +-
src/tracker-extract/tracker-extract-ps.c | 2 +-
src/tracker-extract/tracker-extract-text.c | 3 ++-
src/tracker-extract/tracker-extract-tiff.c | 2 +-
src/tracker-extract/tracker-extract-vorbis.c | 2 +-
src/tracker-extract/tracker-extract-xps.c | 2 +-
24 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-abw.c b/src/tracker-extract/tracker-extract-abw.c
index 497023b..6bfbf3a 100644
--- a/src/tracker-extract/tracker-extract-abw.c
+++ b/src/tracker-extract/tracker-extract-abw.c
@@ -123,7 +123,7 @@ abw_parser_text (GMarkupParseContext *context,
case ABW_PARSER_TAG_CREATOR: {
TrackerResource *creator;
creator = tracker_resource_new (NULL);
- tracker_resource_set_uri (creator, "rdf:type", "nco:Contact");
+ tracker_resource_add_uri (creator, "rdf:type", "nco:Contact");
tracker_resource_set_string (creator, "nco:fullname", str);
tracker_resource_set_relation (data->resource, "nco:creator", creator);
@@ -240,7 +240,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
data.uri = g_file_get_uri (f);
data.resource = tracker_resource_new (NULL);
- tracker_resource_set_uri (data.resource, "rdf:type", "nfo:Document");
+ tracker_resource_add_uri (data.resource, "rdf:type", "nfo:Document");
context = g_markup_parse_context_new (&parser, 0, &data, NULL);
g_markup_parse_context_parse (context, contents, len, &error);
diff --git a/src/tracker-extract/tracker-extract-bmp.c b/src/tracker-extract/tracker-extract-bmp.c
index f6d7d3d..be7dc66 100644
--- a/src/tracker-extract/tracker-extract-bmp.c
+++ b/src/tracker-extract/tracker-extract-bmp.c
@@ -126,7 +126,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
image = tracker_resource_new (NULL);
- tracker_resource_set_uri (image, "rdf:type", "nfo:Image");
+ tracker_resource_add_uri (image, "rdf:type", "nfo:Image");
tracker_resource_add_uri (image, "rdf:type", "nmm:Photo");
if (get_img_resolution (file, &width, &height)) {
diff --git a/src/tracker-extract/tracker-extract-dvi.c b/src/tracker-extract/tracker-extract-dvi.c
index 9b0ebfe..48c6aef 100644
--- a/src/tracker-extract/tracker-extract-dvi.c
+++ b/src/tracker-extract/tracker-extract-dvi.c
@@ -232,7 +232,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
resource = tracker_resource_new (NULL);
- tracker_resource_set_uri (resource, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (resource, "rdf:type", "nfo:PaginatedTextDocument");
tracker_resource_set_int64 (resource, "nfo:pageCount", context->npages);
diff --git a/src/tracker-extract/tracker-extract-epub.c b/src/tracker-extract/tracker-extract-epub.c
index 961e639..4f7b5cf 100644
--- a/src/tracker-extract/tracker-extract-epub.c
+++ b/src/tracker-extract/tracker-extract-epub.c
@@ -626,7 +626,7 @@ extract_opf (const gchar *uri,
g_debug ("Extracting OPF file contents from EPUB '%s'", uri);
ebook = tracker_resource_new (NULL);
- tracker_resource_set_uri (ebook, "rdf:type", "nfo:EBook");
+ tracker_resource_add_uri (ebook, "rdf:type", "nfo:EBook");
data = opf_data_new (uri, ebook);
diff --git a/src/tracker-extract/tracker-extract-flac.c b/src/tracker-extract/tracker-extract-flac.c
index a8b3318..16344b9 100644
--- a/src/tracker-extract/tracker-extract-flac.c
+++ b/src/tracker-extract/tracker-extract-flac.c
@@ -241,7 +241,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nmm:MusicPiece");
+ tracker_resource_add_uri (metadata, "rdf:type", "nmm:MusicPiece");
tracker_resource_add_uri (metadata, "rdf:type", "nfo:Audio");
tracker_resource_set_relation (metadata, "nmm:performer", artist);
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
index 6a26743..8e96199 100644
--- a/src/tracker-extract/tracker-extract-gif.c
+++ b/src/tracker-extract/tracker-extract-gif.c
@@ -247,7 +247,7 @@ read_metadata (GifFileType *gifFile,
md.artist = tracker_coalesce_strip (2, xd->artist, xd->contributor);
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:Image");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:Image");
tracker_resource_add_uri (metadata, "rdf:type", "nmm:Photo");
if (xd->license) {
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index eaeabd6..65edebb 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -931,14 +931,14 @@ extract_metadata (MetadataExtractor *extractor,
if (extractor->mime == EXTRACT_MIME_GUESS) {
g_warning ("Cannot guess real stream type if no tags were read! "
"Defaulting to Video.");
- tracker_resource_set_uri (resource, "rdf:type", "nmm:Video");
+ tracker_resource_add_uri (resource, "rdf:type", "nmm:Video");
} else {
if (extractor->mime == EXTRACT_MIME_AUDIO) {
/* Audio: don't make an nmm:MusicPiece for the file resource if it's
* actually a container for an entire album - we will make a
* nmm:MusicPiece for each of the tracks inside instead.
*/
- tracker_resource_set_uri (resource, "rdf:type", "nfo:Audio");
+ tracker_resource_add_uri (resource, "rdf:type", "nfo:Audio");
if (extractor->toc == NULL || extractor->toc->entry_list == NULL)
tracker_resource_add_uri (resource, "rdf:type", "nmm:MusicPiece");
@@ -947,13 +947,13 @@ extract_metadata (MetadataExtractor *extractor,
extractor->media_art_type = MEDIA_ART_ALBUM;
#endif
} else if (extractor->mime == EXTRACT_MIME_VIDEO) {
- tracker_resource_set_uri (resource, "rdf:type", "nmm:Video");
+ tracker_resource_add_uri (resource, "rdf:type", "nmm:Video");
#ifdef HAVE_LIBMEDIAART
extractor->media_art_type = MEDIA_ART_VIDEO;
#endif
} else {
- tracker_resource_set_uri (resource, "rdf:type", "nfo:Image");
+ tracker_resource_add_uri (resource, "rdf:type", "nfo:Image");
tracker_resource_add_uri (resource, "rdf:type", "nmm:Photo");
}
}
diff --git a/src/tracker-extract/tracker-extract-html.c b/src/tracker-extract/tracker-extract-html.c
index 222ec89..497f009 100644
--- a/src/tracker-extract/tracker-extract-html.c
+++ b/src/tracker-extract/tracker-extract-html.c
@@ -275,7 +275,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
file = tracker_extract_info_get_file (info);
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:HtmlDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:HtmlDocument");
pd.metadata = metadata;
pd.current = -1;
diff --git a/src/tracker-extract/tracker-extract-icon.c b/src/tracker-extract/tracker-extract-icon.c
index 40deb00..4f7dfa4 100644
--- a/src/tracker-extract/tracker-extract-icon.c
+++ b/src/tracker-extract/tracker-extract-icon.c
@@ -141,7 +141,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
/* The Windows Icon file format may contain the same icon with different
* sizes inside, so there's no clear way of setting single width and
* height values. Thus, we set maximum sizes found. */
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:Image");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:Image");
tracker_resource_add_uri (metadata, "rdf:type", "nfo:Icon");
if (find_max_width_and_height (uri, &max_width, &max_height)) {
diff --git a/src/tracker-extract/tracker-extract-iso.c b/src/tracker-extract/tracker-extract-iso.c
index 7745810..66f3c62 100644
--- a/src/tracker-extract/tracker-extract-iso.c
+++ b/src/tracker-extract/tracker-extract-iso.c
@@ -96,7 +96,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info_)
if (os == NULL)
goto unknown_os;
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:FilesystemImage");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:FilesystemImage");
variants = osinfo_media_get_os_variants (media);
if (osinfo_list_get_length (OSINFO_LIST (variants)) > 0) {
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index a305a92..03ab269 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -177,7 +177,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:Image");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:Image");
tracker_resource_add_uri (metadata, "rdf:type", "nmm:Photo");
jpeg_create_decompress (&cinfo);
diff --git a/src/tracker-extract/tracker-extract-libav.c b/src/tracker-extract/tracker-extract-libav.c
index 4e9ec88..cd8147b 100644
--- a/src/tracker-extract/tracker-extract-libav.c
+++ b/src/tracker-extract/tracker-extract-libav.c
@@ -94,7 +94,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
if (video_stream) {
- tracker_resource_set_uri(metadata, "rdf:type", "nmm:Video");
+ tracker_resource_add_uri(metadata, "rdf:type", "nmm:Video");
if (video_stream->codec->width > 0 && video_stream->codec->height > 0) {
tracker_resource_set_int64 (metadata, "nfo:width", video_stream->codec->width);
@@ -140,7 +140,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
char *album_artist_name = NULL;
char *album_title = NULL;
- tracker_resource_set_uri (metadata, "rdf:type", "nmm:MusicPiece");
+ tracker_resource_add_uri (metadata, "rdf:type", "nmm:MusicPiece");
tracker_resource_add_uri (metadata, "rdf:type", "nfo:Audio");
if (audio_stream->duration > 0) {
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 21d8ca5..8540452 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -2479,7 +2479,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
}
- tracker_resource_set_uri (main_resource, "rdf:type", "nmm:MusicPiece");
+ tracker_resource_add_uri (main_resource, "rdf:type", "nmm:MusicPiece");
tracker_resource_add_uri (main_resource, "rdf:type", "nfo:Audio");
tracker_guarantee_resource_title_from_file (main_resource,
diff --git a/src/tracker-extract/tracker-extract-msoffice-xml.c
b/src/tracker-extract/tracker-extract-msoffice-xml.c
index e18ab5d..1c6516c 100644
--- a/src/tracker-extract/tracker-extract-msoffice-xml.c
+++ b/src/tracker-extract/tracker-extract-msoffice-xml.c
@@ -836,7 +836,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *extract_info)
g_debug ("Extracting MsOffice XML format...");
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
/* Setup Parser info */
info.metadata = metadata;
diff --git a/src/tracker-extract/tracker-extract-msoffice.c b/src/tracker-extract/tracker-extract-msoffice.c
index 530cab8..976477c 100644
--- a/src/tracker-extract/tracker-extract-msoffice.c
+++ b/src/tracker-extract/tracker-extract-msoffice.c
@@ -1665,7 +1665,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
/* Extracting summary */
extract_summary (metadata, infile, uri);
@@ -1679,12 +1679,12 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
content = extract_msword_content (infile, max_bytes, &is_encrypted);
} else if (g_ascii_strcasecmp (mime_used, "application/vnd.ms-powerpoint") == 0) {
/* PowerPoint file */
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:Presentation");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:Presentation");
content = extract_powerpoint_content (infile, max_bytes, &is_encrypted);
} else if (g_ascii_strcasecmp (mime_used, "application/vnd.ms-excel") == 0) {
/* Excel File */
- tracker_resource_set_uri(metadata, "rdf:type", "nfo:Spreadsheet");
+ tracker_resource_add_uri(metadata, "rdf:type", "nfo:Spreadsheet");
content = extract_excel_content (infile, max_bytes, &is_encrypted);
} else {
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index bfd657c..704dd2a 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -200,7 +200,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *extract_info)
/* First, parse metadata */
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
/* Create parse info */
info.metadata = metadata;
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index 76a5cac..b6b4274 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -352,7 +352,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
if (error->code == POPPLER_ERROR_ENCRYPTED) {
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
tracker_resource_set_boolean (metadata, "nfo:isContentEncrypted", TRUE);
tracker_extract_info_set_resource (info, metadata);
@@ -386,7 +386,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
g_object_get (document,
"title", &pd.title,
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index 1f8629d..943b1ce 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -138,7 +138,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
g_signal_connect (G_OBJECT (pl), "playlist-started", G_CALLBACK (playlist_started), &data);
g_signal_connect (G_OBJECT (pl), "entry-parsed", G_CALLBACK (entry_parsed), &data);
- tracker_resource_set_uri (metadata, "rdf:type", "nmm:Playlist");
+ tracker_resource_add_uri (metadata, "rdf:type", "nmm:Playlist");
tracker_resource_add_uri (metadata, "rdf:type", "nfo:MediaList");
if (totem_pl_parser_parse (pl, uri, FALSE) == TOTEM_PL_PARSER_RESULT_SUCCESS) {
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 417b38e..2bf13cb 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -689,7 +689,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:Image");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:Image");
tracker_resource_add_uri (metadata, "rdf:type", "nmm:Photo");
uri = g_file_get_uri (file);
diff --git a/src/tracker-extract/tracker-extract-ps.c b/src/tracker-extract/tracker-extract-ps.c
index 1738262..aa3f62f 100644
--- a/src/tracker-extract/tracker-extract-ps.c
+++ b/src/tracker-extract/tracker-extract-ps.c
@@ -114,7 +114,7 @@ extract_ps_from_filestream (FILE *f)
length = 0;
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:PaginatedTextDocument");
/* 20 MiB should be enough! (original safe limit) */
accum = 0;
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index 3d1b6e5..857daa4 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -101,7 +101,8 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
tracker_config_get_max_bytes (config));
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:PlainTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:PlainTextDocument");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:FileDataObject");
if (content) {
tracker_resource_set_string (metadata, "nie:plainTextContent", content);
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index a2350be..1cd9a9c 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -299,7 +299,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nfo:Image");
+ tracker_resource_add_uri (metadata, "rdf:type", "nfo:Image");
tracker_resource_add_uri (metadata, "rdf:type", "nmm:Photo");
uri = g_file_get_uri (file);
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index fdf4721..9c2b778 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -120,7 +120,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
metadata = tracker_resource_new (NULL);
- tracker_resource_set_uri (metadata, "rdf:type", "nmm:MusicPiece");
+ tracker_resource_add_uri (metadata, "rdf:type", "nmm:MusicPiece");
tracker_resource_add_uri (metadata, "rdf:type", "nfo:Audio");
if ((comment = ov_comment (&vf, -1)) != NULL) {
diff --git a/src/tracker-extract/tracker-extract-xps.c b/src/tracker-extract/tracker-extract-xps.c
index 3ace79a..096bdd1 100644
--- a/src/tracker-extract/tracker-extract-xps.c
+++ b/src/tracker-extract/tracker-extract-xps.c
@@ -56,7 +56,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
}
resource = tracker_resource_new (NULL);
- tracker_resource_set_uri (resource, "rdf:type", "nfo:PaginatedTextDocument");
+ tracker_resource_add_uri (resource, "rdf:type", "nfo:PaginatedTextDocument");
tracker_resource_set_int64 (resource, "nfo:pageCount", gxps_document_get_n_pages (document));
g_object_unref (document);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
