cope with unknown vessels by turning them unto zz vcunk

[ypp-sc-tools.main.git] / yarrg / where-vessels

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 272a11432b37f6c6d7169f773b89a621790e7326..5af2dfaf41129847defe886d547725d1b6677726 100755 (executable)
--- 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" }
        }
@@ -246,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
@@ -270,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} {
@@ -377,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 {
@@ -576,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]/[ \
@@ -1154,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