Auto-update improvements

Author: jhenin

vmd/cv_dashboard/VERSION

@@ -1 +1 @@
-2025-05-20
+2025-05-24

vmd/cv_dashboard/cv_dashboard.tcl

@@ -26,12 +26,8 @@
 # - index group builder
 
 set dir [file dirname [info script]]
-set version_file [open "${dir}/VERSION"]
-gets $version_file git_date
-close $version_file
-# Convert to Tcl-style package version number
-set CV_DASHBOARD_VERSION [string map { "-" "." } $git_date]
-package provide cv_dashboard $CV_DASHBOARD_VERSION
+set VERSION [::cv_dashboard::read_version $dir]
+package provide cv_dashboard $VERSION
 
 namespace eval ::cv_dashboard {
   # General UI state
@@ -90,12 +86,6 @@ namespace eval ::cv_dashboard {
   # Array keping track of precomputed colvars trajectories for a given molecule
   # This is an array of dict, where the dictionary keys are colvar names
   array set colvar_trajectory {}
-
-  # Information for self-update
-  variable version $CV_DASHBOARD_VERSION
-  variable repo_user "Colvars"
-  variable repo_name "colvars"
-  variable branch "dashboard_update"
 }
 
 set script_dir [file dirname [info script]]

vmd/cv_dashboard/cv_dashboard_update.tcl

@@ -1,7 +1,11 @@
 ####################################
 # Self-update utilities
 
-namespace eval ::cv_dashboard {}
+namespace eval ::cv_dashboard {
+  variable repo_user "Colvars"
+  variable repo_name "colvars"
+  variable branch "dashboard_update"
+}
 
 proc ::cv_dashboard::check_version_file {} {
   variable version
@@ -19,7 +23,7 @@ proc ::cv_dashboard::check_version_file {} {
   }
 
   set fp [open $temp_file r]
-  set remote_version [string trim [read $fp]]
+  set remote_version [string map { "-" "." } [string trim [read $fp]]]
   close $fp
   file delete $temp_file
 
@@ -29,8 +33,8 @@ proc ::cv_dashboard::check_version_file {} {
 
 proc ::cv_dashboard::compare_versions {current latest} {
   # Versioned by date: e.g. 2025-05-21
-  set current_parts [split $current "-"]
-  set latest_parts [split $latest "-"]
+  set current_parts [split $current "."]
+  set latest_parts [split $latest "."]
 
   # Pad with zeros if needed
   while {[llength $current_parts] < 3} {lappend current_parts 0}
@@ -180,7 +184,6 @@ proc ::cv_dashboard::self_update {{force false}} {
     download_directory_smart $repo_user $repo_name "vmd/cv_dashboard" $branch $temp_dir
 
     # Replace current installation
-    puts "Installing update..."
     file delete -force $package_dir
     file rename $temp_dir $package_dir
 
@@ -245,23 +248,10 @@ proc ::cv_dashboard::cleanup_backups { package_dir {keep 2}} {
   }
 }
 
-proc ::cv_dashboard::load_newer_version {} {
-
-  # Try to load updated local version
-  set package_dir [get_local_dir]
-  if {[file exists $package_dir]} {
-    # Compare versions
-    set version_file [open [file join $package_dir "cv_dashboard" VERSION]]
-    gets $version_file LOCAL_VERSION
-    close $version_file
-    if { [string compare $LOCAL_VERSION $::cv_dashboard::version] > 0 } {
-      puts "Superseding current version ($::cv_dashboard::version) with local installation of cv_dashboard from $package_dir ($LOCAL_VERSION)"
-      package forget cv_dashboard
-      namespace delete ::cv_dashboard
-      source [file join $package_dir "cv_dashboard" pkgIndex.tcl]
-      package require cv_dashboard
-      return true
-    }
-  }
-  return false
+proc ::cv_dashboard::read_version { path } {
+  set version_file [open [file join $path VERSION]]
+  gets $version_file git_date
+  set version [string map { "-" "." } $git_date]
+  close $version_file
+  return $version
 }

vmd/cv_dashboard/pkgIndex.tcl

@@ -11,43 +11,34 @@
 
 proc init {} {
   set dir [file dirname [info script]]
-  set version_file [open "${dir}/VERSION"]
-  gets $version_file git_date
-  close $version_file
-  # Convert to Tcl-style package version number
-  set CV_DASHBOARD_VERSION [string map { "-" "." } $git_date]
+  source [file join $dir cv_dashboard_update.tcl]
+  set VERSION [::cv_dashboard::read_version $dir]
+  set ::cv_dashboard::version $VERSION
 
   # Compare with version with local package
-  source [file join $dir cv_dashboard_update.tcl]
-  set package_dir [::cv_dashboard::get_local_dir]
+  set local_dir [file join [::cv_dashboard::get_local_dir] "cv_dashboard"]
 
-  if { $package_dir ne $dir && [file exists $package_dir]} {
+  if { $local_dir ne [file dirname $dir] && [file exists $local_dir]} {
+    # There is a local package separate from this instance
     # Compare versions
-    set version_file [open [file join $package_dir "cv_dashboard" VERSION]]
-    gets $version_file git_date
-    close $version_file
-    set LOCAL_VERSION [string map { "-" "." } $git_date]
-
-    if { [string compare $LOCAL_VERSION $CV_DASHBOARD_VERSION] > 0 } {
-      puts "Overriding current version ($CV_DASHBOARD_VERSION) with local installation of cv_dashboard from $package_dir ($LOCAL_VERSION)"
-      source [file join $package_dir "cv_dashboard" pkgIndex.tcl]
+    set LOCAL_VERSION [::cv_dashboard::read_version $local_dir]
+
+    if { [string compare $LOCAL_VERSION $VERSION] > 0 } {
+      puts "Overriding current version ($VERSION) with local installation of cv_dashboard from $local_dir ($LOCAL_VERSION)"
+      source [file join $local_dir pkgIndex.tcl]
       return
     }
   }
 
-  # Only update local install
-  if { $package_dir eq $dir } {
-    set updated [::cv_dashboard::self_update]
-
-    if $updated {
-      # Source ourselves! Hoping this doesn't loop
-      source [file join $package_dir "cv_dashboard" pkgIndex.tcl]
-      return
-    }
+  # Now try to update local package from remote repository
+  if [::cv_dashboard::self_update] {
+    # Reload if necessary
+    source [file join $local_dir pkgIndex.tcl]
+    return
   }
 
-  # Finish initializing package
-  package ifneeded cv_dashboard $CV_DASHBOARD_VERSION "set env(CV_DASHBOARD_DIR) [list $dir]; [list source [file join $dir cv_dashboard.tcl]]"
+  # Finish initializing this version
+  package ifneeded cv_dashboard $VERSION "set env(CV_DASHBOARD_DIR) [list $dir]; [list source [file join $dir cv_dashboard.tcl]]"
 }
 
 init