where-vessels: More improvements to lack-of-ownership handling

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

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 4e6a2250388cc8f53a015bb36bd54945f2a15678..78342db3076a63e490a13c0a050bc6e6e687c47c 100755 (executable)
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -101,10 +101,11 @@ proc nextarg {} {
     return $v
 }
 
-set notes_loc vessel-notes
+set notes_loc {}
 set scraper {./yppedia-ocean-scraper --chart}
 set info_cache _vessel-info-cache
 set info_source rsync.yarrg.chiark.net::yarrg/vessel-info
+set filter_lockown_separate 0
 
 proc parseargs {} {
     global ai argv
@@ -121,6 +122,7 @@ proc parseargs {} {
            --local-html-dir { lappend scraper --local-html-dir=[nextarg] }
            --notes { glset notes_loc [nextarg] }
            --vessel-info-source { glset info_source [nextarg] }
+           --filter-separate-lock-owner { glset filter_lockown_separate 1 }
            --debug { incr debug }
            default { badusage "unknown option $arg" }
        }
@@ -129,9 +131,15 @@ proc parseargs {} {
     if {[llength $argv]} { badusage "non-option args not allowed" }
 }
 
+proc have-notes {} {
+    global notes_loc
+    return [string length $notes_loc]
+}
+
 proc argdefaults {} {
     global ocean notes_loc pirate scraper
-    if {![info exists ocean] || ![info exists pirate]} {
+    if {![info exists ocean] ||
+        (![info exists pirate] && [string length $notes_loc])} {
        set cmd {./yarrg --find-window-only --quiet}
        if {[info exists ocean]} { lappend cmd --ocean $ocean }
        if {[info exists pirate]} { lappend cmd --pirate $pirate }
@@ -140,6 +148,14 @@ proc argdefaults {} {
            error "$ocean $pirate ?"
        }
     }
+    if {![info exists pirate]} {
+       set pirate {}
+       glset filter_lockown_separate 1
+    }
+    if {![have-notes]} {
+       glset filter_lockown_separate 1
+    }
+
     lappend scraper $ocean
 }
 
@@ -440,17 +456,20 @@ proc show-report-decode {code} {
        {(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" }
+    if {[have-notes]} {
+       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" }
+       }
     }
 
     global smash_xabbrev_map
-    if {[llength $smash_xabbrev_map]} {
+    if {![have-notes]} {
+    } elseif {[llength $smash_xabbrev_map]} {
        if {[string length $xabbrev]} {
            report-set xabbrev "(Flags: $xabbrev)"
        } else {
@@ -552,9 +571,6 @@ proc populate-control-grid-tickboxes {cw rows inrow varsvn values flipvalues
 
 #---------- smashing ----------
 
-set smash_subclass 0
-set smash_owner 0
-
 proc smash-code {code} {
     manyset [split $code _] inport size subclass lockown xabbrev
 
@@ -638,9 +654,11 @@ proc make-smashers {} {
        image val { expr 0 } { expr {"icon/$vc_code2abbrev($val)"} }
     $cw.0 configure -state disabled
 
+    glset smash_subclass 0
     make-radio-smasher subclass Class smash_subclass \
        {Show Normal/LE Hide} 1 0
 
+    glset smash_owner [expr {[have-notes] ? 0 : 3}]
     make-radio-smasher owner Owner smash_owner \
        {Show Yours? {For you} Lock Hide} 2 3
 
@@ -673,6 +691,26 @@ proc filter-says-yes/size {codel} {
     return $yes
 }
 
+proc filter-values/lock {} { return {0 1 2} }
+proc filter-icon/lock {lock} { return [code-lockown2icon ${lock}3] }
+proc filter-default/lock {lock} { return 1 }
+proc filter-says-yes/lock {codel} {
+    regexp {^.} [lindex $codel 3] lock
+    upvar #0 filter_lock($lock) yes
+    debug "FILTER-SAYS-YES/LOCK $codel $lock $yes"
+    return $yes
+}
+
+proc filter-values/own {} { return {0 1 2} }
+proc filter-icon/own {own} { return [code-lockown2icon 3${own}] }
+proc filter-default/own {own} { return 1 }
+proc filter-says-yes/own {codel} {
+    regexp {.$} [lindex $codel 3] own
+    upvar #0 filter_own($own) yes
+    debug "FILTER-SAYS-YES/OWN $codel $own $yes"
+    return $yes
+}
+
 proc filter-values/lockown {} {
     foreach lv {0 1 2} {
        foreach ov {0 1 2} {
@@ -766,8 +804,16 @@ proc make-filter {fil label ekind} {
 }
 
 proc make-filters {} {
+    global filter_lockown_separate
     make-tickbox-filter size Size 2 0
-    make-tickbox-filter lockown "Lock/\nowner" 2 6
+    if {!$filter_lockown_separate} {
+       make-tickbox-filter lockown "Lock/\nowner" 2 6
+    } else {
+       make-tickbox-filter lock "Lock" 1 0
+       if {[have-notes]} {
+           make-tickbox-filter own "Owner" 1 0
+       }
+    }
     make-entry-filter xabbre "Flags\n regexp" {}
 }
 
@@ -1249,7 +1295,11 @@ proc widgets-setup {} {
     global canvas debug pirate ocean filterstyle
 
     wm geometry . 1200x800
-    wm title . "where-vessels - $pirate on the $ocean ocean"
+    if {[string length $pirate]} {
+       wm title . "where-vessels - $pirate on the $ocean ocean"
+    } else {
+       wm title . "where-vessels - $ocean ocean"
+    }
 
     #----- map -----
 
@@ -1314,9 +1364,13 @@ proc widgets-setup {} {
     parser-control-create .cp.ctrl.notes \
        notes "Reload notes" \
        "Vessel notes loading report" \
-       
+
     pack .cp.ctrl.notes -side top -pady 2
 
+    if {![have-notes]} {
+       .cp.ctrl.notes.do configure -state disabled
+    }  
+       
     #----- island name count and copy -----
 
     label .islands.count
@@ -1385,7 +1439,9 @@ proc show-report {islandname code} {
        } else {
            set owndesc "Owner unknown"
        }
-       .cp.report.list insert end "$owndesc:"
+       if {[have-notes]} {
+           .cp.report.list insert end "$owndesc:"
+       }
        foreach name $owned($owner) {
            .cp.report.list insert end " $name"
        }
@@ -1464,7 +1520,9 @@ if {[catch { parse-clipboard } emsg]} {
     puts stderr "$emsg\n$errorInfo"
     exit 1
 }
-after idle invoke_notes
+if {[have-notes]} {
+    after idle invoke_notes
+}
 
 draw
 
@@ -1475,4 +1533,10 @@ if {$debug} {
        -prompt2 { return "> " }
 }
 
-# rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.
+# some runes I use:
+#
+# offline development
+#   ./where-vessels --notes ~/vessel-notes --vessel-info-source '' --pirate Aristarchus --ocean Midnight --debug --local-html-dir . --clipboard-file ~/clipboard-aristarchus
+#
+# updating published vessel info
+#   rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.