yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

first working implemetation of Base64InputStream

Browse source
This commit is contained in:
Nikolay Pultsin 2012-03-27 04:12:35 +01:00
parent 97725e0d40
commit 95cbfbbbcd
3 changed files with 69 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TODO.1.4.2
View file

@ -8,7 +8,7 @@ litres: author photos
DONE rtf: images DONE rtf: images
* rtf: underline & strikethrough * rtf: underline & strikethrough
* native fb2 plugin: images * native fb2 plugin: images: Base64InputStream optimization
* native fb2 plugin: underline * native fb2 plugin: underline
* native fb2 plugin: strikethrough * native fb2 plugin: strikethrough
* native fb2 plugin: cover * native fb2 plugin: cover

4
src/org/geometerplus/fbreader/formats/PluginCollection.java
View file

@ -88,9 +88,9 @@ public class PluginCollection {
} }
if (formatType == FormatPlugin.Type.ANY) { if (formatType == FormatPlugin.Type.ANY) {
FormatPlugin p = getPlugin(fileType, FormatPlugin.Type.JAVA); FormatPlugin p = getPlugin(fileType, FormatPlugin.Type.NATIVE);
if (p == null) { if (p == null) {
p = getPlugin(fileType, FormatPlugin.Type.NATIVE); p = getPlugin(fileType, FormatPlugin.Type.JAVA);
} }
return p; return p;
} else { } else {

127
src/org/geometerplus/zlibrary/core/util/Base64InputStream.java
View file

@ -25,6 +25,7 @@ import java.io.InputStream;
public class Base64InputStream extends InputStream { public class Base64InputStream extends InputStream {
private final InputStream myBaseStream; private final InputStream myBaseStream;
private final int[] myDecodedBuffer = { -1, -1, -1 };
private final byte[] myBuffer = new byte[32768]; private final byte[] myBuffer = new byte[32768];
private int myBufferOffset; private int myBufferOffset;
private int myBufferLength; private int myBufferLength;
@ -35,54 +36,43 @@ public class Base64InputStream extends InputStream {
@Override @Override
public int available() throws IOException { public int available() throws IOException {
// TODO: implement // TODO: real value might be less than returned one
return (myBufferLength + myBaseStream.available()) / 2; return (myBufferLength + myBaseStream.available()) * 3 / 4;
} }
@Override @Override
public long skip(long n) throws IOException { public long skip(long n) throws IOException {
// TODO: implement // TODO: optimize
int offset = myBufferOffset; for (long skipped = 0; skipped < n; ++skipped) {
int available = myBufferLength; if (read() == -1) {
byte first = 0; return skipped;
for (long skipped = 0; skipped < 2 * n;) {
while (skipped < 2 * n && available-- > 0) {
if (decode(myBuffer[offset++]) != -1) {
++skipped;
}
}
if (skipped < 2 * n) {
fillBuffer();
available = myBufferLength;
if (available == -1) {
return skipped / 2;
}
offset = 0;
} }
} }
myBufferLength = available;
myBufferOffset = offset;
return n; return n;
} }
@Override @Override
public int read() throws IOException { public int read() throws IOException {
// TODO: implement int result = myDecodedBuffer[0];
int first = -1; if (result != -1) {
while (myBufferLength >= 0) { myDecodedBuffer[0] = -1;
while (myBufferLength-- > 0) { return result;
final int digit = decode(myBuffer[myBufferOffset++]);
if (digit != -1) {
if (first == -1) {
first = digit;
} else {
return (first << 4) + digit;
}
}
}
fillBuffer();
} }
return -1; result = myDecodedBuffer[1];
if (result != -1) {
myDecodedBuffer[1] = -1;
return result;
}
result = myDecodedBuffer[2];
if (result != -1) {
myDecodedBuffer[2] = -1;
return result;
}
fillDecodedBuffer();
result = myDecodedBuffer[0];
myDecodedBuffer[0] = -1;
return result;
} }
@Override @Override
@ -92,33 +82,14 @@ public class Base64InputStream extends InputStream {
@Override @Override
public int read(byte[] b, int off, int len) throws IOException { public int read(byte[] b, int off, int len) throws IOException {
// TODO: implement // TODO: optimize
int offset = myBufferOffset; for (int ready = 0; ready < len; ++ready) {
int available = myBufferLength; final int num = read();
int first = -1; if (num == -1) {
for (int ready = 0; ready < len;) { return ready > 0 ? ready : -1;
while (ready < len && available-- > 0) {
final int digit = decode(myBuffer[offset++]);
if (digit != -1) {
if (first == -1) {
first = digit;
} else {
b[off + ready++] = (byte)((first << 4) + digit);
first = -1;
}
}
}
if (ready < len) {
fillBuffer();
available = myBufferLength;
if (available == -1) {
return ready == 0 ? -1 : ready;
}
offset = 0;
} }
b[off + ready] = (byte)num;
} }
myBufferLength = available;
myBufferOffset = offset;
return len; return len;
} }
@ -127,6 +98,40 @@ public class Base64InputStream extends InputStream {
myBaseStream.reset(); myBaseStream.reset();
myBufferOffset = 0; myBufferOffset = 0;
myBufferLength = 0; myBufferLength = 0;
myDecodedBuffer[0] = -1;
myDecodedBuffer[1] = -1;
myDecodedBuffer[2] = -1;
}
private void fillDecodedBuffer() throws IOException {
int first = -1;
int second = -1;
int third = -1;
int fourth = -1;
main:
while (myBufferLength >= 0) {
while (myBufferLength-- > 0) {
final int digit = decode(myBuffer[myBufferOffset++]);
if (digit != -1) {
if (first == -1) {
first = digit;
} else if (second == -1) {
second = digit;
} else if (third == -1) {
third = digit;
} else {
fourth = digit;
break main;
}
}
}
fillBuffer();
}
if (first != -1) {
myDecodedBuffer[0] = (first << 2) | (second >> 4);
myDecodedBuffer[1] = 0xFF & ((second << 4) | (third >> 2));
myDecodedBuffer[2] = 0xFF & ((third << 6) | fourth);
}
} }
private void fillBuffer() throws IOException { private void fillBuffer() throws IOException {