Check-in [a66bd4a075]
Not logged in
Overview
Comment:Continue fleshing out the 'extractVersionsFromFile' procedure.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | pending
Files: files | file ages | folders
SHA1: a66bd4a0752c132ca517b53cf9388112a98614ec
User & Date: mistachkin on 2020-03-26 01:04:23
Other Links: branch diff | manifest | tags
Context
2020-03-26
14:52
Add comments. check-in: cf6edd5132 user: mistachkin tags: pending
01:04
Continue fleshing out the 'extractVersionsFromFile' procedure. check-in: a66bd4a075 user: mistachkin tags: pending
2020-03-25
22:25
Yet more work-in-progress on 'package ifneeded' version extraction. check-in: 8485e855f4 user: mistachkin tags: pending
Changes

Modified client/1.0/neutral/pkgd.eagle from [9467330148] to [2ae07ec8f6].

1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596















1597
1598
1599
1600
1601
1602
1603
1604

  #
  # NOTE: TBD
  #
  proc getIfNeededVersions { interp fileName } {
    set result [list]

    set oldPackages [interp eval $interp [list package names]]
    interp invokehidden $interp source $fileName
    set newPackages [interp eval $interp [list package names]]

    foreach package $newPackages {
      if {[lsearch -exact $oldPackages $package] == -1} then {
        lappend result [list $package [lsort -decreasing \
            -command [list package vcompare] [interp eval \
            $interp [list package versions $package]]]]
      }
    }

    return $result
  }

  #
  # NOTE: This procedure attempts to extract a package version information
  #       from the specified file.  The fileName argument is the local file
  #       name to read.  This procedure may raise script errors.
  #
  proc extractVersionFromFile { fileName } {
    switch -exact -- [file tail $fileName] {
      VERSION {
        return [string trim [readFile $fileName]]
      }
      pkgIndex.eagle -
      pkgIndex.tcl {
        #
        # TODO: Evaluate the package index file in a new "safe"
        #       interpreter and obtain the newly added [package
        #       ifneeded] version(s)?
        #















        return ""
      }
    }
  }

  #
  # NOTE: This procedure checks if there is a higher version available of the
  #       specified package on the package file server.  The language argument







|
|
|

|
|
|

|











|


|








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|







1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619

  #
  # NOTE: TBD
  #
  proc getIfNeededVersions { interp fileName } {
    set result [list]

    set oldPackageNames [interp eval $interp [list package names]]
    interp invokehidden $interp source $fileName; # [package ifneeded], etc.
    set newPackageNames [interp eval $interp [list package names]]

    foreach packageName $newPackageNames {
      if {[lsearch -exact $oldPackageNames $packageName] == -1} then {
        lappend result [list $packageName [lsort -decreasing \
            -command [list package vcompare] [interp eval \
            $interp [list package versions $packageName]]]]
      }
    }

    return $result
  }

  #
  # NOTE: This procedure attempts to extract a package version information
  #       from the specified file.  The fileName argument is the local file
  #       name to read.  This procedure may raise script errors.
  #
  proc extractVersionsFromFile { fileName } {
    switch -exact -- [file tail $fileName] {
      VERSION {
        return [list [string trim [readFile $fileName]]]
      }
      pkgIndex.eagle -
      pkgIndex.tcl {
        #
        # TODO: Evaluate the package index file in a new "safe"
        #       interpreter and obtain the newly added [package
        #       ifneeded] version(s)?
        #
        if {[catch {createInterp interp} error] == 0} then {
          set result [getIfNeededVersions $interp $fileName]
        } else {
          pkgLog [appendArgs \
              "could not create interp to extract versions: " \
              $error]

          set result [list]
        }

        if {[info exists interp]} then {
          catch {interp delete $interp}
          unset interp; # REDUNDANT
        }

        return $result
      }
    }
  }

  #
  # NOTE: This procedure checks if there is a higher version available of the
  #       specified package on the package file server.  The language argument
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
              [appendArgs $fileName .asc] \
              [appendArgs $downloadFileName .asc] $usePgp
        }

        set localFileName [file join $persistentDirectory $fileName]

        set compare [package vcompare \
            [extractVersionFromFile $downloadFileName] \
            [extractVersionFromFile $localFileName]]

        if {[isEagle]} then {
          file delete -recursive -- $temporaryDirectory
        } else {
          file delete -force -- $temporaryDirectory
        }








|
|







1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
              [appendArgs $fileName .asc] \
              [appendArgs $downloadFileName .asc] $usePgp
        }

        set localFileName [file join $persistentDirectory $fileName]

        set compare [package vcompare \
            [lindex [extractVersionsFromFile $downloadFileName] 0] \
            [lindex [extractVersionsFromFile $localFileName] 0]]

        if {[isEagle]} then {
          file delete -recursive -- $temporaryDirectory
        } else {
          file delete -force -- $temporaryDirectory
        }