topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

fix: some bug fixes and improvements with File interface

Browse Source
This commit is contained in:
TopchetoEU 2023-12-26 11:26:08 +02:00
parent e9e020512e
commit 28265a8f44
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
3 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/me/topchetoeu/jscript/filesystem/File.java
View File

@ -5,17 +5,13 @@ import me.topchetoeu.jscript.Buffer;
public interface File { public interface File {
int read(byte[] buff); int read(byte[] buff);
void write(byte[] buff); void write(byte[] buff);
long getPtr(); long seek(long offset, int pos);
void setPtr(long offset, int pos);
void close(); void close();
Mode mode();
default String readToString() { default String readToString() {
setPtr(0, 2); long len = seek(0, 2);
long len = getPtr();
if (len < 0) return null; if (len < 0) return null;
seek(0, 0);
setPtr(0, 0);
byte[] res = new byte[(int)len]; byte[] res = new byte[(int)len];
len = read(res); len = read(res);

17
src/me/topchetoeu/jscript/filesystem/MemoryFile.java
View File

@ -27,17 +27,17 @@ public class MemoryFile implements File {
} }
@Override @Override
public long getPtr() { public long seek(long offset, int pos) {
if (data == null || !mode.readable) throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R);
return ptr;
}
@Override
public void setPtr(long offset, int pos) {
if (data == null || !mode.readable) throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R); if (data == null || !mode.readable) throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R);
if (pos == 0) ptr = (int)offset; if (pos == 0) ptr = (int)offset;
else if (pos == 1) ptr += (int)offset; else if (pos == 1) ptr += (int)offset;
else if (pos == 2) ptr = data.length() - (int)offset; else if (pos == 2) ptr = data.length() - (int)offset;
if (ptr < 0) ptr = 0;
if (ptr > data.length()) ptr = data.length();
return pos;
} }
@Override @Override
@ -45,11 +45,6 @@ public class MemoryFile implements File {
mode = Mode.NONE; mode = Mode.NONE;
ptr = 0; ptr = 0;
} }
@Override
public Mode mode() {
if (data == null) return Mode.NONE;
return mode;
}
public MemoryFile(String filename, Buffer buff, Mode mode) { public MemoryFile(String filename, Buffer buff, Mode mode) {
this.filename = filename; this.filename = filename;

11
src/me/topchetoeu/jscript/filesystem/PhysicalFile.java
View File

@ -25,19 +25,14 @@ public class PhysicalFile implements File {
} }
@Override @Override
public long getPtr() { public long seek(long offset, int pos) {
if (file == null || !perms.readable) throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R);
else try { return file.getFilePointer(); }
catch (IOException e) { throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R); }
}
@Override
public void setPtr(long offset, int pos) {
if (file == null || !perms.readable) throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R); if (file == null || !perms.readable) throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R);
try { try {
if (pos == 1) offset += file.getFilePointer(); if (pos == 1) offset += file.getFilePointer();
else if (pos == 2) offset += file.length(); else if (pos == 2) offset += file.length();
file.seek(offset); file.seek(offset);
return offset;
} }
catch (IOException e) { throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R); } catch (IOException e) { throw new FilesystemException(filename, FSCode.NO_PERMISSIONS_R); }
} }
@ -50,8 +45,6 @@ public class PhysicalFile implements File {
file = null; file = null;
perms = Mode.NONE; perms = Mode.NONE;
} }
@Override
public Mode mode() { return perms; }
public PhysicalFile(String path, Mode mode) throws FileNotFoundException { public PhysicalFile(String path, Mode mode) throws FileNotFoundException {
if (mode == Mode.NONE) file = null; if (mode == Mode.NONE) file = null;