mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-26 00:46:54 +00:00
Code Issues Releases Wiki Activity

Merge pull request #377 from Wilma456/fserror

Browse Source 
Better Errors for fs API
This commit is contained in:
Daniel Ratcliffe 2017-08-27 13:51:36 +01:00 committed by GitHub
commit fd8837c631
4 changed files with 34 additions and 34 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 @@ public class ComboMount implements IMount
}
else
{
throw new IOException( "Not a directory" );
throw new IOException( "/" + path + ": Not a directory" );
}
}
@ -109,7 +109,7 @@ public class ComboMount implements IMount
return part.getSize( path );
}
}
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
@Nonnull
@ -124,6 +124,6 @@ public class ComboMount implements IMount
return part.openForRead( path );
}
}
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
}

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

@ -129,7 +129,7 @@ public class FileMount implements IWritableMount
{
if( path.length() != 0 )
{
throw new IOException( "Not a directory" );
throw new IOException( "/" + path + ": Not a directory" );
}
}
else
@ -148,7 +148,7 @@ public class FileMount implements IWritableMount
}
else
{
throw new IOException( "Not a directory" );
throw new IOException( "/" + path + ": Not a directory" );
}
}
}
@ -178,7 +178,7 @@ public class FileMount implements IWritableMount
}
}
}
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
@Nonnull
@ -193,7 +193,7 @@ public class FileMount implements IWritableMount
return new FileInputStream( file );
}
}
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
// IWritableMount implementation
@ -207,7 +207,7 @@ public class FileMount implements IWritableMount
{
if( !file.isDirectory() )
{
throw new IOException( "File exists" );
throw new IOException( "/" + path + ": File exists" );
}
}
else
@ -222,7 +222,7 @@ public class FileMount implements IWritableMount
if( getRemainingSpace() < dirsToCreate * MINIMUM_FILE_SIZE )
{
throw new IOException( "Out of space" );
throw new IOException( "/" + path + ": Out of space" );
}
boolean success = file.mkdirs();
@ -232,7 +232,7 @@ public class FileMount implements IWritableMount
}
else
{
throw new IOException( "Access denied" );
throw new IOException( "/" + path + ": Access denied" );
}
}
}
@ -242,7 +242,7 @@ public class FileMount implements IWritableMount
{
if( path.length() == 0 )
{
throw new IOException( "Access denied" );
throw new IOException( "/" + path + ": Access denied" );
}
if( created() )
@ -288,7 +288,7 @@ public class FileMount implements IWritableMount
File file = getRealPath( path );
if( file.exists() && file.isDirectory() )
{
throw new IOException( "Cannot write to directory" );
throw new IOException( "/" + path + ": Cannot write to directory" );
}
else
{
@ -296,7 +296,7 @@ public class FileMount implements IWritableMount
{
if( getRemainingSpace() < MINIMUM_FILE_SIZE )
{
throw new IOException( "Out of space" );
throw new IOException( "/" + path + ": Out of space" );
}
else
{
@ -321,11 +321,11 @@ public class FileMount implements IWritableMount
File file = getRealPath( path );
if( !file.exists() )
{
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
else if( file.isDirectory() )
{
throw new IOException( "Cannot write to directory" );
throw new IOException( "/" + path + ": Cannot write to directory" );
}
else
{
@ -334,7 +334,7 @@ public class FileMount implements IWritableMount
}
else
{
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
}

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

@ -110,7 +110,7 @@ public class FileSystem
}
else
{
throw new FileSystemException( "Not a directory" );
throw new FileSystemException( "/" + path + ": Not a directory" );
}
}
catch( IOException e )
@ -137,7 +137,7 @@ public class FileSystem
}
else
{
throw new FileSystemException( "No such file" );
throw new FileSystemException( "/" + path + ": No such file" );
}
}
catch( IOException e )
@ -157,7 +157,7 @@ public class FileSystem
}
else
{
throw new FileSystemException( "No such file" );
throw new FileSystemException( "/" + path + ": No such file" );
}
}
catch( IOException e )
@ -172,7 +172,7 @@ public class FileSystem
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "/" + path + ": Access denied" );
}
try
{
@ -181,7 +181,7 @@ public class FileSystem
{
if( !m_mount.isDirectory( path ) )
{
throw new FileSystemException( "File exists" );
throw new FileSystemException( "/" + path + ": File exists" );
}
}
else
@ -199,7 +199,7 @@ public class FileSystem
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "/" + path + ": Access denied" );
}
try
{
@ -219,14 +219,14 @@ public class FileSystem
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "/" + path + ": Access denied" );
}
try
{
path = toLocal( path );
if( m_mount.exists( path ) && m_mount.isDirectory( path ) )
{
throw new FileSystemException( "Cannot write to directory" );
throw new FileSystemException( "/" + path + ": Cannot write to directory" );
}
else
{
@ -251,7 +251,7 @@ public class FileSystem
{
if( m_writableMount == null )
{
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "/" + path + ": Access denied" );
}
try
{
@ -270,7 +270,7 @@ public class FileSystem
}
else if( m_mount.isDirectory( path ) )
{
throw new FileSystemException( "Cannot write to directory" );
throw new FileSystemException( "/" + path + ": Cannot write to directory" );
}
else
{
@ -557,16 +557,16 @@ public class FileSystem
sourcePath = sanitizePath( sourcePath );
destPath = sanitizePath( destPath );
if( isReadOnly( destPath ) ) {
throw new FileSystemException( "Access denied" );
throw new FileSystemException( "/" + destPath + ": Access denied" );
}
if( !exists( sourcePath ) ) {
throw new FileSystemException( "No such file" );
throw new FileSystemException( "/" + sourcePath + ": No such file" );
}
if( exists( destPath ) ) {
throw new FileSystemException( "File exists" );
throw new FileSystemException( "/" + destPath + ": File exists" );
}
if( contains( sourcePath, destPath ) ) {
throw new FileSystemException( "Can't copy a directory inside itself" );
throw new FileSystemException( "/" + sourcePath + ": Can't copy a directory inside itself" );
}
copyRecursive( sourcePath, getMount( sourcePath ), destPath, getMount( destPath ) );
}
@ -730,7 +730,7 @@ public class FileSystem
}
if( match == null )
{
throw new FileSystemException( "Invalid Path" );
throw new FileSystemException( "/" + path + ": Invalid Path" );
}
return match;
}

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

@ -203,7 +203,7 @@ public class JarMount implements IMount
}
else
{
throw new IOException( "Not a directory" );
throw new IOException( "/" + path + ": Not a directory" );
}
}
@ -215,7 +215,7 @@ public class JarMount implements IMount
{
return file.getSize();
}
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
@Nonnull
@ -243,6 +243,6 @@ public class JarMount implements IMount
// treat errors as non-existance of file
}
}
throw new IOException( "No such file" );
throw new IOException( "/" + path + ": No such file" );
}
}