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" }
}
#---------- vessel properties ----------
-set vessel_class_info {
- smsloop am sl Sloop
- lgsloop bm ct Cutter
- dhow cm dh Dhow
- longship dm ls Longship
- baghlah em bg Baghlah
- junk eo jk Junk
- 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}
-}
-
-set vessel_subclass_info {
- celtic E {Emerald class}
- icy F {Frost class}
- rogue R {Rogue class}
- verdant V {Verdant class}
- inferno I {Inferno class}
+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
- global vessel_class_info vessel_subclass_info
+
+ global vessel_class_data
+ manyset $vessel_class_data classinfos subclassinfos
+
set vc_codes {}
- foreach {game code abbrev full} $vessel_class_info {
+ 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
global vsc_game2code
set vsc_game2code(null) {}
set vsc_code2report() Ordinary
- foreach {game code full} $vessel_subclass_info {
+ 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
}
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"
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 \
}
}
+#---------- smashing ----------
+
+set smash_subclass 0
+
+proc smash-code {code} {
+ manyset [split $code _] inport class subclass lockown xabbrev
+
+ global smash_subclass
+ if {$smash_subclass && [string length $subclass]} {
+ set subclass !
+ }
+
+ return [join [list $inport $class $subclass $lockown $xabbrev] _]
+}
+
#---------- filtering ----------
set filters {}
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 gamesubclass [errexpect-arrayget vi vesselSubclass]
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 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
+ 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)]
+# debug "SHOWING $smkey $c"
+ regexp {^(.*) (\S+)$} $smkey dummy islandname code
if {![filters-say-yes $code]} continue
#----- 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 .smash .filter .islands -side top
+
+ label .smash.title -text Smash
+ pack .smash.title -side left
+
+ checkbutton .smash.subclass -text Subclass \
+ -variable smash_subclass -command redraw-needed
+ pack .smash.subclass -side left
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
#---------- 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/.