Apple-2-Tools/AppleCommander
1
0
Fork 0
mirror of https://github.com/AppleCommander/AppleCommander.git synced 2026-04-19 10:41:26 +00:00
Code Issues Projects Releases Wiki Activity

Found that the GUI reads disks to build out the detailed file listing. Fixed the following bugs: DOS can try to read a deleted file; the WOZ1 track read algorithm was passing last byte of the track instead of the length of the track (doh!).

Browse Source
This commit is contained in:
Rob Greene
2025-07-30 18:18:21 -05:00
parent 312efa2b40
commit 32e2fcbebb
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ac-api/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java
+3
View File
@@ -335,6 +335,9 @@ public class DosFileEntry implements FileEntry {
* and length into Applesoft files.
*/
public byte[] getFileData() {
if (isDeleted()) {
return new byte[0];
}
byte[] rawdata = disk.getFileData(this);
byte[] filedata;
if (isBinaryFile()) {
lib/ac-api/src/main/java/com/webcodepro/applecommander/storage/physical/WozOrder.java
+1 -2
View File
@@ -300,8 +300,7 @@ public class WozOrder extends ImageOrder {
byte[] details = readBytes(start + 6646, 10);
int bytesUsed = AppleUtil.getWordValue(details, 0);
int bitCount = AppleUtil.getWordValue(details, 2);
int end = start + bytesUsed;
byte[] rawData = readBytes(start, end);
byte[] rawData = readBytes(start, bytesUsed);
return transformBitstream(rawData, bitCount);
}
lib/ac-api/src/test/java/com/webcodepro/applecommander/storage/DiskHelperTest.java
+25
View File
@@ -50,6 +50,7 @@ public class DiskHelperTest {
assertTextFile(disks[0], "APPLE PROMS"); //$NON-NLS-1$
assertBinaryFile(disks[0], "BOOT13"); //$NON-NLS-1$
assertEquals(DOS33_FORMAT, disks[0].getFormat());
assertCanReadFiles(disks[0]);
}
@Test
@@ -68,6 +69,7 @@ public class DiskHelperTest {
assertApplesoftFile(disks[0], "COPY.ME"); //$NON-NLS-1$
assertBinaryFile(disks[0], "SETTINGS"); //$NON-NLS-1$
assertDisassemblyFile(disks[0], "PRODOS"); //$NON-NLS-1$
assertCanReadFiles(disks[0]);
}
@Test
@@ -94,6 +96,7 @@ public class DiskHelperTest {
assertBinaryFile(disks[0], "TWN31"); //$NON-NLS-1$
assertTextFile(disks[0], "ITEM"); //$NON-NLS-1$
assertGraphicsFile(disks[0], "ICE DRAGON"); //$NON-NLS-1$
assertCanReadFiles(disks[0]);
}
@Test
@@ -109,6 +112,7 @@ public class DiskHelperTest {
assertBinaryFile(disks[0], "TWN21"); //$NON-NLS-1$
assertTextFile(disks[0], "ITEM"); //$NON-NLS-1$
assertGraphicsFile(disks[0], "ICE DRAGON"); //$NON-NLS-1$
assertCanReadFiles(disks[0]);
}
@Test
@@ -131,6 +135,7 @@ public class DiskHelperTest {
FormattedDisk[] disks = showDirectory(config.getDiskDir()
+ "/CavernsOfFreitag.dsk"); //$NON-NLS-1$
assertGraphicsFile(disks[0], "TITLE.PIC"); //$NON-NLS-1$
assertCanReadFiles(disks[0]);
}
@Test
@@ -153,6 +158,7 @@ public class DiskHelperTest {
assertIntegerFile(disks[0], "COPY"); //$NON-NLS-1$
assertBinaryFile(disks[0], "BOOT13"); //$NON-NLS-1$
assertEquals(DOS33_FORMAT, disks[0].getFormat());
assertCanReadFiles(disks[0]);
}
@Test
@@ -163,6 +169,7 @@ public class DiskHelperTest {
assertIntegerFile(disks[0], "COPY"); //$NON-NLS-1$
assertBinaryFile(disks[0], "BOOT13"); //$NON-NLS-1$
assertEquals(DOS33_FORMAT, disks[0].getFormat());
assertCanReadFiles(disks[0]);
}
@Test
@@ -172,6 +179,7 @@ public class DiskHelperTest {
assertIntegerFile(disks[0], "HELLO"); //$NON-NLS-1$
assertBinaryFile(disks[0], "UPDATE 3.2"); //$NON-NLS-1$
assertEquals(DOS32_FORMAT, disks[0].getFormat());
assertCanReadFiles(disks[0]);
}
@Test
@@ -182,6 +190,7 @@ public class DiskHelperTest {
assertBinaryFile(disks[0], "UPDATE 3.2.1");
assertTextFile(disks[0], "APPLE PROMS");
assertEquals(DOS32_FORMAT, disks[0].getFormat());
assertCanReadFiles(disks[0]);
}
protected FormattedDisk[] showDirectory(String imageName) throws IOException, DiskException {
@@ -300,4 +309,20 @@ public class DiskHelperTest {
assertTrue("GraphicsFileFilter was not chosen", //$NON-NLS-1$
fileEntry.getSuggestedFilter() instanceof GraphicsFileFilter);
}
protected void assertCanReadFiles(DirectoryEntry dir) throws DiskException {
for (FileEntry file : dir.getFiles()) {
if (file instanceof DirectoryEntry) {
assertCanReadFiles((DirectoryEntry) file);
}
else {
try {
byte[] data = file.getFileData();
assertNotNull(data);
} catch (Exception e) {
throw new AssertionError(String.format("Unable to read file '%s'", file.getFilename()), e);
}
}
}
}
}