chiark / gitweb /
yoweb-scrape: new flag and ocean functionality - embargoes-flag-of
[ypp-sc-tools.git] / yoweb-scrape
index a2add1001aa0d25e6a047f1f472353eb259a5a72..f9976b8341a14bf96aa5d851a7691c8b13df0ca2 100755 (executable)
@@ -361,12 +361,14 @@ u'\\s*\\S*/([-A-Za-z]+)\\s*$|\\s*\\S*/\\S*\\s*\\(ocean\\-wide(?:\\s|\\xa0)+([-A-
 
 class CrewInfo(SomethingSoupInfo):
        # Public data members:
+       #  ci.crewid
        #  ci.crew = [ ('Captain',        ['Pirate', ...]),
        #              ('Senior Officer', [...]),
        #               ... ]
        #  pi.msgs = [ 'message describing problem with scrape' ]
 
        def __init__(self, crewid, max_age=300):
+               self.crewid = crewid
                SomethingSoupInfo.__init__(self,
                        'crew/info.wm?crewid=', crewid, max_age)
                self._find_crew()
@@ -410,6 +412,7 @@ class CrewInfo(SomethingSoupInfo):
 class FlagInfo(SomethingSoupInfo):
        # Public data members (after init):
        #
+       #   flagid
        #   name        #               string
        #
        #   relations[n] = (otherflagname, otherflagid, [stringfromyoweb],
@@ -424,6 +427,7 @@ class FlagInfo(SomethingSoupInfo):
        #   islands[n] = (islandname, islandid)
        #
        def __init__(self, flagid, max_age=600):
+               self.flagid = flagid
                SomethingSoupInfo.__init__(self,
                        'flag/info.wm?flagid=', flagid, max_age)
                self._find_flag()
@@ -591,6 +595,14 @@ class IslandExtendedInfo(IslandBasicInfo):
                        self.yoweb_url, self.flagid)`
 
 class IslandFlagInfo(IslandExtendedInfo):
+       # Public data attributes (inherited):
+       #  ocean
+       #  name
+       #  islandid
+       #  yoweb_url
+       #  flagid
+       # Public data attributes (additional):
+       #  flag
        def __init__(self, ocean, islename):
                IslandExtendedInfo.__init__(self, ocean, islename)
                self.flag = None
@@ -603,6 +615,30 @@ class IslandFlagInfo(IslandExtendedInfo):
        def __str__(self):
                return IslandExtendedInfo.__str__(self) + '; ' + str(self.flag)
 
+class NullProgressReporter():
+       def doing(self, msg): pass
+       def stop(self): pass
+
+class TypewriterProgressReporter():
+       def __init__(self):
+               self._l = 0
+       def doing(self,m):
+               self._doing(m + '...')
+       def _doing(self,m):
+               self._write('\r')
+               self._write(m)
+               less = self._l - len(m)
+               if less > 0:
+                       self._write(' ' * less)
+                       self._write('\b' * less)
+               self._l = len(m)
+               sys.stdout.flush()
+       def stop(self):
+               self._doing('')
+               self._l = 0
+       def _write(self,t):
+               sys.stdout.write(t)
+
 class OceanInfo():
        # Public data attributes:
        #   oi.islands[islename] = IslandInfo(...)
@@ -611,6 +647,8 @@ class OceanInfo():
                self.isleclass = isleclass
                self.ocean = fetcher.ocean.lower().capitalize()
 
+               progressreporter.doing('fetching ocean info')
+
                cmdl = ['./yppedia-ocean-scraper']
                if opts.localhtml is not None:
                        cmdl += ['--local-html-dir',opts.localhtml]
@@ -628,10 +666,16 @@ class OceanInfo():
                arch_re = regexp.compile('^ (\S.*)')
                island_re = regexp.compile('^  (\S.*)')
 
+               oscraper.wait()
+               assert(oscraper.returncode == 0)
+
                self.islands = { }
                self.arches = { }
                archname = None
 
+               isles = [ ]
+               progressreporter.doing('parsing ocean info')
+
                for l in oscraper.stdout:
                        debug('OceanInfo collect l '+`l`)
                        l = l.rstrip('\n')
@@ -639,10 +683,7 @@ class OceanInfo():
                        if m:
                                assert(archname is not None)
                                islename = m.group(1)
-                               isle = self.isleclass(self.ocean, islename)
-                               isle.arch = archname
-                               self.islands[islename] = isle
-                               self.arches[archname][islename] = isle
+                               isles.append((archname, islename))
                                continue
                        m = arch_re.match(l)
                        if m:
@@ -651,8 +692,16 @@ class OceanInfo():
                                self.arches[archname] = { }
                                continue
                        assert(False)
-               oscraper.wait()
-               assert(oscraper.returncode == 0)
+
+               for i in xrange(0, len(isles)-1):
+                       (archname, islename) = isles[i]
+                       progressreporter.doing(
+                               'fetching isle info %2d/%d (%s: %s)'
+                               % (i, len(isles), archname, islename))
+                       isle = self.isleclass(self.ocean, islename)
+                       isle.arch = archname
+                       self.islands[islename] = isle
+                       self.arches[archname][islename] = isle
 
        def __str__(self):
                return `(self.islands, self.arches)`
@@ -1306,23 +1355,27 @@ def do_pirate(pirates, bu):
                print '%s: %s,' % (`pirate`, info)
        print '}'
 
-def prep_crew_of(args, bu, max_age=300):
-       if len(args) != 1: bu('crew-of takes one pirate name')
+def prep_crewflag_of(args, bu, max_age, selector, constructor):
+       if len(args) != 1: bu('crew-of etc. take one pirate name')
        pi = PirateInfo(args[0], max_age)
-       if pi.crew is None: return None
-       return CrewInfo(pi.crew[0], max_age)
+       cf = selector(pi)
+       if cf is None: return None
+       return constructor(cf[0], max_age)
+
+def prep_crew_of(args, bu, max_age=300):
+       return prep_crewflag_of(args, bu, max_age,
+               (lambda pi: pi.crew), CrewInfo)
+
+def prep_flag_of(args, bu, max_age=300):
+       return prep_crewflag_of(args, bu, max_age,
+               (lambda pi: pi.flag), FlagInfo)
 
 def do_crew_of(args, bu):
        ci = prep_crew_of(args, bu)
        print ci
 
 def do_flag_of(args, bu):
-       if len(args) != 1: bu('flag-of takes one pirate name')
-       max_age = 300
-       pi = PirateInfo(args[0], max_age)
-       if pi.flag is None: fi = None
-       else: fi = FlagInfo(pi.flag[0], max_age)
-       print fi
+       fi = prep_flag_of(args, bu)
 
 def do_standings_crew_of(args, bu):
        ci = prep_crew_of(args, bu, 60)
@@ -1345,6 +1398,61 @@ def do_ocean(args, bu):
                isle = oi.islands[islename]
                print isle
 
+def do_embargoes(args, bu):
+       if (len(args)): bu('ocean takes no further arguments')
+       fetcher.default_ocean()
+       oi = OceanInfo(IslandFlagInfo)
+       wr = sys.stdout.write
+       print ('EMBARGOES:  Island    | Owning flag'+
+               '                    | Embargoed flags')
+
+       def getflname(isle):
+               if isle.islandid is None: return 'uncolonisable'
+               if isle.flag is None: return 'uncolonised'
+               return isle.flag.name
+
+       progressreporter.stop()
+
+       for archname in sorted(oi.arches.keys()):
+               print 'ARCHIPELAGO: ',archname
+               for islename in sorted(oi.arches[archname].keys()):
+                       isle = oi.islands[islename]
+                       wr(' %-20s | ' % isle.name)
+                       flname = getflname(isle)
+                       wr('%-30s | ' % flname)
+                       flag = isle.flag
+                       if flag is None: print ''; continue
+                       delim = ''
+                       for rel in flag.relations:
+                               (oname, oid, dummy, thisdeclaring,
+                                       odeclaringmin,odeclaringmax) = rel
+                               if thisdeclaring >= 0: continue
+                               wr(delim)
+                               wr(oname)
+                               delim = '; '
+                       print ''
+
+def do_embargoes_flag_of(args, bu):
+       progressreporter.doing('fetching flag info')
+       fi = prep_flag_of(args, bu)
+       oi = OceanInfo(IslandFlagInfo)
+       progressreporter.stop()
+       any = False
+       for islename in sorted(oi.islands.keys()):
+               isle = oi.islands[islename]
+               flag = isle.flag
+               if flag is None: continue
+               for rel in flag.relations:
+                       (oname, oid, dummy, thisdeclaring,
+                               odeclaringmin,odeclaringmax) = rel
+                       if thisdeclaring >= 0: continue
+                       if oid != fi.flagid: continue
+                       if not any: print 'EMBARGOED:'
+                       any = True
+                       print " %-30s (%s)" % (islename, flag.name)
+       if not any:
+               print 'No embargoes.'
+
 #----- modes which use the chat log parser are quite complex -----
 
 class ProgressPrintPercentage:
@@ -1666,7 +1774,7 @@ class KeystrokeReader(DummyKeystrokeReader):
 #---------- main program ----------
 
 def main():
-       global opts, fetcher, yppedia
+       global opts, fetcher, yppedia, progressreporter
 
        pa = OptionParser(
 '''usage: .../yoweb-scrape [OPTION...] ACTION [ARGS...]
@@ -1675,6 +1783,8 @@ actions:
  yoweb-scrape [--ocean OCEAN ...] crew-of PIRATE
  yoweb-scrape [--ocean OCEAN ...] standings-crew-of PIRATE
  yoweb-scrape [--ocean OCEAN ...] track-chat-log CHAT-LOG
+ yoweb-scrape [--ocean OCEAN ...] ocean|embargoes
+ yoweb-scrape [--ocean OCEAN ...] embargoes-flag-of PIRATE
  yoweb-scrape [options] ship-aid CHAT-LOG  (must be .../PIRATE_OCEAN_chat-log*)
 
 display modes (for --display) apply to ship-aid:
@@ -1751,6 +1861,11 @@ display modes (for --display) apply to ship-aid:
        fetcher = Yoweb(opts.ocean, opts.cache_dir)
        yppedia = Yppedia(opts.cache_dir)
 
+       if opts.debug or not os.isatty(0):
+                progressreporter = NullProgressReporter()
+       else:
+               progressreporter = TypewriterProgressReporter()
+
        mode_fn(args[1:], pa.error)
 
 main()