Date: Sunday, March 4, 2007 @ 21:32:14 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: rankmirrors (1.6 -> 1.7) * rankmirrors updates from Scott Horowitz <stonecrest@gmail.com>. Formatted output is now the default. Added a TODO for later as well. -------------+ rankmirrors | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) Index: pacman-lib/scripts/rankmirrors diff -u pacman-lib/scripts/rankmirrors:1.6 pacman-lib/scripts/rankmirrors:1.7 --- pacman-lib/scripts/rankmirrors:1.6 Thu Feb 22 03:06:54 2007 +++ pacman-lib/scripts/rankmirrors Sun Mar 4 21:32:14 2007 @@ -23,17 +23,20 @@ import os, sys, datetime, time, socket, urllib2 from optparse import OptionParser +# TODO: handle KeyboardInterrupt better, print list of already timed +# servers and then exit. Easier if program is function-ized. + def createOptParser(): usage = "usage: %prog [options] MIRRORFILE | URL" description = "Ranks pacman mirrors by their connection and opening " \ "speed. Pacman mirror files are located in /etc/pacman.d/. It " \ "can also rank one mirror if the URL is provided." parser = OptionParser(usage = usage, description = description) - parser.add_option("-f", "--formatted", action = "store_true", - dest = "formatted", default = False, - help = "output in mirror file format") parser.add_option("-n", type = "int", dest = "num", default = 0, help = "number of servers to output, 0 for all") + parser.add_option("-t", "--times", action = "store_true", + dest = "times", default = False, + help = "only output mirrors and their response times") parser.add_option("-u", "--url", action = "store_true", dest = "url", default=False, help="test a specific url") parser.add_option("-v", "--verbose", action = "store_true", @@ -88,43 +91,49 @@ fl = open(args[0], 'r') serverToTime = {} - if options.formatted: + if options.times: + print 'Querying servers, this may take some time...' + else: print "# Server list generated by rankmirrors on", print datetime.date.today() - else: - print 'Querying servers, this may take some time...' for ln in fl.readlines(): splitted = ln.split('=') if splitted[0].strip() != 'Server': - if options.formatted: + if not options.times: print ln, continue serverUrl = splitted[1].strip() if serverUrl[-1] == '\n': serverUrl = serverUrl[0:-1] - if options.verbose and options.formatted: - print '#',serverUrl,'...', - elif options.verbose: + if options.verbose and options.times: print serverUrl,'...', - elif not options.formatted: + elif options.verbose: + print '#',serverUrl,'...', + elif options.times: print ' * ', sys.stdout.flush() serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) if options.verbose: - print serverToTime[serverUrl] + try: + print "%.2f" % serverToTime[serverUrl] + except: + print serverToTime[serverUrl] items = serverToTime.items() items.sort(cmpPairBySecond) numToShow = int(options.num) if numToShow == 0: numToShow = len(items) if len(items) > 0: - if options.formatted: + if options.times: + print + print ' Servers sorted by time (seconds):' for i in items[0:numToShow]: - print 'Server =', i[0] + try: + print "%.2f" % i[1], ':', i[0] + except: + print i[1], ':', i[0] else: - print - print ' Servers sorted by time:' for i in items[0:numToShow]: - print i[1], ':', i[0] + print 'Server =', i[0] # vim: set ts=4 sw=4 et: