proper cache max_age propagation

diff --git a/yoweb-scrape b/yoweb-scrape
index dceeafd7bbcb225acd512675bcc881bf809f859a..e14719210d443c96e7b65ae8a93dc4e37924be36 100755 (executable)
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -91,12 +91,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()
@@ -149,6 +149,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 +157,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')
@@ -343,10 +345,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 +361,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 +376,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, 1800)
+                       tab.pirate(pi)
        print tab.results()
 
 def main():