X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fguile%2Fautodl;h=ff21b84cfb30c0afa8a97c2991eaa856ee75156c;hb=3af4536f80baf4ff661a577f8206b611ad07bab1;hp=ddf34cda6feb8c3ed918d3b8e02327427d724838;hpb=30806d5e4c205c0c2e71d70a84ede67e92cc0bd6;p=doldaconnect.git diff --git a/lib/guile/autodl b/lib/guile/autodl index ddf34cd..ff21b84 100755 --- a/lib/guile/autodl +++ b/lib/guile/autodl @@ -1,6 +1,23 @@ #!/usr/bin/guile -s !# +; Dolda Connect - Modular multiuser Direct Connect-style client +; Copyright (C) 2007 Fredrik Tolf +; +; This program is free software; you can redistribute it and/or modify +; it under the terms of the GNU General Public License as published by +; the Free Software Foundation; either version 2 of the License, or +; (at your option) any later version. +; +; This program is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +; GNU General Public License for more details. +; +; You should have received a copy of the GNU General Public License +; along with this program; if not, write to the Free Software +; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + (use-modules (dolcon ui)) (use-modules (ice-9 pretty-print)) @@ -234,8 +251,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 +348,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 +465,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 +542,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))