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

Added sqlite support and fixed some issues

Browse source
This commit is contained in:
Ziver Koc 2014-07-01 19:54:30 +00:00
parent 78205d97af
commit fcbaef3e76
26 changed files with 348 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/zutil/io/DynamicByteArrayStream.java
View file

@ -29,24 +29,25 @@ import java.util.ArrayList;
public class DynamicByteArrayStream extends InputStream{
/** The byte array container */
private ArrayList<byte[]> bytes;
/** Current virtual size of the stream */
private int size;
/** Points the current byte array index */
private int arrayIndex;
/** Points to a local index in the current byte array */
private int arrayLocalIndex;
/** Current virtual position of the stream */
private int pos;
private int globalPos;
/** Current virtual size of the stream */
private int globalSize;
/** Points the current byte array index */
private int globalArrayIndex;
/** Points to a local index in the current byte array */
private int localArrayOffset;
/**
* Create a new instance of DynamicByteArrayStream
*/
public DynamicByteArrayStream(){
bytes = new ArrayList<byte[]>();
size = 0;
arrayIndex = 0;
arrayLocalIndex = 0;
pos = 0;
globalPos = 0;
globalSize = 0;
globalArrayIndex = 0;
localArrayOffset = 0;
}
/**
@ -56,7 +57,7 @@ public class DynamicByteArrayStream extends InputStream{
*/
public synchronized void append(byte[] b){
bytes.add(b);
size += b.length;
globalSize += b.length;
}
/**
@ -71,70 +72,70 @@ public class DynamicByteArrayStream extends InputStream{
byte[] new_b = new byte[length];
System.arraycopy(b, offset, new_b, 0, length);
bytes.add(new_b);
size += length;
globalSize += length;
}
@Override
public synchronized int read() throws IOException {
if(pos >= size) return -1;
if(globalPos >= globalSize) return -1;
int ret = bytes.get(arrayIndex)[arrayLocalIndex] & 0xff;
pos++;
arrayLocalIndex++;
if(arrayLocalIndex >= bytes.get(arrayIndex).length){
arrayIndex++;
arrayLocalIndex = 0;
int ret = bytes.get(globalArrayIndex)[localArrayOffset] & 0xff;
globalPos++;
localArrayOffset++;
if(localArrayOffset >= bytes.get(globalArrayIndex).length){
globalArrayIndex++;
localArrayOffset = 0;
}
return ret;
}
public synchronized int read(byte b[], int off, int len) {
if(len <= 0) return 0;
if(pos >= size) return -1;
if(globalPos >= globalSize) return -1;
int bytes_read=0;
if(pos+len >= size) len = size - pos;
for(; bytes_read<len ;bytes_read++){
byte[] src = bytes.get(arrayIndex);
if(globalPos+len >= globalSize) len = globalSize - globalPos;
while(bytes_read<len){
byte[] src = bytes.get(globalArrayIndex);
// Read length is LONGER than local array
if(arrayLocalIndex +len-bytes_read >= src.length){
int length = src.length- arrayLocalIndex;
System.arraycopy(src, arrayLocalIndex, b, off+bytes_read, length);
if(localArrayOffset +len-bytes_read > src.length){
int length = src.length- localArrayOffset;
System.arraycopy(src, localArrayOffset, b, off+bytes_read, length);
arrayLocalIndex = 0;
arrayIndex++;
localArrayOffset = 0;
globalArrayIndex++;
bytes_read += length;
}
// Read length is SHORTER than local array
else{
int length = len-bytes_read;
System.arraycopy(src, arrayLocalIndex, b, off+bytes_read, length);
System.arraycopy(src, localArrayOffset, b, off+bytes_read, length);
arrayLocalIndex += length;
localArrayOffset += length;
bytes_read += length;
}
}
pos += len;
globalPos += len;
return bytes_read;
}
public synchronized int available() {
return size - pos;
return globalSize - globalPos;
}
/**
* Clears this stream from the byte arrays
*/
public synchronized void clear(){
size = 0;
globalSize = 0;
reset();
bytes.clear();
}
public synchronized void reset() {
arrayIndex = 0;
arrayLocalIndex = 0;
pos = 0;
globalArrayIndex = 0;
localArrayOffset = 0;
globalPos = 0;
}
public void close() throws IOException {
@ -145,8 +146,8 @@ public class DynamicByteArrayStream extends InputStream{
* @return all of the buffers content as a byte array.
*/
public byte[] getBytes(){
byte[] data = new byte[size];
this.read(data, 0, size);
byte[] data = new byte[globalSize];
this.read(data, 0, globalSize);
return data;
}

59
src/zutil/io/InputStreamCloser.java Normal file
View file

@ -0,0 +1,59 @@
/*******************************************************************************
* Copyright (c) 2013 Ziver
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
******************************************************************************/
package zutil.io;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
/**
* A simple Class that mirrors a InputStream but
* also has an additional Closeable object that
* will be closed with the InputStream
*
* @author Ziver
*/
public class InputStreamCloser extends InputStream{
private Closeable c;
private InputStream in;
public InputStreamCloser(InputStream in, Closeable c){
this.c = c;
this.in = in;
}
public void close() throws IOException {
in.close();
c.close();
}
// Mirror functions
public int read() throws IOException { return in.read(); }
public int read(byte b[]) throws IOException { return in.read(b); }
public int read(byte b[], int off, int len) throws IOException { return in.read(b, off, len); }
public long skip(long n) throws IOException { return in.skip(n); }
public int available() throws IOException { return in.available(); }
public synchronized void mark(int readlimit) { in.mark(readlimit); }
public synchronized void reset() throws IOException { in.reset(); }
public boolean markSupported() { return in.markSupported(); }
}

169
src/zutil/io/file/FileSearch.java
View file

@ -23,49 +23,68 @@
package zutil.io.file;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
public class FileSearch implements Iterable<File>{
import zutil.io.InputStreamCloser;
public class FileSearch implements Iterable<FileSearchItem>{
// Constants
private static final List<String> compressedFileExtensions = Arrays.asList(new String[]{
"jar", "zip"
});
// Constructor params
private File root;
// Search parameters
private String fileName;
private String extension;
private boolean recursive;
//private int depth;
private boolean searchFiles;
private boolean searchCompressedFiles;
private boolean searchFolders;
public FileSearch(File root){
this.root = root;
searchFiles = true;
searchFolders = true;
}
/**
* @param file Sets the exact file name to search for (includes extension)
*/
public void setFileName(String file){
fileName = file;
}
/**
* Sets the file extensions to search for (should not include . at the beggining)
*/
public void setExtension(String ext){
}
/**
* Sets if the search should go into sub-folders
*/
public void setRecursive(boolean recursive){
this.recursive = recursive;
}
/**
* Sets how deep into folders the search should go
* (Recursion needs to be enabled for this attribute to be used)
@ -73,75 +92,153 @@ public class FileSearch implements Iterable<File>{
//public void setDepth(int depth){
// this.depth = depth;
//}
public void searchFiles(boolean searchFiles){
this.searchFiles = searchFiles;
}
public void searchCompressedFiles(boolean searchCompressedFiles){
this.searchCompressedFiles = searchCompressedFiles;
}
public void searchFolders(boolean searchFolders){
this.searchFolders = searchFolders;
}
@Override
public Iterator<File> iterator() {
public Iterator<FileSearchItem> iterator() {
return new FileSearchIterator();
}
protected class FileSearchIterator implements Iterator<File>{
private ArrayList<File> fileList;
protected class FileSearchIterator implements Iterator<FileSearchItem>{
private ArrayList<FileSearchItem> fileList;
private int currentIndex;
public FileSearchIterator(){
fileList = new ArrayList<File>();
fileList = new ArrayList<FileSearchItem>();
currentIndex = 0;
addToFileList(root.listFiles());
addFiles(root.list());
next();
}
@Override
public boolean hasNext() {
return currentIndex != fileList.size();
}
@Override
public void remove() {
throw new UnsupportedOperationException();
}
@Override
public File next() {
public FileSearchItem next() {
if(currentIndex < 0)
return null;
// Temporarily save the current file
File ret = fileList.get(currentIndex);
FileSearchItem ret = fileList.get(currentIndex);
// Find the next file
for(; currentIndex<fileList.size(); currentIndex++){
File file = fileList.get(currentIndex);
FileSearchItem file = fileList.get(currentIndex);
if(recursive && file.isDirectory()){
addToFileList(file.listFiles());
addFiles(file.listFiles());
if(searchFolders && file.getName().equalsIgnoreCase(fileName))
break;
break;
}
else if(searchCompressedFiles && file.isFile() &&
compressedFileExtensions.contains(FileUtil.getFileExtension(file.getName()).toLowerCase())){
try {
String url = file.getUrl().getFile();
ZipFile zipFile = new ZipFile(url);
Enumeration<? extends ZipEntry> e = zipFile.entries();
while(e.hasMoreElements()){
ZipEntry entry = e.nextElement();
fileList.add(new FileSearchZipItem(url, entry));
}
zipFile.close();
} catch (IOException e) {
e.printStackTrace();
}
}
else if(searchFiles && file.isFile()){
if(extension != null && FileUtil.getFileExtension(file).equalsIgnoreCase(extension))
if(extension != null && FileUtil.getFileExtension(file.getName()).equalsIgnoreCase(extension))
break;
else if(fileName != null && file.getName().equalsIgnoreCase(fileName))
break;
}
}
return ret;
}
private void addToFileList(File[] list){
for(File file : list){
fileList.add(file);
private void addFiles(String[] list){
for(String file : list){
fileList.add(new FileSearchFileItem(new File(file)));
}
}
}
}
interface FileSearchItem{
/** @return a file or folder name **/
public String getName();
/** @return a URL to the file or folder, in case of a compressed file the URL to the package will be returned **/
public URL getUrl() throws MalformedURLException ;
public boolean isCompressed();
public boolean isFile();
public boolean isDirectory();
/** @return an InputStream if this is a file otherwise null **/
public InputStream getInputStream() throws IOException;
/** @return an String array with all files if this is a folder otherwise null **/
public String[] listFiles();
}
class FileSearchFileItem implements FileSearchItem{
private File file;
protected FileSearchFileItem(File file){
this.file = file;
}
public String getName() { return file.getName(); }
public URL getUrl() throws MalformedURLException { return new URL(file.getAbsolutePath()); }
public boolean isCompressed() { return false; }
public boolean isFile() { return file.isFile(); }
public boolean isDirectory() { return file.isDirectory(); }
public InputStream getInputStream() throws IOException { return new FileInputStream(file); }
public String[] listFiles() { return file.list(); }
}
class FileSearchZipItem implements FileSearchItem{
private String file;
private ZipEntry entry;
protected FileSearchZipItem(String file, ZipEntry entry){
this.file = file;
this.entry = entry;
}
public String getName() { return entry.getName(); }
public URL getUrl() throws MalformedURLException { return new URL(file); }
public boolean isCompressed() { return true; }
public boolean isFile() { return !entry.isDirectory(); }
public boolean isDirectory() { return entry.isDirectory(); }
public InputStream getInputStream() throws IOException {
ZipFile zip = new ZipFile(file);
return new InputStreamCloser(zip.getInputStream(entry), zip);
}
public String[] listFiles() { return null; }
}

43
src/zutil/io/file/FileUtil.java
View file

@ -23,8 +23,12 @@
package zutil.io.file;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
@ -310,4 +314,43 @@ public class FileUtil {
return file.substring(0, file.lastIndexOf(".")+1)+ext;
}
/**
* This function will replace some data between two boundaries.
* If the boundary is not found it will be added to the end of the file.
*
* @param file is the file to modify
* @param boundary is the start and end boundary to put the data between, this is a full line boundary.
* @param data is the data that will be written to the file
*/
public static void writeBetweenBoundary(File file, String boundary, String data) throws IOException{
BufferedReader in = new BufferedReader(new FileReader(file));
StringBuilder output = new StringBuilder();
String line;
while((line = in.readLine()) != null){
// Found starting boundary
if(line.equals(boundary)){
while((line = in.readLine()) != null)
// Find ending boundary
if(line.equals(boundary)) break;
// EOF and no ending boundary found
if(line == null){
in.close();
throw new EOFException("No ending boundary found");
}
// Write the new data
output.append(boundary).append('\n');
output.append(data).append('\n');
output.append(boundary).append('\n');
}
else
output.append(line).append('\n');
}
in.close();
// Save changes
FileWriter out = new FileWriter(file);
out.write(output.toString());
out.close();
}
}