Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to 3.2.0 #4

Merged
merged 1 commit into from Oct 4, 2021
Merged

Update to 3.2.0 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions rpm/0001-Tracker-config-overrides.patch
View file
Open in desktop
@@ -1,7 +1,7 @@
From bd8b2262d9e96042f928d1950cf0717928b64107 Mon Sep 17 00:00:00 2001
From aae99517e9159f9eb7980fb1e7e53606c8b8a04f Mon Sep 17 00:00:00 2001
From: Islam Amer <islam.amer@jollamobile.com>
Date: Wed, 12 Nov 2014 18:10:53 +0200
Subject: [PATCH 1/8] Tracker config overrides
Subject: [PATCH 1/7] Tracker config overrides

[schema] change default miner initial sleep to 30 seconds to not hammer the system during bootup
Set the default delay for GraphUpdated to 350 instead of upstream default of 1000. Helps fixing JB#11570
Expand Down
4 changes: 2 additions & 2 deletions rpm/0002-Fix-systemd-unit-files.patch
View file
Open in desktop
@@ -1,7 +1,7 @@
From a2194287ff7be2711f8129d5874edc1afd9404a4 Mon Sep 17 00:00:00 2001
From 2032310bf3bcfe3eb2822dab1a1a22b8fc234add Mon Sep 17 00:00:00 2001
From: Matti Kosola <matti.kosola@jolla.com>
Date: Tue, 14 Aug 2018 09:35:50 -0400
Subject: [PATCH 2/8] Fix systemd unit files
Subject: [PATCH 2/7] Fix systemd unit files

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
---
Expand Down
8 changes: 4 additions & 4 deletions rpm/0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch
View file
Open in desktop
@@ -1,18 +1,18 @@
From a27e73331e42e7e5cb100422aaf04c43f5471ed2 Mon Sep 17 00:00:00 2001
From 67ce4e797a59d6c6ac5577e150aba80b4d2928d4 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@jolla.com>
Date: Fri, 28 Aug 2020 00:04:51 +0200
Subject: [PATCH 3/8] Prevent tracker-extract failing when seccomp loading
Subject: [PATCH 3/7] Prevent tracker-extract failing when seccomp loading
fails on older kernels. JB#50862

---
src/libtracker-miners-common/tracker-seccomp.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/libtracker-miners-common/tracker-seccomp.c b/src/libtracker-miners-common/tracker-seccomp.c
index f8be94924..2fc65df2f 100644
index 7d88395da..47b555d65 100644
--- a/src/libtracker-miners-common/tracker-seccomp.c
+++ b/src/libtracker-miners-common/tracker-seccomp.c
@@ -267,11 +267,16 @@ tracker_seccomp_init (void)
@@ -270,11 +270,16 @@ tracker_seccomp_init (void)
#endif

g_debug ("Loading seccomp rules.");
Expand Down
14 changes: 7 additions & 7 deletions rpm/0004-Add-also-fileSize-to-the-basic-set-of-file-info-on-a.patch
View file
Open in desktop
@@ -1,7 +1,7 @@
From f28e21e5e27304c75ce0d464b31de632cc139e3a Mon Sep 17 00:00:00 2001
From a2f3a944b9986d4a92f1333049027e7eb99d15dc Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Wed, 19 May 2021 13:26:07 +0300
Subject: [PATCH 4/8] Add also fileSize to the basic set of file info on all
Subject: [PATCH 4/7] Add also fileSize to the basic set of file info on all
the graph

No need to depend on FileSystem graph to have the sizes.
Expand All @@ -12,13 +12,13 @@ Related: https://gitlab.gnome.org/GNOME/tracker/-/issues/221
1 file changed, 3 insertions(+)

diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 098b105dc..fb7b3152f 100644
index edb43c9d8..35ac13381 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -2162,6 +2162,9 @@ miner_files_process_file (TrackerMinerFS *fs,
time_str = g_date_time_format_iso8601 (modified);
tracker_resource_set_string (graph_file, "nfo:fileLastModified", time_str);
g_free (time_str);
@@ -2179,6 +2179,9 @@ miner_files_process_file (TrackerMinerFS *fs,
g_file_info_get_display_name (file_info));

tracker_resource_set_datetime (graph_file, "nfo:fileLastModified", modified);
+
+ tracker_resource_set_int64 (graph_file, "nfo:fileSize",
+ g_file_info_get_size (file_info));
Expand Down
4 changes: 2 additions & 2 deletions rpm/0005-Fix-database-corruption-caused-by-the-miner-being-re.patch
View file
Open in desktop
@@ -1,7 +1,7 @@
From 2d180086e2859b9a282e1c9338fa73424a498107 Mon Sep 17 00:00:00 2001
From 8b4374744c566561c0fa4dd45139b79df0667c37 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Wed, 7 Jul 2021 13:05:57 +0300
Subject: [PATCH 5/8] Fix database corruption caused by the miner being
Subject: [PATCH 5/7] Fix database corruption caused by the miner being
restarted during setup.

Install the signal handlers before starting database setup so if the
Expand Down
4 changes: 2 additions & 2 deletions rpm/0006-Allow-D-Bus-activation-only-through-systemd.patch
View file
Open in desktop
@@ -1,7 +1,7 @@
From d92cd99e6558e867bcb914cdb1559aaf67f9fd34 Mon Sep 17 00:00:00 2001
From f629b2ef69bf24932bc85cc8314208983a652525 Mon Sep 17 00:00:00 2001
From: Simo Piiroinen <simo.piiroinen@jolla.com>
Date: Thu, 12 Aug 2021 08:26:21 +0300
Subject: [PATCH 6/8] Allow D-Bus activation only through systemd
Subject: [PATCH 6/7] Allow D-Bus activation only through systemd

Starting D-Bus services should happen only via systemd. Using a dummy
Exec line in D-Bus configuration ensures that systemd can't be bypassed.
Expand Down
24 changes: 11 additions & 13 deletions ...stModified-also-on-content-specific.patch → ...stModified-also-on-content-specific.patch
View file
Open in desktop
@@ -1,7 +1,7 @@
From 3ca4979071a832aabddfb99b7f3933d6993f35c3 Mon Sep 17 00:00:00 2001
From 739d32a1cbbe9b243841a3ba8902517fd11ce02d Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Tue, 21 Sep 2021 19:38:08 +0300
Subject: [PATCH 8/8] Update nfo:fileLastModified also on content specific
Subject: [PATCH 7/7] Update nfo:fileLastModified also on content specific
graphs

Executing 'touch' on a file was updating only tracker:FileSystem.
Expand All @@ -10,40 +10,38 @@ Executing 'touch' on a file was updating only tracker:FileSystem.
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index d1c1dc841..d886650e6 100644
index 35ac13381..8d68b2dc7 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -2190,9 +2190,10 @@ miner_files_process_file_attributes (TrackerMinerFS *fs,
@@ -2207,8 +2207,9 @@ miner_files_process_file_attributes (TrackerMinerFS *fs,
GFileInfo *info,
TrackerSparqlBuffer *buffer)
{
- TrackerResource *resource;
+ TrackerResource *resource, *graph_file;
time_t time_;
gchar *uri, *time_str;
gchar *uri;
+ const gchar *mime_type, *graph;
GDateTime *modified;

uri = g_file_get_uri (file);
@@ -2210,9 +2211,18 @@ miner_files_process_file_attributes (TrackerMinerFS *fs,
#ifdef GIO_SUPPORTS_CREATION_TIME
GDateTime *accessed, *created;
@@ -2233,8 +2234,17 @@ miner_files_process_file_attributes (TrackerMinerFS *fs,
if (!modified)
modified = g_date_time_new_from_unix_utc (0);

+ mime_type = g_file_info_get_content_type (info);
+ graph = tracker_extract_module_manager_get_graph (mime_type);
+
/* Update nfo:fileLastModified */
time_str = g_date_time_format_iso8601 (modified);
tracker_resource_set_string (resource, "nfo:fileLastModified", time_str);
tracker_resource_set_datetime (resource, "nfo:fileLastModified", modified);
+ if (graph) {
+ graph_file = tracker_resource_new (uri);
+ tracker_resource_set_string (graph_file, "nfo:fileLastModified", time_str);
+ tracker_resource_set_datetime (graph_file, "nfo:fileLastModified", modified);
+ tracker_sparql_buffer_push (buffer, file, graph, graph_file);
+ g_clear_object (&graph_file);
+ }
g_date_time_unref (modified);
g_free (time_str);

#ifdef GIO_SUPPORTS_CREATION_TIME
--
2.31.1

38 changes: 0 additions & 38 deletions rpm/0007-Update-nfo-fileName-on-content-specific-graphs-too-w.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions rpm/tracker-miners.spec
View file
Open in desktop
@@ -1,6 +1,6 @@
Name: tracker-miners
Summary: Tracker miners and metadata extractors
Version: 3.1.2
Version: 3.2.0
Release: 1
License: LGPLv2+ and GPLv2+
URL: https://wiki.gnome.org/Projects/Tracker
Expand All @@ -13,8 +13,7 @@ Patch3: 0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch
Patch4: 0004-Add-also-fileSize-to-the-basic-set-of-file-info-on-a.patch
Patch5: 0005-Fix-database-corruption-caused-by-the-miner-being-re.patch
Patch6: 0006-Allow-D-Bus-activation-only-through-systemd.patch
Patch7: 0007-Update-nfo-fileName-on-content-specific-graphs-too-w.patch
Patch8: 0008-Update-nfo-fileLastModified-also-on-content-specific.patch
Patch7: 0007-Update-nfo-fileLastModified-also-on-content-specific.patch

BuildRequires: meson >= 0.50
BuildRequires: gettext
Expand Down
2 changes: 1 addition & 1 deletion upstream
Open in desktop
Submodule upstream updated 58 files
+249 −14 .gitlab-ci.yml
+131 −0 .gitlab-ci/uncrustify.cfg
+35 −2 NEWS
+1 −1 README.md
+134 −0 check-style.py
+3 −0 config-miners.h.meson.in
+1 −1 docs/manpages/tracker-miner-fs.1.txt
+6 −2 meson.build
+84 −79 po/cs.po
+141 −120 po/da.po
+91 −85 po/de.po
+85 −81 po/en_GB.po
+84 −80 po/es.po
+80 −76 po/eu.po
+1,414 −2,156 po/fi.po
+86 −81 po/fr.po
+121 −114 po/fur.po
+83 −73 po/gl.po
+184 −174 po/he.po
+82 −78 po/hr.po
+97 −240 po/hu.po
+83 −79 po/id.po
+153 −147 po/kk.po
+84 −80 po/ko.po
+82 −78 po/lt.po
+85 −81 po/nl.po
+82 −78 po/pl.po
+84 −80 po/pt.po
+84 −80 po/pt_BR.po
+77 −73 po/ro.po
+1,288 −924 po/ru.po
+81 −78 po/sk.po
+81 −77 po/sl.po
+77 −73 po/sr.po
+84 −79 po/sv.po
+82 −78 po/tr.po
+83 −80 po/uk.po
+76 −72 po/zh_TW.po
+6 −1 src/libtracker-extract/tracker-utils.c
+7 −2 src/libtracker-miner/tracker-file-notifier.c
+44 −33 src/libtracker-miner/tracker-miner-fs.c
+24 −0 src/libtracker-miner/tracker-monitor.c
+0 −7 src/libtracker-miner/tracker-sparql-buffer.c
+0 −81 src/libtracker-miners-common/tracker-file-utils.c
+3 −0 src/libtracker-miners-common/tracker-seccomp.c
+52 −15 src/miners/fs/tracker-miner-files.c
+1 −0 src/miners/rss/meson.build
+0 −1 src/tracker-control/meson.build
+1 −0 src/tracker/meson.build
+108 −0 src/tracker/tracker-cli-utils.c
+31 −0 src/tracker/tracker-cli-utils.h
+1 −1 src/tracker/tracker-index.c
+70 −5 src/tracker/tracker-info.c
+135 −106 src/tracker/tracker-search.c
+3 −75 src/tracker/tracker-status.c
+47 −3 tests/functional-tests/miner-basic.py
+40 −15 tests/libtracker-miner/tracker-miner-fs-test.c
+0 −29 tests/libtracker-miners-common/tracker-file-utils-test.c