def debug(m):
if opts.debug > 0:
- print m
+ print >>opts.debug_file, m
+
+def sleep(seconds):
+ if opts.debug > 0:
+ opts.debug_file.flush()
+ time.sleep(seconds)
def format_time_interval(ti):
if ti < 120: return '%d:%02d' % (ti / 60, ti % 60)
need_wait = self.need_wait(now)
if need_wait > 0:
debug('Fetcher wait %d' % need_wait)
- time.sleep(need_wait)
+ sleep(need_wait)
def fetch(self, url, max_age):
debug('Fetcher fetch %s' % url)
def force_redisplay(self):
self._need_redisplay = True
- def _onboard_event(self,timestamp,pirate,event):
- try: pa = self._pl[pirate]
- except KeyError: pa = None
- if pa is not None and pa.v is self._v:
+ def _onboard_event(self,v,timestamp,pirate,event):
+ pa = self._pl.get(pirate, None)
+ if pa is not None and pa.v is v:
pa.last_time = timestamp
pa.last_event = event
else:
if pa is not None: del pa.v[pirate]
- pa = PirateAboard(pirate, self._v, timestamp, event)
+ pa = PirateAboard(pirate, v, timestamp, event)
self._pl[pirate] = pa
- self._v[pirate] = pa
- self._v['#lastinfo'] = timestamp
+ v[pirate] = pa
+ v['#lastinfo'] = timestamp
self.force_redisplay()
return pa
l = l[l.find(' ')+1:]
- def ob_x(who,event):
- return self._onboard_event(timestamp, who, event)
+ def ob_x(pirate,event):
+ return self._onboard_event(
+ self._v, timestamp, pirate, event)
def ob1(did): ob_x(m.group(1), did); return d(did)
def oba(did): return ob1('%s %s' % (did, m.group(2)))
- def disembark(who, how):
- ob_x(who, 'leaving '+how)
- del self._v[who]
- del self._pl[who]
+ def disembark(v, timestamp, pirate, event):
+ self._onboard_event(
+ v, timestamp, pirate, 'leaving '+event)
+ del v[pirate]
+ del self._pl[pirate]
m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
if m:
m = rm('(\\w+) abandoned a (\\S.*\\S) station\\.$')
if m: oba('stopped'); return d("end")
- def chat(what):
- who = m.group(1)
- try: pa = self._pl[who]
- except KeyError: return d('chat mystery')
- if pa.v is self._v:
- pa.last_chat_time = timestamp
- pa.last_chat_chan = what
- self.force_redisplay()
- return d('chat '+what)
-
- def chat_metacmd(what):
+ def chat_core(speaker, chan):
+ try: pa = self._pl[speaker]
+ except KeyError: return 'mystery'
+ if pa.v is not self._v: return 'elsewhere'
+ pa.last_chat_time = timestamp
+ pa.last_chat_chan = chan
+ self.force_redisplay()
+ return 'here'
+
+ def chat(chan):
+ speaker = m.group(1)
+ dm = chat_core(speaker, chan)
+ return d('chat %s %s' % (chan, dm))
+
+ def chat_metacmd(chan):
(cmdr, metacmd) = m.groups()
metacmd = regexp.sub('\\s+', ' ', metacmd).strip()
m2 = regexp.match(
'/([ad]) (?:([A-Za-z ]+)\\s*:)?([A-Za-z ]+)$',
metacmd)
- if not m2: return chat(what)
+ if not m2: return chat(chan)
(cmd, vn, targets) = m2.groups()
+ dml = ['cmd', chan, cmd]
- if cmdr == self._myself.name: how = 'manual: /%s' % cmd
- else: how = '/%s %s' % (cmd,cmdr)
- if cmd == 'a': each = ob_x
+ if cmd == 'a': each = self._onboard_event
else: each = disembark
- if vn is not None:
- vn = vn.title()
- if not regexp.match(
- '(?:.* )?' + vn + '$',
- self._vessel):
- return chat('/%s %s:' % (cmd,vn))
+ if cmdr == self._myself.name:
+ dml.append('self')
+ how = 'manual: /%s' % cmd
+ else:
+ dml.append('other')
+ how = '/%s %s' % (cmd,cmdr)
+
+ v = None
+ if vn is not None and len(vn.split(' ')) == 2:
+ v = self._update_vessel_lookup(
+ vn.title(), timestamp, dml)
+ elif self._v is None:
+ dml.append('no-current')
+ elif vn is None:
+ dml.append('current')
+ v = self._v
+ elif regexp.match('(?:.* )?%s$' % vn.title(),
+ self._vessel):
+ dml.append('match')
+ v = self._v
+ else:
+ dml.append('unk-abbrev')
+
+ if v is not None:
+ targets = targets.strip().split(' ')
+ dml.append(`len(targets)`)
+ for target in targets:
+ each(v, timestamp, target.title(), how)
- for target in targets.split(' '):
- if not target: continue
- each(target.title(), how)
- return d('/%s' % cmd)
+ dm = ' '.join(dml)
+ chat_core(cmdr, 'cmd '+chan)
+ return d(dm)
m = rm('(\\w+) (?:issued an order|ordered everyone) "')
if m: return ob1('general order');
m = rm('(\\w+) has left the vessel\.')
if m:
- disembark(m.group(1), 'disembarked')
+ pirate = m.group(1)
+ disembark(self._v, timestamp, pirate, 'disembarked')
return d('disembarked')
return d('not matched')
track.catchup()
if track.changed():
print track
- time.sleep(1)
+ sleep(1)
#----- ship management aid -----
s += tbl.results()
displayer.show(s)
- time.sleep(1)
+ sleep(1)
rotate_nya = rotate_nya[1:3] + rotate_nya[0]
#---------- main program ----------
help='cache yoweb pages in DIR')
ao('-D','--debug', action='count', dest='debug', default=0,
help='enable debugging output')
- ao('--debug-fd', action='count', dest='debug_fd',
+ ao('--debug-fd', type='int', dest='debug_fd',
help='write any debugging output to specified fd')
ao('-q','--quiet', action='store_true', dest='quiet',
help='suppress warning output')
pa.error('need a mode argument')
if opts.debug_fd is not None:
- opts.debug_file = fdopen(opts.debug_fd, 'w')
+ opts.debug_file = os.fdopen(opts.debug_fd, 'w')
+ else:
+ opts.debug_file = sys.stdout
mode = args[0]
mode_fn_name = 'do_' + mode.replace('_','#').replace('-','_')
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff