mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-26 19:37:39 +00:00
Code Issues Releases Wiki Activity

Handle missing file metadata on zip files

Browse Source 
- Return EPOCH if a zip entry's creation/modification/access time is
   missing.
 - If a BasicFileAttributes.*Time method returns null, use 0 as our
   time. This shouldn't happen, but is a good sanity check.

Fixes #371
This commit is contained in:
SquidDev
2020-04-10 14:43:42 +01:00
parent e52d98ad8b
commit 062977336a
3 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dan200/computercraft/core/apis/FSAPI.java
View File

@@ -23,6 +23,7 @@ import java.io.BufferedWriter;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.FileTime;
import java.util.HashMap;
import java.util.Map;
import java.util.OptionalLong;
@@ -359,8 +360,8 @@ public class FSAPI implements ILuaAPI
{
BasicFileAttributes attributes = m_fileSystem.getAttributes( path );
Map<String, Object> result = new HashMap<>();
result.put( "modification", attributes.lastModifiedTime().toMillis() );
result.put( "created", attributes.creationTime().toMillis() );
result.put( "modification", getFileTime( attributes.lastModifiedTime() ) );
result.put( "created", getFileTime( attributes.creationTime() ) );
result.put( "size", attributes.isDirectory() ? 0 : attributes.size() );
result.put( "isDir", attributes.isDirectory() );
return new Object[] { result };
@@ -375,4 +376,9 @@ public class FSAPI implements ILuaAPI
return null;
}
}
private static long getFileTime( FileTime time )
{
return time == null ? 0 : time.toMillis();
}
}

15
src/main/java/dan200/computercraft/core/filesystem/JarMount.java
View File

@@ -25,6 +25,7 @@ import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.FileTime;
import java.time.Instant;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -290,19 +291,20 @@ public class JarMount implements IMount
@Override
public FileTime lastModifiedTime()
{
return entry.getLastModifiedTime();
return orEpoch( entry.getLastModifiedTime() );
}
@Override
public FileTime lastAccessTime()
{
return entry.getLastAccessTime();
return orEpoch( entry.getLastAccessTime() );
}
@Override
public FileTime creationTime()
{
return entry.getCreationTime();
FileTime time = entry.getCreationTime();
return time == null ? lastModifiedTime() : time;
}
@Override
@@ -340,5 +342,12 @@ public class JarMount implements IMount
{
return null;
}
private static final FileTime EPOCH = FileTime.from( Instant.EPOCH );
private static FileTime orEpoch( FileTime time )
{
return time == null ? EPOCH : time;
}
}
}