introduce --dry-run arg, closes jiehanzheng#2

Author: jiehanzheng

README.md

@@ -21,9 +21,18 @@ git clone git://github.com/jiehanzheng/squid2radius.git
 sudo pacman -S python2-pip
 
 # install pyrad, command varies if you are on a different OS
-sudo pip2 install pyrad
+sudo pip2 install pyrad hurry.filesize
 ```
 
+Upgrading to v1.0
+-----------------
+
+### New dependency `hurry.filesize`
+
+Note that an dependency `hurry.filesize` is required since Version 1.0.  Run 
+`sudo pip2 install hurry.filesize` to install it.
+
+
 Usage
 -----
 
@@ -48,6 +57,10 @@ You should also read [SquidFaq/SquidLogs](http://wiki.squid-cache.org/SquidFaq/S
 
 If for some reason you need to prevent usage information of certain user from being sent to the RADIUS server, there is an argument for that!  Use `--exclude-pattern="(girl|boy)friend"` and squid2radius won't send usage of either your `girlfriend` or `boyfriend` to the RADIUS server.
 
+### --dry-run
+
+If the script is called with this argument, no data will be sent to the server.
+
 ### --no-rotation
 
 By default squid2radius calls `squid -k rotate` to make squid rotate your log files right after we are done counting usage data, in order to ensure usage data accuracy by not counting any log lines more than once next time you run it.  If this is troublesome in your setup, you can add `--no-rotation` argument to disable this behavior.

squid2radius.py

@@ -9,10 +9,17 @@
 from pyrad.client import Client
 from pyrad.dictionary import Dictionary
 
+try:
+  from hurry.filesize import size
+except ImportError:
+  print "WARNING: Unable to import hurry.filesize.  Data transfer will be " \
+        "displayed in bytes.  To fix this, run `pip2 install hurry.filesize`."
+
 
 parser = argparse.ArgumentParser(description='Analyze squid log by user ' \
                                              'and upload result to RADIUS ' \
                                              'server.')
+parser.add_argument('--version', action='version', version='%(prog)s 1.0')
 parser.add_argument('logfile_path', help='logfile to analyze')
 parser.add_argument('radius_server')
 parser.add_argument('radius_secret')
@@ -22,6 +29,9 @@
 parser.add_argument('--exclude-pattern', help='do not send to server if ' \
                                               'username contains this regexp',
                                          default='')
+parser.add_argument('--dry-run', help='run locally only and never contact the' \
+                                      'server',
+                                 action='store_true')
 parser.add_argument('--no-rotation', help='do not rotate squid log files',
                                      action='store_true')
 args = parser.parse_args()
@@ -50,7 +60,8 @@
     sum_bytes[rfc931] = int(num_bytes)
 
 
-print "\nSending..."
+print
+print "Sending..." if not args.dry_run else "Stats:"
 srv = Client(server=args.radius_server, secret=args.radius_secret,
              dict=Dictionary(sys.path[0] + "/dictionary"))
 
@@ -60,18 +71,28 @@
 
 failed_usernames = []
 for username, total_bytes in sum_bytes.iteritems():
-  sys.stdout.write(username + ' ' + str(total_bytes))
-  sys.stdout.write('.')
-  sys.stdout.flush()
+  sys.stdout.write('  ' + username + ' ')
+
+  try:
+    sys.stdout.write(size(total_bytes))
+  except NameError:
+    sys.stdout.write(str(total_bytes))
 
+  if args.dry_run:
+    sys.stdout.write("\n")
+    continue
+
   if args.exclude_pattern and exclude_pattern.search(username):
-    sys.stdout.write("..skipped!\n")
+    sys.stdout.write("...skipped!\n")
     sys.stdout.flush()
     continue
 
   session_id = str(time.time())
 
   try:
+    sys.stdout.write('.')
+    sys.stdout.flush()
+
     req = srv.CreateAcctPacket()
     req['User-Name'] = username
     req['NAS-Identifier'] = args.radius_nasid
@@ -95,15 +116,17 @@
     reply = srv.SendPacket(req)
     if not reply.code == pyrad.packet.AccountingResponse:
       raise Exception("Unexpected response from RADIUS server")
+
+    sys.stdout.write('.')
+    sys.stdout.flush()
 
   except Exception as e:
     failed_usernames.append((username, e))
-    sys.stdout.write("..FAILED!\n")
+    sys.stdout.write("FAILED!\n")
     sys.stdout.flush()
     continue
 
-  sys.stdout.write(".\n")
-  sys.stdout.flush()
+  sys.stdout.write("\n")
 
 
 if not args.no_rotation: