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
--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" }
}
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
}
#---------- 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 {
+ 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
load-icon $abbrev
}
+ global vsc_code2report
+ global vsc_game2code
+ set vsc_game2code(null) {}
+ set vsc_code2report() Ordinary
+ set vsc_code2report(!) "(Special/L.E.)"
+ 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
+ set owners {ours dot query}
+ foreach b $owners { load-icon $b }
foreach a {battle borrow dot} {
- foreach b {ours dot query} {
- load-icon-combine $a $b
- }
+ load-icon $a
+ foreach b $owners { load-icon-combine $a $b }
}
}
proc load-icon {icon} {
- image create bitmap icon/$icon -file icons/$icon.xbm
+ global info_cache
+ image create bitmap icon/$icon -file $info_cache/$icon.xbm
}
proc load-icon-combine {args} {
+ global info_cache
set cmd {}
set delim "pnmcat -lr "
foreach icon $args {
- append cmd $delim " <(xbmtopbm icons/$icon.xbm)"
+ append cmd $delim " <(xbmtopbm $info_cache/$icon.xbm)"
set delim " <(pbmmake -white 1 1)"
}
append cmd " | pbmtoxbm"
proc code-lockown2icon {lockown} {
manyset [split $lockown ""] lock notown
- return icon/[
- lindex {battle borrow dot} $lock
- ]+[
- lindex {ours dot query} $notown
- ]
+ set l "
+ [lindex {battle borrow dot} $lock]
+ [lindex {ours dot query {} {} dot} $notown]
+ "
+ if {[llength $l]} { return icon/[join $l +] } { return {} }
}
proc canvas-horiz-stack {xvar xoff y bind type args} {
upvar 1 canvas canvas
set id [eval $canvas create $type [expr {$x+$xoff}] $y $args]
set bbox [$canvas bbox $id]
+# debug "CANVAS-HORIZ-STACK $type $x $xoff $id $bbox [list $args]"
set x [lindex $bbox 2]
$canvas bind $id <ButtonPress> $bind
return $id
incr stackx
}
+ upvar #0 vc_code2abbrev($class) vcabb
+ if {![info exists vcabb]} {
+ set vcabb vc-$class
+ image create bitmap icon/$vcabb -data \
+ [exec pbmtext -builtin fixed $class | pnminvert | pnmcrop >t.pnm]
+ }
canvas-horiz-stack stackx -1 $imy $bind \
- image -anchor nw -image icon/$vc_code2abbrev($class)
+ image -anchor nw -image icon/$vcabb
if {[string length $subclass]} {
canvas-horiz-stack stackx 0 $y $bind \
}
incr stackx
- canvas-horiz-stack stackx 0 $imy $bind \
- image -anchor nw -image [code-lockown2icon $lockown]
- incr stackx
+ set lockownicon [code-lockown2icon $lockown]
+ if {[string length $lockownicon]} {
+ canvas-horiz-stack stackx 0 $imy $bind \
+ image -anchor nw -image $lockownicon
+ incr stackx
+ }
if {[string length $xabbrev]} {
canvas-horiz-stack stackx 0 $y $bind \
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\"" }
+ global smash_subclass
+ if {$smash_subclass >= 2} {
+ report-set subclass "(Any subclass)"
+ } elseif {[
+ upvar #0 vsc_code2report($subclass) subclass_report
+ info exists subclass_report
+ ]} {
+ report-set subclass $subclass_report
+ } else {
+ report-set subclass "Subclass \"$subclass\""
}
report-set lock [lindex {
{Battle ready} {Unlocked} {Locked}
+ {(All lock states)} {(Not battle ready)}
} $lock]
switch -exact $notown {
0 { report-set own "Yours" }
1 { report-set own "Other pirate's" }
2 { report-set own "Owner unknown" }
+ 3 { report-set own "(All ownerships)" }
+ 4 - 5 { report-set own "(Yours/unknown)" }
default { report-set own "?? $notown" }
}
}
}
+#---------- common to smashing and filtering ----------
+
+proc make-control {parent ctrl label ekind} {
+ debug "MAKE-CONTROL [list $parent $ctrl $label $ekind]"
+ label $parent.lab_$ctrl -text $label -justify left
+ $ekind $parent.$ctrl
+ manyset [grid size $parent] dummy row
+ incr row
+ grid configure $parent.lab_$ctrl -row $row -column 0 -sticky nw -pady 4
+ grid configure $parent.$ctrl -row $row -column 1 -sticky w -pady 3
+ return $parent.$ctrl
+}
+
+proc begin-control-grid {cw count rows inrow} {
+ if {!$inrow} { set inrow [expr {($count + $rows) / $rows}] }
+ upvar #0 control_grid_properties($cw) props
+ set props [list $rows $inrow]
+ return $cw
+}
+
+proc make-control-grid-entry {cw kind ix ekind args} {
+ upvar #0 control_grid_properties($cw) props
+ manyset $props rows inrow
+
+ set ew $cw.$ix
+ eval [list $ekind $ew] $args
+
+ switch -exact $kind {
+ ix {
+ grid configure $ew -sticky sw \
+ -row [expr {$ix / $inrow}] \
+ -column [expr {$ix % $inrow}]
+ }
+ final {
+ grid configure $ew -sticky se \
+ -row [expr {$rows-1}] \
+ -column [expr {$inrow-1}]
+ }
+ default {
+ error "$kind ?"
+ }
+ }
+ return $ew
+}
+
+#---------- smashing ----------
+
+set smash_subclass 0
+set smash_owner 0
+
+proc smash-code {code} {
+ manyset [split $code _] inport class subclass lockown xabbrev
+
+ global smash_subclass
+ if {$smash_subclass > 1} {
+ set subclass {}
+ } elseif {$smash_subclass && [string length $subclass]} {
+ set subclass !
+ }
+
+ global smash_owner
+ switch $smash_owner {
+ 0 { }
+ 1 { regsub {[12]$} $lockown 5 lockown }
+ 2 {
+ if {[regexp {^0.} $lockown]} {
+ # battle ready / all lock states
+ set lockown 03
+ } elseif {[regexp {^.0} $lockown]} {
+ # not battle ready / yours
+ set lockown 40
+ } else {
+ # state (not battle ready) / not known to be yours
+ regsub {.$} $lockown 4 lockown
+ }
+ }
+ 3 { regsub {.$} $lockown {3} lockown }
+ 4 { set lockown 33 }
+ }
+
+ return [join [list $inport $class $subclass $lockown $xabbrev] _]
+}
+
+proc make-smasher {sma label ekind} {
+ return [make-control .smash $sma $label $ekind]
+}
+
+proc make-radio-smasher {sma label variable descs} {
+ set w [make-smasher $sma $label frame]
+ for {set i 0} {$i < [llength $descs]} {incr i} {
+ radiobutton $w.v$i \
+ -variable $variable -value $i -command redraw-needed \
+ -text [lindex $descs $i]
+ pack $w.v$i -side left
+ }
+}
+
#---------- filtering ----------
set filters {}
proc filter-says-yes/lockown {codel} {
set lockown [lindex $codel 3]
upvar #0 filter_lockown($lockown) yes
+ debug "FILTER-SAYS-YES/LOCKOWN $codel $lockown $yes"
return $yes
}
proc make-tickbox-filter {fil label rows inrow} {
upvar #0 filter_$fil vars
- set fw [make-filter tickbox $fil $label frame]
set values [filter-values/$fil]
- set nvalues [llength $values]
- if {!$inrow} {
- set inrow [expr {($nvalues + $rows) / $rows}]
- }
+ set count [llength $values]
set noicons [catch { info args filter-icon/$fil }]
- for {set ix 0} {$ix < $nvalues} {incr ix} {
+
+ set fw [make-filter $fil $label frame]
+ begin-control-grid $fw $count $rows $inrow
+
+ for {set ix 0} {$ix < $count} {incr ix} {
set val [lindex $values $ix]
set vars($val) [filter-default/$fil $val]
- checkbutton $fw.$ix -variable filter_${fil}($val) \
- -font fixed -command redraw-needed
+ set ew [make-control-grid-entry $fw ix $ix checkbutton \
+ -variable filter_${fil}($val) \
+ -font fixed \
+ -command [list redraw-needed tickbox-filter $fil $val]]
if {!$noicons} {
$fw.$ix configure -image [filter-icon/$fil $val] -height 16
} else {
$fw.$ix configure -text [filter-map/$fil $val]
}
- grid configure $fw.$ix -sticky sw \
- -row [expr {$ix / $inrow}] \
- -column [expr {$ix % $inrow}]
}
- button $fw.invert -text flip -command [list filter-tickbox-flip $fil] \
+ [make-control-grid-entry $fw final invert button] \
+ configure \
+ -text flip -command [list filter-tickbox-flip $fil] \
-padx 0 -pady 0
- grid configure $fw.invert -sticky se \
- -row [expr {$rows-1}] \
- -column [expr {$inrow-1}]
}
proc entry-filter-changed {fw fil n1 n2 op} {
global filterentered_$fil
upvar #0 filter_$fil realvar
set realvar $def
- set fw [make-filter entry $fil $label frame]
+ set fw [make-filter $fil $label frame]
entry $fw.entry -textvariable filterentered_$fil
label $fw.error
glset def_background [$fw.error cget -background]
pack $fw.entry $fw.error -side top -anchor w
}
-proc make-filter {kind fil label ekind} {
+proc make-filter {fil label ekind} {
global filters
- label .filter.lab_$fil -text $label -justify left
- $ekind .filter.$fil
lappend filters $fil
- set nfilters [llength $filters]
- grid configure .filter.lab_$fil -row $nfilters -column 0 -sticky nw -pady 4
- grid configure .filter.$fil -row $nfilters -column 1 -sticky w -pady 3
- return .filter.$fil
+ return [make-control .filter $fil $label $ekind]
}
proc make-filters {} {
proc filters-say-yes {code} {
global filters filterstyle
- debug "filters-say-yes $code"
set codel [split $code _]
set lockown [lindex $codel 3]
switch -exact $filterstyle {
}
foreach fil $filters {
- if {![filter-says-yes/$fil $codel]} { return 0 }
+ if {![filter-says-yes/$fil $codel]} {
+ debug "FILTERS-SAY-YES $code NO $fil"
+ return 0
+ }
}
+ debug "FILTERS-SAY-YES $code YES $filters"
return 1
}
set gameclass [errexpect-arrayget vi vesselClass]
upvar #0 vc_game2code($gameclass) class
- if {![info exists class]} { errexpect-error "unexpected vesselClass"}
+ if {![info exists class]} {
+ set class "($gameclass)"
+ upvar #0 vc_code2abbrev($class) vcabb
+ set vcabb vc-$class
+ set data [exec pbmtext -builtin fixed " $gameclass " \
+ | pnminvert | pnmcrop | pbmtoxbm]
+ debug "INVENTED ICON $vcabb $data"
+ image create bitmap icon/$vcabb -data $data
+
+ global vc_code2full
+ set vc_code2full($class) "Type \"$gameclass\""
+ }
lappend codel $class
- set subclass [errexpect-arrayget vi vesselSubclass]
- switch -exact $subclass {
- null { lappend codel {} }
- icy { lappend codel F }
- default { lappend codel ($subclass) }
+ 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]/[ \
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"
}
yppedia_chart_parse(\*STDIN, (new IO::File ">/dev/null"),
sub { sprintf "%d %d", @_; },
sub { printf "archlabel %d %d %s\n", @_; },
- sub { printf "island %s %s\n", @_; },
+ sub { printf "island %s {%s} %s\n", @_; },
sub { printf "league %s %s %s.\n", @_; },
sub { printf STDERR "warning: %s: incomprehensible: %s", @_; }
);
}
proc chart-got/archlabel {args} { }
-proc chart-got/island {x y args} {
-# debug "ISLE $x $y $args"
+proc chart-got/island {x y isle sizecol} {
+ debug "ISLE $x $y $isle $sizecol"
global canvas isleloc
- set isleloc($args) [list $x $y]
+ set isleloc($isle) [list $x $y]
set sz 5
# $canvas create oval \
# [expr {[coord $x] - $sz}] [expr {[coord $y] - $sz}] \
# [expr {[coord $x] + $sz}] [expr {[coord $y] + $sz}] \
# -fill blue
+ set colour "#888"
+ if {[string match *_col $sizecol]} { set colour black }
$canvas create text [coord $x] [coord $y] \
- -text $args -anchor s
+ -text $isle -anchor s -fill $colour
}
proc chart-got/league {x1 y1 x2 y2 kind} {
# debug "LEAGUE $x1 $y1 $x2 $y2 $kind"
}
}
-proc redraw-needed {} {
+proc debug-filter-array {array} {
+ upvar #0 $array a
+ set m " FILTER $array"
+ foreach k [lsort [array names a]] {
+ append m " $k=$a($k)"
+ }
+ debug $m
+}
+
+proc redraw-needed {args} {
global redraw_after
- debug "REDRAW NEEDED"
+ debug "REDRAW NEEDED $args"
if {[info exists redraw_after]} return
+
+ global filterstyle
+ debug " FILTER style $filterstyle"
+ debug-filter-array filter_size
+ debug-filter-array filter_lockown
+ global filter_xabbre
+ debug " FILTER xabbre $filter_xabbre"
+
set redraw_after [after 250 draw]
}
proc draw {} {
- global chart found isleloc canvas redraw_after islandnames
+ global chart found isleloc canvas redraw_after islandnames smfound
catch { after cancel $redraw_after }
catch { unset redraw_after }
eval chart-got/$proc [lrange $l 1 end]
}
- set islandnames {}
- set lastislandname {}
+ catch { unset smfound }
foreach key [lsort [array names found]] {
- set c [llength $found($key)]
-# debug "SHOWING $key $c"
regexp {^(.*) (\S+)$} $key dummy islandname code
if {![filters-say-yes $code]} continue
+ set smcode [smash-code $code]
+ debug "smashed $code => $smcode"
+ set smkey "$islandname $smcode"
+ foreach vessel $found($key) { lappend smfound($smkey) $vessel }
+ }
+
+ set islandnames {}
+ set lastislandname {}
+ foreach smkey [lsort [array names smfound]] {
+ set c [llength $smfound($smkey)]
+ regexp {^(.*) (\S+)$} $smkey dummy islandname code
+ debug "SHOWING [list $smkey $c $islandname $code l=$lastislandname]"
+
if {[string compare $lastislandname $islandname]} {
manyset $isleloc($islandname) x y
set x [coord $x]
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
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] \
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} {
#----- control panels and filter -----
frame .cp
+ frame .smash -relief groove -bd 2 -padx 1
frame .filter -relief groove -bd 2 -padx 1
frame .islands -pady 2
- pack .cp .filter .islands -side top
+ pack .cp .filter .islands .smash -side top
+
+ label .smash.title -text Smash
+ grid .smash.title -row 0 -column 0 -columnspan 2
+
+ make-radio-smasher subclass Subclass smash_subclass \
+ {Show Normal/LE Hide}
+
+ make-radio-smasher owner Owner smash_owner \
+ {Show Yours? You Lock Hide}
set filterstyle 1
trace add variable filterstyle write filterstyle-changed
show-report-decode $code
set kk "$islandname $code"
- upvar #0 found($kk) k
+ upvar #0 smfound($kk) k
.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"
+ }
}
}
#---------- main program ----------
parseargs
-vesselclasses-init
argdefaults
httpclientsetup where-vessels
+info-cache-update
+vesselclasses-init
load-chart
widgets-setup
make-filters
after idle invoke_notes
draw
+
+# rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff