v0.7.4b: refactored file handling to use String instead of File

This commit is contained in:
Evan Debenham
2019-08-01 21:52:31 -04:00
parent 7885da4b99
commit 785726f4f8
3 changed files with 38 additions and 71 deletions

View File

@@ -24,9 +24,7 @@ package com.watabou.utils;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -41,27 +39,10 @@ public class FileUtils {
return file.exists() && !file.isDirectory();
}
public static File getFile( String name ){
return Gdx.files.local(name).file();
}
public static File getFile( File base, String name ){
File file = new File(base, name);
if (!file.exists() || !file.isDirectory()){
return file;
}
return null;
}
public static boolean deleteFile( String name ){
return Gdx.files.local(name).delete();
}
public static boolean deleteFile( File file ){
return !file.isDirectory() && file.delete();
}
// Directories
public static boolean dirExists( String name ){
@@ -69,50 +50,26 @@ public class FileUtils {
return dir.exists() && dir.isDirectory();
}
//base directory
public static File getDir( String name ){
return Gdx.files.local( name ).file();
}
public static File getDir( File base, String name ){
File dir = new File(base, name);
if (!dir.exists() && dir.mkdirs()){
return dir;
} else if (dir.isDirectory()){
return dir;
}
return null;
}
public static boolean deleteDir( String name ){
return deleteDir(getDir(name));
}
public static boolean deleteDir( File dir ){
FileHandle dir = Gdx.files.local( name );
if (dir == null || !dir.isDirectory()){
return false;
} else {
return dir.deleteDirectory();
}
for (File f : dir.listFiles()){
if (f.isDirectory()){
if (!deleteDir(f)) return false;
} else {
if (!deleteFile(f)) return false;
}
}
return dir.delete();
}
// bundle reading
//only works for base path
public static Bundle bundleFromFile( String fileName ) throws IOException{
return bundleFromStream(Gdx.files.local(fileName).read());
}
public static Bundle bundleFromFile( File file ) throws IOException{
return bundleFromStream(new FileInputStream(file));
FileHandle file = Gdx.files.local(fileName);
if (!file.exists()){
throw new FileNotFoundException("file not found: " + file.path());
} else {
return bundleFromStream(file.read());
}
}
private static Bundle bundleFromStream( InputStream input ) throws IOException{
@@ -128,10 +85,6 @@ public class FileUtils {
bundleToStream( Gdx.files.local(fileName).write(false), bundle);
}
public static void bundleToFile( File file, Bundle bundle ) throws IOException{
bundleToStream( new FileOutputStream(file), bundle);
}
private static void bundleToStream( OutputStream output, Bundle bundle ) throws IOException{
Bundle.write( bundle, output );
output.close();