ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added Binary formater for human string output

Browse source
This commit is contained in:
Ziver Koc 2014-04-01 19:59:35 +00:00
parent 1bd1c98858
commit d713c74832
5 changed files with 114 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/zutil/jee/upload/AjaxFileUpload.java
View file

@ -22,35 +22,10 @@
package zutil.jee.upload;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemHeaders;
import org.apache.commons.fileupload.FileItemHeadersSupport;
import org.apache.commons.fileupload.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.*;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.util.Streams;
import zutil.StringUtil;
import zutil.io.file.FileUtil;
import zutil.jee.upload.FileUploadListener.Status;
@ -59,6 +34,19 @@ import zutil.parser.DataNode;
import zutil.parser.DataNode.DataType;
import zutil.parser.json.JSONWriter;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* <XMP>
* Example web.xml:
@ -240,7 +228,7 @@ public abstract class AjaxFileUpload extends HttpServlet {
}
else{
files.add( fileItem );
logger.info("Recieved file: "+fileItem.getName()+" ("+StringUtil.formatBytesToString( fileItem.getSize() )+")");
logger.info("Recieved file: "+fileItem.getName()+" ("+StringUtil.formatByteSizeToString(fileItem.getSize())+")");
}
}
// Process the upload

7
src/zutil/jee/upload/FileUploadListener.java
View file

@ -23,7 +23,6 @@
package zutil.jee.upload;
import org.apache.commons.fileupload.ProgressListener;
import zutil.StringUtil;
import zutil.parser.DataNode;
import zutil.parser.DataNode.DataType;
@ -152,9 +151,9 @@ public class FileUploadListener implements ProgressListener{
node.set("filename", filename);
node.set("percent", getPercentComplete());
node.set("uploaded", StringUtil.formatBytesToString( bytes ));
node.set("total", StringUtil.formatBytesToString( length ));
node.set("speed", StringUtil.formatBytesToString( speed )+"/s");
node.set("uploaded", StringUtil.formatByteSizeToString(bytes));
node.set("total", StringUtil.formatByteSizeToString(length));
node.set("speed", StringUtil.formatByteSizeToString(speed)+"/s");
return node;
}
}