Merge pull request #61 from intersystems-community/stage

fix show description and install not latest version with proxy

Author: nsolov

src/cls/ZPM/Package.cls

@@ -488,15 +488,6 @@ ClassMethod LoadFromGitHub(Url = "")
   do ##class(%File).RemoveDirectoryTree(outputFolder)
 }
 
-ClassMethod GetTopVersion(pkg As %String) As %String
-{
-  Set version = ""
-  &sql(SELECT TOP 1 version INTO :version FROM ZPM.Package 
-        WHERE name = :pkg
-        ORDER BY versionMajor DESC, versionMinor DESC, versionPatch DESC, versionPrerelease DESC, versionBuildmetadata DESC ) 
-  Return version
-}
-
 /// returns latest versions of packages 
 ClassMethod GetLatest(searchTerms As %DynamicArray = "", Output pStatus As %Status) As %DynamicArray
 {
@@ -521,11 +512,12 @@ ClassMethod GetLatest(searchTerms As %DynamicArray = "", Output pStatus As %Stat
     }
     Set searchCondition = searchCondition_ " ) "
   }
-  Set sql = "SELECT name, repository, description "_
-            "FROM ZPM.Package p1 "_
-            "WHERE "_ searchCondition _
-            "GROUP BY name "_
-            "ORDER BY name"
+  set sql = "SELECT name, repository, description, "_
+              " ( SELECT TOP 1 version FROM ZPM.Package p2 WHERE p1.name=p2.name ORDER BY versionMajor DESC, versionMinor DESC, versionPatch DESC, versionPrerelease DESC, versionBuildmetadata DESC ) version " _ 
+            "  FROM ZPM.Package p1 "_
+            "  WHERE "_searchCondition_" "_
+            "  GROUP BY name ORDER BY name"
+
   Set tStatement = ##class(%SQL.Statement).%New()
   Set tStatus = tStatement.%Prepare(sql)
   If ($$$ISERR(tStatus)) { 
@@ -541,9 +533,9 @@ ClassMethod GetLatest(searchTerms As %DynamicArray = "", Output pStatus As %Stat
   While tResult.%Next() {
     Set tPkgInfo = {
       "name": (tResult.name),
-      "description": (tResult.Description),
+      "description": (tResult.description),
       "repository": (tResult.repository),
-      "versions": [(..GetTopVersion(tResult.name))]
+      "versions": [(tResult.version)]
     }
     do tList.%Push(tPkgInfo)
   }

src/cls/ZPM/Registry.cls

@@ -93,6 +93,11 @@ ClassMethod Reset() As %Status
 ClassMethod Package(pkg As %String = "", version As %String = "") As %Status
 {
   Set pkg = $$$lcase(pkg)
+
+  If (version="") {
+    $$$ThrowOnError(##class(ZPM.UpLink).FindPackageInAllUpLinks(pkg))
+  }
+
   Set version = ##class(ZPM.Package).VersionFind(pkg, version)
   If (version = "") {
     Return ..ReportHttpStatusCode(..#HTTP404NOTFOUND)

src/cls/ZPM/UpLink.cls

@@ -101,11 +101,49 @@ Method UpdatePackagesFromOneUpLink() As %Status
         While iter.%GetNext(.key , .package ) {
             Do ..AddPackage(package)
         }
-    } Catch { 
-        Return 0 
+    } Catch ex {
+        Do ex.Log() 
+        Return ex.AsStatus()
+    }
+}
+
+Method FindPackageInOneUpLink(pkg As %String)
+{
+    If ('..MatchAllowlist(pkg)) { 
+        Return $$$ERROR($$$GeneralError, "invalid package name "_pkg) 
+    }
+    Set httprequest = ..GetHttpRequest()
+    Set searchStr = "packages/"_pkg
+    Set tSC = httprequest.Get(..Location_searchStr)
+    If ($$$ISERR(tSC)) { Return tSC }
+    Try {
+        Set package = {}.%FromJSON(httprequest.HttpResponse.Data)
+        Set iter = package.versions.%GetIterator()
+        While iter.%GetNext(.key , .version ) {
+            set tPackage = {"name":(package.name), "description":"", "repository":(package.repository), "versions":[(version)]}
+            Do ..AddPackage(tPackage)
+        }
+    } Catch ex {
+        Do ex.Log()
+        Return ex.AsStatus()
     }
 }
 
+ClassMethod FindPackageInAllUpLinks(pkg As %String) As %Status
+{
+    Do ..ReadUplinksFromFile()
+    Set sql = "SELECT ID FROM ZPM.UpLink WHERE Active = 1 ORDER BY Position"
+    Set statement = ##class(%SQL.Statement).%New()
+    Set tSC = statement.%Prepare(sql)
+    If $$$ISERR(tSC) { Return tSC }
+    Set resultset=statement.%Execute()
+    While resultset.%Next() {
+        Set uplink = ..%OpenId(resultset.ID)
+        Do uplink.FindPackageInOneUpLink(pkg)
+    } 
+    Return $$$OK
+}
+
 ClassMethod LoadPackageFromAllUpLinks(pkg As %String = "", version As %String = "") As ZPM.Package
 {
     Do ..ReadUplinksFromFile()
@@ -145,6 +183,7 @@ Method LoadPackageFromOneUpLink(pPackage As ZPM.Package, pkg As %String = "", ve
         $$$ThrowOnError(..LoadPackage(pPackage, pkg, version))
         $$$ThrowOnError(..LoadInstaller(pPackage, pkg, version))
     } Catch ex {
+        do ex.Log()
         Return ex.AsStatus()
     }
     Return $$$OK
@@ -314,6 +353,7 @@ ClassMethod ReadUplinksFromFile() As %Status
             }
         }
     } Catch ex {
+        do ex.Log()
         Set sc = ex.AsStatus()
     }
     Return sc
@@ -366,7 +406,11 @@ ClassMethod AddUplink(name, url, allowList, position) As %Status
     If $Data(tComponents("port"), port), port'="" {
         Set tUplink.Port = port
     }
-    Set tUplink.Location = tComponents("path")
+    Set tPath = tComponents("path")
+    If ($EXTRACT(tPath,*) = "/") {
+        Set tPath = $EXTRACT(tPath,1,*-1)
+    }
+    Set tUplink.Location = tPath
     If $Get(tComponents("scheme"))="https" {
         Set tUplink.SSL = 1
     }

zpm-registry.yaml

@@ -1,4 +1,4 @@
 uplinks:
   pm:
     url: https://pm.community.intersystems.com/
-    allow_packages: zpm* 
+    allow_packages: zpm*,?u*