Changeset 3008

Timestamp:

Dec 7, 2006, 2:52:12 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #454: File upload times out

Changed the way progress reporter works. It now requires less bytes to be sent since the whole
page no longer has to be reloaded.

Location:

branches/2.1.2

Files:

• src/clients/web/net/sf/basedb/clients/web/fileupload/FileUpload.java (modified) (4 diffs)
• src/clients/web/net/sf/basedb/clients/web/fileupload/FileUploadProgress.java (modified) (6 diffs)
• src/core/net/sf/basedb/util/zip/ZipUnpacker.java (modified) (2 diffs)
• www/filemanager/upload/index.jsp (modified) (2 diffs)
• www/filemanager/upload/progress.jsp (modified) (4 diffs)
• www/filemanager/upload/select.jsp (modified) (6 diffs)
• www/filemanager/upload/show_exception.jsp (added)
• www/filemanager/upload/upload.jsp (modified) (4 diffs)

branches/2.1.2/src/clients/web/net/sf/basedb/clients/web/fileupload/FileUpload.java

@@ -65 +65 @@
     arrive.
   */
-  public static final long DEFAULT_TIMEOUT = 20000;
+  public static final long DEFAULT_TIMEOUT = 60000;
   
   private static final String EMPTY_STRING = "";
@@ -108 +108 @@
   /**
     The timeout in milliseconds that we wait for more data to arrive.
-    Default value is 20000 = 20 seconds.
+    Default value is 60000 = 60 seconds.
   */
   private long timeout = DEFAULT_TIMEOUT;
@@ -636 +636 @@
       try
       {
-        if (debugEnabled) log.debug("Calling in.readLine() for more data");
         bytes = in.readLine(b, off, len);
-        if (debugEnabled) log.debug("Got " + bytes + " bytes");
         gotData = true;
       }
@@ -648 +646 @@
         {
           SocketTimeoutException ex2 = 
-            new SocketTimeoutException("No data for " + waitTime + " milliseconds");
+            new SocketTimeoutException("No data for " + (waitTime / 1000) + " seconds");
           ex2.initCause(ex);
-          log.debug("Total timeout exceeded after" + waitTime + "ms", ex2);
+          log.debug("Total timeout exceeded after " + waitTime + "ms", ex2);
           throw ex2;
         }

branches/2.1.2/src/clients/web/net/sf/basedb/clients/web/fileupload/FileUploadProgress.java

@@ -24 +24 @@
 package net.sf.basedb.clients.web.fileupload;
 
-import java.util.Date;
-
-import net.sf.basedb.core.ProgressReporter;
-
 /**
   Objects of this class holds information about the progress
@@ -43 +39 @@
 */
 public class FileUploadProgress
-  implements ProgressReporter
 {
   private final long totalBytes;
   private final long startTime;
-  private final Date lastTransfer;
   private long transferredBytes;
   private String currentFilename;
   private Throwable exception;
   private boolean abort = false;
-  private boolean unpacking = false;
-  private int percent = 0;
-  private String message = null;
 
   /**
@@ -68 +59 @@
     this.totalBytes = totalBytes;
     this.startTime = System.currentTimeMillis();
-    this.lastTransfer = new Date();
     this.transferredBytes = 0;
   }
-  
-  /*
-    From the ProgressReporter interface
-    -------------------------------------------
-  */
-  public void display(int percent, String message)
-  {
-    this.unpacking = percent < 100;
-    this.message = message;
-    this.percent = percent;
-  }
-  
-  public void append(String message)
-  {
-    this.message += message;
-  }
-  // -------------------------------------------
   
   /**
@@ -113 +86 @@
   {
     transferredBytes = bytes;
-    lastTransfer.setTime(System.currentTimeMillis());
   }
   /**
@@ -122 +94 @@
   {
     transferredBytes += bytes;
-    lastTransfer.setTime(System.currentTimeMillis());
   }
   
   /**
     Checks if the transfer is complete or not. A transfer is complete
-    when the transferred bytes equals the total bytes and when optional
-    unpacking of a zip file has been completed.
+    when the transferred bytes equals the total bytes.
     @return TRUE if the transfer has been completed, FALSE otherwise
   */
   public boolean transferIsComplete()
   {
-    return (getTotalBytes() == getTransferredBytes() && !unpacking);
+    return (getTotalBytes() == getTransferredBytes());
   }
 
@@ -179 +149 @@
 
   /**
-    Get the data and time for the last update to this object.
-    This value is used by the a {@link FileUpload} object
-    to decide when to remove old progress information from the cache.
-    @return The data and time of the last update to this object.
-  */
-  Date getLastTransfer()
-  {
-    return lastTransfer;
-  }
-  
-  /**
     Request that the upload should be aborted. The associated {@link
     FileUpload} object will check this property at regular intervals and if set

branches/2.1.2/src/core/net/sf/basedb/util/zip/ZipUnpacker.java

@@ -40 +40 @@
 import net.sf.basedb.core.Path;
 import net.sf.basedb.util.FileUtil;
+import net.sf.basedb.util.Values;
 
 /**
@@ -101 +102 @@
       {
         progress.displayAbsolute(totalUnpacked, 
-          "Unpacking " + (isDirectory ? "directory: " : "file: ") + completePath);
+          "Unpacking " + (isDirectory ? "directory: " : "file: ") + completePath + 
+          " (" +Values.formatBytes(entry.getSize()) + ")");
       }
       if (!isDirectory)

branches/2.1.2/www/filemanager/upload/index.jsp

@@ -34 +34 @@
   @version 2.0
 --%>
-<%@ page
+<%@ page session="false"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
@@ -52 +52 @@
 int directoryId = Values.getInt(request.getParameter("directory_id"));
 int fileId = Values.getInt(request.getParameter("file_id"));
-String thePage = "select.jsp";
-FileUploadProgress progress = (FileUploadProgress)sc.getSessionSetting("FileUploadProgress");
-if (progress != null && !progress.transferIsComplete() && progress.getException() == null)
-{
-  thePage = "progress.jsp";
-}
-else
-{
-  sc.setSessionSetting("FileUploadProgress", null);
-}
+sc.setSessionSetting("FileUploadProgress", null);
+sc.setSessionSetting("UnpackProgress", null);
 %>
 
 <base:page type="frameset" title="Upload file">
   <base:head />
-  <frameset rows="*,0" frameborder="no" border="0">
-    <frame name="progress" src="<%=thePage%>?ID=<%=ID%>&directory_id=<%=directoryId%>&file_id=<%=fileId%>"
+  <frameset rows="*,0,0" frameborder="yes" border="1">
+    <frame name="select" src="select.jsp?ID=<%=ID%>&directory_id=<%=directoryId%>&file_id=<%=fileId%>"
       scrolling="no" frameborder="0">
+    <frame name="progress" scrolling="no" frameborder="0">
     <frame name="upload" scrolling="no" frameborder="0">
   </frameset>

branches/2.1.2/www/filemanager/upload/progress.jsp

@@ -35 +35 @@
   @version 2.0
 --%>
-<%@ page
+<%@ page session="false"
   import="net.sf.basedb.core.SessionControl"
-  import="net.sf.basedb.core.SimpleProgressReporter"
+  import="net.sf.basedb.core.SimpleAbsoluteProgressReporter"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.util.Values"
@@ -51 +51 @@
 final boolean abort = Values.getBoolean(request.getParameter("abort"));
 final FileUploadProgress progress = (FileUploadProgress)sc.getSessionSetting("FileUploadProgress");
-final SimpleProgressReporter unpackProgress = (SimpleProgressReporter)sc.getSessionSetting("UnpackProgress");
+final SimpleAbsoluteProgressReporter unpackProgress = (SimpleAbsoluteProgressReporter)sc.getSessionSetting("UnpackProgress");
+
 boolean aborted = false;
-if (progress != null)
-{
-  if (abort) progress.setAbort();
-  Throwable t = progress.getException();
-  if (t != null) 
-  {
-    if (t instanceof UploadAbortedException)
-    {
-      aborted = true;
-    }
-    else
-    {
-      throw progress.getException();
-    }
-  }
-}
+boolean transferIsComplete = false;
 long total = 0;
 long transferred = 0;
-boolean transferIsComplete = false;
 long seconds = 0;
 long transferRate = 0;
@@ -77 +62 @@
 String currentFileName = "";
 long percent = 0;
+String unpackMessage = "";
 if (progress != null)
 {
-  currentFileName = "Uploading " + progress.getCurrentFilename();
+  if (abort) progress.setAbort();
+  currentFileName = progress.getCurrentFilename();
   total = progress.getTotalBytes();
   transferred = progress.getTransferredBytes();
@@ -87 +74 @@
   remain = transferRate != 0 ? (total-transferred)/transferRate : 0;
   percent = (total==0 ? 0 : 100 * transferred / total);
+  aborted = progress.getException() != null || abort;
 }
-final String onload = transferIsComplete ? "xdone();" : aborted ? null : "setTimeout('location.reload()', 1500);";
+if (unpackProgress != null)
+{
+  unpackMessage = unpackProgress.getMessage();
+}
+
+String onload = "";
 if (transferIsComplete)
 {
+  onload = "displayProgress(true)";
   sc.setSessionSetting("FileUploadProgress", null);
+  sc.setSessionSetting("UnpackProgress", null);
+}
+else if (aborted)
+{
+  onload = "uploadAborted()";
+}
+else if (progress != null)
+{
+  onload = "displayProgress(false)";
+}
+else
+{
+  onload = "setTimeout('location.reload()', 1500)";
 }
 %>
-<base:page type="popup" title="Uploading file...">
-  <base:head styles="progressbar.css">
-  <script language="JavaScript">
-  function done()
+<html>
+<head>
+</head>
+<body onload="<%=onload%>">
+  <script language="javascript">
+  function displayProgress(isComplete)
   {
-    var message = '<%=HTML.urlEncode(aborted ? "Upload aborted" : "File uploaded successfully")%>';
-    location.href = getRoot()+'common/close_popup.jsp?refresh_opener=1&message='+(message);
-  }
-  function abortUpload()
-  {
-    if (confirm('Are you sure you want to abort the upload? It cannot be resumed.'))
+    var fileName = '<%=HTML.javaScriptEncode(currentFileName)%>';
+    var percentDone = '<%=percent%>';
+    var transferredBytes = '<%=Values.formatBytes(transferred)%>';
+    var totalBytes = '<%=Values.formatBytes(total)%>';
+    var transferTime = '<%=Values.formatTime(seconds)%>';
+    var transferRate = '<%=Values.formatBytes(transferRate)%>/s';
+    var remainTime = '<%=Values.formatTime(remain)%>';
+    var unpackMessage = '<%=HTML.javaScriptEncode(unpackMessage)%>';
+    window.top.frames['select'].displayProgress(fileName, percentDone, transferredBytes, totalBytes, transferTime, transferRate, remainTime, unpackMessage);
+    if (!isComplete) 
     {
-      location.href = 'progress.jsp?ID=<%=ID%>&abort=1';
+      setTimeout('location.reload()', 1500);
     }
   }
-  <%
-  if (abort && progress == null)
+  function displayException()
   {
-    %>
-    top.window.close();
-    <%
+    window.top.frames['select'].location = 'show_exception.jsp?ID=<%=ID%>';
   }
-  %>
+  function uploadAborted()
+  {
+    window.top.location = '../../common/close_popup.jsp?refresh_opener=1&message=<%=HTML.urlEncode("The upload was aborted before it was completed.")%>';
+  }
   </script>
-  </base:head>
-  <base:body onload="<%=onload%>" >
-
-  <%
-  if (aborted)
-  {
-    %>
-    <base:note type="info" title="Upload aborted">
-      The upload was aborted before it was completed.
-    </base:note>
-    <table align="center">
-    <tr>
-      <td><base:button onclick="window.top.close()" title="Close" /></td>
-    </tr>
-    </table>
-    <%
-  }
-  else
-  {
-    %>
-    <h3 class="docked"><%=currentFileName%>...</h3>
-    <div class="boxed" style="background: #E0E0E0">
-      <br>
-      <table width="90%" border=0 cellspacing=0 cellpadding=0 align="center">
-      <tr>
-      <td width="90%" >
-        <table width="100%" class="progressbar" border=0 cellspacing=0 cellpadding=0>
-        <tr>
-          <%
-          if (percent > 0) 
-          {
-            %>
-            <td width="<%=percent%>%" class="done">&nbsp;</td>
-            <% 
-          }
-          if (percent < 100) 
-          { 
-            %>
-            <td width="<%=100-percent%>%" class="remain">&nbsp;</td>
-            <%
-          }
-          %>
-        </tr>
-        </table>
-      </td>
-        <td width="10%">&nbsp;<%=percent%>%</td>
-      </tr>
-      <tr>
-        <td colspan="2">
-          <% 
-          if (progress == null) 
-          {
-            %>
-            Waiting for transfer to begin...
-            <%
-          } 
-          else
-          {
-            %>
-            <b>Transferred:</b> <%=Values.formatBytes(transferred)%> of <%=Values.formatBytes(total)%><br>
-            <b>Time:</b> <%=Values.formatTime(seconds)%> (<%=Values.formatBytes(transferRate)%>/s)<br>
-            <b>Remain:</b> <%=Values.formatTime(remain)%> (estimated)<br>
-            <%
-            if (unpackProgress != null)
-            {
-              %>
-              <b><%=unpackProgress.getMessage()%></b>
-              <%
-            }
-          }
-          %>
-        </td>
-      </tr>
-      </table>
-      <br>
-    </div>
-    <br>
-    <table align="center">
-    <tr>
-      <td><base:button image="cancel.gif" onclick="abortUpload()" title="Abort..." /></td>
-    </tr>
-    </table>
-    <%
-  }
-  %>
-  </base:body>
-</base:page>
+</body>
+</html>

branches/2.1.2/www/filemanager/upload/select.jsp

@@ -26 +26 @@
   @version 2.0
 --%>
-<%@ page
+<%@ page session="false"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
@@ -118 +118 @@
 
   <base:page type="popup" title="<%=title%>">
-  <base:head scripts="tabcontrol.js" styles="tabcontrol.css">
+  <base:head scripts="tabcontrol.js" styles="tabcontrol.css,progressbar.css">
     <script language="JavaScript">
     // Validate the "File" tab
@@ -149 +149 @@
       
         frm.submit();
-        this.location.href = "progress.jsp?ID=<%=ID%>";
-      }
-    }
+        window.top.frames['progress'].location.href = 'progress.jsp?ID=<%=ID%>';
+        Main.hide('selectForm');
+        Main.show('progressForm');
+      }
+    }
+    
+    function abortUpload()
+    {
+      if (confirm('Are you sure you want to abort the upload? It cannot be resumed.'))
+      {
+        window.top.frames['progress'].location.href = 'progress.jsp?ID=<%=ID%>&abort=1';
+      }
+    }
+    
     function fileOnChange()
     {
@@ -199 +210 @@
       }
       %>
+    }
+    
+    function displayProgress(fileName, percentDone, transferredBytes, totalBytes, transferTime, transferRate, remainTime, unpackMessage)
+    {
+      document.getElementById('fileName').innerHTML = 'Uploading ' + fileName + '...';
+      document.getElementById('percent').innerHTML = '&nbsp;' + percentDone+'%';
+      var doneElement = document.getElementById('percentDone');
+      doneElement.style.width = percentDone+'%';
+      var remainElement = document.getElementById('percentRemain');
+      remainElement.style.width = (100-percentDone)+'%';
+      if (percentDone == 100) Main.hide('percentRemain');
+      document.getElementById('transferredBytes').innerHTML = transferredBytes;
+      document.getElementById('totalBytes').innerHTML = totalBytes;
+      document.getElementById('transferTime').innerHTML = transferTime;
+      document.getElementById('transferRate').innerHTML = '(' + transferRate + ')';
+      document.getElementById('remainTime').innerHTML = remainTime + ' (estimated)';
+      document.getElementById('unpackMessage').innerHTML = unpackMessage.replace(/(.*):(.*)/, '<b>$1:</b> $2');
     }
     
@@ -246 +274 @@
         return s;
       }
-      
-    }
-    
-    
+    }
     
     </script>
   </base:head>
   <base:body onload="initZipFormats()">
-    <p>
-    
+  <p>
+  <div id="selectForm">
     <form action="upload.jsp?ID=<%=ID%>&directory_id=<%=directory.getId()%>" 
       method="post" name="file" enctype="multipart/form-data" onsubmit="return false;" target="upload">
@@ -387 +412 @@
     </table>
     </form>
+  </div>
+  
+  <div id="progressForm" style="display:none;">
+    <h3 class="docked" id="fileName">Preparing file upload...</h3>
+    <div class="boxed" style="background: #E0E0E0">
+      <br>
+      <table width="90%" border=0 cellspacing=0 cellpadding=0 align="center">
+      <tr>
+      <td width="90%" >
+        <table width="100%" class="progressbar" border=0 cellspacing=0 cellpadding=0>
+        <tr>
+          <td width="0%" class="done" id="percentDone">&nbsp;</td>
+          <td width="100%" class="remain" id="percentRemain">&nbsp;</td>
+        </tr>
+        </table>
+      </td>
+        <td width="10%" id="percent">&nbsp;0%</td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <b>Transferred:</b> <span id="transferredBytes">0 bytes</span> of <span id="totalBytes">unknown</span><br>
+          <b>Time:</b> <span id="transferTime">0s</span> <span id="transferRate"></span><br>
+          <b>Remain:</b> <span id="remainTime">unknown</span><br>
+          <span id="unpackMessage"></span>
+        </td>
+      </tr>
+      </table>
+      <br>
+    </div>
+    <br>
+    <table align="center">
+    <tr>
+      <td><base:button image="cancel.gif" onclick="abortUpload()" title="Abort..." /></td>
+    </tr>
+    </table>
+  
+  </div>
   </base:body>
   </base:page>

branches/2.1.2/www/filemanager/upload/upload.jsp

@@ -31 +31 @@
   @version 2.0
 --%>
-<%@ page
+<%@ page session="false"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
@@ -68 +68 @@
 final int directoryId = Values.getInt(request.getParameter("directory_id"), SystemItems.getId(Directory.ROOT));
 final ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, null);
-
 String message = null;
+String onload = "";
 DbControl dc = null;
 FileUpload upload = null;
@@ -193 +193 @@
   }
   dc.commit();
-  dc.close();
   message = unpackZip ? numUnpackedFiles + " file(s) unpacked successfully" : "File uploaded successfully";
+  onload="done()";
 }
 catch (Throwable t)
 {
   if (upload != null) upload.setException(t);
-  throw t;
+  if (t instanceof UploadAbortedException)
+  {
+    message = "The upload was aborted before it was completed.";
+    onload="done()";
+  }
+  else
+  {
+    onload = "exception()";
+  }
 }
 finally
@@ -205 +213 @@
   if (dc != null) dc.close();
 }
-
 %>
-<base:page type="popup">
-<base:head>
+<html>
+<head>
   <script language="JavaScript">
   function done()
   {
-    window.top.location = getRoot() + 'common/close_popup.jsp?refresh_opener=1&message=<%=HTML.urlEncode(message)%>';
+    window.top.location = '../../common/close_popup.jsp?refresh_opener=1&message=<%=HTML.urlEncode(message)%>';
+  }
+  function exception()
+  {
+    window.top.frames['select'].location = 'show_exception.jsp?ID=<%=ID%>';
   }
   </script>
-</base:head>
-<base:body onload="done()">
-</base:body>
-</base:page>
-
-
+</head>
+<body onload="<%=onload%>">
+</body>
+</html>
+
+
+