javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove NSError** out parameters from file-system-access.ios.

Browse Source
This commit is contained in:
Jason Zhekov
2015-07-13 16:11:38 +03:00
parent e07561332f
commit 8a1b4b7bce
1 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
file-system/file-system-access.ios.ts
View File

@ -15,7 +15,7 @@ export class FileSystemAccess {
public getLastModified(path: string): Date { public getLastModified(path: string): Date {
var fileManager = NSFileManager.defaultManager(); var fileManager = NSFileManager.defaultManager();
var attributes = fileManager.attributesOfItemAtPathError(path, null); var attributes = fileManager.attributesOfItemAtPathError(path);
if (attributes) { if (attributes) {
return attributes.objectForKey(this.keyModificationTime); return attributes.objectForKey(this.keyModificationTime);
@ -84,10 +84,12 @@ export class FileSystemAccess {
var exists = this.folderExists(path); var exists = this.folderExists(path);
if (!exists) { if (!exists) {
if (!fileManager.createDirectoryAtPathWithIntermediateDirectoriesAttributesError(path, true, null, null)) { try {
// error fileManager.createDirectoryAtPathWithIntermediateDirectoriesAttributesError(path, true, null)
}
catch (ex) {
if (onError) { if (onError) {
onError(new Error("Failed to create folder at path '" + path + "'")); onError(new Error("Failed to create folder at path '" + path + "': " + ex));
} }
return undefined; return undefined;
@ -189,9 +191,12 @@ export class FileSystemAccess {
var filesEnum = function (files: Array<{ path: string; name: string; extension: string }>) { var filesEnum = function (files: Array<{ path: string; name: string; extension: string }>) {
var i; var i;
for (i = 0; i < files.length; i++) { for (i = 0; i < files.length; i++) {
if (!fileManager.removeItemAtPathError(files[i].path, null)) { try {
fileManager.removeItemAtPathError(files[i].path);
}
catch (ex) {
if (onError) { if (onError) {
onError(new Error("Failed to empty folder '" + path + "'")); onError(new Error("Failed to empty folder '" + path + "': " + ex));
} }
return; return;
@ -208,11 +213,19 @@ export class FileSystemAccess {
public rename(path: string, newPath: string, onSuccess?: () => any, onError?: (error: any) => any) { public rename(path: string, newPath: string, onSuccess?: () => any, onError?: (error: any) => any) {
var fileManager = NSFileManager.defaultManager(); var fileManager = NSFileManager.defaultManager();
if (!fileManager.moveItemAtPathToPathError(path, newPath, null)) {
try {
fileManager.moveItemAtPathToPathError(path, newPath);
}
catch (ex) {
if (onError) { if (onError) {
onError(new Error("Failed to rename '" + path + "' to '" + newPath + "'")); onError(new Error("Failed to rename '" + path + "' to '" + newPath + "': " + ex));
} }
} else if (onSuccess) {
return;
}
if (onSuccess) {
onSuccess(); onSuccess();
} }
} }
@ -231,12 +244,18 @@ export class FileSystemAccess {
actualEncoding = textModule.encoding.UTF_8; actualEncoding = textModule.encoding.UTF_8;
} }
var nsString = NSString.stringWithContentsOfFileEncodingError(path, actualEncoding, null); try {
if (!nsString) { var nsString = NSString.stringWithContentsOfFileEncodingError(path, actualEncoding);
}
catch (ex) {
if (onError) { if (onError) {
onError(new Error("Failed to read file at path '" + path + "'")); onError(new Error("Failed to read file at path '" + path + "': " + ex));
} }
} else if (onSuccess) {
return;
}
if (onSuccess) {
onSuccess(nsString.toString()); onSuccess(nsString.toString());
} }
} }
@ -250,11 +269,18 @@ export class FileSystemAccess {
} }
// TODO: verify the useAuxiliaryFile parameter should be false // TODO: verify the useAuxiliaryFile parameter should be false
if (!nsString.writeToFileAtomicallyEncodingError(path, false, actualEncoding, null)) { try {
nsString.writeToFileAtomicallyEncodingError(path, false, actualEncoding);
}
catch (ex) {
if (onError) { if (onError) {
onError(new Error("Failed to write to file '" + path + "'")); onError(new Error("Failed to write to file '" + path + "': " + ex));
} }
} else if (onSuccess) {
return;
}
if (onSuccess) {
onSuccess(); onSuccess();
} }
} }
@ -267,7 +293,7 @@ export class FileSystemAccess {
return url.path; return url.path;
} }
// TODO: This method is the same as in the iOS implementation. // TODO: This method is the same as in the iOS implementation.
// Make it in a separate file / module so it can be reused from both implementations. // Make it in a separate file / module so it can be reused from both implementations.
private getFileExtension(path: string): string { private getFileExtension(path: string): string {
// TODO [For Panata]: The definitions currently specify "any" as a return value of this method // TODO [For Panata]: The definitions currently specify "any" as a return value of this method
@ -289,25 +315,29 @@ export class FileSystemAccess {
private deleteEntity(path: string, onSuccess?: () => any, onError?: (error: any) => any) { private deleteEntity(path: string, onSuccess?: () => any, onError?: (error: any) => any) {
var fileManager = NSFileManager.defaultManager(); var fileManager = NSFileManager.defaultManager();
if (!fileManager.removeItemAtPathError(path, null)) { try {
fileManager.removeItemAtPathError(path);
}
catch (ex) {
if (onError) { if (onError) {
onError(new Error("Failed to delete file at path '" + path + "'")); onError(new Error("Failed to delete file at path '" + path + "': " + ex));
}
} else {
if (onSuccess) {
onSuccess();
} }
} }
if (onSuccess) {
onSuccess();
}
} }
private enumEntities(path: string, callback: (entity: { path: string; name: string; extension: string }) => boolean, onError?: (error) => any) { private enumEntities(path: string, callback: (entity: { path: string; name: string; extension: string }) => boolean, onError?: (error) => any) {
try { try {
var fileManager = NSFileManager.defaultManager(); var fileManager = NSFileManager.defaultManager();
var files = fileManager.contentsOfDirectoryAtPathError(path, null); try {
var files = fileManager.contentsOfDirectoryAtPathError(path);
if (!files) { }
catch (ex) {
if (onError) { if (onError) {
onError(new Error("Failed to enum files for forlder '" + path + "'")); onError(new Error("Failed to enum files for folder '" + path + "': " + ex));
} }
return; return;