[Spambayes-checkins] spambayes proxytee.py,1.1,1.2

[Skip Montanaro]

Update of /cvsroot/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv24266

Modified Files:
	proxytee.py 
Log Message:
add prob= flag to allow random subset of messages to be passed to trainer


Index: proxytee.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/proxytee.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** proxytee.py	16 Jan 2003 17:38:28 -0000	1.1
--- proxytee.py	18 Jan 2003 14:51:52 -0000	1.2
***************
*** 5,9 ****
  web browser and write it to standard output.
  
! usage:  %(progname)s [-h] [-n] [-s server] [-p port]
  
  Options:
--- 5,9 ----
  web browser and write it to standard output.
  
! usage:  %(progname)s [-h] [-n] [-s server] [-p port] [-r N]
  
  Options:
***************
*** 12,15 ****
--- 12,16 ----
      -s, --server= - provide alternate web server (default %(server)s)
      -p, --port=   - provide alternate server port (default %(port)s)
+     -r, --prob=   - feed the message to the trainer w/ prob N [0.0...1.0]
  """
  
***************
*** 18,21 ****
--- 19,23 ----
  import mimetypes
  import getopt
+ import random
  from spambayes.Options import options
  
***************
*** 91,99 ****
      server = "localhost"
      port = options.html_ui_port
  
      try:
!         opts, args = getopt.getopt(argv, "hns:p:",
!                                    ["help", "null", "server=", "port="])
!     except getopt.Error:
          usage(globals(), locals())
          sys.exit(1)
--- 93,103 ----
      server = "localhost"
      port = options.html_ui_port
+     prob = 1.0
  
      try:
!         opts, args = getopt.getopt(argv, "hns:p:r:",
!                                    ["help", "null", "server=", "port=",
!                                     "prob="])
!     except getopt.error:
          usage(globals(), locals())
          sys.exit(1)
***************
*** 109,112 ****
--- 113,122 ----
          elif opt in ("-p", "--port"):
              port = int(arg)
+         elif opt in ("-r", "--prob"):
+             n = float(arg)
+             if n < 0.0 or n > 1.0:
+                 usage(globals(), locals())
+                 sys.exit(1)
+             prob = n
  
      if args:
***************
*** 115,121 ****
  
      data = sys.stdin.read()
-     post_multipart("%s:%d"%(server,port), "/upload", [],
-                    [('file', 'message.dat', data)])
      sys.stdout.write(data)
  
  if __name__ == "__main__":
--- 125,136 ----
  
      data = sys.stdin.read()
      sys.stdout.write(data)
+     if random.random() < prob:
+         try:
+             post_multipart("%s:%d"%(server,port), "/upload", [],
+                            [('file', 'message.dat', data)])
+         except:
+             print >> sys.stderr, "upload failed"
+             sys.exit(1)
  
  if __name__ == "__main__":