Skip to content

fix(ios): use resolved bookmark paths for file operations #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ios): use resolved bookmark paths for file operations #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions ios/ReactNativeFs.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ - (void) appendFile:(NSString *)filepath
NSError *error = nil;
NSURL *url = [ReactNativeFs pathToUrl:filepath error:&error];
if (error) return [[RNFSException fromError:error] reject:reject];
filepath = url.path;

BOOL allowed = [url startAccessingSecurityScopedResource];

Expand All @@ -215,10 +216,14 @@ - (void) appendFile:(NSString *)filepath
}

@try {
NSFileHandle *fH = [NSFileHandle fileHandleForUpdatingAtPath:filepath];

[fH seekToEndOfFile];
[fH writeData:data];
NSFileHandle *fH = [NSFileHandle fileHandleForWritingToURL:url error:&error];
if (!fH) return [[RNFSException fromError:error] reject:reject];
@try {
[fH seekToEndOfFile];
[fH writeData:data];
} @finally {
[fH closeFile];
}

return resolve(nil);
} @catch (NSException *exception) {
Expand Down Expand Up @@ -282,6 +287,7 @@ - (void) unlink:(NSString*)filepath
NSError *error = nil;
NSURL *url = [ReactNativeFs pathToUrl:filepath error:&error];
if (error) return [[RNFSException fromError:error] reject:reject];
filepath = url.path;

BOOL allowed = [url startAccessingSecurityScopedResource];

Expand Down Expand Up @@ -342,6 +348,7 @@ - (void) readFile:(NSString *)filepath
NSError *error = nil;
NSURL *url = [ReactNativeFs pathToUrl:filepath error:&error];
if (error) return [[RNFSException fromError:error] reject:reject];
filepath = url.path;

BOOL allowed = [url startAccessingSecurityScopedResource];

Expand All @@ -362,7 +369,8 @@ - (void) readFile:(NSString *)filepath
return reject(@"EISDIR", @"EISDIR: illegal operation on a directory, read", nil);
}

NSData *content = [[NSFileManager defaultManager] contentsAtPath:filepath];
NSData *content = [NSData dataWithContentsOfURL:url options:0 error:&error];
if (!content) return [[RNFSException fromError:error] reject:reject];
NSString *base64Content = [content base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];

resolve(base64Content);
Expand Down Expand Up @@ -393,11 +401,11 @@ - (void) read:(NSString *)path

NSError *error = nil;

NSFileAttributeType type;
BOOL success = [url getResourceValue:&type forKey:NSFileType error:&error];
NSNumber *isDirectory;
BOOL success = [url getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:&error];
if (!success) return [[RNFSException fromError:error] reject:reject];

if (type == NSFileTypeDirectory) {
if (isDirectory.boolValue) {
return reject(@"EISDIR", @"EISDIR: illegal operation on a directory, read", nil);
}

Expand All @@ -407,14 +415,16 @@ - (void) read:(NSString *)path
return reject(@"EISDIR", @"EISDIR: Could not open file for reading", error);
}

// Seek to the position if there is one.
[file seekToFileOffset: (long)position];

NSData *content;
if ((long)length > 0) {
content = [file readDataOfLength: (long)length];
} else {
content = [file readDataToEndOfFile];
@try {
[file seekToFileOffset: (long)position];
if ((long)length > 0) {
content = [file readDataOfLength: (long)length];
} else {
content = [file readDataToEndOfFile];
}
} @finally {
[file closeFile];
}

NSString *base64Content = [content base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
Expand Down Expand Up @@ -585,7 +595,7 @@ - (void) moveFile:(NSString *)from
NSFileManager *manager = [NSFileManager defaultManager];

NSError *error = nil;
BOOL success = [manager moveItemAtPath:from toPath:into error:&error];
BOOL success = [manager moveItemAtURL:url toURL:[NSURL fileURLWithPath:into] error:&error];

if (!success) return [[RNFSException fromError:error] reject:reject];

Expand Down