korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-29 23:24:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools/obexctl: Print ETA time when transfer size is known

Browse Source 
This prints ETA together with the speed if property Size is set.
This commit is contained in:
Luiz Augusto von Dentz 2013-09-24 17:28:35 +03:00
parent 260346d7be
commit 0998328a5b
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tools/obexctl.c
View File

@ -66,6 +66,7 @@ static GDBusProxy *client = NULL;
struct transfer_data {
uint64_t transferred;
uint64_t size;
};
static void connect_handler(DBusConnection *connection, void *user_data)
@ -1349,6 +1350,30 @@ static void session_added(GDBusProxy *proxy)
print_proxy(proxy, "Session", COLORED_NEW);
}
static void print_transferred(struct transfer_data *data, const char *str,
DBusMessageIter *iter)
{
dbus_uint64_t valu64;
uint64_t speed;
int seconds, minutes;
dbus_message_iter_get_basic(iter, &valu64);
speed = valu64 - data->transferred;
data->transferred = valu64;
if (data->size == 0) {
rl_printf("%sTransferred: %" PRIu64 " (@%" PRIu64 "KB/s)\n",
str, valu64, speed / 1000);
return;
}
seconds = (data->size - data->transferred) / speed;
minutes = seconds / 60;
seconds %= 60;
rl_printf("%sTransferred: %" PRIu64 " (@%" PRIu64 "KB/s %02u:%02u)\n",
str, valu64, speed / 1000, minutes, seconds);
}
static void transfer_property_changed(GDBusProxy *proxy, const char *name,
DBusMessageIter *iter, void *user_data)
{
@ -1356,15 +1381,18 @@ static void transfer_property_changed(GDBusProxy *proxy, const char *name,
char *str;
str = proxy_description(proxy, "Transfer", COLORED_CHG);
if (strcmp(name, "Transferred") == 0) {
dbus_uint64_t valu64;
dbus_message_iter_get_basic(iter, &valu64);
rl_printf("%s%s: %" PRIu64 " (@%" PRIu64 "KB/s)\n", str, name,
valu64, (valu64 - data->transferred) / 1000);
data->transferred = valu64;
} else
print_iter(str, name, iter);
if (strcmp(name, "Transferred") == 0) {
print_transferred(data, str, iter);
goto done;
}
if (strcmp(name, "Size") == 0)
dbus_message_iter_get_basic(iter, &data->size);
print_iter(str, name, iter);
done:
g_free(str);
}
@ -1389,6 +1417,9 @@ static void transfer_added(GDBusProxy *proxy)
if (g_dbus_proxy_get_property(proxy, "Transfered", &iter))
dbus_message_iter_get_basic(&iter, &data->transferred);
if (g_dbus_proxy_get_property(proxy, "Size", &iter))
dbus_message_iter_get_basic(&iter, &data->size);
g_dbus_proxy_set_property_watch(proxy, transfer_property_changed, data);
g_dbus_proxy_set_removed_watch(proxy, transfer_destroy, data);
}