Fixed transfer stall detecion in dsh.

[doldaconnect.git] / clients / gui-shell / dsh.c

diff --git a/clients/gui-shell/dsh.c b/clients/gui-shell/dsh.c
index 41291e9..652e45e 100644 (file)
--- a/clients/gui-shell/dsh.c
+++ b/clients/gui-shell/dsh.c
@@ -48,6 +48,7 @@ struct trinfo {
     int ostate;
     int opos, spos, speed;
     time_t lastprog;
+    int warned;
     double sprog;
 };
 
@@ -200,12 +201,12 @@ void updatetooltip(void)
 {
     struct dc_transfer *tr;
     struct trinfo *tri;
-    int t, i, a, st;
+    int t, i, a, st, bc, bt;
     char *buf;
     size_t bufsize, bufdata;
     
     t = i = a = 0;
-    st = -1;
+    st = bc = bt = -1;
     for(tr = dc_transfers; tr != NULL; tr = tr->next) {
        if(tr->dir != DC_TRNSD_DOWN)
            continue;
@@ -215,20 +216,27 @@ void updatetooltip(void)
            i++;
        else if((tr->state == DC_TRNS_HS) || (tr->state == DC_TRNS_MAIN))
            a++;
-       if((tr->state == DC_TRNS_MAIN) && (tri->speed != -1)) {
-           if(st == -1)
-               st = 0;
-           st += tri->speed;
+       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, "Transfers: %i", t);
+    bprintf(buf, "%s: %i", _("Transfers"), t);
     if(t > 0)
        bprintf(buf, " (%i/%i)", i, a);
-    if(st != -1) {
+    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);
@@ -280,11 +288,14 @@ 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)) {