[tracker-miners/wip/carlosg/status-improvements: 2/2] tracker: Show full output in "tracker3 status" if redirected to file
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/status-improvements: 2/2] tracker: Show full output in "tracker3 status" if redirected to file
- Date: Fri, 8 Apr 2022 10:45:00 +0000 (UTC)
commit 3e14dac88e5c85df1ab987b358ce3ef108e3b1d2
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Apr 8 12:09:50 2022 +0200
tracker: Show full output in "tracker3 status" if redirected to file
Handle "tracker3 status" output being redirected to a file showing the
full error reports for all existing errors, instead of the clamped/paged
list meant for interactive navigation.
src/tracker/tracker-status.c | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/src/tracker/tracker-status.c b/src/tracker/tracker-status.c
index 8519ddc41..df6869045 100644
--- a/src/tracker/tracker-status.c
+++ b/src/tracker/tracker-status.c
@@ -60,6 +60,8 @@ static GOptionEntry entries[] = {
{ NULL }
};
+static int show_errors (gchar **terms);
+
static TrackerSparqlCursor *
statistics_query (TrackerSparqlConnection *connection,
GError **error)
@@ -376,8 +378,9 @@ get_no_args (void)
gint remaining_time;
gint files, folders;
GList *keyfiles;
+ gboolean use_pager;
- tracker_term_pipe_to_pager ();
+ use_pager = tracker_term_pipe_to_pager ();
/* How many files / folders do we have? */
if (get_file_and_folder_count (&files, &folders) != 0) {
@@ -437,7 +440,14 @@ get_no_args (void)
g_list_length (keyfiles));
g_print ("\n\n");
- print_errors (keyfiles);
+
+ if (use_pager) {
+ print_errors (keyfiles);
+ } else {
+ gchar *all[2] = { "", NULL };
+ show_errors ((GStrv) all);
+ }
+
g_list_free_full (keyfiles, (GDestroyNotify) g_key_file_unref);
}
@@ -454,8 +464,6 @@ show_errors (gchar **terms)
guint i;
gboolean found = FALSE;
- tracker_term_pipe_to_pager ();
-
keyfiles = tracker_cli_get_error_keyfiles ();
for (i = 0; terms[i] != NULL; i++) {
@@ -498,8 +506,6 @@ show_errors (gchar **terms)
if (!found)
g_print (BOLD_BEGIN "%s" BOLD_END "\n", _("No reports found"));
- tracker_term_pager_close ();
-
return EXIT_SUCCESS;
}
@@ -545,8 +551,15 @@ main (int argc, const char **argv)
return status_run ();
}
- if (terms)
- return show_errors (terms);
+ if (terms) {
+ gint result;
+
+ tracker_term_pipe_to_pager ();
+ result = show_errors (terms);
+ tracker_term_pager_close ();
+
+ return result;
+ }
return status_run_default ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]