tracker-extract: Avoid non-native URI (from upstream).

This commit is contained in:
ajacoutot 2020-11-11 13:11:32 +00:00
parent d6e91a92bc
commit b6e77d1b2e
2 changed files with 43 additions and 5 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2020/11/08 11:07:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2020/11/11 13:11:32 ajacoutot Exp $
COMMENT= tracker miners and metadata extractors
GNOME_PROJECT= tracker-miners
GNOME_VERSION= 3.0.1
PKGNAME= tracker3-miners-${GNOME_VERSION}
REVISION= 0
REVISION= 1
#SHARED_LIBS += tracker-extract 1.1 # 0.0
@ -56,9 +56,6 @@ CONFIGURE_ARGS += -Dminer_rss=false
DEBUG_PACKAGES= ${BUILD_PACKAGES}
# XXX https://gitlab.gnome.org/GNOME/tracker-miners/issues/7
CFLAGS += -O0
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tracker3-miners
mv ${WRKINST}${SYSCONFDIR}/xdg \

View File

@ -0,0 +1,41 @@
$OpenBSD: patch-src_tracker-extract_tracker-extract-decorator_c,v 1.1 2020/11/11 13:11:33 ajacoutot Exp $
From 5699d14e025853256c98d9c75c4afcf4ca15d7b7 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 30 Oct 2020 13:25:38 +0100
Subject: [PATCH] tracker-extract: Avoid non-native URIs
Index: src/tracker-extract/tracker-extract-decorator.c
--- src/tracker-extract/tracker-extract-decorator.c.orig
+++ src/tracker-extract/tracker-extract-decorator.c
@@ -251,6 +251,7 @@ decorator_next_item_cb (TrackerDecorator *decorator,
GError *error = NULL;
ExtractData *data;
GTask *task;
+ GFile *file;
priv = tracker_extract_decorator_get_instance_private (TRACKER_EXTRACT_DECORATOR (decorator));
info = tracker_decorator_next_finish (decorator, result, &error);
@@ -281,10 +282,21 @@ decorator_next_item_cb (TrackerDecorator *decorator,
return;
}
+ file = g_file_new_for_uri (tracker_decorator_info_get_url (info));
+
+ if (!g_file_is_native (file)) {
+ g_warning ("URI '%s' is not native",
+ tracker_decorator_info_get_url (info));
+ priv->n_extracting_files--;
+ tracker_decorator_info_unref (info);
+ decorator_get_next_file (decorator);
+ return;
+ }
+
data = g_new0 (ExtractData, 1);
data->decorator = decorator;
data->decorator_info = info;
- data->file = g_file_new_for_uri (tracker_decorator_info_get_url (info));
+ data->file = file;
task = tracker_decorator_info_get_task (info);
g_debug ("Extracting metadata for '%s'", tracker_decorator_info_get_url (info));