X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yoweb-scrape;h=cc98ea3b21b869154ed0a46ca5aec941d7f71a71;hp=1450d2029d861a31e48c8050ad0974b2a79baf3c;hb=16509b590987a0b966a326b6d39d8a2d553582be;hpb=17901a7fd29680cdcaa62551b8ac93c53680e20a

diff --git a/yoweb-scrape b/yoweb-scrape
index 1450d20..cc98ea3 100755
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -13,6 +13,7 @@ import errno
 import sys
 import re as regexp
 import random
+import curses
 from optparse import OptionParser
 
 from BeautifulSoup import BeautifulSoup
@@ -58,9 +59,9 @@ class Fetcher:
 			if oe.errno != errno.EEXIST: raise
 		self._cache_scan(time.time())
 
-	def _default_ocean(self):
+	def default_ocean(self, ocean='ice'):
 		if self.ocean is None:
-			self.ocean = 'ice'
+			self.ocean = ocean
 
 	def _cache_scan(self, now):
 		# returns list of ages, unsorted
@@ -141,7 +142,7 @@ class Fetcher:
 		return data
 
 	def yoweb(self, kind, tail, max_age):
-		self._default_ocean()
+		self.default_ocean()
 		url = 'http://%s.puzzlepirates.com/yoweb/%s%s' % (
 			self.ocean, kind, tail)
 		return self.fetch(url, max_age)
@@ -432,7 +433,7 @@ class ChatLogTracker:
 		self._lbuf = ''
 		self._progress = [0, os.fstat(self._f.fileno()).st_size]
 
-	def _refresh(self):
+	def force_redisplay(self):
 		self._need_redisplay = True
 
 	def _onboard_event(self,timestamp,pirate,event):
@@ -447,14 +448,14 @@ class ChatLogTracker:
 			self._pl[pirate] = pa
 			self._v[pirate] = pa
 		self._v['#lastaboard'] = timestamp
-		self._refresh()
+		self.force_redisplay()
 		return pa
 
 	def _trash_vessel(self, v):
 		for pn in v:
 			if pn.startswith('#'): continue
 			del self._pl[pn]
-		self._refresh()
+		self.force_redisplay()
 
 	def expire_garbage(self, timestamp):
 		for (vn,v) in list(self._vl.iteritems()):
@@ -481,7 +482,8 @@ class ChatLogTracker:
 
 		m = rm('=+ (\\d+)/(\\d+)/(\\d+) =+$')
 		if m:
-			self._date = m.groups()
+			self._date = [int(x) for x in m.groups()]
+			self._previous_timestamp = None
 			return d('date '+`self._date`)
 
 		if self._date is None:
@@ -491,9 +493,18 @@ class ChatLogTracker:
 		if not m:
 			return d('no timestamp')
 
-		time_tuple = [int(x) for x in self._date + m.groups()]
-		time_tuple += (-1,-1,-1)
-		timestamp = time.mktime(time_tuple)
+		while True:
+			time_tuple = (self._date +
+				      [int(x) for x in m.groups()] +
+				      [-1,-1,-1])
+			timestamp = time.mktime(time_tuple)
+			if timestamp >= self._previous_timestamp: break
+			self._date[2] += 1
+			self._debug_line_disposition(timestamp,'',
+				'new date '+`self._date`)
+
+		self._previous_timestamp = timestamp
+
 		l = l[l.find(' ')+1:]
 
 		def ob_x(who,event):
@@ -545,7 +556,7 @@ class ChatLogTracker:
 			if pa.v is self._v:
 				pa.last_chat_time = timestamp
 				pa.last_chat_chan = what
-				self._refresh()
+				self.force_redisplay()
 				return d(what+' chat')
 
 		m = rm('(\\w+) (?:issued an order|ordered everyone) "')
@@ -648,6 +659,7 @@ class ChatLogTracker:
 		return self._vessel
 	def aboard(self):
 		# returns a list of PirateAboard sorted by name
+		if self._v is None: return []
 		return [ self._v[pn]
 			 for pn in sorted(self._v.keys())
 			 if not pn.startswith('#') ]
@@ -684,10 +696,16 @@ def do_standings_crew_of(args, bu):
 	print tab.results()
 
 class ProgressPrintPercentage:
-	def __init__(self, f=sys.stdout): self._f = f
-	def progress(self,done,total):
-		self._f.write("scan chat logs %3d%%\r" % ((done*100) / total))
+	def __init__(self, f=sys.stdout):
+		self._f = f
+	def progress_string(self,done,total):
+		return "scan chat logs %3d%%\r" % ((done*100) / total)
+	def progress(self,*a):
+		self._f.write(self.progress_string(*a))
 		self._f.flush()
+	def show_init(self, pirate, ocean):
+		print >>self._f, 'Starting up, %s on the %s ocean' % (
+			pirate, ocean)
 	def caughtup(self):
 		self._f.write('                   \r')
 		self._f.flush()
@@ -699,18 +717,22 @@ def prep_chat_log(args, bu,
 		max_myself_age=3600):
 	if len(args) != 1: bu('this action takes only chat log filename')
 	logfn = args[0]
-	logfn_re = '(?:.*/)?([A-Z][a-z]+)_([a-z]+)_chat-log-\\w+$'
+	logfn_re = '(?:.*/)?([A-Z][a-z]+)_([a-z]+)_'
 	match = regexp.match(logfn_re, logfn)
-	if not match: bu('chat log filename is not in default format')
-	(pirate, fetcher.ocean) = match.groups()
+	if not match: bu('chat log filename is not in expected format')
+	(pirate, ocean) = match.groups()
+	fetcher.default_ocean(ocean)
 	
 	myself = PirateInfo(pirate,max_myself_age)
+	progress.show_init(pirate, fetcher.ocean)
 	track = ChatLogTracker(myself, logfn)
 
 	opts.debug -= 1
 	track.catchup(progress)
 	opts.debug += 1
 
+	track.force_redisplay()
+
 	return (myself, track)
 
 def do_track_chat_log(args, bu):
@@ -721,17 +743,84 @@ def do_track_chat_log(args, bu):
 			print track
 		time.sleep(1)
 
+#----- ship management aid -----
+
+class Display_dumb(ProgressPrintPercentage):
+	def __init__(self):
+		ProgressPrintPercentage.__init__(self)
+	def show(self, s):
+		print '\n\n', s;
+	def realstart(self):
+		pass
+
+class Display_overwrite(ProgressPrintPercentage):
+	def __init__(self):
+		ProgressPrintPercentage.__init__(self)
+
+		null = file('/dev/null','w')
+		curses.setupterm(fd=null.fileno())
+
+		self._clear = curses.tigetstr('clear')
+		if not self._clear:
+			self._debug('missing clear!')
+			self.show = Display_dumb.show
+			return
+
+		self._t = {'el':'', 'ed':''}
+		if not self._init_sophisticated():
+			for k in self._t.keys(): self._t[k] = ''
+			self._t['ho'] = self._clear
+
+	def _debug(self,m): debug('display overwrite: '+m)
+
+	def _init_sophisticated(self):
+		for k in self._t.keys():
+			s = curses.tigetstr(k)
+			self._t[k] = s
+		self._t['ho'] = curses.tigetstr('ho')
+		if not self._t['ho']:
+			cup = curses.tigetstr('cup')
+			self._t['ho'] = curses.tparm(cup,0,0)
+		missing = [k for k in self._t.keys() if not self._t[k]]
+		if missing:
+			self.debug('missing '+(' '.join(missing)))
+			return 0
+		return 1
+
+	def show(self, s):
+		w = sys.stdout.write
+		def wti(k): w(self._t[k])
+
+		wti('ho')
+		nl = ''
+		for l in s.rstrip().split('\n'):
+			w(nl)
+			w(l)
+			wti('el')
+			nl = '\r\n'
+		wti('ed')
+		w(' ')
+		sys.stdout.flush()
+
+	def realstart(self):
+		sys.stdout.write(self._clear)
+		sys.stdout.flush()
+			
+
 def do_ship_aid(args, bu):
 	if opts.ship_duty is None: opts.ship_duty = True
 
-	(myself, track) = prep_chat_log(args, bu)
-
+	displayer = globals()['Display_'+opts.display]()
 	rotate_nya = '/-\\'
 
+	(myself, track) = prep_chat_log(args, bu, progress=displayer)
+
 	def timeevent(t,e):
 		if t is None: return ' ' * 22
 		return " %-4s %-16s" % (format_time_interval(now - t),e)
 
+	displayer.realstart()
+
 	while True:
 		track.catchup()
 		now = time.time()
@@ -739,10 +828,9 @@ def do_ship_aid(args, bu):
 		s = "%s" % track.myname()
 
 		vn = track.vessel()
-		if vn is None: print s + " ...?"; return
-
-		s += " on board the %s at %s\n" % (
-			vn, time.strftime("%Y-%m-%d %H:%M:%S"))
+		if vn is None: s += " not on a vessel?!"
+		else: s += " on board the %s" % vn
+		s += " at %s\n" % time.strftime("%Y-%m-%d %H:%M:%S")
 
 		tbl = StandingsTable()
 		tbl.headings()
@@ -763,8 +851,7 @@ def do_ship_aid(args, bu):
 
 		s += tbl.results()
 
-		print '\n\n', s;
-
+		displayer.show(s)
 		time.sleep(1)
 		rotate_nya = rotate_nya[1:2] + rotate_nya[0]
 
@@ -780,7 +867,11 @@ 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 ...] ship-aid CHAT-LOG
+ yoweb-scrape [options] ship-aid CHAT-LOG  (must be .../PIRATE_OCEAN_chat-log*)
+
+display modes (for --display) apply to ship-aid:
+ --display=dumb       just print new information, scrolling the screen
+ --display=overwrite  use cursor motion, selective clear, etc. to redraw at top
 ''')
 	ao = pa.add_option
 	ao('-O','--ocean',dest='ocean', metavar='OCEAN', default=None,
@@ -790,8 +881,13 @@ actions:
 		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',
+		help='write any debugging output to specified fd')
 	ao('-q','--quiet', action='store_true', dest='quiet',
 		help='suppress warning output')
+	ao('--display', action='store', dest='display',
+		type='choice', choices=['dumb','overwrite'],
+		help='how to display ship aid')
 
 	ao('--ship-duty', action='store_true', dest='ship_duty',
 		help='show ship duty station puzzles')
@@ -804,6 +900,9 @@ actions:
 	if len(args) < 1:
 		pa.error('need a mode argument')
 
+	if opts.debug_fd is not None:
+		opts.debug_file = fdopen(opts.debug_fd, 'w')
+
 	mode = args[0]
 	mode_fn_name = 'do_' + mode.replace('_','#').replace('-','_')
 	try: mode_fn = globals()[mode_fn_name]
@@ -817,6 +916,13 @@ actions:
 	if opts.cache_dir.startswith('~/'):
 		opts.cache_dir = os.getenv('HOME') + opts.cache_dir[1:]
 
+	if opts.display is None:
+		if ((opts.debug > 0 and opts.debug_fd is None)
+		    or not os.isatty(sys.stdout.fileno())):
+			opts.display = 'dumb'
+		else:
+			opts.display = 'overwrite'
+
 	fetcher = Fetcher(opts.ocean, opts.cache_dir)
 
 	mode_fn(args[1:], pa.error)