X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=5af2dfaf41129847defe886d547725d1b6677726;hp=47cd6ed1119fb63aedea28561d8a8a00abdae5c3;hb=a1d85248991a3b50783608d8d2ae35b4be29e82a;hpb=26b072b5c12ff3f3d2f1a1e068ebbce1dc8ca5ce

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 47cd6ed..5af2dfa 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -103,6 +103,8 @@ proc nextarg {} {
 
 set notes_loc vessel-notes
 set scraper {./yppedia-ocean-scraper --chart}
+set info_cache _vessel-info-cache
+set info_source rsync.yarrg.chiark.net::yarrg/vessel-info
 
 proc parseargs {} {
     global ai argv
@@ -118,6 +120,7 @@ proc parseargs {} {
 	    --clipboard-file { load-clipboard-file [nextarg] }
 	    --local-html-dir { lappend scraper --local-html-dir=[nextarg] }
 	    --notes { glset notes_loc [nextarg] }
+	    --vessel-info-source { glset info_source [nextarg] }
 	    --debug { incr debug }
 	    default { badusage "unknown option $arg" }
 	}
@@ -133,6 +136,9 @@ proc argdefaults {} {
 	if {[info exists ocean]} { lappend cmd --ocean $ocean }
 	if {[info exists pirate]} { lappend cmd --pirate $pirate }
 	manyset [split [eval exec $cmd] " "] ocean pirate
+	if {![llength $ocean] || ![llength $pirate]} {
+	    error "$ocean $pirate ?"
+	}
     }
     lappend scraper $ocean
 }
@@ -243,23 +249,37 @@ proc display-note-infos {} {
 
 #---------- vessel properties ----------
 
+proc info-cache-update {} {
+    global info_source info_cache
+    file mkdir $info_cache
+    exec sh -c "cp -u icons/* $info_cache/."
+
+    if {[string length $info_source]} {
+	set cmdl [list \
+		  rsync -udLKtOzm \
+		  --exclude=*~ --exclude=*.bak --exclude=.* --exclude=*.tmp \
+		  $info_source/ $info_cache 2>@ stderr]
+	debug "INFO-CACHE $cmdl"
+	eval exec $cmdl
+    }
+
+    set f [open $info_cache/vessel-info]
+    glset vessel_class_data [read $f]
+    close $f
+}
+
 proc vesselclasses-init {} {
     global vc_game2code vc_code2abbrev vc_code2full vc_codes
-    set vcl {
-	smsloop		am	sl	Sloop
-	lgsloop		bm	ct	Cutter
-	dhow		cm	dh	Dhow
-	longship	dm	ls	Longship
-	baghlah		em	bg	Baghlah
-	merchbrig	fm	mb	{Merchant Brig}
-	warbrig		gm	wb	{War Brig}
-	xebec		hm	xe	Xebec
-	merchgal	jm	mg	{Merchant Galleon}
-	warfrig		im	wf	{War Frigate}
-	grandfrig	km	gf	{Grand Frigate}
-    }
+
+    global vessel_class_data
+    manyset $vessel_class_data classinfos subclassinfos
+
     set vc_codes {}
-    foreach {game code abbrev full} $vcl {
+    set vc_code2abbrev(zz) vcunk
+    load-icon vcunk
+    foreach {game code abbrev full} $classinfos {
+	if {![regexp {^[a-z][a-z]$} $code code]} { error "bad code" }
+	if {![regexp {^[a-z][a-z]$} $abbrev abbrev]} { error "bad abbrev" }
 	lappend vc_codes $code
 	set vc_game2code($game) $code
 	set vc_code2abbrev($code) $abbrev
@@ -267,6 +287,16 @@ proc vesselclasses-init {} {
 	load-icon $abbrev
     }
 
+    global vsc_code2report
+    global vsc_game2code
+    set vsc_game2code(null) {}
+    set vsc_code2report() Ordinary
+    foreach {game code full} $subclassinfos {
+	if {![regexp {^[A-Z]$} $code code]} { error "bad code" }
+	set vsc_game2code($game) $code
+	set vsc_code2report($code) $full
+    }
+
     load-icon atsea
     foreach a {battle borrow dot} {
 	foreach b {ours dot query} {
@@ -374,10 +404,11 @@ proc show-report-decode {code} {
     report-set inport [lindex {{At Sea} {In port}} $inport]
     report-set class $vc_code2full($classcode)
 
-    switch -exact $subclass {
-	{} { report-set subclass {Ordinary} }
-	F { report-set subclass {"Frost class"} }
-	default { report-set subclass "Subclass \"$subclass\"" }
+    upvar #0 vsc_code2report($subclass) subclass_report
+    if {[info exists subclass_report]} {
+	report-set subclass $subclass_report
+    } else {
+	report-set subclass "Subclass \"$subclass\""
     }
 
     report-set lock [lindex {
@@ -537,11 +568,27 @@ proc make-filters {} {
     make-entry-filter xabbre "Flags\n regexp" {}
 }
 
+proc filterstyle-changed {n1 n2 op} {
+    global filterstyle
+    debug "filterstyle-changed $filterstyle"
+    redraw-needed
+}
+
 proc filters-say-yes {code} {
-    global filters
+    global filters filterstyle
     debug "filters-say-yes $code"
+    set codel [split $code _]
+    set lockown [lindex $codel 3]
+    switch -exact $filterstyle {
+	0 { return 1 }
+	1 { return [filter-default/lockown $lockown] }
+	2 { return [regexp {^.0} $lockown] }
+	3 { }
+	default { error $filterstyle }
+    }
+    
     foreach fil $filters {
-	if {![filter-says-yes/$fil [split $code _]]} { return 0 }
+	if {![filter-says-yes/$fil $codel]} { return 0 }
     }
     return 1
 }
@@ -557,14 +604,18 @@ proc vessel {vin} {
 
     set gameclass [errexpect-arrayget vi vesselClass]
     upvar #0 vc_game2code($gameclass) class
-    if {![info exists class]} { errexpect-error "unexpected vesselClass"}
-    lappend codel $class
-
-    set subclass [errexpect-arrayget vi vesselSubclass]
-    switch -exact $subclass {
-	null		{ lappend codel {} }
-	icy		{ lappend codel F }
-	default		{ lappend codel ($subclass) }
+    if {[info exists class]} {
+	lappend codel $class
+    } else {
+	lappend codel zz
+    }
+
+    set gamesubclass [errexpect-arrayget vi vesselSubclass]
+    upvar #0 vsc_game2code($gamesubclass) subclass
+    if {[info exists subclass]} {
+	lappend codel $subclass
+    } else {
+	lappend codel ($gamesubclass)
     }
 
     switch -exact [errexpect-arrayget vi isLocked]/[ \
@@ -609,7 +660,7 @@ proc vessel {vin} {
     lappend newnotes [list $vid $realname $owner $xabbrev]
     set kk "$island [join $codel _]"
     upvar #0 found($kk) k
-    lappend k [list $vid $realname]
+    lappend k [list $vid $realname $owner]
  
     debug "CODED $kk $vid $realname"
 }
@@ -789,6 +840,7 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     toplevel $eb
     wm withdraw $eb
     wm title $eb "where-vessels - $etl_title"
+    wm protocol $eb WM_DELETE_WINDOW [list wm withdraw $eb]
 
     label $eb.title -text $etl_title
     pack $eb.title -side top
@@ -797,17 +849,17 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     pack $eb.close -side bottom
 
     frame $eb.emsg -bd 2 -relief groove
-    label $eb.emsg.lab -text "Error:"
+    label $eb.emsg.lab -anchor nw -text "Error:"
     text $eb.emsg.text -height 1
-    pack $eb.emsg.text -side bottom
+    pack $eb.emsg.text -side bottom -fill x
     pack $eb.emsg.lab -side left
 
-    pack $eb.emsg -side top -pady 2
+    pack $eb.emsg -side top -pady 2 -fill x
 
     frame $eb.text -bd 2 -relief groove
-    pack $eb.text -side bottom -pady 2
+    pack $eb.text -side bottom -pady 2 -fill both -expand y
     
-    label $eb.text.lab
+    label $eb.text.lab -anchor nw
 
     text $eb.text.text -width 85 \
 	-xscrollcommand [list $eb.text.xscroll set] \
@@ -820,10 +872,15 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     scrollbar $eb.text.yscroll -orient vertical \
 	-command [list $eb.text.text yview]
 
-    grid configure $eb.text.lab -row 0 -column 0 -sticky w
-    grid configure $eb.text.text -row 1 -column 0
+    grid configure $eb.text.lab -row 0 -column 0 -sticky w -columnspan 2
+    grid configure $eb.text.text -row 1 -column 0 -sticky news
     grid configure $eb.text.yscroll -sticky ns -row 1 -column 1
     grid configure $eb.text.xscroll -sticky ew -row 2 -column 0
+    grid rowconfigure $eb.text 0 -weight 0
+    grid rowconfigure $eb.text 1 -weight 1
+    grid rowconfigure $eb.text 2 -weight 0
+    grid columnconfigure $eb.text 0 -weight 1
+    grid columnconfigure $eb.text 1 -weight 0
 }
 
 proc parser-control-ok-core {w base background show} {
@@ -934,9 +991,9 @@ proc islandnames-handler {offset maxchars} {
 #---------- main user interface ----------
 
 proc widgets-setup {} {
-    global canvas debug pirate ocean
+    global canvas debug pirate ocean filterstyle
 
-    wm geometry . 1024x480
+    wm geometry . 1024x600
     wm title . "where-vessels - $pirate on the $ocean ocean"
 
     #----- map -----
@@ -954,7 +1011,19 @@ proc widgets-setup {} {
     frame .islands -pady 2
     pack .cp .filter .islands -side top
 
-    label .filter.title -text Filter
+    set filterstyle 1
+    trace add variable filterstyle write filterstyle-changed
+
+    frame .filter.title
+    label .filter.title.title -text Show
+    pack .filter.title.title -side left
+    for {set fing 0} {$fing < 4} {incr fing} {
+	radiobutton .filter.title.f$fing \
+	    -variable filterstyle -value $fing \
+	    -text [lindex {All Useable Mine These:} $fing]
+	pack .filter.title.f$fing -side left
+    }
+
     grid configure .filter.title -row 0 -column 0 -columnspan 2
 
     #----- control panel -----
@@ -1045,8 +1114,20 @@ proc show-report {islandname code} {
     .cp.report.list delete 0 end
 
     foreach entry $k {
-	manyset $entry vid name
-	.cp.report.list insert end $name
+	manyset $entry vid name owner
+	lappend owned($owner) $name
+    }
+
+    foreach owner [lsort [array names owned]] {
+	if {[string length $owner]} {
+	    set owndesc "$owner's"
+	} else {
+	    set owndesc "Owner unknown"
+	}
+	.cp.report.list insert end "$owndesc:"
+	foreach name $owned($owner) {
+	    .cp.report.list insert end " $name"
+	}
     }
 }
 
@@ -1105,9 +1186,10 @@ proc invoke_notes {} {
 #---------- main program ----------
 
 parseargs
-vesselclasses-init
 argdefaults
 httpclientsetup where-vessels
+info-cache-update
+vesselclasses-init
 load-chart
 widgets-setup
 make-filters