X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fguile%2Fautodl;h=440e70d8b686bb385230d3f837dd02bc673118ad;hb=156fedc8c67e242084aae14307d4fb4bb3592020;hp=669fbfcefd2c1cd38fcb3e26110a655b0d1ff3e3;hpb=e6485bffce48ca28206fd71bf5da70db0efb3493;p=doldaconnect.git diff --git a/lib/guile/autodl b/lib/guile/autodl index 669fbfc..440e70d 100755 --- a/lib/guile/autodl +++ b/lib/guile/autodl @@ -28,7 +28,7 @@ (lambda (key . err) #f)))) ) -(define (infomgs fmt . msg) +(define (infomsg fmt . msg) (if infoport (begin (apply format (cons* infoport (string-append fmt "\n") msg)) @@ -234,8 +234,6 @@ (logf "entering parseresults with ~a results in ~a sizes" (apply + (map (lambda (o) (length (cdr o))) sr)) (number->string (length sr))) - (infomsg "srs ~a" - (apply + (map (lambda (o) (length (cdr o))) sr))) (let ((retval #t) (numreal 0) (numtotal 0) (numavail 0)) (catch 'ret (lambda () @@ -333,6 +331,7 @@ (set! info-numavail numavail) (set! info-numreal numreal) (set! info-numtotal numtotal) + (infomsg "srs ~a ~a ~a" numtotal numreal numavail) (write-info-file) retval) ) @@ -449,11 +448,9 @@ (if (not (assoc 'search-mode session)) (set! session (cons '(search-mode . normal) session))) (if (not (validate-session session)) (begin (display "Invalid session!\n" (current-error-port)) (exit 1))) - (if (not dc-server) (set! dc-server (getenv "DCSERVER"))) - (if (not dc-server) (set! dc-server "localhost")) (catch 'system-error (lambda () - (dc-c&l #t dc-server #t)) + (dc-c&l #f dc-server #t)) (lambda (key . args) (logf "could not connect to server: ~a" (apply format #f (cadr args) (caddr args))) (exit 2))) @@ -528,7 +525,8 @@ (if tr (begin (if (eq? (cdr (assoc 'state (cdr tr))) 'done) (begin (logf "transfer ~a done (~a)" (car ires) (cadr ires)) - (infomsg "dldone ~a ~a" (car ires) (cadr ires)) + (infomsg "dldone ~a" (car ires)) + (infomsg "estat ~a" (cadr ires)) (set! trans (assq-remove! trans (car ires))) (set! done #t) (set! filterexit (cadr ires))