X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgui-shell%2Fdsh.c;h=1922aaf2a367668a2495397a6de08c4a6cca7f44;hb=8efceeb63faf9c6968da9f4dfe581490dd6cd4b4;hp=b6886680c6390bec2cbd65718e485ec929f643f2;hpb=31a01fddb038535690783feb3e76bcd35c1edb16;p=doldaconnect.git

diff --git a/clients/gui-shell/dsh.c b/clients/gui-shell/dsh.c
index b688668..1922aaf 100644
--- a/clients/gui-shell/dsh.c
+++ b/clients/gui-shell/dsh.c
@@ -46,13 +46,16 @@
 
 struct trinfo {
     int ostate;
-    int opos;
+    int opos, spos, speed;
     time_t lastprog;
+    int warned;
+    double sprog;
 };
 
 void updatewrite(void);
 
 int remote = 0;
+char *server;
 GtkStatusIcon *tray;
 pid_t dpid = 0, dcpid = 0;
 int connected = 0;
@@ -135,8 +138,10 @@ void inittr(struct dc_transfer *tr)
     tr->udata = tri = memset(smalloc(sizeof(*tri)), 0, sizeof(*tri));
     tr->destroycb = destroytr;
     tri->ostate = tr->state;
-    tri->opos = tr->curpos;
+    tri->spos = tri->opos = tr->curpos;
+    tri->speed = -1;
     tri->lastprog = time(NULL);
+    tri->sprog = ntime();
 }
 
 #ifdef HAVE_NOTIFY
@@ -169,8 +174,80 @@ wchar_t *getfilename(wchar_t *path)
 	return(p + 1);
 }
 
+char *bytes2si(long long bytes)
+{
+    int i;
+    double b;
+    char *sd;
+    static char ret[64];
+    
+    b = bytes;
+    for(i = 0; (b >= 1024) && (i < 4); i++)
+	b /= 1024;
+    if(i == 0)
+	sd = "B";
+    else if(i == 1)
+	sd = "kiB";
+    else if(i == 2)
+	sd = "MiB";
+    else if(i == 3)
+	sd = "GiB";
+    else
+	sd = "TiB";
+    snprintf(ret, 64, "%.1f %s", b, sd);
+    return(ret);
+}
+
+void updatetooltip(void)
+{
+    struct dc_transfer *tr;
+    struct trinfo *tri;
+    int t, i, a, st, bc, bt;
+    char *buf;
+    size_t bufsize, bufdata;
+    
+    t = i = a = 0;
+    st = bc = bt = -1;
+    for(tr = dc_transfers; tr != NULL; tr = tr->next) {
+	if(tr->dir != DC_TRNSD_DOWN)
+	    continue;
+	tri = tr->udata;
+	t++;
+	if(tr->state == DC_TRNS_WAITING)
+	    i++;
+	else if((tr->state == DC_TRNS_HS) || (tr->state == DC_TRNS_MAIN))
+	    a++;
+	if((tr->state == DC_TRNS_MAIN)) {
+	    if(bt == -1)
+		bc = bt = 0;
+	    bc += tr->curpos;
+	    bt += tr->size;
+	    if(tri->speed != -1) {
+		if(st == -1)
+		    st = 0;
+		st += tri->speed;
+	    }
+	}
+    }
+    buf = NULL;
+    bufsize = bufdata = 0;
+    bprintf(buf, "%s: %i", _("Transfers"), t);
+    if(t > 0)
+	bprintf(buf, " (%i/%i)", i, a);
+    if(bt > 0)
+	bprintf(buf, ", %.1f%%", ((double)bc / (double)bt) * 100.0);
+    if(st != -1)
+	bprintf(buf, ", %s/s", bytes2si(st));
+    addtobuf(buf, 0);
+    gtk_status_icon_set_tooltip(tray, buf);
+    free(buf);
+}
+
 void trstatechange(struct dc_transfer *tr, int ostate)
 {
+    struct trinfo *tri;
+    
+    tri = tr->udata;
     if((ostate == DC_TRNS_MAIN) && (tr->dir == DC_TRNSD_DOWN)) {
 	if(tr->state == DC_TRNS_DONE) {
 #ifdef HAVE_NOTIFY
@@ -184,6 +261,11 @@ void trstatechange(struct dc_transfer *tr, int ostate)
 #endif
 	}
     }
+    if(tr->state == DC_TRNS_MAIN) {
+	tri->speed = -1;
+	tri->spos = tr->curpos;
+	tri->sprog = ntime();
+    }
 }
 
 void updatetrinfo(void)
@@ -191,8 +273,10 @@ void updatetrinfo(void)
     struct dc_transfer *tr;
     struct trinfo *tri;
     time_t now;
+    double dnow;
     
     now = time(NULL);
+    dnow = ntime();
     for(tr = dc_transfers; tr != NULL; tr = tr->next) {
 	if(tr->udata == NULL) {
 	    inittr(tr);
@@ -205,15 +289,24 @@ void updatetrinfo(void)
 	    if(tri->opos != tr->curpos) {
 		tri->opos = tr->curpos;
 		tri->lastprog = now;
+		tri->warned = 0;
 	    }
-#ifdef NOTIFY
-	    if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600)) {
-		if(dcpid == 0)
+#ifdef HAVE_NOTIFY
+	    if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600) && !tri->warned) {
+		if(dcpid == 0) {
 		    notify(&trnote, "transfer.error", _("Transfer stalled"), _("The transfer of %ls from %ls has not made progress for 10 minutes"), getfilename(tr->path), tr->peernick);
+		    tri->warned = 1;
+		}
 	    }
 #endif
+	    if((tr->state == DC_TRNS_MAIN) && (dnow - tri->sprog > 10)) {
+		tri->speed = ((double)(tr->curpos - tri->spos) / (dnow - tri->sprog));
+		tri->spos = tr->curpos;
+		tri->sprog = dnow;
+	    }
 	}
     }
+    updatetooltip();
 }
 
 void trlscb(int resp, void *data)
@@ -221,13 +314,18 @@ void trlscb(int resp, void *data)
     updatetrinfo();
 }
 
+gint trupdatecb(gpointer data)
+{
+    updatetrinfo();
+    return(TRUE);
+}
+
 void logincb(int err, wchar_t *reason, void *data)
 {
     if(err != DC_LOGIN_ERR_SUCCESS) {
 	msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server"));
 	exit(1);
     }
-    gtk_status_icon_set_tooltip(tray, "Dolda Connect");
     dc_queuecmd(NULL, NULL, L"notify", L"trans:act", L"on", L"trans:prog", L"on", NULL);
     dc_gettrlistasync(trlscb, NULL);
     connected = 1;
@@ -263,6 +361,7 @@ void dcfdcb(gpointer data, gint source, GdkInputCondition cond)
 	    dc_uimisc_handlenotify(resp);
 	    updatetrinfo();
 	}
+	dc_freeresp(resp);
     }
     updatewrite();
 }
@@ -284,7 +383,7 @@ void updatewrite(void)
 
 void connectdc(void)
 {
-    if((dcfd = dc_connect(remote?NULL:dc_srv_local)) < 0) {
+    if((dcfd = dc_connect(server)) < 0) {
 	msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server: %s"), strerror(errno));
 	exit(1);
     }
@@ -449,14 +548,20 @@ int main(int argc, char **argv)
     textdomain(PACKAGE);
     signal(SIGCHLD, sighandler);
     dc_init();
+    server = dc_srv_local;
     gtk_init(&argc, &argv);
 #ifdef HAVE_NOTIFY
     notify_init("Dolda Connect");
 #endif
-    while((c = getopt(argc, argv, "rh")) != -1) {
+    while((c = getopt(argc, argv, "rhs:")) != -1) {
 	switch(c) {
 	case 'r':
 	    remote = 1;
+	    server = NULL;
+	    break;
+	case 's':
+	    remote = 1;
+	    server = optarg;
 	    break;
 	case 'h':
 	    printf("usage: doldacond-shell [-hr]\n");
@@ -478,6 +583,7 @@ int main(int argc, char **argv)
     else
 	startdaemon();
     
+    g_timeout_add(10000, trupdatecb, NULL);
     gtk_main();
 
     return(0);