mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-25 22:53:22 +00:00
Code Issues Releases Wiki Activity

Better Errors for fs API

Browse Source
This commit is contained in:
Wilma456 2017-07-15 16:09:29 +02:00
parent 94d701b1f7
commit 239a2f0d25
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dan200/computercraft/core/filesystem/ComboMount.java
View File

@ -94,7 +94,7 @@ else if( foundDirs > 1 )
}
else
{
throw new IOException( "Not a directory" );
throw new IOException( "Not a directory (" + path + ")" );
}
}
@ -109,7 +109,7 @@ public long getSize( @Nonnull String path ) throws IOException
return part.getSize( path );
}
}
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
@Nonnull
@ -124,6 +124,6 @@ public InputStream openForRead( @Nonnull String path ) throws IOException
return part.openForRead( path );
}
}
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
}

30
src/main/java/dan200/computercraft/core/filesystem/FileMount.java
View File

@ -129,7 +129,7 @@ public void list( @Nonnull String path, @Nonnull List<String> contents ) throws
{
if( path.length() != 0 )
{
throw new IOException( "Not a directory" );
throw new IOException( "Not a directory (" + path + ")" );
}
}
else
@ -148,7 +148,7 @@ public void list( @Nonnull String path, @Nonnull List<String> contents ) throws
}
else
{
throw new IOException( "Not a directory" );
throw new IOException( "Not a directory (" + path + ")" );
}
}
}
@ -178,7 +178,7 @@ public long getSize( @Nonnull String path ) throws IOException
}
}
}
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
@Nonnull
@ -193,7 +193,7 @@ public InputStream openForRead( @Nonnull String path ) throws IOException
return new FileInputStream( file );
}
}
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
// IWritableMount implementation
@ -207,7 +207,7 @@ public void makeDirectory( @Nonnull String path ) throws IOException
{
if( !file.isDirectory() )
{
throw new IOException( "File exists" );
throw new IOException( "File exists (" + path + ")" );
}
}
else
@ -222,7 +222,7 @@ public void makeDirectory( @Nonnull String path ) throws IOException
if( getRemainingSpace() < dirsToCreate * MINIMUM_FILE_SIZE )
{
throw new IOException( "Out of space" );
throw new IOException( "Out of space (" + path + ")" );
}
boolean success = file.mkdirs();
@ -232,7 +232,7 @@ public void makeDirectory( @Nonnull String path ) throws IOException
}
else
{
throw new IOException( "Access denied" );
throw new IOException( "Access denied (" + path + ")" );
}
}
}
@ -242,7 +242,7 @@ public void delete( @Nonnull String path ) throws IOException
{
if( path.length() == 0 )
{
throw new IOException( "Access denied" );
throw new IOException( "Access denied (" + path + ")" );
}
if( created() )
@ -276,7 +276,7 @@ private void deleteRecursively( File file ) throws IOException
}
else
{
throw new IOException( "Access denied" );
throw new IOException( "Access denied (" + path + ")" );
}
}
@ -288,7 +288,7 @@ public OutputStream openForWrite( @Nonnull String path ) throws IOException
File file = getRealPath( path );
if( file.exists() && file.isDirectory() )
{
throw new IOException( "Cannot write to directory" );
throw new IOException( "Cannot write to directory (" + path + ")" );
}
else
{
@ -296,7 +296,7 @@ public OutputStream openForWrite( @Nonnull String path ) throws IOException
{
if( getRemainingSpace() < MINIMUM_FILE_SIZE )
{
throw new IOException( "Out of space" );
throw new IOException( "Out of space (" + path + ")" );
}
else
{
@ -321,11 +321,11 @@ public OutputStream openForAppend( @Nonnull String path ) throws IOException
File file = getRealPath( path );
if( !file.exists() )
{
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
else if( file.isDirectory() )
{
throw new IOException( "Cannot write to directory" );
throw new IOException( "Cannot write to directory (" + path + ")" );
}
else
{
@ -334,7 +334,7 @@ else if( file.isDirectory() )
}
else
{
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
}
@ -361,7 +361,7 @@ private void create() throws IOException
boolean success = m_rootPath.mkdirs();
if( !success )
{
throw new IOException( "Access denied" );
throw new IOException( "Access denied (" + path + ")" );
}
}
}

30
src/main/java/dan200/computercraft/core/filesystem/FileSystem.java
View File

@ -110,7 +110,7 @@ public void list( String path, List<String> contents ) throws FileSystemExceptio
}
else
{
throw new FileSystemException( "Not a directory" );
throw new FileSystemException( "Not a directory (" + path + ")" );
}
}
catch( IOException e )
@ -137,7 +137,7 @@ public long getSize( String path ) throws FileSystemException
}
else
{
throw new FileSystemException( "No such file" );
throw new FileSystemException( "No such file (" + path + ")" );
}
}
catch( IOException e )
@ -157,7 +157,7 @@ public InputStream openForRead( String path ) throws FileSystemException
}
else
{
throw new FileSystemException( "No such file" );
throw new FileSystemException( "No such file (" + path + ")" );
}
}
catch( IOException e )
@ -172,7 +172,7 @@ public void makeDirectory( String path ) throws FileSystemException
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "Access denied (" + path + ")" );
}
try
{
@ -181,7 +181,7 @@ public void makeDirectory( String path ) throws FileSystemException
{
if( !m_mount.isDirectory( path ) )
{
throw new FileSystemException( "File exists" );
throw new FileSystemException( "File exists (" + path + ")" );
}
}
else
@ -199,7 +199,7 @@ public void delete( String path ) throws FileSystemException
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "Access denied (" + path + ")" );
}
try
{
@ -219,14 +219,14 @@ public OutputStream openForWrite( String path ) throws FileSystemException
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "Access denied (" + path + ")" );
}
try
{
path = toLocal( path );
if( m_mount.exists( path ) && m_mount.isDirectory( path ) )
{
throw new FileSystemException( "Cannot write to directory" );
throw new FileSystemException( "Cannot write to directory (" + path + ")" );
}
else
{
@ -251,7 +251,7 @@ public OutputStream openForAppend( String path ) throws FileSystemException
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "Access denied (" + path + ")" );
}
try
{
@ -270,7 +270,7 @@ public OutputStream openForAppend( String path ) throws FileSystemException
}
else if( m_mount.isDirectory( path ) )
{
throw new FileSystemException( "Cannot write to directory" );
throw new FileSystemException( "Cannot write to directory (" + path + ")" );
}
else
{
@ -557,16 +557,16 @@ public synchronized void copy( String sourcePath, String destPath ) throws FileS
sourcePath = sanitizePath( sourcePath );
destPath = sanitizePath( destPath );
if( isReadOnly( destPath ) ) {
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "Access denied (" + destPath + ")" );
}
if( !exists( sourcePath ) ) {
throw new FileSystemException( "No such file" );
throw new FileSystemException( "No such file (" + sourcePath + ")" );
}
if( exists( destPath ) ) {
throw new FileSystemException( "File exists" );
throw new FileSystemException( "File exists (" + destPath + ")" );
}
if( contains( sourcePath, destPath ) ) {
throw new FileSystemException( "Can't copy a directory inside itself" );
throw new FileSystemException( "Can't copy a directory inside itself (" + sourcePath + ")" );
}
copyRecursive( sourcePath, getMount( sourcePath ), destPath, getMount( destPath ) );
}
@ -730,7 +730,7 @@ private MountWrapper getMount( String path ) throws FileSystemException
}
if( match == null )
{
throw new FileSystemException( "Invalid Path" );
throw new FileSystemException( "Invalid Path (" + path + ")" );
}
return match;
}

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

@ -203,7 +203,7 @@ public void list( @Nonnull String path, @Nonnull List<String> contents ) throws
}
else
{
throw new IOException( "Not a directory" );
throw new IOException( "Not a directory (" + path + ")" );
}
}
@ -215,7 +215,7 @@ public long getSize( @Nonnull String path ) throws IOException
{
return file.getSize();
}
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
@Nonnull
@ -243,6 +243,6 @@ public InputStream openForRead( @Nonnull String path ) throws IOException
// treat errors as non-existance of file
}
}
throw new IOException( "No such file" );
throw new IOException( "No such file (" + path + ")" );
}
}