Changeset 95edff5 in tol

Timestamp:

Jul 8, 2010, 5:14:29 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

cd9c096

Parents:

c13253c

Message:

Refs #916
Nuevo método TolPackage::Client::InstallFromUrl para instalación manual mediante llamada al étodo interno Static TolPackage::Client::@Repository::DownloadPackageFromUrl

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2385 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/stdlib/general/TolPackage

Files:

• client.tol (modified) (1 diff)
• repository.tol (modified) (1 diff)

tol/stdlib/general/TolPackage/client.tol

@@ -66 +66 @@
   @Repository r = @Repository::Get(repository, True);
   r::Exist(package.version)
+};
+
+//////////////////////////////////////////////////////////////////////////////
+Text _.autodoc.member.InstallFromUrl = 
+"Instala desde una URL arbitraria un paquete determinado para que esté "
+"disponible llamando a #Require. \n"
+"La URL puede ser en realidad un directorio local para "
+"facilitar proceso de instalación cerrada. Para ello la URL comenzará por "
+"file:// seguido del path local donde se ubica el repositorio.\n"
+"Si la URL empieza por http:// https:// ftp:// o cualquier otro protocolo"
+"reconocible por el sistema operativo se realizará la correspondiente "
+"descarga remota. \n";
+//////////////////////////////////////////////////////////////////////////////
+Real InstallFromUrl(Text url, Text package.version)
+//////////////////////////////////////////////////////////////////////////////
+{
+  Text pack = package.version+".zip";
+  @Repository::DownloadPackageFromUrl(url,package.version)
 };
 

tol/stdlib/general/TolPackage/repository.tol

@@ -191 +191 @@
 //////////////////////////////////////////////////////////////////////////////
 //Copia un fichero del repositorio remoto al directorio local de paquetes
+  Static Real DownloadPackageFromUrl(Text url, Text packageName)
+//////////////////////////////////////////////////////////////////////////////
+{
+  Real prtPos = TextFind(url,"://")+2;
+  Text protocol = Sub(url,1,prtPos);
+  //Resto de la URL tras el protocolo
+  Real isRemote =  protocol!="file://";
+
+  Text pack = packageName+".zip";
+  Text oza = packageName+"/"+packageName+".oza";
+  Text localPack = TolPackage::Client::_.localRoot+pack;
+  Text localOza = TolPackage::Client::_.localRoot+oza;
+  Text localDir = TolPackage::Client::_.localRoot+packageName;
+  
+  If(FileExist(localPack), OSFilRemove(localPack));
+//WriteLn("TRACE DownloadPackage localPack="<<localPack);
+  If(!isRemote,
+  {
+    Text address =  Sub(url,prtPos+1,TextLength(url));
+  //WriteLn("TRACE DownloadPackage  cp \""+_.address+@Repository::_.platform+"/"+pack+"\" \""+localPack+"\"");
+    OSFilCopy(address+"/"+pack,localPack)
+  },
+  {
+    Set CurlApi::GetUrl([[
+      Text url  = url+"/"+pack, 
+      Text file = localPack ]]) 
+  });
+  If(!FileExist(localPack), False,
+  {
+  //WriteLn("TRACE DownloadPackage UnpackFull("<<localDir+")");
+    Real PackArchive::UnpackFull("ZipArchive", localDir);
+    OSFilRemove(localPack);
+    True
+  });
+  FileExist(localOza)
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//Copia un fichero del repositorio remoto al directorio local de paquetes
   Real DownloadPackage(Text packageName)
 //////////////////////////////////////////////////////////////////////////////