packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull-local: Port to GSConsole

Browse Source
This commit is contained in:
Colin Walters committed 2013-01-28 15:35:47 -05:00
1 parent 13f36aa224
commit aa5e11af12
1 file changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/ostree/ot-builtin-pull-local.c
+13 -10
View File
@@ -37,7 +37,6 @@ typedef struct {
OstreeRepo *dest_repo; OstreeRepo *dest_repo;
GThreadPool *threadpool; GThreadPool *threadpool;
GMainLoop *loop; GMainLoop *loop;
gboolean stdout_is_tty;
int n_objects_to_check; int n_objects_to_check;
volatile int n_objects_checked; volatile int n_objects_checked;
volatile int n_objects_copied; volatile int n_objects_copied;
@@ -136,11 +135,13 @@ static gboolean
idle_print_status (gpointer user_data) idle_print_status (gpointer user_data)
{ {
OtLocalCloneData *data = user_data; OtLocalCloneData *data = user_data;
gs_free char *str = NULL;
g_print ("%c8pull: %d/%d scanned, %d objects copied", 0x1B, str = g_strdup_printf ("pull: %d/%d scanned, %d objects copied",
g_atomic_int_get (&data->n_objects_checked), g_atomic_int_get (&data->n_objects_checked),
data->n_objects_to_check, data->n_objects_to_check,
g_atomic_int_get (&data->n_objects_copied)); g_atomic_int_get (&data->n_objects_copied));
gs_console_begin_status_line (gs_console_get (), str, NULL, NULL);
return TRUE; return TRUE;
} }
@@ -155,6 +156,7 @@ ostree_builtin_pull_local (int argc, char **argv, GFile *repo_path, GError **err
int i; int i;
GHashTableIter hash_iter; GHashTableIter hash_iter;
gpointer key, value; gpointer key, value;
GSConsole *console;
ot_lhash GHashTable *objects = NULL; ot_lhash GHashTable *objects = NULL;
ot_lobj GFile *src_f = NULL; ot_lobj GFile *src_f = NULL;
ot_lobj GFile *src_repo_dir = NULL; ot_lobj GFile *src_repo_dir = NULL;
@@ -199,7 +201,6 @@ ostree_builtin_pull_local (int argc, char **argv, GFile *repo_path, GError **err
data->threadpool = ot_thread_pool_new_nproc (import_one_object_thread, data); data->threadpool = ot_thread_pool_new_nproc (import_one_object_thread, data);
data->loop = g_main_loop_new (NULL, TRUE); data->loop = g_main_loop_new (NULL, TRUE);
data->stdout_is_tty = isatty (1);
src_repo_dir = g_object_ref (ostree_repo_get_path (data->src_repo)); src_repo_dir = g_object_ref (ostree_repo_get_path (data->src_repo));
dest_repo_dir = g_object_ref (ostree_repo_get_path (data->dest_repo)); dest_repo_dir = g_object_ref (ostree_repo_get_path (data->dest_repo));
@@ -268,9 +269,11 @@ ostree_builtin_pull_local (int argc, char **argv, GFile *repo_path, GError **err
if (data->n_objects_to_check > 0) if (data->n_objects_to_check > 0)
{ {
if (data->stdout_is_tty) console = gs_console_get ();
if (console)
{ {
g_print ("%c7", 0x1B); gs_console_begin_status_line (console, "", NULL, NULL);
g_timeout_add_seconds (1, idle_print_status, data); g_timeout_add_seconds (1, idle_print_status, data);
idle_print_status (data); idle_print_status (data);
} }
@@ -279,8 +282,8 @@ ostree_builtin_pull_local (int argc, char **argv, GFile *repo_path, GError **err
idle_print_status (data); idle_print_status (data);
if (data->stdout_is_tty) if (console)
g_print ("\n"); gs_console_end_status_line (console, NULL, NULL);
} }
if (!ostree_repo_commit_transaction (data->dest_repo, NULL, error)) if (!ostree_repo_commit_transaction (data->dest_repo, NULL, error))