X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjsch%2FScpTo.java;h=5da5f79e7ba2511ee774f8e4b62498d17fb65b4e;hb=0e203ff53b8339d966c24687fe335bbbb7192641;hp=484cd6dc3c9c37dccec2c242db3d350a93568005;hpb=fd1492b7ed1ff9bca6fe2a04c420346288024e4e;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpTo.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpTo.java index 484cd6dc3..5da5f79e7 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpTo.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpTo.java @@ -1,18 +1,21 @@ package org.argeo.slc.jsch; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; +import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; @@ -54,30 +57,7 @@ public class ScpTo extends AbstractJschTask { } if (localResource != null) { - try { - File lFile = localResource.getFile(); - uploadFile(session, lFile, remotePath); - } catch (IOException e) { - OutputStream out = null; - InputStream in = null; - File tempFile = null; - try { - tempFile = File.createTempFile(getClass().getSimpleName() - + "-" + localResource.getFilename(), null); - out = FileUtils.openOutputStream(tempFile); - in = localResource.getInputStream(); - IOUtils.copy(in, out); - uploadFile(session, tempFile, remotePath); - } catch (IOException e1) { - throw new SlcException("Can neither interpret resource " - + localResource - + " as file, nor create a temporary file", e1); - } finally { - IOUtils.closeQuietly(in); - IOUtils.closeQuietly(out); - FileUtils.deleteQuietly(tempFile); - } - } + uploadResource(session, localResource); } } @@ -127,8 +107,56 @@ public class ScpTo extends AbstractJschTask { return false; } - protected void uploadFile(Session session, File localFile, String remoteFile) { - InputStream in = null; + protected void uploadFile(Session session, File file, String remoteFile) { + try { + upload(session, new FileInputStream(file), file.length(), file + .getPath(), file.toString(), remoteFile); + } catch (FileNotFoundException e) { + throw new SlcException("Cannot upload " + file, e); + } + } + + protected void uploadResource(Session session, Resource resource) { + String targetPath = remotePath != null ? remotePath : remoteDir + '/' + + resource.getFilename(); + try { + File lFile = resource.getFile(); + uploadFile(session, lFile, targetPath); + } catch (IOException e) { + // no underlying file found + // load the resource in memory before transferring it + InputStream in = null; + try { + byte[] arr; + String path; + if (resource instanceof ByteArrayResource) { + arr = ((ByteArrayResource) resource).getByteArray(); + path = "bytearray"; + } else { + in = resource.getInputStream(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + IOUtils.copy(in, out); + arr = out.toByteArray(); + path = resource.getURL().getPath(); + if (path.startsWith("/")) + path = path.substring(1); + } + ByteArrayInputStream content = new ByteArrayInputStream(arr); + upload(session, content, arr.length, path, resource.toString(), + targetPath); + arr = null; + } catch (IOException e1) { + throw new SlcException("Can not interpret resource " + + localResource, e1); + } finally { + IOUtils.closeQuietly(in); + // no need to close byte arrays streams + } + } + } + + protected void upload(Session session, InputStream in, long size, + String path, String sourceDesc, String remoteFile) { OutputStream channelOut; InputStream channelIn; try { @@ -147,13 +175,13 @@ public class ScpTo extends AbstractJschTask { // send "C0644 filesize filename", where filename should not include // '/' - long filesize = localFile.length(); + long filesize = size; command = "C0644 " + filesize + " "; - int index = localFile.getPath().lastIndexOf('/'); + int index = path.lastIndexOf('/'); if (index > 0) { - command += localFile.getPath().substring(index + 1); + command += path.substring(index + 1); } else { - command += localFile.getPath(); + command += path; } command += "\n"; @@ -161,25 +189,27 @@ public class ScpTo extends AbstractJschTask { channelOut.flush(); checkAck(channelIn); - if (log.isDebugEnabled()) - log.debug("Start copy of " + localFile + " to " + remoteFile + if (log.isTraceEnabled()) + log.debug("Start copy of " + sourceDesc + " to " + remoteFile + " on " + getSshTarget() + "..."); final long oneMB = 1024l;// in KB final long tenMB = 10 * oneMB;// in KB // send a content of lfile - in = new FileInputStream(localFile); byte[] buf = new byte[1024]; long cycleCount = 0; + long nbrOfBytes = 0; while (true) { int len = in.read(buf, 0, buf.length); if (len <= 0) break; channelOut.write(buf, 0, len); // out.flush(); - if ((cycleCount % oneMB) == 0)// each 1 MB + nbrOfBytes = nbrOfBytes + len; + if (((cycleCount % oneMB) == 0) && cycleCount != 0)// each 1 MB System.out.print('#'); - if ((cycleCount % (tenMB)) == 0)// each 10 MB + if (((cycleCount % (tenMB)) == 0) && cycleCount != 0)// each 10 + // MB System.out.print(" - " + cycleCount / tenMB + "0 MB\n"); cycleCount++; } @@ -189,24 +219,31 @@ public class ScpTo extends AbstractJschTask { channelOut.flush(); checkAck(channelIn); - log.info("\n" + (cycleCount) + " KB sent to server. (" - + (cycleCount / oneMB + " MB)")); - if (log.isDebugEnabled()) - log.debug("Finished copy of " + localFile + " to " + remoteFile - + " on " + getSshTarget() + "..."); + log.debug("Transferred to " + remoteFile + " (" + + sizeDesc(nbrOfBytes) + ") on " + getSshTarget() + + " from " + sourceDesc); IOUtils.closeQuietly(channelOut); channel.disconnect(); } catch (Exception e) { - throw new SlcException("Cannot copy " + localFile + " to " - + remoteFile, e); + throw new SlcException("Cannot copy " + path + " to " + remoteFile, + e); } finally { IOUtils.closeQuietly(in); } } + protected String sizeDesc(Long nbrOfBytes) { + if (nbrOfBytes < 1024) + return nbrOfBytes + " B"; + else if (nbrOfBytes < 1024 * 1024) + return (nbrOfBytes / 1024) + " KB"; + else + return nbrOfBytes / (1024 * 1024) + " MB"; + } + public void setLocalResource(Resource localFile) { this.localResource = localFile; }