X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fguile%2Fautodl;h=281c2364e6b68e46ce7dd2cd22baddbc5617a484;hb=c6a77cc5ac215d62eefd1449088439ee109ea0b5;hp=3d2a340862d22234162b60260f57aceea5a1df15;hpb=ecd6e23dca40656e40e7910dbbfa9fe4dad429d5;p=doldaconnect.git

diff --git a/lib/guile/autodl b/lib/guile/autodl
index 3d2a340..281c236 100755
--- a/lib/guile/autodl
+++ b/lib/guile/autodl
@@ -62,7 +62,9 @@
 
 (define (wanttosearch)
   (> (- (current-time) lastsearch)
-     (if (> (length trans) 0) 300 60))
+     (if (eq? (cdr (assoc 'search-mode session)) 'wait)
+	 7200
+	 (if (> (length trans) 0) 300 60)))
   )
 
 (define defspeed '())
@@ -209,7 +211,8 @@
 		     (cons 'realsr info-numreal)
 		     (cons 'totalsr info-numtotal)
 		     (cons 'lastsrch lastsearch)
-		     (cons 'srcheta info-searcheta))
+		     (cons 'srcheta info-searcheta)
+		     (cons 'srchmode (cdr (assoc 'search-mode session))))
 	       op)
 	(newline op)
 	(close-port op))))
@@ -323,6 +326,9 @@
   )
 
 (define (handlesr filename fnet peer size slots resptime hash)
+  (if (eq? (cdr (assoc 'search-mode session)) 'wait)
+      (begin (set-cdr! (assoc 'search-mode session) 'normal)
+	     (logf "reverting to normal mode")))
   (let ((cl (or (assoc size sr)
 		(let ((newp (cons size '()))) (set! sr (append sr (list newp))) newp)))
 	(newsr (list
@@ -375,11 +381,11 @@
 
 (define (autodl-main args)
   (let ((dc-server #f) (done #f) (retval 0))
-    (let ((getopt (make-getopt (cdr args) "hs:S:e:p:t:a:I:")) (arg #f))
+    (let ((getopt (make-getopt (cdr args) "whs:S:e:p:t:a:I:")) (arg #f))
       (do ((arg (getopt) (getopt))) ((not (and (pair? arg) (char? (car arg)))) (set! args arg))
 	(cond ((eq? (car arg) #\h)
 	       (begin (display "usage: autodl [-s server] -S sessfile\n" (current-error-port))
-		      (display "       autodl [-s server] -e search-expression [-p prio] [-t tag] [-a userarg]\n" (current-error-port))
+		      (display "       autodl [-w] [-s server] -e search-expression [-p prio] [-t tag] [-a userarg]\n" (current-error-port))
 		      (display "       autodl [-s server]\n" (current-error-port))
 		      (display "       autodl -h\n" (current-error-port))
 		      (exit 0)))
@@ -405,6 +411,8 @@
 		     (set! session (cons (cons 'info-file (cdr arg)) session)))))
 	      ((eq? (car arg) #\e)
 	       (set! session (cons (cons 'sexpr (dc-lexsexpr (cdr arg))) session)))
+	      ((eq? (car arg) #\w)
+	       (set! session (cons '(search-mode . wait) session)))
 	      )
 	)
       )
@@ -413,6 +421,8 @@
 	(set! session (cons '(prio . 10) session)))
     (if (not (assoc 'maxtrans session))
 	(set! session (cons '(maxtrans . 1) session)))
+    (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"))
@@ -422,7 +432,7 @@
 	   (lambda (key . args)
 	     (logf (string-append "could not connect to server: " (apply format #f (cadr args) (caddr args))))
 	     (exit 2)))
-    (dc-ecmd-assert 200 "notify" "all" "on")
+    (dc-ecmd-assert 200 "notify" "trans:act" "on" "trans:prog" "on" "srch:act" "on")
     (for-each (lambda (sig) (sigaction sig (lambda (sig) (throw 'sig sig)))) (list SIGINT SIGTERM SIGHUP))
     (catch 'sig
 	   (lambda ()
@@ -497,13 +507,15 @@
 					   (let ((ires (dc-intresp resp)))
 					     (if (and ires (= (car ires) srchid))
 						 (begin (set! info-searcheta (+ (current-time) (cadr ires)))
-							(logf (string-append "search rescheduled to T+" (number->string (cadr ires))))))))
+							(logf (string-append "search rescheduled to T+" (number->string (cadr ires))))
+							(write-info-file)))))
 					  ((621) ; Search committed
 					   (let ((ires (dc-intresp resp)))
 					     (if (and ires (= (car ires) srchid))
 						 (begin (logf "search committed")
 							(set! info-searcheta 0)
-							(set! lastsearch (current-time))))))
+							(set! lastsearch (current-time))
+							(write-info-file)))))
 					  ((622) ; Search result
 					   (let ((ires (list->vector (dc-intresp resp))))
 					     (if (and ires (= (vector-ref ires 0) srchid)) (apply handlesr (map (lambda (n) (vector-ref ires n)) '(1 2 3 4 5 7 8))))))