Skip to content

Fix issue parsing iWork '14 format, Fixes #3 #4

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
stephenlind wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue parsing iWork '14 format, Fixes #3 #4

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
39 changes: 27 additions & 12 deletions iWorkFileInspector/iWorkFileInspector/Bundle/IWBundle.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,33 @@ @implementation IWBundle

- (instancetype)initWithURL:(NSURL *)fileURL decryptionKey:(NSData *)decryptionKey
{
self = [super init];
if (self == nil) {
return nil;
}

_objectArchive = [[IWZipArchive alloc] initWithURL:[fileURL URLByAppendingPathComponent:IWBundleComponentZipFileName]];
if (_objectArchive == nil) {
return nil;
}

_decryptionKey = decryptionKey;

self = [super init];
if (self) {
_decryptionKey = decryptionKey;

/*
The object archive can be in one of two places, depending
on which version of iWork was used:

1. The top level file (iWork '14)
2. In the bundle zip component file (iWork '13)
*/


// Start with iWork '13 structure
_objectArchive = [[IWZipArchive alloc] initWithURL:[fileURL URLByAppendingPathComponent:IWBundleComponentZipFileName]];
if (_objectArchive == nil) {
// Try again with iWork '14
_objectArchive = [[IWZipArchive alloc] initWithURL:fileURL];
}


if (_objectArchive == nil) {
return nil;
}
}


return self;
}

Expand Down