but prettier like this

[ypp-sc-tools.db-test.git] / yoweb-scrape

diff --git a/yoweb-scrape b/yoweb-scrape
index 2d08d269ea0e7c859e184b5c9caab1e7165ca472..a8a1a1169b0ee5f4ddb4b5548575d53b3c9ae348 100755 (executable)
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -10,6 +10,7 @@ import urllib2
 import errno
 import sys
 import re as regexp
+import random
 from optparse import OptionParser
 
 from BeautifulSoup import BeautifulSoup
@@ -27,7 +28,7 @@ standingvals = ('Able/Distinguished/Respected/Master'+
 
 pirate_ref_re = regexp.compile('^/yoweb/pirate\\.wm')
 
-max_pirate_namelen = 20
+max_pirate_namelen = 12
 
 
 def debug(m):
@@ -44,6 +45,10 @@ class Fetcher:
                        if oe.errno != errno.EEXIST: raise
                self._cache_scan(time.time())
 
+       def _default_ocean(self):
+               if self.ocean is None:
+                       self.ocean = 'ice'
+
        def _cache_scan(self, now):
                # returns list of ages, unsorted
                ages = []
@@ -72,12 +77,12 @@ class Fetcher:
                min_age = 1
                need_wait = 0
                for age in ages:
-                       if age < min_age:
+                       if age < min_age and age < 300:
                                debug('Fetcher   morewait min=%d age=%d' %
                                        (min_age, age))
                                need_wait = max(need_wait, min_age - age)
-                       min_age += 1
-                       min_age *= 1.5
+                       min_age += 3
+                       min_age *= 1.25
                if need_wait > 0:
                        debug('Fetcher   wait %d' % need_wait)
                        time.sleep(need_wait)
@@ -91,12 +96,12 @@ class Fetcher:
                        if oe.errno != errno.ENOENT: raise
                        f = None
                now = time.time()
-               max_age = max(opts.min_max_age, max(max_age, opts.expire_age))
+               max_age = max(opts.min_max_age, min(max_age, opts.expire_age))
                if f is not None:
                        s = os.fstat(f.fileno())
                        age = now - s.st_mtime
                        if age > max_age:
-                               debug('Fetcher  stale')
+                               debug('Fetcher  stale %d < %d'% (max_age, age))
                                f = None
                if f is not None:
                        data = f.read()
@@ -119,6 +124,7 @@ class Fetcher:
                return data
 
        def yoweb(self, kind, tail, max_age):
+               self._default_ocean()
                url = 'http://%s.puzzlepirates.com/yoweb/%s%s' % (
                        self.ocean, kind, tail)
                return self.fetch(url, max_age)
@@ -149,6 +155,7 @@ class SomethingSoupInfo(SoupLog):
 class PirateInfo(SomethingSoupInfo):
        # Public data members:
        #  pi.standings = { 'Treasure Haul': 'Able' ... }
+       #  pi.name = name
        #  pi.crew = (id, name)
        #  pi.flag = (id, name)
        #  pi.msgs = [ 'message describing problem with scrape' ]
@@ -156,6 +163,7 @@ class PirateInfo(SomethingSoupInfo):
        def __init__(self, pirate, max_age=300):
                SomethingSoupInfo.__init__(self,
                        'pirate.wm?target=', pirate, max_age)
+               self.name = pirate
                self._find_standings()
                self.crew = self._find_crewflag('crew',
                        '^/yoweb/crew/info\\.wm')
@@ -310,7 +318,7 @@ class StandingsTable:
                self._cw = col_width-1
 
        def _pline(self, pirate, puzstrs):
-               self.s += ' %-*s' % (max_pirate_namelen, pirate)
+               self.s += ' %-*s' % (max(max_pirate_namelen, 14), pirate)
                for v in puzstrs:
                        self.s += ' %-*.*s' % (self._cw,self._cw, v)
                self.s += '\n'
@@ -343,10 +351,9 @@ class StandingsTable:
                self._pline('', map(puzn_redact, self._puzzles))
        def literalline(self, line):
                self.s += line + '\n'
-       def pirate(self, pirate):
-               pi = PirateInfo(pirate, 600)
+       def pirate(self, pi):
                puzstrs = [self._puzstr(pi,puz) for puz in self._puzzles]
-               self._pline(pirate, puzstrs)
+               self._pline(pi.name, puzstrs)
 
        def results(self):
                return self.s
@@ -360,8 +367,8 @@ def do_pirate(pirates, bu):
 
 def prep_crew_of(args, bu, max_age=300):
        if len(args) != 1: bu('crew-of takes one pirate name')
-       pi = PirateInfo(args[0])
-       return CrewInfo(pi.crew[0])
+       pi = PirateInfo(args[0], max_age)
+       return CrewInfo(pi.crew[0], max_age)
 
 def do_crew_of(args, bu):
        ci = prep_crew_of(args, bu)
@@ -375,7 +382,8 @@ def do_standings_crew_of(args, bu):
                if not members: continue
                tab.literalline('%s:' % rank)
                for p in members:
-                       tab.pirate(p)
+                       pi = PirateInfo(p, random.randint(900,1800))
+                       tab.pirate(pi)
        print tab.results()
 
 def main():
@@ -387,10 +395,10 @@ actions:
  yoweb-scrape [--ocean OCEAN ...] pirate PIRATE
  yoweb-scrape [--ocean OCEAN ...] crew-of PIRATE
  yoweb-scrape [--ocean OCEAN ...] standings-crew-of PIRATE
+ yoweb-scrape [--ocean OCEAN ...] ship-aid CHAT-LOG
 ''')
        ao = pa.add_option
-       ao('-O','--ocean',dest='ocean', metavar='OCEAN',
-               default='ice',
+       ao('-O','--ocean',dest='ocean', metavar='OCEAN', default=None,
                help='select ocean OCEAN')
        ao('--cache-dir', dest='cache_dir', metavar='DIR',
                default='~/.yoweb-scrape-cache',
@@ -404,6 +412,7 @@ actions:
                help='show ship duty station puzzles')
 
        (opts,args) = pa.parse_args()
+       random.seed()
 
        if len(args) < 1:
                pa.error('need a mode argument')