public/Objective-Zip
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: public:0.8.2
Branches Tags
public:master
public:1.0.5 public:1.0.4 public:1.0.3 public:1.0.2 public:1.0.1 public:1.0.0 public:0.8.3 public:0.8.2 public:0.8.0
..
compare: public:1.0.3
Branches Tags
public:master
public:1.0.5 public:1.0.4 public:1.0.3 public:1.0.2 public:1.0.1 public:1.0.0 public:0.8.3 public:0.8.2 public:0.8.0

44 Commits
0.8.2 ... 1.0.3

Author SHA1 Message Date
Gianluca Bertani
04d8d9d1d4 Fixed podspec by adding public headers 2016-08-28 12:12:38 +02:00
Gianluca Bertani
cc40af1311 Bumped version to 1.0.3 2016-08-28 11:28:16 +02:00
Gianluca Bertani
1dbde8f9c9 Bumped version to 1.0.3 2016-08-28 11:26:08 +02:00
Gianluca Bertani
5a90a66267 Merge pull request #41 from atlasti/master 
Removing a potential leak found by static analysis.
 2016-08-28 11:01:55 +02:00
Gianluca Bertani
00386a3fe9 Merge pull request #48 from andyj-at-aspin/Swift3ExceptionThrowing 
Changed throwing of Swift errors
 2016-08-28 10:59:34 +02:00
Andy Johnson
ec6056de67 Changed throwing of Swift errors from the Stream reading/writing to be nonnull_error rather than zero_result. Continues to work with Swift 2.x but now works with Swift 3 Beta (circa XCode 8 beta 6) 2016-08-26 16:53:19 +01:00
Martin Winter
2485f97586 Apply changes from commit e54e129 of https://github.com/madler/zlib/ repository to silence compiler warning about shifting a negative signed value. 2016-04-01 13:57:52 +01:00
Gianluca Bertani
8364f87f9a Merge pull request #44 from deni2s/master 
Update README.md
 2016-03-18 08:37:38 +01:00
deni2s
9dfa7e43da Update README.md 
Suppresses warning about using int type instead of long long for info.size
 2016-03-17 17:38:39 +02:00
Gianluca Bertani
401dfa4b17 Merge pull request #43 from deni2s/patch-1 
Update README.md
 2016-03-17 16:21:54 +01:00
deni2s
a1e5810879 Update README.md 
Fixed typo in example code
 2016-03-17 17:07:48 +02:00
Kevin Meaney
64185c4750 Removing a potential leek found by static analysis. 2016-01-04 11:22:31 +00:00
Gianluca Bertani
4ed48f8e04 Bumped version to 1.0.2 2015-10-18 14:37:22 +02:00
Gianluca Bertani
6797222f63 Improved section on reading a file; removed section on memory management; added version 1.0.2 in version history 2015-10-18 14:33:49 +02:00
Gianluca Bertani
f1f4fee67f Improved interface of locateFileInZip and readDataWithBuffer in NSError variant 2015-10-18 14:32:45 +02:00
Gianluca Bertani
07288c8e00 Fixed pod name in README 2015-10-18 10:35:30 +02:00
Gianluca Bertani
1409b8622d Updated podspec 2015-09-20 19:01:01 +02:00
Gianluca Bertani
7f6ea3dd22 Bumped version to 1.0.1 2015-09-20 19:00:10 +02:00
Gianluca Bertani
f3ccab7a68 Added Swift unit tests; bug fixes for Swift compatibility; verified settings for Xcode 7 2015-09-20 18:55:05 +02:00
Gianluca Bertani
74cbccda01 Merged back Getting Started in README 2015-09-14 11:51:02 +02:00
Gianluca Bertani
5178459102 Moved enums to NS_ENUMs for Swift compatibility 2015-09-14 11:49:48 +02:00
Gianluca Bertani
51b449b51f Added back the podspec 2015-09-09 23:21:12 +02:00
Gianluca Bertani
2b57e61fbc Temporarily removed podspec 2015-09-09 23:20:46 +02:00
Gianluca Bertani
94312b945e Solved some type conversion warnings; replaced #warning with // TODO 2015-09-09 21:00:36 +02:00
Gianluca Bertani
dbd1e5962f Bumped version to 1.0.0; updated README and GETTING_STARTED; added podspec 2015-09-09 20:28:10 +02:00
Gianluca Bertani
6e0a47fc64 Separated standard (exceptions) and NSError variants of interfaces with categories 2015-09-09 18:54:53 +02:00
Gianluca Bertani
b7dcbb63b3 Added API docs 2015-09-09 18:30:10 +02:00
Gianluca Bertani
b87bd38b66 Added nullability annotations 2015-09-06 11:26:52 +02:00
Gianluca Bertani
4be16c97b0 Fixed use of NSError pattern; fixed minor int conversion issues 2015-08-29 18:10:01 +02:00
Gianluca Bertani
1839a1c65c Added targets for iOS and OS X static libraries; moved DIY tests to XCTest 2015-08-29 17:33:09 +02:00
Gianluca Bertani
2be9361540 Fixed bug in error wrapping 2015-08-29 15:46:21 +02:00
Gianluca Bertani
faa7e4d897 Introduced method variants with NSError handling; simplified exception creation 2015-08-28 19:43:47 +02:00
Gianluca Bertani
1a91d92c51 Fixed used of deprecated constants (pull request #33) 2015-08-28 17:39:12 +02:00
Gianluca Bertani
0d62b04cc6 Fixed some conversion warnings (pull request #28) 2015-08-28 17:33:58 +02:00
Gianluca Bertani
e2e8bdc700 Added support for legacy 32-bit zip files (see pull requests #18, #24 and #30) 2015-08-28 17:28:39 +02:00
Gianluca Bertani
48a53904d8 Some code clean up 2015-08-27 17:18:43 +02:00
Gianluca Bertani
5cbe4cde4d Added class prefix OZ 2015-08-27 16:30:59 +02:00
Gianluca Bertani
433d629232 ARC-ified; removed ARCHelper.h 2015-08-27 16:16:26 +02:00
Gianluca Bertani
c8f2e3843f Added tests to unzip & check zip files created with Mac OS X and Windows; updated README 2013-06-23 17:26:21 +02:00
Gianluca Bertani
f05b2ed31b Minor project updates 2013-06-23 14:26:01 +02:00
Gianluca Bertani
049d1d4359 Updated REDAME 2013-06-23 14:14:43 +02:00
Gianluca Bertani
1c2bf920ac Updated README 2013-06-23 14:14:21 +02:00
Gianluca Bertani
0148dc65ef Fixed test 2 to zip & unzip up to 6.3 GB 2013-06-23 14:14:03 +02:00
Gianluca Bertani
1f0a183797 Fixed use of 64 bit APIs; bumped version to 0.8.3 2013-06-23 14:13:34 +02:00
49 changed files with 4493 additions and 2294 deletions
Expand all files Collapse all files

59
ARCHelper/ARCHelper.h
View File

@@ -1,59 +0,0 @@
//
// ARC Helper
//
// Version 2.1
//
// Created by Nick Lockwood on 05/01/2012.
// Copyright 2012 Charcoal Design
//
// Distributed under the permissive zlib license
// Get the latest version from here:
//
// https://gist.github.com/1563325
//
#ifndef ah_retain
#if __has_feature(objc_arc)
#define ah_retain self
#define ah_dealloc self
#define release self
#define autorelease self
#else
#define ah_retain retain
#define ah_dealloc dealloc
#define __bridge
#endif
#endif
// Weak reference support
#import <Availability.h>
#if (!__has_feature(objc_arc)) || \
(defined __IPHONE_OS_VERSION_MIN_REQUIRED && \
__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_5_0) || \
(defined __MAC_OS_X_VERSION_MIN_REQUIRED && \
__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7)
#undef weak
#define weak unsafe_unretained
#undef __weak
#define __weak __unsafe_unretained
#endif
// Weak delegate support
#ifndef ah_weak
#import <Availability.h>
#if (__has_feature(objc_arc)) && \
((defined __IPHONE_OS_VERSION_MIN_REQUIRED && \
__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0) || \
(defined __MAC_OS_X_VERSION_MIN_REQUIRED && \
__MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_7))
#define ah_weak weak
#define __ah_weak __weak
#else
#define ah_weak unsafe_unretained
#define __ah_weak __unsafe_unretained
#endif
#endif
// ARC Helper ends

330
Classes/Objective_ZipViewController.m
View File

@@ -1,330 +0,0 @@
//
// Objective_ZipViewController.m
// Objective-Zip
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright Flying Dolphin Studio 2009. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "Objective_ZipViewController.h"
#import "../Objective-Zip/ZipFile.h"
#import "../Objective-Zip/ZipException.h"
#import "../Objective-Zip/FileInZipInfo.h"
#import "../Objective-Zip/ZipWriteStream.h"
#import "../Objective-Zip/ZipReadStream.h"
#define HUGE_TEST_BLOCK_LENGTH (63000)
#define HUGE_TEST_NUMBER_OF_BLOCKS (68149)
@implementation Objective_ZipViewController
- (void) loadView {
[super loadView];
_textView.font= [UIFont fontWithName:@"Helvetica" size:11.0];
}
- (void) dealloc {
if (_testThread)
[_testThread release];
[super dealloc];
}
- (void) didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
}
- (IBAction) zipUnzip {
if (_testThread)
[_testThread release];
_testThread= [[NSThread alloc] initWithTarget:self selector:@selector(test) object:nil];
[_testThread start];
}
- (IBAction) zipUnzip2 {
if (_testThread)
[_testThread release];
_testThread= [[NSThread alloc] initWithTarget:self selector:@selector(test2) object:nil];
[_testThread start];
}
- (void) test {
NSAutoreleasePool *pool= [[NSAutoreleasePool alloc] init];
@try {
NSString *documentsDir= [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
NSString *filePath= [documentsDir stringByAppendingPathComponent:@"test.zip"];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: opening zip file for writing..." waitUntilDone:YES];
ZipFile *zipFile= [[ZipFile alloc] initWithFileName:filePath mode:ZipFileModeCreate];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: adding first file..." waitUntilDone:YES];
ZipWriteStream *stream1= [zipFile writeFileInZipWithName:@"abc.txt" fileDate:[NSDate dateWithTimeIntervalSinceNow:-86400.0] compressionLevel:ZipCompressionLevelBest];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: writing to first file's stream..." waitUntilDone:YES];
NSString *text= @"abc";
[stream1 writeData:[text dataUsingEncoding:NSUTF8StringEncoding]];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: closing first file's stream..." waitUntilDone:YES];
[stream1 finishedWriting];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: adding second file..." waitUntilDone:YES];
ZipWriteStream *stream2= [zipFile writeFileInZipWithName:@"x/y/z/xyz.txt" compressionLevel:ZipCompressionLevelNone];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: writing to second file's stream..." waitUntilDone:YES];
NSString *text2= @"XYZ";
[stream2 writeData:[text2 dataUsingEncoding:NSUTF8StringEncoding]];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: closing second file's stream..." waitUntilDone:YES];
[stream2 finishedWriting];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: closing zip file..." waitUntilDone:YES];
[zipFile close];
[zipFile release];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: opening zip file for reading..." waitUntilDone:YES];
ZipFile *unzipFile= [[ZipFile alloc] initWithFileName:filePath mode:ZipFileModeUnzip];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: reading file infos..." waitUntilDone:YES];
NSArray *infos= [unzipFile listFileInZipInfos];
for (FileInZipInfo *info in infos) {
NSString *fileInfo= [NSString stringWithFormat:@"Test 1: - %@ %@ %d (%d)", info.name, info.date, info.size, info.level];
[self performSelectorOnMainThread:@selector(log:) withObject:fileInfo waitUntilDone:YES];
}
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: opening first file..." waitUntilDone:YES];
[unzipFile goToFirstFileInZip];
ZipReadStream *read1= [unzipFile readCurrentFileInZip];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: reading from first file's stream..." waitUntilDone:YES];
NSMutableData *data1= [[[NSMutableData alloc] initWithLength:256] autorelease];
int bytesRead1= [read1 readDataWithBuffer:data1];
BOOL ok= NO;
if (bytesRead1 == 3) {
NSString *fileText1= [[[NSString alloc] initWithBytes:[data1 bytes] length:bytesRead1 encoding:NSUTF8StringEncoding] autorelease];
if ([fileText1 isEqualToString:@"abc"])
ok= YES;
}
if (ok)
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: content of first file is OK" waitUntilDone:YES];
else
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: content of first file is WRONG" waitUntilDone:YES];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: closing first file's stream..." waitUntilDone:YES];
[read1 finishedReading];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: opening second file..." waitUntilDone:YES];
[unzipFile goToNextFileInZip];
ZipReadStream *read2= [unzipFile readCurrentFileInZip];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: reading from second file's stream..." waitUntilDone:YES];
NSMutableData *data2= [[[NSMutableData alloc] initWithLength:256] autorelease];
int bytesRead2= [read2 readDataWithBuffer:data2];
ok= NO;
if (bytesRead2 == 3) {
NSString *fileText2= [[[NSString alloc] initWithBytes:[data2 bytes] length:bytesRead2 encoding:NSUTF8StringEncoding] autorelease];
if ([fileText2 isEqualToString:@"XYZ"])
ok= YES;
}
if (ok)
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: content of second file is OK" waitUntilDone:YES];
else
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: content of second file is WRONG" waitUntilDone:YES];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: closing second file's stream..." waitUntilDone:YES];
[read2 finishedReading];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: closing zip file..." waitUntilDone:YES];
[unzipFile close];
[unzipFile release];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: test terminated succesfully" waitUntilDone:YES];
} @catch (ZipException *ze) {
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: caught a ZipException (see logs), terminating..." waitUntilDone:YES];
NSLog(@"Test 1: ZipException caught: %d - %@", ze.error, [ze reason]);
} @catch (id e) {
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 1: caught a generic exception (see logs), terminating..." waitUntilDone:YES];
NSLog(@"Test 1: Exception caught: %@ - %@", [[e class] description], [e description]);
}
[pool drain];
}
- (void) test2 {
NSAutoreleasePool *pool= [[NSAutoreleasePool alloc] init];
@try {
NSString *documentsDir= [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
NSString *filePath= [documentsDir stringByAppendingPathComponent:@"huge_test.zip"];
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: opening zip file for writing..." waitUntilDone:YES];
ZipFile *zipFile= [[ZipFile alloc] initWithFileName:filePath mode:ZipFileModeCreate];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: adding file..." waitUntilDone:YES];
ZipWriteStream *stream= [zipFile writeFileInZipWithName:@"huge_file.txt" compressionLevel:ZipCompressionLevelBest];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: writing to file's stream..." waitUntilDone:YES];
NSMutableData *data= [[NSMutableData alloc] initWithLength:HUGE_TEST_BLOCK_LENGTH];
SecRandomCopyBytes(kSecRandomDefault, [data length], [data mutableBytes]);
NSData *checkData= [data subdataWithRange:NSMakeRange(0, 100)];
NSMutableData *buffer= [[NSMutableData alloc] initWithLength:HUGE_TEST_BLOCK_LENGTH]; // For use later
for (int i= 0; i < HUGE_TEST_NUMBER_OF_BLOCKS; i++) {
[stream writeData:data];
if (i % 100 == 0) {
NSString *logLine= [[NSString alloc] initWithFormat:@"Test 2: written %d KB...", ([data length] / 1024) * (i +1)];
[self performSelectorOnMainThread:@selector(log:) withObject:logLine waitUntilDone:YES];
[logLine release];
}
}
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: closing file's stream..." waitUntilDone:YES];
[stream finishedWriting];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: closing zip file..." waitUntilDone:YES];
[zipFile close];
[zipFile release];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: opening zip file for reading..." waitUntilDone:YES];
ZipFile *unzipFile= [[ZipFile alloc] initWithFileName:filePath mode:ZipFileModeUnzip];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: opening file..." waitUntilDone:YES];
[unzipFile goToFirstFileInZip];
ZipReadStream *read= [unzipFile readCurrentFileInZip];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: reading from file's stream..." waitUntilDone:YES];
for (int i= 0; i < HUGE_TEST_NUMBER_OF_BLOCKS; i++) {
int bytesRead= [read readDataWithBuffer:buffer];
BOOL ok= NO;
if (bytesRead == [data length]) {
NSRange range= [buffer rangeOfData:checkData options:0 range:NSMakeRange(0, [buffer length])];
if (range.location == 0)
ok= YES;
}
if (!ok) {
NSString *logLine= [[NSString alloc] initWithFormat:@"Test 2: content of file is WRONG at position %d KB", ([buffer length] / 1024) * i];
[self performSelectorOnMainThread:@selector(log:) withObject:logLine waitUntilDone:YES];
[logLine release];
}
if (i % 100 == 0) {
NSString *logLine= [[NSString alloc] initWithFormat:@"Test 2: read %d KB...", ([buffer length] / 1024) * (i +1)];
[self performSelectorOnMainThread:@selector(log:) withObject:logLine waitUntilDone:YES];
[logLine release];
}
}
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: closing file's stream..." waitUntilDone:YES];
[read finishedReading];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: closing zip file..." waitUntilDone:YES];
[unzipFile close];
[unzipFile release];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: deleting zip file..." waitUntilDone:YES];
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: test terminated succesfully" waitUntilDone:YES];
[data release];
[buffer release];
} @catch (ZipException *ze) {
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: caught a ZipException (see logs), terminating..." waitUntilDone:YES];
NSLog(@"Test 2: ZipException caught: %d - %@", ze.error, [ze reason]);
} @catch (id e) {
[self performSelectorOnMainThread:@selector(log:) withObject:@"Test 2: caught a generic exception (see logs), terminating..." waitUntilDone:YES];
NSLog(@"Test 2: Exception caught: %@ - %@", [[e class] description], [e description]);
}
[pool drain];
}
- (void) log:(NSString *)text {
NSLog(@"%@", text);
_textView.text= [_textView.text stringByAppendingString:text];
_textView.text= [_textView.text stringByAppendingString:@"\n"];
NSRange range;
range.location= [_textView.text length] -6;
range.length= 5;
[_textView scrollRangeToVisible:range];
}
@end

BIN
Default.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 408 KiB

186
GETTING_STARTED.md
View File

@@ -1,186 +0,0 @@
Getting started with Objective-Zip
==================================
Objective-Zip exposes basic functionalities to read and write zip files,
encapsulating both ZLib for the compression mechanism and MiniZip for
the zip wrapping.
Adding Objective-Zip to your project
------------------------------------
The library is distributed as source only, so simply download the unit
test application and copy-paste these directories in your own project:
- ARCHelper
- ZLib
- MiniZip
- Objective-Zip
The first two are simply copies of the distribution of version 1.2.7 of
ZLib and of version 1.1 of MiniZip (which is itself part of ZLib
contributions), while the third is their Objective-C wrapper.
Main concepts
-------------
Objective-Zip is centered on a class called (with a lack of fantasy)
ZipFile. It can be created with the common Objective-C procedure of an
alloc followed by an init, specifying in the latter if the zip file is
being created, appended or unzipped:
ZipFile *zipFile= [[ZipFile alloc] initWithFileName:@"test.zip"
mode:ZipFileModeCreate];
Creating and appending are both write-only modalities, while unzipping
is a read-only modality. You can not request reading operations on a
write-mode zip file, nor request writing operations on a read-mode zip
file.
Adding a file to a zip file
---------------------------
The ZipFile class has a couple of methods to add new files to a zip
file, one of which keeps the file in clear and the other encrypts it
with a password. Both methods return an instance of a ZipWriteStream
class, which will be used solely for the scope of writing the content of
the file, and then must be closed:
ZipWriteStream *stream= [zipFile writeFileInZipWithName:@"abc.txt"
compressionLevel:ZipCompressionLevelBest];
[stream writeData:abcData];
[stream finishedWriting];
Reading a file from a zip file
------------------------------
The ZipFile class, when used in unzip mode, must be treated like a
cursor: you position the instance on a file at a time, either by
step-forwarding or by locating the file by name. Once you are on the
correct file, you can obtain an instance of a ZipReadStream that will
let you read the content (and then must be closed):
ZipFile *unzipFile= [[ZipFile alloc] initWithFileName:@"test.zip"
mode:ZipFileModeUnzip];
[unzipFile goToFirstFileInZip];
ZipReadStream *read= [unzipFile readCurrentFileInZip];
NSMutableData *data= [[NSMutableData alloc] initWithLength:256];
int bytesRead= [read readDataWithBuffer:data];
[read finishedReading];
Note that the NSMutableData instance that acts as the read buffer must
have been set with a length greater than 0: the readDataWithBuffer API
will use that length to know how many bytes it can fetch from the zip
file.
Listing files in a zip file
---------------------------
When the ZipFile class is used in unzip mode, it can also list the files
contained in zip by filling an NSArray with instances of FileInZipInfo
class. You can then use its name property to locate the file inside the
zip and expand it:
ZipFile *unzipFile= [[ZipFile alloc] initWithFileName:@"test.zip"
mode:ZipFileModeUnzip];
NSArray *infos= [unzipFile listFileInZipInfos];
for (FileInZipInfo *info in infos) {
NSLog(@"- %@ %@ %d (%d)", info.name, info.date, info.size,
info.level);
// Locate the file in the zip
[unzipFile locateFileInZip:info.name];
// Expand the file in memory
ZipReadStream *read= [unzipFile readCurrentFileInZip];
NSMutableData *data= [[NSMutableData alloc] initWithLength:256];
int bytesRead= [read readDataWithBuffer:data];
[read finishedReading];
}
Note that the FileInZipInfo class provide two sizes:
- **length** is the original (uncompressed) file size, while
- **size** is the compressed file size.
Closing the zip file
--------------------
Remember, when you are done, to close your ZipFile instance to avoid
file corruption problems:
[zipFile close];
Notes
=====
File/folder hierarchy inide the zip
-----------------------------------
Please note that inside the zip files there is no representation of a
file-folder hierarchy: it is simply embedded in file names (i.e.: a file
with a name like "x/y/z/file.txt"). It is up to the program that
extracts the files to consider these file names as expressing a
structure and rebuild it on the file system (and viceversa during
creation). Common zippers/unzippers simply follow this rule.
Memory management
-----------------
If you need to extract huge files that cannot be contained in memory,
you can do so using a read-then-write buffered loop like this:
NSFileHandle *file= [NSFileHandle fileHandleForWritingAtPath:filePath];
NSMutableData *buffer= [[NSMutableData alloc]
initWithLength:BUFFER_SIZE];
ZipReadStream *read= [unzipFile readCurrentFileInZip];
// Read-then-write buffered loop
do {
// Reset buffer length
[buffer setLength:BUFFER_SIZE];
// Expand next chunk of bytes
int bytesRead= [read readDataWithBuffer:buffer];
if (bytesRead > 0) {
// Write what we have read
[buffer setLength:bytesRead];
[file writeData:buffer];
} else
break;
} while (YES);
// Clean up
[file closeFile];
[read finishedReading];
[buffer release];
Exception handling
------------------
If something goes wrong during an operation, Objective-Zip will always
throw an exception of class ZipException, which contains a property with
the specific error number of MiniZip. With that number you are supposed
to find the reason of the error.

219
MainWindow.xib
View File

@@ -1,219 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">784</int>
<string key="IBDocument.SystemVersion">10A394</string>
<string key="IBDocument.InterfaceBuilderVersion">732</string>
<string key="IBDocument.AppKitVersion">1027.1</string>
<string key="IBDocument.HIToolboxVersion">430.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">60</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="10"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBProxyObject" id="841351856">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
</object>
<object class="IBProxyObject" id="427554174">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
</object>
<object class="IBUICustomObject" id="664661524"/>
<object class="IBUIViewController" id="943309135">
<string key="IBUINibName">Objective_ZipViewController</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
</object>
<object class="IBUIWindow" id="117978783">
<nil key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{320, 480}</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="664661524"/>
</object>
<int key="connectionID">4</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">viewController</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="943309135"/>
</object>
<int key="connectionID">11</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="117978783"/>
</object>
<int key="connectionID">14</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<reference key="object" ref="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="841351856"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">3</int>
<reference key="object" ref="664661524"/>
<reference key="parent" ref="0"/>
<string key="objectName">Objective_Zip App Delegate</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="427554174"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="943309135"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="117978783"/>
<reference key="parent" ref="0"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
<string>10.CustomClassName</string>
<string>10.IBEditorWindowLastContentRect</string>
<string>10.IBPluginDependency</string>
<string>12.IBEditorWindowLastContentRect</string>
<string>12.IBPluginDependency</string>
<string>3.CustomClassName</string>
<string>3.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
<string>UIResponder</string>
<string>Objective_ZipViewController</string>
<string>{{512, 351}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>{{525, 346}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>Objective_ZipAppDelegate</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">14</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">Objective_ZipAppDelegate</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>viewController</string>
<string>window</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Objective_ZipViewController</string>
<string>UIWindow</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/Objective_ZipAppDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">Objective_ZipAppDelegate</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">Objective_ZipViewController</string>
<string key="superclassName">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/Objective_ZipViewController.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3100" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">Objective-Zip.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">3.1</string>
</data>
</archive>

2
MiniZip/ioapi.c
View File

@@ -121,7 +121,7 @@ static voidpf file_build_ioposix(FILE *file, const char *filename)
return NULL;
ioposix = (FILE_IOPOSIX*)malloc(sizeof(FILE_IOPOSIX));
ioposix->file = file;
ioposix->filenameLength = strlen(filename) + 1;
ioposix->filenameLength = (int) (strlen(filename) + 1);
ioposix->filename = (char*)malloc(ioposix->filenameLength * sizeof(char));
strncpy(ioposix->filename, filename, ioposix->filenameLength);
return (voidpf)ioposix;

13
MiniZip/unzip.c
View File

@@ -342,7 +342,10 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
return 0;
if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
{
TRYFREE(buf);
return 0;
}
file_size = ZTELL64(*pzlib_filefunc_def, filestream);
@@ -646,14 +649,14 @@ local int unzGoToNextDisk(unzFile file)
if (s == NULL)
return UNZ_PARAMERROR;
pfile_in_zip_read_info = s->pfile_in_zip_read;
number_disk_next = s->number_disk;
number_disk_next = (int) s->number_disk;
if ((pfile_in_zip_read_info != NULL) && (pfile_in_zip_read_info->rest_read_uncompressed > 0))
/* We are currently reading a file and we need the next sequential disk */
number_disk_next += 1;
else
/* Goto the disk for the current file */
number_disk_next = s->cur_file_info.disk_num_start;
number_disk_next = (int) s->cur_file_info.disk_num_start;
if (number_disk_next != s->number_disk)
{
@@ -1390,8 +1393,8 @@ extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len)
uInt total_bytes_read = 0;
if (pfile_in_zip_read_info->stream.next_in != NULL)
bytes_not_read = pfile_in_zip_read_info->read_buffer + UNZ_BUFSIZE -
pfile_in_zip_read_info->stream.next_in;
bytes_not_read = (uInt) (pfile_in_zip_read_info->read_buffer + UNZ_BUFSIZE -
pfile_in_zip_read_info->stream.next_in);
bytes_to_read -= bytes_not_read;
if (bytes_not_read > 0)
memcpy(pfile_in_zip_read_info->read_buffer, pfile_in_zip_read_info->stream.next_in, bytes_not_read);
@@ -1407,7 +1410,7 @@ extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len)
ZLIB_FILEFUNC_SEEK_SET) != 0)
return UNZ_ERRNO;
bytes_read = ZREAD64(pfile_in_zip_read_info->z_filefunc, pfile_in_zip_read_info->filestream,
bytes_read = (int) ZREAD64(pfile_in_zip_read_info->z_filefunc, pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->read_buffer + bytes_not_read + total_bytes_read,
bytes_to_read - total_bytes_read);

23
MiniZip/zip.c
View File

@@ -510,7 +510,7 @@ local int zipGoToFirstDisk(zipFile file)
return err;
number_disk_next = 0;
if (zi->number_disk_with_CD > 0)
number_disk_next = zi->number_disk_with_CD - 1;
number_disk_next = (int) (zi->number_disk_with_CD - 1);
err = zipGoToSpecificDisk(file, number_disk_next, (zi->append == APPEND_STATUS_ADDINZIP));
if ((err == ZIP_ERRNO) && (zi->append == APPEND_STATUS_ADDINZIP))
err = zipGoToSpecificDisk(file, number_disk_next, 0);
@@ -535,7 +535,7 @@ local int zipGoToNextDisk(zipFile file)
if (zi->disk_size == 0)
return err;
number_disk_next = zi->number_disk + 1;
number_disk_next = (int) (zi->number_disk + 1);
do
{
@@ -575,7 +575,10 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
return 0;
if (ZSEEK64(*pzlib_filefunc_def, filestream, 0, ZLIB_FILEFUNC_SEEK_END) != 0)
{
TRYFREE(buf);
return 0;
}
file_size = ZTELL64(*pzlib_filefunc_def, filestream);
@@ -661,14 +664,14 @@ extern zipFile ZEXPORT zipOpen4(const void *pathname, int append, ZPOS64_T disk_
zip64_internal ziinit;
zip64_internal* zi;
ZPOS64_T byte_before_the_zipfile; /* byte before the zipfile, (>0 for sfx)*/
ZPOS64_T size_central_dir; /* size of the central directory */
ZPOS64_T offset_central_dir; /* offset of start of central directory */
ZPOS64_T number_entry_CD; /* total number of entries in the central dir */
ZPOS64_T size_central_dir = 0; /* size of the central directory */
ZPOS64_T offset_central_dir = 0; /* offset of start of central directory */
ZPOS64_T number_entry_CD = 0; /* total number of entries in the central dir */
ZPOS64_T number_entry;
ZPOS64_T central_pos;
ZPOS64_T size_central_dir_to_read;
uLong uL;
uLong size_comment;
uLong size_comment = 0;
size_t buf_size = SIZEDATA_INDATABLOCK;
void* buf_read;
int err = ZIP_OK;
@@ -1428,7 +1431,7 @@ local int zip64FlushWriteBuffer(zip64_internal* zi)
max_write = (uInt)size_available;
}
written = ZWRITE64(zi->z_filefunc, zi->filestream, zi->ci.buffered_data + total_written, max_write);
written = (int) ZWRITE64(zi->z_filefunc, zi->filestream, zi->ci.buffered_data + total_written, max_write);
if (ZERROR64(zi->z_filefunc,zi->filestream))
{
@@ -1784,7 +1787,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, ZPOS64_T uncompressed_si
/* Local file header is stored on previous disk, switch to make edits */
if (zi->ci.number_disk != cur_number_disk)
zipGoToSpecificDisk(file, zi->ci.number_disk, 1);
zipGoToSpecificDisk(file, (int) (zi->ci.number_disk), 1);
if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET) != 0)
err = ZIP_ERRNO;
@@ -1818,7 +1821,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, ZPOS64_T uncompressed_si
/* Now switch back again to the disk we were on before */
if (zi->ci.number_disk != cur_number_disk)
zipGoToSpecificDisk(file, cur_number_disk, 1);
zipGoToSpecificDisk(file, (int) cur_number_disk, 1);
if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip, ZLIB_FILEFUNC_SEEK_SET) != 0)
err = ZIP_ERRNO;
@@ -1877,7 +1880,7 @@ extern int ZEXPORT zipClose(zipFile file, const char* global_comment)
{
if ((err == ZIP_OK) && (ldi->filled_in_this_block > 0))
{
write = ZWRITE64(zi->z_filefunc, zi->filestream, ldi->data, ldi->filled_in_this_block);
write = (int) ZWRITE64(zi->z_filefunc, zi->filestream, ldi->data, ldi->filled_in_this_block);
if (write != ldi->filled_in_this_block)
err = ZIP_ERRNO;
}

22
Objective_Zip-Info.plist → Objective-Zip Tests/Info.plist
View File

@@ -3,28 +3,22 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>${PRODUCT_NAME}</string>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>ObjectiveZipIcon.png</string>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
<string>MainWindow</string>
<string>1</string>
</dict>
</plist>

5
Objective-Zip Tests/Objective-Zip OS X Tests-Bridging-Header.h Normal file
View File

@@ -0,0 +1,5 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//
#import "Objective-Zip+NSError.h"

5
Objective-Zip Tests/Objective-Zip Tests-Bridging-Header.h Normal file
View File

@@ -0,0 +1,5 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//
#import "Objective-Zip+NSError.h"

454
Objective-Zip Tests/Objective-Zip_Swift_Tests.swift Normal file
View File

@@ -0,0 +1,454 @@
//
// Objective-Zip_Swift_Tests.swift
// Objective-Zip
//
// Created by Gianluca Bertani on 20/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES LOSS OF USE, DATA, OR PROFITS OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
import XCTest
let HUGE_TEST_BLOCK_LENGTH = 50000
let HUGE_TEST_NUMBER_OF_BLOCKS = 100000
let MAC_TEST_ZIP = "UEsDBBQACAAIAPWF10IAAAAAAAAAAAAAAAANABAAdGVzdF9maWxlLnR4dFVYDACQCsdRjQrHUfYB9gHzT8pKTS7JLEvVjcosUPBNTFYoSS0uUUjLzEnlAgBQSwcIlXE92h4AAAAcAAAAUEsDBAoAAAAAAACG10IAAAAAAAAAAAAAAAAJABAAX19NQUNPU1gvVVgMAKAKx1GgCsdR9gH2AVBLAwQUAAgACAD1hddCAAAAAAAAAAAAAAAAGAAQAF9fTUFDT1NYLy5fdGVzdF9maWxlLnR4dFVYDACQCsdRjQrHUfYB9gFjYBVjZ2BiYPBNTFbwD1aIUIACkBgDJxAbAXElEIP4qxmIAo4hIUFQJkjHHCDmR1PCiBAXT87P1UssKMhJ1QtJrShxzUvOT8nMSwdKlpak6VpYGxqbGBmaW1qYAABQSwcIcBqNwF0AAACrAAAAUEsBAhUDFAAIAAgA9YXXQpVxPdoeAAAAHAAAAA0ADAAAAAAAAAAAQKSBAAAAAHRlc3RfZmlsZS50eHRVWAgAkArHUY0Kx1FQSwECFQMKAAAAAAAAhtdCAAAAAAAAAAAAAAAACQAMAAAAAAAAAABA/UFpAAAAX19NQUNPU1gvVVgIAKAKx1GgCsdRUEsBAhUDFAAIAAgA9YXXQnAajcBdAAAAqwAAABgADAAAAAAAAAAAQKSBoAAAAF9fTUFDT1NYLy5fdGVzdF9maWxlLnR4dFVYCACQCsdRjQrHUVBLBQYAAAAAAwADANwAAABTAQAAAAA="
let WIN_TEST_ZIP = "UEsDBBQAAAAAAMmF10L4VbPKIQAAACEAAAANAAAAdGVzdF9maWxlLnR4dE9iamVjdGl2ZS1aaXAgV2luZG93cyB0ZXN0IGZpbGUNClBLAQIUABQAAAAAAMmF10L4VbPKIQAAACEAAAANAAAAAAAAAAEAIAAAAAAAAAB0ZXN0X2ZpbGUudHh0UEsFBgAAAAABAAEAOwAAAEwAAAAAAA=="
class Objective_Zip_Swift_Tests: XCTestCase {
override func setUp() {
super.setUp()
}
override func tearDown() {
super.tearDown()
}
func test01ZipAndUnzip() {
let documentsUrl = NSURL(fileURLWithPath:NSHomeDirectory(), isDirectory:true).URLByAppendingPathComponent("Documents")
let fileUrl = documentsUrl.URLByAppendingPathComponent("test.zip")
let filePath = fileUrl.path!
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
defer {
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
}
do {
NSLog("Test 1: opening zip file for writing...")
let zipFile = try OZZipFile(fileName:filePath, mode:OZZipFileMode.Create)
XCTAssertNotNil(zipFile)
NSLog("Test 1: adding first file...")
let stream1 = try zipFile.writeFileInZipWithName("abc.txt", fileDate:NSDate(timeIntervalSinceNow:-86400.0), compressionLevel:OZZipCompressionLevel.Best)
XCTAssertNotNil(stream1)
NSLog("Test 1: writing to first file's stream...")
let text = "abc"
try stream1.writeData(text.dataUsingEncoding(NSUTF8StringEncoding)!)
NSLog("Test 1: closing first file's stream...")
try stream1.finishedWriting()
NSLog("Test 1: adding second file...")
let file2name = "x/y/z/xyz.txt"
let stream2 = try zipFile.writeFileInZipWithName(file2name, compressionLevel:OZZipCompressionLevel.None)
XCTAssertNotNil(stream2)
NSLog("Test 1: writing to second file's stream...")
let text2 = "XYZ"
try stream2.writeData(text2.dataUsingEncoding(NSUTF8StringEncoding)!)
NSLog("Test 1: closing second file's stream...")
try stream2.finishedWriting()
NSLog("Test 1: closing zip file...")
try zipFile.close()
NSLog("Test 1: opening zip file for reading...")
let unzipFile = try OZZipFile(fileName:filePath, mode:OZZipFileMode.Unzip)
XCTAssertNotNil(unzipFile)
NSLog("Test 1: reading file infos...")
let infos = try unzipFile.listFileInZipInfos()
XCTAssertEqual(2, infos.count)
let info1 = infos[0] as! OZFileInZipInfo
XCTAssertEqualWithAccuracy(NSDate().timeIntervalSinceReferenceDate, info1.date.timeIntervalSinceReferenceDate + 86400, accuracy:5.0)
NSLog("Test 1: - \(info1.name) \(info1.date) \(info1.size) (\(info1.level))")
let info2 = infos[1] as! OZFileInZipInfo
XCTAssertEqualWithAccuracy(NSDate().timeIntervalSinceReferenceDate, info2.date.timeIntervalSinceReferenceDate, accuracy:5.0)
NSLog("Test 1: - \(info2.name) \(info2.date) \(info2.size) (\(info2.level))")
NSLog("Test 1: opening first file...")
try unzipFile.goToFirstFileInZip()
let read1 = try unzipFile.readCurrentFileInZip()
XCTAssertNotNil(read1)
NSLog("Test 1: reading from first file's stream...")
let data1 = NSMutableData(length:256)!
let bytesRead1 = try read1.readDataWithBuffer(data1)
XCTAssertEqual(3, bytesRead1)
let fileText1 = NSString(bytes:data1.bytes, length:Int(bytesRead1), encoding:NSUTF8StringEncoding)
XCTAssertEqual("abc", fileText1)
NSLog("Test 1: closing first file's stream...")
try read1.finishedReading()
NSLog("Test 1: opening second file...")
try unzipFile.locateFileInZip(file2name)
let read2 = try unzipFile.readCurrentFileInZip()
XCTAssertNotNil(read2)
NSLog("Test 1: reading from second file's stream...")
let data2 = NSMutableData(length:256)!
let bytesRead2 = try read2.readDataWithBuffer(data2)
XCTAssertEqual(3, bytesRead2)
let fileText2 = NSString(bytes:data2.bytes, length:Int(bytesRead2), encoding:NSUTF8StringEncoding)
XCTAssertEqual("XYZ", fileText2)
NSLog("Test 1: closing second file's stream...")
try read2.finishedReading()
NSLog("Test 1: closing zip file...")
try unzipFile.close()
NSLog("Test 1: test terminated succesfully")
} catch let error as NSError {
NSLog("Test 1: error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
XCTFail("Error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
} catch let error {
NSLog("Test 1: generic error caught: \(error)")
XCTFail("Generic error caught: \(error)")
}
}
/*
* Uncomment to execute this test, but be careful: takes 5 minutes and consumes 5 GB of disk space
*
func test02ZipAndUnzip5GB() {
let documentsUrl = NSURL(fileURLWithPath:NSHomeDirectory(), isDirectory:true).URLByAppendingPathComponent("Documents")
let fileUrl = documentsUrl.URLByAppendingPathComponent("huge_test.zip")
let filePath = fileUrl.path!
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
defer {
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
}
do {
NSLog("Test 2: opening zip file for writing...")
let zipFile = try OZZipFile(fileName:filePath, mode:OZZipFileMode.Create)
XCTAssertNotNil(zipFile)
NSLog("Test 2: adding file...")
let stream = try zipFile.writeFileInZipWithName("huge_file.txt", compressionLevel:OZZipCompressionLevel.Best)
XCTAssertNotNil(stream)
NSLog("Test 2: writing to file's stream...")
let data = NSMutableData(length:HUGE_TEST_BLOCK_LENGTH)!
SecRandomCopyBytes(kSecRandomDefault, data.length, UnsafeMutablePointer<UInt8>(data.mutableBytes))
let checkData = data.subdataWithRange(NSMakeRange(0, 100))
let buffer = NSMutableData(length:HUGE_TEST_BLOCK_LENGTH)! // For use later
for (var i = 0; i < HUGE_TEST_NUMBER_OF_BLOCKS; i++) {
try stream.writeData(data)
if (i % 100 == 0) {
NSLog("Test 2: written \((data.length / 1024) * (i + 1)) KB...")
}
}
NSLog("Test 2: closing file's stream...")
try stream.finishedWriting()
NSLog("Test 2: closing zip file...")
try zipFile.close()
NSLog("Test 2: opening zip file for reading...")
let unzipFile = try OZZipFile(fileName:filePath, mode:OZZipFileMode.Unzip)
XCTAssertNotNil(unzipFile)
NSLog("Test 1: reading file infos...")
let infos = try unzipFile.listFileInZipInfos()
XCTAssertEqual(1, infos.count)
let info1 = infos[0] as! OZFileInZipInfo
XCTAssertEqual(info1.length, UInt64(HUGE_TEST_NUMBER_OF_BLOCKS) * UInt64(HUGE_TEST_BLOCK_LENGTH))
NSLog("Test 1: - \(info1.name) \(info1.date) \(info1.size) (\(info1.level))")
NSLog("Test 2: opening file...")
try unzipFile.goToFirstFileInZip()
let read = try unzipFile.readCurrentFileInZip()
XCTAssertNotNil(read)
NSLog("Test 2: reading from file's stream...")
for (var i = 0; i < HUGE_TEST_NUMBER_OF_BLOCKS; i++) {
let bytesRead = try read.readDataWithBuffer(buffer)
XCTAssertEqual(data.length, bytesRead)
let range = buffer.rangeOfData(checkData, options:NSDataSearchOptions(), range:NSMakeRange(0, buffer.length))
XCTAssertEqual(0, range.location)
if (i % 100 == 0) {
NSLog("Test 2: read \((buffer.length / 1024) * (i + 1))) KB...")
}
}
NSLog("Test 2: closing file's stream...")
try read.finishedReading()
NSLog("Test 2: closing zip file...")
try unzipFile.close()
NSLog("Test 2: test terminated succesfully")
} catch let error as NSError {
NSLog("Test 2: error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
XCTFail("Error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
}
}
*/
func test03UnzipMacZipFile() -> () {
let documentsUrl = NSURL(fileURLWithPath:NSHomeDirectory(), isDirectory:true).URLByAppendingPathComponent("Documents")
let fileUrl = documentsUrl.URLByAppendingPathComponent("mac_test_file.zip")
let filePath = fileUrl.path!
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
let macZipData = NSData(base64EncodedString:MAC_TEST_ZIP, options:NSDataBase64DecodingOptions())!
macZipData.writeToFile(filePath, atomically:false)
defer {
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
}
do {
NSLog("Test 3: opening zip file for reading...")
let unzipFile = try OZZipFile(fileName:filePath, mode:OZZipFileMode.Unzip)
XCTAssertNotNil(unzipFile)
NSLog("Test 3: opening file...")
try unzipFile.goToFirstFileInZip()
let read = try unzipFile.readCurrentFileInZip()
XCTAssertNotNil(read)
NSLog("Test 3: reading from file's stream...")
let buffer = NSMutableData(length:1024)!
let bytesRead = try read.readDataWithBuffer(buffer)
let fileText = NSString(bytes:buffer.bytes, length:Int(bytesRead), encoding:NSUTF8StringEncoding)
XCTAssertEqual("Objective-Zip Mac test file\n", fileText)
NSLog("Test 3: closing file's stream...")
try read.finishedReading()
NSLog("Test 3: closing zip file...")
try unzipFile.close()
NSLog("Test 3: test terminated succesfully")
} catch let error as NSError {
NSLog("Test 3: error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
XCTFail("Error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
}
}
func test04UnzipWinZipFile() {
let documentsUrl = NSURL(fileURLWithPath:NSHomeDirectory(), isDirectory:true).URLByAppendingPathComponent("Documents")
let fileUrl = documentsUrl.URLByAppendingPathComponent("win_test_file.zip")
let filePath = fileUrl.path!
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
let winZipData = NSData(base64EncodedString:WIN_TEST_ZIP, options:NSDataBase64DecodingOptions())!
winZipData.writeToFile(filePath, atomically:false)
defer {
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
}
do {
NSLog("Test 4: opening zip file for reading...")
let unzipFile = try OZZipFile(fileName:filePath, mode:OZZipFileMode.Unzip)
XCTAssertNotNil(unzipFile)
NSLog("Test 4: opening file...")
try unzipFile.goToFirstFileInZip()
let read = try unzipFile.readCurrentFileInZip()
XCTAssertNotNil(read)
NSLog("Test 4: reading from file's stream...")
let buffer = NSMutableData(length:1024)!
let bytesRead = try read.readDataWithBuffer(buffer)
let fileText = NSString(bytes:buffer.bytes, length:Int(bytesRead), encoding:NSUTF8StringEncoding)
XCTAssertEqual("Objective-Zip Windows test file\r\n", fileText)
NSLog("Test 4: closing file's stream...")
try read.finishedReading()
NSLog("Test 4: closing zip file...")
try unzipFile.close()
NSLog("Test 4: test terminated succesfully")
} catch let error as NSError {
NSLog("Test 4: error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
XCTFail("Error caught: \(error.code) - \(error.userInfo[NSLocalizedFailureReasonErrorKey])")
}
}
func test05ErrorWrapping() {
let fileUrl = NSURL(fileURLWithPath:"/root.zip", isDirectory:false)
let filePath = fileUrl.path!
defer {
do {
try NSFileManager.defaultManager().removeItemAtPath(filePath)
} catch {}
}
do {
NSLog("Test 5: opening impossible zip file for writing...")
let zipFile = try OZZipFile(fileName:filePath, mode:OZZipFileMode.Create)
try zipFile.close()
NSLog("Test 5: test failed, no error reported")
XCTFail("No error reported")
} catch let error as NSError {
XCTAssertEqual(OZ_ERROR_NO_SUCH_FILE, error.code)
NSLog("Test 5: test terminated succesfully")
}
}
}

488
Objective-Zip Tests/ObjectiveZip_Tests.m Normal file
View File

@@ -0,0 +1,488 @@
//
// ObjectiveZip_Tests.m
// Objective-Zip
//
// Created by Gianluca Bertani on 29/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import <XCTest/XCTest.h>
#import "Objective-Zip.h"
#import "Objective-Zip+NSError.h"
#define HUGE_TEST_BLOCK_LENGTH (50000LL)
#define HUGE_TEST_NUMBER_OF_BLOCKS (100000LL)
#define MAC_TEST_ZIP (@"UEsDBBQACAAIAPWF10IAAAAAAAAAAAAAAAANABAAdGVzdF9maWxlLnR4dFVYDACQCsdRjQrHUfYB9gHzT8pKTS7JLEvVjcosUPBNTFYoSS0uUUjLzEnlAgBQSwcIlXE92h4AAAAcAAAAUEsDBAoAAAAAAACG10IAAAAAAAAAAAAAAAAJABAAX19NQUNPU1gvVVgMAKAKx1GgCsdR9gH2AVBLAwQUAAgACAD1hddCAAAAAAAAAAAAAAAAGAAQAF9fTUFDT1NYLy5fdGVzdF9maWxlLnR4dFVYDACQCsdRjQrHUfYB9gFjYBVjZ2BiYPBNTFbwD1aIUIACkBgDJxAbAXElEIP4qxmIAo4hIUFQJkjHHCDmR1PCiBAXT87P1UssKMhJ1QtJrShxzUvOT8nMSwdKlpak6VpYGxqbGBmaW1qYAABQSwcIcBqNwF0AAACrAAAAUEsBAhUDFAAIAAgA9YXXQpVxPdoeAAAAHAAAAA0ADAAAAAAAAAAAQKSBAAAAAHRlc3RfZmlsZS50eHRVWAgAkArHUY0Kx1FQSwECFQMKAAAAAAAAhtdCAAAAAAAAAAAAAAAACQAMAAAAAAAAAABA/UFpAAAAX19NQUNPU1gvVVgIAKAKx1GgCsdRUEsBAhUDFAAIAAgA9YXXQnAajcBdAAAAqwAAABgADAAAAAAAAAAAQKSBoAAAAF9fTUFDT1NYLy5fdGVzdF9maWxlLnR4dFVYCACQCsdRjQrHUVBLBQYAAAAAAwADANwAAABTAQAAAAA=")
#define WIN_TEST_ZIP (@"UEsDBBQAAAAAAMmF10L4VbPKIQAAACEAAAANAAAAdGVzdF9maWxlLnR4dE9iamVjdGl2ZS1aaXAgV2luZG93cyB0ZXN0IGZpbGUNClBLAQIUABQAAAAAAMmF10L4VbPKIQAAACEAAAANAAAAAAAAAAEAIAAAAAAAAAB0ZXN0X2ZpbGUudHh0UEsFBgAAAAABAAEAOwAAAEwAAAAAAA==")
#pragma mark -
#pragma mark ObjectiveZip_Tests declaration
@interface ObjectiveZip_Tests : XCTestCase
@end
#pragma mark -
#pragma mark ObjectiveZip_Tests implementation
@implementation ObjectiveZip_Tests
#pragma mark -
#pragma mark Set up and tear down
- (void) setUp {
[super setUp];
}
- (void) tearDown {
[super tearDown];
}
#pragma mark -
#pragma mark Tests
- (void) test01ZipAndUnzip {
NSString *documentsDir= [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
NSString *filePath= [documentsDir stringByAppendingPathComponent:@"test.zip"];
@try {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
NSLog(@"Test 1: opening zip file for writing...");
OZZipFile *zipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeCreate];
XCTAssertNotNil(zipFile);
NSLog(@"Test 1: adding first file...");
OZZipWriteStream *stream1= [zipFile writeFileInZipWithName:@"abc.txt" fileDate:[NSDate dateWithTimeIntervalSinceNow:-86400.0] compressionLevel:OZZipCompressionLevelBest];
XCTAssertNotNil(stream1);
NSLog(@"Test 1: writing to first file's stream...");
NSString *text= @"abc";
[stream1 writeData:[text dataUsingEncoding:NSUTF8StringEncoding]];
NSLog(@"Test 1: closing first file's stream...");
[stream1 finishedWriting];
NSLog(@"Test 1: adding second file...");
NSString *file2name= @"x/y/z/xyz.txt";
OZZipWriteStream *stream2= [zipFile writeFileInZipWithName:file2name compressionLevel:OZZipCompressionLevelNone];
XCTAssertNotNil(stream2);
NSLog(@"Test 1: writing to second file's stream...");
NSString *text2= @"XYZ";
[stream2 writeData:[text2 dataUsingEncoding:NSUTF8StringEncoding]];
NSLog(@"Test 1: closing second file's stream...");
[stream2 finishedWriting];
NSLog(@"Test 1: closing zip file...");
[zipFile close];
NSLog(@"Test 1: opening zip file for reading...");
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeUnzip];
XCTAssertNotNil(unzipFile);
NSLog(@"Test 1: reading file infos...");
NSArray *infos= [unzipFile listFileInZipInfos];
XCTAssertEqual(2, infos.count);
OZFileInZipInfo *info1= [infos objectAtIndex:0];
XCTAssertEqualWithAccuracy([[NSDate date] timeIntervalSinceReferenceDate], [info1.date timeIntervalSinceReferenceDate] + 86400, 5.0);
NSLog(@"Test 1: - %@ %@ %lu (%ld)", info1.name, info1.date, (unsigned long) info1.size, (long) info1.level);
OZFileInZipInfo *info2= [infos objectAtIndex:1];
XCTAssertEqualWithAccuracy([[NSDate date] timeIntervalSinceReferenceDate], [info2.date timeIntervalSinceReferenceDate], 5.0);
NSLog(@"Test 1: - %@ %@ %lu (%ld)", info2.name, info2.date, (unsigned long) info2.size, (long) info2.level);
NSLog(@"Test 1: opening first file...");
[unzipFile goToFirstFileInZip];
OZZipReadStream *read1= [unzipFile readCurrentFileInZip];
XCTAssertNotNil(read1);
NSLog(@"Test 1: reading from first file's stream...");
NSMutableData *data1= [[NSMutableData alloc] initWithLength:256];
NSUInteger bytesRead1= [read1 readDataWithBuffer:data1];
XCTAssertEqual(3, bytesRead1);
NSString *fileText1= [[NSString alloc] initWithBytes:[data1 bytes] length:bytesRead1 encoding:NSUTF8StringEncoding];
XCTAssertEqualObjects(@"abc", fileText1);
NSLog(@"Test 1: closing first file's stream...");
[read1 finishedReading];
NSLog(@"Test 1: opening second file...");
[unzipFile locateFileInZip:file2name];
OZZipReadStream *read2= [unzipFile readCurrentFileInZip];
XCTAssertNotNil(read2);
NSLog(@"Test 1: reading from second file's stream...");
NSMutableData *data2= [[NSMutableData alloc] initWithLength:256];
NSUInteger bytesRead2= [read2 readDataWithBuffer:data2];
XCTAssertEqual(3, bytesRead2);
NSString *fileText2= [[NSString alloc] initWithBytes:[data2 bytes] length:bytesRead2 encoding:NSUTF8StringEncoding];
XCTAssertEqualObjects(@"XYZ", fileText2);
NSLog(@"Test 1: closing second file's stream...");
[read2 finishedReading];
NSLog(@"Test 1: closing zip file...");
[unzipFile close];
NSLog(@"Test 1: test terminated succesfully");
} @catch (OZZipException *ze) {
NSLog(@"Test 1: zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
XCTFail(@"Zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
} @catch (NSException *e) {
NSLog(@"Test 1: generic exception caught: %@ - %@", [[e class] description], [e description]);
XCTFail(@"Generic exception caught: %@ - %@", [[e class] description], [e description]);
} @finally {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
}
}
/*
* Uncomment to execute this test, but be careful: takes 5 minutes and consumes 5 GB of disk space
*
- (void) test02ZipAndUnzip5GB {
NSString *documentsDir= [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
NSString *filePath= [documentsDir stringByAppendingPathComponent:@"huge_test.zip"];
@try {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
NSLog(@"Test 2: opening zip file for writing...");
OZZipFile *zipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeCreate];
XCTAssertNotNil(zipFile);
NSLog(@"Test 2: adding file...");
OZZipWriteStream *stream= [zipFile writeFileInZipWithName:@"huge_file.txt" compressionLevel:OZZipCompressionLevelBest];
XCTAssertNotNil(stream);
NSLog(@"Test 2: writing to file's stream...");
NSMutableData *data= [[NSMutableData alloc] initWithLength:HUGE_TEST_BLOCK_LENGTH];
SecRandomCopyBytes(kSecRandomDefault, [data length], [data mutableBytes]);
NSData *checkData= [data subdataWithRange:NSMakeRange(0, 100)];
NSMutableData *buffer= [[NSMutableData alloc] initWithLength:HUGE_TEST_BLOCK_LENGTH]; // For use later
for (int i= 0; i < HUGE_TEST_NUMBER_OF_BLOCKS; i++) {
[stream writeData:data];
if (i % 100 == 0)
NSLog(@"Test 2: written %lu KB...", (unsigned long) ([data length] / 1024) * (i +1));
}
NSLog(@"Test 2: closing file's stream...");
[stream finishedWriting];
NSLog(@"Test 2: closing zip file...");
[zipFile close];
NSLog(@"Test 2: opening zip file for reading...");
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeUnzip];
XCTAssertNotNil(unzipFile);
NSLog(@"Test 1: reading file infos...");
NSArray *infos= [unzipFile listFileInZipInfos];
XCTAssertEqual(1, infos.count);
OZFileInZipInfo *info1= [infos objectAtIndex:0];
XCTAssertEqual(info1.length, HUGE_TEST_NUMBER_OF_BLOCKS * HUGE_TEST_BLOCK_LENGTH);
NSLog(@"Test 1: - %@ %@ %lu (%ld)", info1.name, info1.date, (unsigned long) info1.size, (long) info1.level);
NSLog(@"Test 2: opening file...");
[unzipFile goToFirstFileInZip];
OZZipReadStream *read= [unzipFile readCurrentFileInZip];
XCTAssertNotNil(read);
NSLog(@"Test 2: reading from file's stream...");
for (int i= 0; i < HUGE_TEST_NUMBER_OF_BLOCKS; i++) {
NSUInteger bytesRead= [read readDataWithBuffer:buffer];
XCTAssertEqual([data length], bytesRead);
NSRange range= [buffer rangeOfData:checkData options:0 range:NSMakeRange(0, [buffer length])];
XCTAssertEqual(0, range.location);
if (i % 100 == 0)
NSLog(@"Test 2: read %lu KB...", (unsigned long) ([buffer length] / 1024) * (i +1));
}
NSLog(@"Test 2: closing file's stream...");
[read finishedReading];
NSLog(@"Test 2: closing zip file...");
[unzipFile close];
NSLog(@"Test 2: test terminated succesfully");
} @catch (OZZipException *ze) {
NSLog(@"Test 2: zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
XCTFail(@"Zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
} @catch (NSException *e) {
NSLog(@"Test 2: generic exception caught: %@ - %@", [[e class] description], [e description]);
XCTFail(@"Generic exception caught: %@ - %@", [[e class] description], [e description]);
} @finally {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
}
}
*/
- (void) test03UnzipMacZipFile {
NSString *documentsDir= [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
NSString *filePath= [documentsDir stringByAppendingPathComponent:@"mac_test_file.zip"];
NSData *macZipData= [[NSData alloc] initWithBase64EncodedString:MAC_TEST_ZIP options:0];
[macZipData writeToFile:filePath atomically:NO];
@try {
NSLog(@"Test 3: opening zip file for reading...");
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeUnzip];
XCTAssertNotNil(unzipFile);
NSLog(@"Test 3: opening file...");
[unzipFile goToFirstFileInZip];
OZZipReadStream *read= [unzipFile readCurrentFileInZip];
XCTAssertNotNil(read);
NSLog(@"Test 3: reading from file's stream...");
NSMutableData *buffer= [[NSMutableData alloc] initWithLength:1024];
NSUInteger bytesRead= [read readDataWithBuffer:buffer];
NSString *fileText= [[NSString alloc] initWithBytes:[buffer bytes] length:bytesRead encoding:NSUTF8StringEncoding];
XCTAssertEqualObjects(@"Objective-Zip Mac test file\n", fileText);
NSLog(@"Test 3: closing file's stream...");
[read finishedReading];
NSLog(@"Test 3: closing zip file...");
[unzipFile close];
NSLog(@"Test 3: test terminated succesfully");
} @catch (OZZipException *ze) {
NSLog(@"Test 3: zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
XCTFail(@"Zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
} @catch (NSException *e) {
NSLog(@"Test 3: generic exception caught: %@ - %@", [[e class] description], [e description]);
XCTFail(@"Generic exception caught: %@ - %@", [[e class] description], [e description]);
} @finally {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
}
}
- (void) test04UnzipWinZipFile {
NSString *documentsDir= [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
NSString *filePath= [documentsDir stringByAppendingPathComponent:@"win_test_file.zip"];
NSData *winZipData= [[NSData alloc] initWithBase64EncodedString:WIN_TEST_ZIP options:0];
[winZipData writeToFile:filePath atomically:NO];
@try {
NSLog(@"Test 4: opening zip file for reading...");
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeUnzip];
XCTAssertNotNil(unzipFile);
NSLog(@"Test 4: opening file...");
[unzipFile goToFirstFileInZip];
OZZipReadStream *read= [unzipFile readCurrentFileInZip];
XCTAssertNotNil(read);
NSLog(@"Test 4: reading from file's stream...");
NSMutableData *buffer= [[NSMutableData alloc] initWithLength:1024];
NSUInteger bytesRead= [read readDataWithBuffer:buffer];
NSString *fileText= [[NSString alloc] initWithBytes:[buffer bytes] length:bytesRead encoding:NSUTF8StringEncoding];
XCTAssertEqualObjects(@"Objective-Zip Windows test file\r\n", fileText);
NSLog(@"Test 4: closing file's stream...");
[read finishedReading];
NSLog(@"Test 4: closing zip file...");
[unzipFile close];
NSLog(@"Test 4: test terminated succesfully");
} @catch (OZZipException *ze) {
NSLog(@"Test 4: zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
XCTFail(@"Zip exception caught: %ld - %@", (long) ze.error, [ze reason]);
} @catch (NSException *e) {
NSLog(@"Test 4: generic exception caught: %@ - %@", [[e class] description], [e description]);
XCTFail(@"Generic exception caught: %@ - %@", [[e class] description], [e description]);
} @finally {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
}
}
- (void) test05ErrorWrapping {
NSString *filePath= @"/root.zip";
@try {
NSLog(@"Test 5: opening impossible zip file for writing...");
OZZipFile *zipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeCreate];
[zipFile close];
NSLog(@"Test 5: test failed, no error reported");
XCTFail(@"No error reported");
} @catch (OZZipException *ze) {
XCTAssertEqual(OZ_ERROR_NO_SUCH_FILE, ze.error);
} @catch (NSException *e) {
NSLog(@"Test 5: generic exception caught: %@ - %@", [[e class] description], [e description]);
XCTFail(@"Generic exception caught: %@ - %@", [[e class] description], [e description]);
} @finally {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
}
@try {
NSLog(@"Test 5: opening again impossible zip file for writing...");
NSError *error= nil;
OZZipFile *zipFile= [[OZZipFile alloc] initWithFileName:filePath mode:OZZipFileModeCreate error:&error];
[zipFile close];
XCTAssertNil(zipFile);
XCTAssertNotNil(error);
XCTAssertEqual(OZ_ERROR_NO_SUCH_FILE, error.code);
NSLog(@"Test 5: test terminated succesfully");
} @catch (NSException *e) {
NSLog(@"Test 5: generic exception caught: %@ - %@", [[e class] description], [e description]);
XCTFail(@"Generic exception caught: %@ - %@", [[e class] description], [e description]);
} @finally {
[[NSFileManager defaultManager] removeItemAtPath:filePath error:NULL];
}
}
@end

1157
Objective-Zip.xcodeproj/project.pbxproj
View File

File diff suppressed because one or more lines are too long

62
Objective-Zip/ZipReadStream.h → Objective-Zip/OZFileInZipInfo+Internals.h
View File

@@ -1,52 +1,46 @@
//
// ZipReadStream.h
// Objective-Zip v. 0.8.2
// OZFileInZipInfo+Internals.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 28/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import <Foundation/Foundation.h>
#import "ARCHelper.h"
#include "unzip.h"
#import "OZFileInZipInfo.h"
@interface ZipReadStream : NSObject {
NSString *_fileNameInZip;
@private
unzFile _unzFile;
}
@interface OZFileInZipInfo (Internals)
- (id) initWithUnzFileStruct:(unzFile)unzFile fileNameInZip:(NSString *)fileNameInZip;
- (NSUInteger) readDataWithBuffer:(NSMutableData *)buffer;
- (void) finishedReading;
#pragma mark -
#pragma mark Initialization
- (nonnull instancetype) initWithName:(nonnull NSString *)name length:(unsigned long long)length level:(OZZipCompressionLevel)level crypted:(BOOL)crypted size:(unsigned long long)size date:(nonnull NSDate *)date crc32:(NSUInteger)crc32;
@end

77
Objective-Zip/FileInZipInfo.h → Objective-Zip/OZFileInZipInfo.h
View File

@@ -1,9 +1,9 @@
//
// FileInZipInfo.h
// Objective-Zip v. 0.8.2
// OZFileInZipInfo.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -32,30 +32,63 @@
//
#import <Foundation/Foundation.h>
#import "ZipFile.h"
#import "ARCHelper.h"
#import "OZZipCompressionLevel.h"
@interface FileInZipInfo : NSObject {
@private
NSUInteger _length;
ZipCompressionLevel _level;
BOOL _crypted;
NSUInteger _size;
NSDate *_date;
NSUInteger _crc32;
NSString *_name;
}
/**
@brief OZFileInZipInfo provides properties to inspect a file contained in
the zip file.
*/
@interface OZFileInZipInfo : NSObject
- (id) initWithName:(NSString *)name length:(NSUInteger)length level:(ZipCompressionLevel)level crypted:(BOOL)crypted size:(NSUInteger)size date:(NSDate *)date crc32:(NSUInteger)crc32;
@property (nonatomic, readonly) NSString *name;
@property (nonatomic, readonly) NSUInteger length;
@property (nonatomic, readonly) ZipCompressionLevel level;
#pragma mark -
#pragma mark Properties
/**
@brief Name of the file in the zip file.
<p>Note: in case the zip file has a directory structure, directory and
subdirectory names are prepended to the file name, e.g.
"docs/html/index.html".</p>
*/
@property (nonatomic, readonly, nonnull) NSString *name;
/**
@brief Length in bytes of the uncompressed file.
*/
@property (nonatomic, readonly) unsigned long long length;
/**
@brief Compression level of the file. Can be:<ul>
<li>OZZipCompressionLevelNone: not compressed (stored as is).
<li>OZZipCompressionLevelFastest: minimum compression.
<li>OZZipCompressionLevelBest: maximum compression
<li>OZZipCompressionLevelDefault: intermediate compression.
</ul>
*/
@property (nonatomic, readonly) OZZipCompressionLevel level;
/**
@brief <code>YES</code> if the file has been encrypted during
writing, <code>NO</code> if the file is not encrypted.
*/
@property (nonatomic, readonly) BOOL crypted;
@property (nonatomic, readonly) NSUInteger size;
@property (nonatomic, readonly) NSDate *date;
/**
@brief Length in bytes of the (compressed) file in the zip file.
*/
@property (nonatomic, readonly) unsigned long long size;
/**
@brief Date/time the of file.
*/
@property (nonatomic, readonly, nonnull) NSDate *date;
/**
@brief CRC32 of the file.
*/
@property (nonatomic, readonly) NSUInteger crc32;
@end

52
Objective-Zip/FileInZipInfo.m → Objective-Zip/OZFileInZipInfo.m
View File

@@ -1,9 +1,9 @@
//
// FileInZipInfo.m
// Objective-Zip v. 0.8.2
// OZFileInZipInfo.m
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -31,31 +31,54 @@
// POSSIBILITY OF SUCH DAMAGE.
//
#import "FileInZipInfo.h"
#import "OZFileInZipInfo.h"
@implementation FileInZipInfo
#pragma mark -
#pragma mark OZFileInZipInfo extension
- (id) initWithName:(NSString *)name length:(NSUInteger)length level:(ZipCompressionLevel)level crypted:(BOOL)crypted size:(NSUInteger)size date:(NSDate *)date crc32:(NSUInteger)crc32 {
@interface OZFileInZipInfo () {
@private
unsigned long long _length;
OZZipCompressionLevel _level;
BOOL _crypted;
unsigned long long _size;
NSDate *_date;
NSUInteger _crc32;
NSString *_name;
}
@end
#pragma mark -
#pragma mark OZFileInZipInfo implementation
@implementation OZFileInZipInfo
#pragma mark -
#pragma mark Initialization
- (instancetype) initWithName:(NSString *)name length:(unsigned long long)length level:(OZZipCompressionLevel)level crypted:(BOOL)crypted size:(unsigned long long)size date:(NSDate *)date crc32:(NSUInteger)crc32 {
if (self= [super init]) {
_name= [name ah_retain];
_name= name;
_length= length;
_level= level;
_crypted= crypted;
_size= size;
_date= [date ah_retain];
_date= date;
_crc32= crc32;
}
return self;
}
- (void) dealloc {
[_date release];
[_name release];
[super ah_dealloc];
}
#pragma mark -
#pragma mark Properties
@synthesize name= _name;
@synthesize length= _length;
@@ -65,4 +88,5 @@
@synthesize date= _date;
@synthesize crc32= _crc32;
@end

70
Objective-Zip/OZZipCompressionLevel.h Normal file
View File

@@ -0,0 +1,70 @@
//
// OZZipCompressionLevel.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#ifndef Objective_Zip_OZZipCompressionLevel_h
#define Objective_Zip_OZZipCompressionLevel_h
/**
@brief Compression level to be used to compress new files added to the zip
file.
*/
typedef NS_ENUM(NSInteger, OZZipCompressionLevel) {
/**
@brief Compression level that compresses the new file somewhere inbetween
OZZipCompressionLevelBest and OZZipCompressionLevelFastest.
*/
OZZipCompressionLevelDefault= -1,
/**
@brief Compression level that does not compress the new file, it is
stored as is.
*/
OZZipCompressionLevelNone= 0,
/**
@brief Compression level that compresses the new file as fast as
possible, corresponding to the least compression.
*/
OZZipCompressionLevelFastest= 1,
/**
@brief Compression level that compresses the new file as much as
possible, corresponding to the slowest compression.
*/
OZZipCompressionLevelBest= 9
};
#endif

69
Objective-Zip/OZZipException+Internals.h Normal file
View File

@@ -0,0 +1,69 @@
//
// OZZipException+Internals.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipException.h"
#define ERROR_WRAP_BEGIN \
@try {
#define ERROR_WRAP_END_AND_RETURN(err, ret) \
} @catch (OZZipException *ze) { \
if (ze.error) { \
if (err) { \
*err= [NSError errorWithDomain:@"ObjectiveZipErrorDomain" \
code:ze.error \
userInfo:@{NSLocalizedDescriptionKey: ze.name, \
NSLocalizedFailureReasonErrorKey: ze.reason}]; \
} \
return ret; \
} else \
@throw ze; \
} @catch (NSException *exc) { \
@throw exc; \
}
@interface OZZipException (Internals)
#pragma mark -
#pragma mark Initialization
+ (nonnull OZZipException *) zipExceptionWithReason:(nonnull NSString *)format, ...;
+ (nonnull OZZipException *) zipExceptionWithError:(NSInteger)error reason:(nonnull NSString *)format, ...;
- (nonnull instancetype) initWithReason:(nonnull NSString *)reason;
- (nonnull instancetype) initWithError:(NSInteger)error reason:(nonnull NSString *)reason;
@end

37
Objective-Zip/ZipWriteStream.h → Objective-Zip/OZZipException.h
View File

@@ -1,9 +1,9 @@
//
// ZipWriteStream.h
// Objective-Zip v. 0.8.2
// OZZipException.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -32,21 +32,32 @@
//
#import <Foundation/Foundation.h>
#import "ARCHelper.h"
#include "zip.h"
extern const NSInteger OZ_ERROR_NO_SUCH_FILE;
@interface ZipWriteStream : NSObject {
NSString *_fileNameInZip;
/**
@brief OZZipException is a custom exception type to quickly discern between
error originated during the zip/unzip process or elsewhere.
</p>All exceptions thrown by Objective-Zip are of OZZipException type.</p>
*/
@interface OZZipException : NSException
@private
zipFile _zipFile;
}
- (id) initWithZipFileStruct:(zipFile)zipFile fileNameInZip:(NSString *)fileNameInZip;
#pragma mark -
#pragma mark Properties
/**
@brief Underlying error code provided by MiniZip/ZLib libraries. May be
<code>0</code> if the exception originated in the Objective-Zip layer.
<p>Common error codes are:<ul>
<li>-1: System error.
<li>-103: Bad zip file.
<li>-104: Internal error.
<li>-105: CRC error.
</ul></p>
*/
@property (nonatomic, readonly) NSInteger error;
- (void) writeData:(NSData *)data;
- (void) finishedWriting;
@end

71
Objective-Zip/ZipException.m → Objective-Zip/OZZipException.m
View File

@@ -1,9 +1,9 @@
//
// ZipException.m
// Objective-Zip v. 0.8.2
// OZZipException.m
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -31,27 +31,80 @@
// POSSIBILITY OF SUCH DAMAGE.
//
#import "ZipException.h"
#import "OZZipException.h"
@implementation ZipException
#pragma mark -
#pragma mark OZZipException extension
- (id) initWithReason:(NSString *)reason {
if (self= [super initWithName:@"ZipException" reason:reason userInfo:nil]) {
@interface OZZipException () {
@private
NSInteger _error;
}
@end
#pragma mark -
#pragma mark OZZipException constants
const NSInteger OZ_ERROR_NO_SUCH_FILE= -9001;
#pragma mark -
#pragma mark OZZipException implementation
@implementation OZZipException
#pragma mark -
#pragma mark Initialization
+ (OZZipException *) zipExceptionWithReason:(NSString *)format, ... {
// Variable arguments formatting
va_list arguments;
va_start(arguments, format);
NSString *reason= [[NSString alloc] initWithFormat:format arguments:arguments];
va_end(arguments);
return [[OZZipException alloc] initWithReason:reason];
}
+ (OZZipException *) zipExceptionWithError:(NSInteger)error reason:(NSString *)format, ... {
// Variable arguments formatting
va_list arguments;
va_start(arguments, format);
NSString *reason= [[NSString alloc] initWithFormat:format arguments:arguments];
va_end(arguments);
return [[OZZipException alloc] initWithError:error reason:reason];
}
- (instancetype) initWithReason:(NSString *)reason {
if (self= [super initWithName:@"OZZipException" reason:reason userInfo:nil]) {
_error= 0;
}
return self;
}
- (id) initWithError:(NSInteger)error reason:(NSString *)reason {
if (self= [super initWithName:@"ZipException" reason:reason userInfo:nil]) {
- (instancetype) initWithError:(NSInteger)error reason:(NSString *)reason {
if (self= [super initWithName:@"OZZipException" reason:reason userInfo:nil]) {
_error= error;
}
return self;
}
#pragma mark -
#pragma mark Properties
@synthesize error= _error;
@end

329
Objective-Zip/OZZipFile+NSError.h Normal file
View File

@@ -0,0 +1,329 @@
//
// OZZipFile+NSError.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipFile.h"
/**
@brief Indicates the file could not be located in the zip file.
*/
static const NSInteger OZLocateFileResultNotFound= -1;
/**
@brief Indicates the file has been successfully located in the zip file.
*/
static const NSInteger OZLocateFileResultFound= 1;
@interface OZZipFile (NSError)
#pragma mark -
#pragma mark Initialization (NSError variants)
/**
@brief Creates a OZZipFile with the specified zip file name and access mode.
<p>The access mode specifies if the zip is being created, appended, or
unzipped.</p>
<p>Note: the zip file is opened in 64-bit mode.</p>
@param fileName File name of the zip file.
@param mode Access mode, can be:<ul>
<li>OZZipFileModeUnzip: the zip file is opened for reading.
<li>OZZipFileModeCreate: the zip file is opened for creation.
<br/>Note: if the file already exists the behavior is unspecified.
<li>OZZipFileModeAppend: the zip file is opened for writing.
</ul>
@param error If passed, may be filled with an NSError is case the file
can't be opened.
@throws OZZipException If the access mode is invalid.
*/
- (nullable instancetype) initWithFileName:(nonnull NSString *)fileName mode:(OZZipFileMode)mode error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Creates a OZZipFile with the specified zip file name, access mode and
legacy 32-bit mode compatibility.
<p>The access mode specifies if the zip is being created, appended, or
unzipped.</p>
@param fileName File name of the zip file.
@param mode Access mode, can be:<ul>
<li>OZZipFileModeUnzip: the zip file is opened for reading.
<li>OZZipFileModeCreate: the zip file is opened for creation.
<br/>Note: if the file already exists the behavior is unspecified.
<li>OZZipFileModeAppend: the zip file is opened for writing.
</ul>
@param legacy32BitMode If set, the zip file is opened in 32-bit mode to
provide compatibility with older operating systems (such as some
version of Android).
@param error If passed, may be filled with an NSError is case the file
can't be opened.
@throws OZZipException If the access mode is invalid.
*/
- (nullable instancetype) initWithFileName:(nonnull NSString *)fileName mode:(OZZipFileMode)mode legacy32BitMode:(BOOL)legacy32BitMode error:(NSError * __autoreleasing __nullable * __nullable)error;
#pragma mark -
#pragma mark File writing (NSError variants)
/**
@brief Creates a new OZZipWriteStream for adding a new file in the zip file
content.
<p>The returned write stream can be used to write data to the new file.</p>
<p>Note: the new file is added with the current date/time.</p>
@param fileNameInZip Name of the new file that must be added to the zip file
content.
<br/>Note: to structure the zip file with directories and subdirectories,
ensure to prepend them in the file name, e.g. "docs/html/index.html"
@param compressionLevel The compression level that must be used to compress
the new file added to the zip file content. Can be:<ul>
<li>OZZipCompressionLevelNone: does not compress the new file, it is stored
as is.
<li>OZZipCompressionLevelFastest: uses the fastest compression level, which
also compresses the least.
<li>OZZipCompressionLevelBest: uses the best compression level, which is also
the slowest.
<li>OZZipCompressionLevelDefault: uses the default compression level,
somewhere inbetween OZZipCompressionLevelBest and
OZZipCompressionLevelFastest.
</ul>
@param error If passed, may be filled with an NSError is case the write
stream can't be opened.
@return A new OZZipWriteStream for writing data to the new file in the zip
file content, or <code>nil</code> if an error occurs.
@throws OZZipException If the zip file has been opened in unzip mode.
*/
- (nullable OZZipWriteStream *) writeFileInZipWithName:(nonnull NSString *)fileNameInZip compressionLevel:(OZZipCompressionLevel)compressionLevel error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Creates a new OZZipWriteStream for adding a new file in the zip file
content.
<p>The returned write stream can be used to write data to the new file.</p>
@param fileNameInZip Name of the new file that must be added to the zip file
content.
<br/>Note: to structure the zip file with directories and subdirectories,
ensure to prepend them in the file name, e.g. "docs/html/index.html"
@param fileDate The date/time of the new file that must be added to the zip
file content.
@param compressionLevel The compression level that must be used to compress
the new file added to the zip file content. Can be:<ul>
<li>OZZipCompressionLevelNone: does not compress the new file, it is stored
as is.
<li>OZZipCompressionLevelFastest: uses the fastest compression level, which
also compresses the least.
<li>OZZipCompressionLevelBest: uses the best compression level, which is also
the slowest.
<li>OZZipCompressionLevelDefault: uses the default compression level,
somewhere inbetween OZZipCompressionLevelBest and
OZZipCompressionLevelFastest.
</ul>
@param error If passed, may be filled with an NSError is case the write
stream can't be opened.
@return A new OZZipWriteStream for writing data to the new file in the zip
file content, or <code>nil</code> if an error occurs.
@throws OZZipException If the zip file has been opened in unzip mode.
*/
- (nullable OZZipWriteStream *) writeFileInZipWithName:(nonnull NSString *)fileNameInZip fileDate:(nonnull NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Creates a new OZZipWriteStream for adding a new encrypted file in the
zip file content.
<p>The returned write stream can be used to write data to the new file.</p>
@param fileNameInZip Name of the new file that must be added to the zip file
content.
<br/>Note: to structure the zip file with directories and subdirectories,
ensure to prepend them in the file name, e.g. "docs/html/index.html"
@param fileDate The date/time of the new file that must be added to the zip
file content.
@param compressionLevel The compression level that must be used to compress
the new file added to the zip file content. Can be:<ul>
<li>OZZipCompressionLevelNone: does not compress the new file, it is stored
as is.
<li>OZZipCompressionLevelFastest: uses the fastest compression level, which
also compresses the least.
<li>OZZipCompressionLevelBest: uses the best compression level, which is also
the slowest.
<li>OZZipCompressionLevelDefault: uses the default compression level,
somewhere inbetween OZZipCompressionLevelBest and
OZZipCompressionLevelFastest.
</ul>
@param password The password that must be used to encrypt the new file data.
@param crc32 A precomputed CRC32 of the new file data (needed for crypting).
@param error If passed, may be filled with an NSError is case the write
stream can't be opened.
@return A new OZZipWriteStream for writing data to the new file in the zip
file content, or <code>nil</code> if an error occurs.
@throws OZZipException If the zip file has been opened in unzip mode.
*/
- (nullable OZZipWriteStream *) writeFileInZipWithName:(nonnull NSString *)fileNameInZip fileDate:(nonnull NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel password:(nonnull NSString *)password crc32:(NSUInteger)crc32 error:(NSError * __autoreleasing __nullable * __nullable)error;
#pragma mark -
#pragma mark File seeking and info (NSError variants)
/**
@brief Moves selection to the first file contained in the zip file.
<p>The selected file may then be read by obaining a OZZipReadStream with
<code>readCurrentFileInZip</code>.</p>
@param error If passed, may be filled with an NSError is case the first file
can't be selected.
@return <code>YES</code> if the first file has been selected, <code>NO</code>
if it could not select the first file due to an error.
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (BOOL) goToFirstFileInZipWithError:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Moves selection to the next file contained in the zip file.
<p>The selected file may then be read by obaining a OZZipReadStream with
<code>readCurrentFileInZip</code>.</p>
@param error If passed, may be filled with an NSError is case the next file
can't be selected.
@return <code>YES</code> if the next file has been selected, <code>NO</code>
if there were no more files to select in the zip file, or the next file could
not be selected due to an error.
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (BOOL) goToNextFileInZipWithError:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Locates a file by name in the zip file and selects it.
<p>The selected file may then be read by obaining a OZZipReadStream with
<code>readCurrentFileInZip</code>.</p>
@param error If passed, may be filled with an NSError is case the file can't
be located.
@return <code>OZLocateFileResultFound</code> if the file has been located
and selected, <code>OZLocateFileResultNotFound</code> if the specified
file name is not present in the zip file, or <code>0</code> if the file could
not be located due to an error.
<br/>NOTE: return value convention is different in the standard (non-NSError
compliant) interface.
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (NSInteger) __attribute__((swift_error(nonnull_error))) locateFileInZip:(nonnull NSString *)fileNameInZip error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Returns the number of files contained in the zip file.
@param error If passed, may be filled with an NSError is case the number of
files could not be obtained.
@return The number of files contained in the zip file, 0 if the number of
files could not be obtained due to an error.
@throws OZZipException If the zip file has been opened with a mode other
than Unzip.
*/
- (NSUInteger) __attribute__((swift_error(nonnull_error))) numFilesInZipWithError:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Returns a list of OZFileInZipInfo with the information on all the files
contained in the zip file.
@param error If passed, may be filled with an NSError is case the list of
file info could not be obtained.
@return The list of OZFileInZipInfo with the information on all the files
contained in the zip file, <code>nil</code> if the list of file info could
not be obtained due to an error.
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (nullable NSArray *) listFileInZipInfosWithError:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Returns an OZFileInZipInfo with the information on the currently
selected file in the zip file.
@param error If passed, may be filled with an NSError is case the file info
could not be obtained.
@return An OZFileInZipInfo with the information on the currently
selected file in the zip file, <code>nil</code> if the file info could not be
obtained due to an error.
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (nullable OZFileInZipInfo *) getCurrentFileInZipInfoWithError:(NSError * __autoreleasing __nullable * __nullable)error;
#pragma mark -
#pragma mark File reading (NSError variants)
/**
@brief Creates a OZZipReadStream for reading the currently selected file in
the zip file.
<p>A file in the zip file can be selected using
<code>goToFirstFileInZip</code>, <code>goToNextFileInZip</code> and
<code>locateFileInZip:</code>.</p>
@param error If passed, may be filled with an NSError is case the read stream
could not be created.
@return The OZZipReadStream to be used for reading the currently selected file
in the zip file, <code>nil</code> if the read stream could not be created
due to an error.
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (nullable OZZipReadStream *) readCurrentFileInZipWithError:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Creates a OZZipReadStream for reading the currently selected file in
the zip file, if it is encrypted.
<p>A file in the zip file can be selected using
<code>goToFirstFileInZip</code>, <code>goToNextFileInZip</code> and
<code>locateFileInZip:</code>.</p>
@param password The password that must be used to decrypt the file data.
@param error If passed, may be filled with an NSError is case the read stream
could not be created.
@return The OZZipReadStream to be used for reading the currently selected file
in the zip file, <code>nil</code> if the read stream could not be created
due to an error.
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (nullable OZZipReadStream *) readCurrentFileInZipWithPassword:(nonnull NSString *)password error:(NSError * __autoreleasing __nullable * __nullable)error;
#pragma mark -
#pragma mark Closing (NSError variants)
/**
@brief Closes the zip file and releases its resources.
<p>Once you have finished working with the zip file (e.g. all files have been
unzipped, or all files have been added), it is important to close it so system
resources may be freed.</p>
<p>Note: after the zip file has been closed any subsequent call will result in an
error.</p>
@param error If passed, may be filled with an NSError is case the zip file
could not be closed.
@return <code>YES</code> if the zip file has been closed, <code>NO</code> if
the zip file could not be closed due to an error.
*/
- (BOOL) closeWithError:(NSError * __autoreleasing __nullable * __nullable)error;
@end

284
Objective-Zip/OZZipFile+Standard.h Normal file
View File

@@ -0,0 +1,284 @@
//
// OZZipFile+Standard.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipFile.h"
@interface OZZipFile (Standard)
#pragma mark -
#pragma mark Initialization
/**
@brief Creates a OZZipFile with the specified zip file name and access mode.
<p>The access mode specifies if the zip is being created, appended, or
unzipped.</p>
<p>Note: the zip file is opened in 64-bit mode.</p>
@param fileName File name of the zip file.
@param mode Access mode, can be:<ul>
<li>OZZipFileModeUnzip: the zip file is opened for reading.
<li>OZZipFileModeCreate: the zip file is opened for creation.
<br/>Note: if the file already exists the behavior is unspecified.
<li>OZZipFileModeAppend: the zip file is opened for writing.
</ul>
@throws OZZipException If the file can't be opened due to an erroror if the
access mode is invalid.
*/
- (nonnull instancetype) initWithFileName:(nonnull NSString *)fileName mode:(OZZipFileMode)mode;
/**
@brief Creates a OZZipFile with the specified zip file name, access mode and
legacy 32-bit mode compatibility.
<p>The access mode specifies if the zip is being created, appended, or
unzipped.</p>
@param fileName File name of the zip file.
@param mode Access mode, can be:<ul>
<li>OZZipFileModeUnzip: the zip file is opened for reading.
<li>OZZipFileModeCreate: the zip file is opened for creation.
<br/>Note: if the file already exists the behavior is unspecified.
<li>OZZipFileModeAppend: the zip file is opened for writing.
</ul>
@param legacy32BitMode If set, the zip file is opened in 32-bit mode to
provide compatibility with older operating systems (such as some
version of Android).
@throws OZZipException If the file can't be opened due to an error or if the
access mode is invalid.
*/
- (nonnull instancetype) initWithFileName:(nonnull NSString *)fileName mode:(OZZipFileMode)mode legacy32BitMode:(BOOL)legacy32BitMode;
#pragma mark -
#pragma mark File writing
/**
@brief Creates a new OZZipWriteStream for adding a new file in the zip file
content.
<p>The returned write stream can be used to write data to the new file.</p>
<p>Note: the new file is added with the current date/time.</p>
@param fileNameInZip Name of the new file that must be added to the zip file
content.
<br/>Note: to structure the zip file with directories and subdirectories,
ensure to prepend them in the file name, e.g. "docs/html/index.html"
@param compressionLevel The compression level that must be used to compress
the new file added to the zip file content. Can be:<ul>
<li>OZZipCompressionLevelNone: does not compress the new file, it is stored
as is.
<li>OZZipCompressionLevelFastest: uses the fastest compression level, which
also compresses the least.
<li>OZZipCompressionLevelBest: uses the best compression level, which is also
the slowest.
<li>OZZipCompressionLevelDefault: uses the default compression level,
somewhere inbetween OZZipCompressionLevelBest and
OZZipCompressionLevelFastest.
</ul>
@return A new OZZipWriteStream for writing data to the new file in the zip
file content.
@throws OZZipException If the file stream can't be created due to an error or
if the zip file has been opened in unzip mode.
*/
- (nonnull OZZipWriteStream *) writeFileInZipWithName:(nonnull NSString *)fileNameInZip compressionLevel:(OZZipCompressionLevel)compressionLevel;
/**
@brief Creates a new OZZipWriteStream for adding a new file in the zip file
content.
<p>The returned write stream can be used to write data to the new file.</p>
@param fileNameInZip Name of the new file that must be added to the zip file
content.
<br/>Note: to structure the zip file with directories and subdirectories,
ensure to prepend them in the file name, e.g. "docs/html/index.html"
@param fileDate The date/time of the new file that must be added to the zip
file content.
@param compressionLevel The compression level that must be used to compress
the new file added to the zip file content. Can be:<ul>
<li>OZZipCompressionLevelNone: does not compress the new file, it is stored
as is.
<li>OZZipCompressionLevelFastest: uses the fastest compression level, which
also compresses the least.
<li>OZZipCompressionLevelBest: uses the best compression level, which is also
the slowest.
<li>OZZipCompressionLevelDefault: uses the default compression level,
somewhere inbetween OZZipCompressionLevelBest and
OZZipCompressionLevelFastest.
</ul>
@return A new OZZipWriteStream for writing data to the new file in the zip
file content.
@throws OZZipException If the file stream can't be created due to an error or
if the zip file has been opened in unzip mode.
*/
- (nonnull OZZipWriteStream *) writeFileInZipWithName:(nonnull NSString *)fileNameInZip fileDate:(nonnull NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel;
/**
@brief Creates a new OZZipWriteStream for adding a new encrypted file in the
zip file content.
<p>The returned write stream can be used to write data to the new file.</p>
@param fileNameInZip Name of the new file that must be added to the zip file
content.
<br/>Note: to structure the zip file with directories and subdirectories,
ensure to prepend them in the file name, e.g. "docs/html/index.html"
@param fileDate The date/time of the new file that must be added to the zip
file content.
@param compressionLevel The compression level that must be used to compress
the new file added to the zip file content. Can be:<ul>
<li>OZZipCompressionLevelNone: does not compress the new file, it is stored
as is.
<li>OZZipCompressionLevelFastest: uses the fastest compression level, which
also compresses the least.
<li>OZZipCompressionLevelBest: uses the best compression level, which is also
the slowest.
<li>OZZipCompressionLevelDefault: uses the default compression level,
somewhere inbetween OZZipCompressionLevelBest and
OZZipCompressionLevelFastest.
</ul>
@param password The password that must be used to encrypt the new file data.
@param crc32 A precomputed CRC32 of the new file data (needed for crypting).
@return A new OZZipWriteStream for writing data to the new file in the zip
file content.
@throws OZZipException If the file stream can't be created due to an error or
if the zip file has been opened in unzip mode.
*/
- (nonnull OZZipWriteStream *) writeFileInZipWithName:(nonnull NSString *)fileNameInZip fileDate:(nonnull NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel password:(nonnull NSString *)password crc32:(NSUInteger)crc32;
#pragma mark -
#pragma mark File seeking and info
/**
@brief Moves selection to the first file contained in the zip file.
<p>The selected file may then be read by obaining a OZZipReadStream with
<code>readCurrentFileInZip</code>.</p>
@throws OZZipException If the first file can't be selected due to an error or
if the zip file has been opened with a mode other than Unzip.
*/
- (void) goToFirstFileInZip;
/**
@brief Moves selection to the next file contained in the zip file.
<p>The selected file may then be read by obaining a OZZipReadStream with
<code>readCurrentFileInZip</code>.</p>
@return <code>YES</code> if the next file has been selected,
<code>NO</code> if there were no more files to select in the zip file.
@throws OZZipException If the next file can't be selected due to an error or
if the zip file has been opened with a mode other than Unzip.
*/
- (BOOL) goToNextFileInZip;
/**
@brief Locates a file by name in the zip file and selects it.
<p>The selected file may then be read by obaining a OZZipReadStream with
<code>readCurrentFileInZip</code>.</p>
@return <code>YES</code> if the file has been located and selected,
<code>NO</code> if the specified file name is not present in the zip file.
<br/>NOTE: return value convention is different in NSError compliant
interface.
@throws OZZipException If the file can't be located due to an error or if the
zip file has been opened with a mode other than Unzip.
*/
- (BOOL) locateFileInZip:(nonnull NSString *)fileNameInZip;
/**
@brief Returns the number of files contained in the zip file.
@return The number of files contained in the zip file.
@throws OZZipException If the number of files could not be obtained due to an
error or if the zip file has been opened with a mode other than Unzip.
*/
- (NSUInteger) numFilesInZip;
/**
@brief Returns a list of OZFileInZipInfo with the information on all the files
contained in the zip file.
@return The list of OZFileInZipInfo with the information on all the files
contained in the zip file.
@throws OZZipException If the list of file info could not be obtained due to
an error or if the zip file has been opened with a mode other than Unzip.
*/
- (nonnull NSArray *) listFileInZipInfos;
/**
@brief Returns an OZFileInZipInfo with the information on the currently
selected file in the zip file.
@return An OZFileInZipInfo with the information on the currently
selected file in the zip file.
@throws OZZipException If the info info could not be obtained due to an error
or if the zip file has been opened with a mode other than Unzip.
*/
- (nonnull OZFileInZipInfo *) getCurrentFileInZipInfo;
#pragma mark -
#pragma mark File reading
/**
@brief Creates a OZZipReadStream for reading the currently selected file in
the zip file.
<p>A file in the zip file can be selected using
<code>goToFirstFileInZip</code>, <code>goToNextFileInZip</code> and
<code>locateFileInZip:</code>.</p>
@return The OZZipReadStream to be used for reading the currently selected file
in the zip file.
@throws OZZipException If the read stream could not be created due to an error
or if the zip file has been opened with a mode other than Unzip.
*/
- (nonnull OZZipReadStream *) readCurrentFileInZip;
/**
@brief Creates a OZZipReadStream for reading the currently selected file in
the zip file, if it is encrypted.
<p>A file in the zip file can be selected using
<code>goToFirstFileInZip</code>, <code>goToNextFileInZip</code> and
<code>locateFileInZip:</code>.</p>
@param password The password that must be used to decrypt the file data.
@return The OZZipReadStream to be used for reading the currently selected file
in the zip file.
@throws OZZipException If the read stream could not be created due to an error
or if the zip file has been opened with a mode other than Unzip.
*/
- (nonnull OZZipReadStream *) readCurrentFileInZipWithPassword:(nonnull NSString *)password;
#pragma mark -
#pragma mark Closing
/**
@brief Closes the zip file and releases its resources.
<p>Once you have finished working with the zip file (e.g. all files have been
unzipped, or all files have been added), it is important to close it so system
resources may be freed.</p>
<p>Note: after the zip file has been closed any subsequent call will result in an
error.</p>
@throws OZZipException If the zip file could not be closed due to an error.
*/
- (void) close;
@end

84
Objective-Zip/OZZipFile.h Normal file
View File

@@ -0,0 +1,84 @@
//
// OZZipFile.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import <Foundation/Foundation.h>
#import "OZZipFileMode.h"
#import "OZZipCompressionLevel.h"
@class OZZipReadStream;
@class OZZipWriteStream;
@class OZFileInZipInfo;
/**
@brief OZZipFile provides read or write access to a single zip file.
<p> During initialization you must specify the access mode, i.e. if the zip
file is being created, appended, or unzipped. You can also specify if the zip
file must be opened in legacy 32-bit mode, to be compatible with older
operating systems (such as some versions of Android).</p>
<p> If the zip file has been opened in unzip mode, you can list its content,
move within its content from file to file, and finally open a reading stream
of the selected file.</p>
<p> If the zip file has been opened in creation or append mode, you can open a
writing stream to add new files to its content.</p>
*/
@interface OZZipFile : NSObject
#pragma mark -
#pragma mark Properties
/**
@brief File name of the zip file.
*/
@property (nonatomic, readonly, nonnull) NSString *fileName;
/**
@brief Access mode specified during opening. Can be:<ul>
<li>OZZipFileModeUnzip: the zip file has been opened for reading.
<li>OZZipFileModeCreate: the zip file has been opened for creation.
<li>OZZipFileModeAppend: the zip file has been opened for writing.
</ul>
*/
@property (nonatomic, readonly) OZZipFileMode mode;
/**
@brief <code>YES</code> if the zip file has been opened in 32-bit
compatibility mode, <code>NO</code> if it has been opened in standard
(default) 64-bit mode.
*/
@property (nonatomic, readonly) BOOL legacy32BitMode;
@end

603
Objective-Zip/OZZipFile.m Normal file
View File

@@ -0,0 +1,603 @@
//
// OZZipFile.m
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipFile.h"
#import "OZZipFile+Standard.h"
#import "OZZipFile+NSError.h"
#import "OZZipException.h"
#import "OZZipException+Internals.h"
#import "OZZipReadStream.h"
#import "OZZipReadStream+Standard.h"
#import "OZZipReadStream+NSError.h"
#import "OZZipReadStream+Internals.h"
#import "OZZipWriteStream.h"
#import "OZZipWriteStream+Standard.h"
#import "OZZipWriteStream+NSError.h"
#import "OZZipWriteStream+Internals.h"
#import "OZFileInZipInfo.h"
#import "OZFileInZipInfo+Internals.h"
#include "zip.h"
#include "unzip.h"
#define FILE_IN_ZIP_MAX_NAME_LENGTH (256)
#pragma mark -
#pragma mark OZZipFile extension
@interface OZZipFile () {
NSString *_fileName;
OZZipFileMode _mode;
BOOL _legacy32BitMode;
@private
zipFile _zipFile;
unzFile _unzFile;
}
@end
#pragma mark -
#pragma mark OZZipFile implementation
@implementation OZZipFile
#pragma mark -
#pragma mark Initialization
- (instancetype) initWithFileName:(NSString *)fileName mode:(OZZipFileMode)mode {
return [self initWithFileName:fileName mode:mode legacy32BitMode:NO];
}
- (instancetype) initWithFileName:(NSString *)fileName mode:(OZZipFileMode)mode legacy32BitMode:(BOOL)legacy32BitMode {
if (self= [super init]) {
_fileName= fileName;
_mode= mode;
_legacy32BitMode= legacy32BitMode;
const char *path= [_fileName cStringUsingEncoding:NSUTF8StringEncoding];
switch (mode) {
case OZZipFileModeUnzip:
// Support for legacy 32 bit mode: here we use 32 or 64 bit version
// alternatively, as internal (common) version is not exposed
_unzFile= (_legacy32BitMode ? unzOpen(path) : unzOpen64(path));
if (_unzFile == NULL)
@throw [OZZipException zipExceptionWithError:OZ_ERROR_NO_SUCH_FILE reason:@"Can't open '%@'", _fileName];
break;
case OZZipFileModeCreate:
// Support for legacy 32 bit mode: here we use the common version
_zipFile= zipOpen3(path, APPEND_STATUS_CREATE, 0, NULL, NULL);
if (_zipFile == NULL)
@throw [OZZipException zipExceptionWithError:OZ_ERROR_NO_SUCH_FILE reason:@"Can't open '%@'", _fileName];
break;
case OZZipFileModeAppend:
// Support for legacy 32 bit mode: here we use the common version
_zipFile= zipOpen3(path, APPEND_STATUS_ADDINZIP, 0, NULL, NULL);
if (_zipFile == NULL)
@throw [OZZipException zipExceptionWithError:OZ_ERROR_NO_SUCH_FILE reason:@"Can't open '%@'", _fileName];
break;
default:
@throw [OZZipException zipExceptionWithReason:@"Unknown mode %d", _mode];
}
}
return self;
}
#pragma mark -
#pragma mark Initialization (NSError variants)
- (instancetype) initWithFileName:(NSString *)fileName mode:(OZZipFileMode)mode error:(NSError *__autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self initWithFileName:fileName mode:mode];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
- (instancetype) initWithFileName:(NSString *)fileName mode:(OZZipFileMode)mode legacy32BitMode:(BOOL)legacy32BitMode error:(NSError *__autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self initWithFileName:fileName mode:mode legacy32BitMode:legacy32BitMode];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
#pragma mark -
#pragma mark File writing
- (OZZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip compressionLevel:(OZZipCompressionLevel)compressionLevel {
if (_mode == OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation not permitted in Unzip mode"];
NSDate *now= [NSDate date];
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDateComponents *date= [calendar components:(NSCalendarUnitSecond | NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear) fromDate:now];
zip_fileinfo zi;
zi.tmz_date.tm_sec= (uInt) [date second];
zi.tmz_date.tm_min= (uInt) [date minute];
zi.tmz_date.tm_hour= (uInt) [date hour];
zi.tmz_date.tm_mday= (uInt) [date day];
zi.tmz_date.tm_mon= (uInt) [date month] -1;
zi.tmz_date.tm_year= (uInt) [date year];
zi.internal_fa= 0;
zi.external_fa= 0;
zi.dosDate= 0;
// Support for legacy 32 bit mode: here we use the common version,
// passing a flag to tell if it is a 32 or 64 bit file
int err= zipOpenNewFileInZip3_64(_zipFile,
[fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
&zi,
NULL, 0, NULL, 0, NULL,
(compressionLevel != OZZipCompressionLevelNone) ? Z_DEFLATED : 0,
compressionLevel, 0,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
NULL, 0,
(_legacy32BitMode ? 0 : 1));
if (err != ZIP_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error opening '%@' in zipfile", fileNameInZip];
return [[OZZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip];
}
- (OZZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel {
if (_mode == OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation not permitted in Unzip mode"];
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDateComponents *date= [calendar components:(NSCalendarUnitSecond | NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear) fromDate:fileDate];
zip_fileinfo zi;
zi.tmz_date.tm_sec= (uInt) [date second];
zi.tmz_date.tm_min= (uInt) [date minute];
zi.tmz_date.tm_hour= (uInt) [date hour];
zi.tmz_date.tm_mday= (uInt) [date day];
zi.tmz_date.tm_mon= (uInt) [date month] -1;
zi.tmz_date.tm_year= (uInt) [date year];
zi.internal_fa= 0;
zi.external_fa= 0;
zi.dosDate= 0;
// Support for legacy 32 bit mode: here we use the common version,
// passing a flag to tell if it is a 32 or 64 bit file
int err= zipOpenNewFileInZip3_64(_zipFile,
[fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
&zi,
NULL, 0, NULL, 0, NULL,
(compressionLevel != OZZipCompressionLevelNone) ? Z_DEFLATED : 0,
compressionLevel, 0,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
NULL, 0,
(_legacy32BitMode ? 0 : 1));
if (err != ZIP_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error opening '%@' in zipfile", fileNameInZip];
return [[OZZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip];
}
- (OZZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel password:(NSString *)password crc32:(NSUInteger)crc32 {
if (_mode == OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation not permitted in Unzip mode"];
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDateComponents *date= [calendar components:(NSCalendarUnitSecond | NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear) fromDate:fileDate];
zip_fileinfo zi;
zi.tmz_date.tm_sec= (uInt) [date second];
zi.tmz_date.tm_min= (uInt) [date minute];
zi.tmz_date.tm_hour= (uInt) [date hour];
zi.tmz_date.tm_mday= (uInt) [date day];
zi.tmz_date.tm_mon= (uInt) [date month] -1;
zi.tmz_date.tm_year= (uInt) [date year];
zi.internal_fa= 0;
zi.external_fa= 0;
zi.dosDate= 0;
// Support for legacy 32 bit mode: here we use the common version,
// passing a flag to tell if it is a 32 or 64 bit file
int err= zipOpenNewFileInZip3_64(_zipFile,
[fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
&zi,
NULL, 0, NULL, 0, NULL,
(compressionLevel != OZZipCompressionLevelNone) ? Z_DEFLATED : 0,
compressionLevel, 0,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
[password cStringUsingEncoding:NSUTF8StringEncoding], crc32,
(_legacy32BitMode ? 0 : 1));
if (err != ZIP_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error opening '%@' in zipfile", fileNameInZip];
return [[OZZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip];
}
#pragma mark -
#pragma mark File writing (NSError variants)
- (OZZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip compressionLevel:(OZZipCompressionLevel)compressionLevel error:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self writeFileInZipWithName:fileNameInZip compressionLevel:compressionLevel];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
- (OZZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel error:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self writeFileInZipWithName:fileNameInZip fileDate:fileDate compressionLevel:compressionLevel];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
- (OZZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(OZZipCompressionLevel)compressionLevel password:(NSString *)password crc32:(NSUInteger)crc32 error:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self writeFileInZipWithName:fileNameInZip fileDate:fileDate compressionLevel:compressionLevel password:password crc32:crc32];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
#pragma mark -
#pragma mark File seeking and info
- (void) goToFirstFileInZip {
if (_mode != OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation permitted only in Unzip mode"];
int err= unzGoToFirstFile(_unzFile);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error going to first file in zip of '%@'", _fileName];
}
- (BOOL) goToNextFileInZip {
if (_mode != OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation permitted only in Unzip mode"];
int err= unzGoToNextFile(_unzFile);
if (err == UNZ_END_OF_LIST_OF_FILE)
return NO;
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error going to next file in zip of '%@'", _fileName];
return YES;
}
- (BOOL) locateFileInZip:(NSString *)fileNameInZip {
if (_mode != OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation permitted only in Unzip mode"];
int err= unzLocateFile(_unzFile, [fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding], NULL);
if (err == UNZ_END_OF_LIST_OF_FILE)
return NO;
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error localting file in zip of '%@'", _fileName];
return YES;
}
- (NSUInteger) numFilesInZip {
if (_mode != OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation permitted only in Unzip mode"];
// Support for legacy 32 bit mode: here we use the 32 or 64 bit
// version alternatively, as there is not internal (common) version
if (_legacy32BitMode) {
unz_global_info gi;
int err= unzGetGlobalInfo(_unzFile, &gi);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error getting global info of '%@'", _fileName];
return gi.number_entry;
} else {
unz_global_info64 gi;
int err= unzGetGlobalInfo64(_unzFile, &gi);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error getting global info of '%@'", _fileName];
return (NSUInteger) gi.number_entry;
}
}
- (NSArray *) listFileInZipInfos {
NSUInteger num= [self numFilesInZip];
if (num < 1)
return [NSArray array];
NSMutableArray *files= [[NSMutableArray alloc] initWithCapacity:num];
[self goToFirstFileInZip];
for (int i= 0; i < num; i++) {
OZFileInZipInfo *info= [self getCurrentFileInZipInfo];
[files addObject:info];
if ((i +1) < num)
[self goToNextFileInZip];
}
return files;
}
- (OZFileInZipInfo *) getCurrentFileInZipInfo {
if (_mode != OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation permitted only in Unzip mode"];
char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
unz_file_info64 file_info;
// Support for legacy 32 bit mode: here we use the 64 bit version,
// as it also internally called from the 32 bit version
int err= unzGetCurrentFileInfo64(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error getting current file info of '%@'", _fileName];
NSString *name= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
OZZipCompressionLevel level= OZZipCompressionLevelNone;
if (file_info.compression_method != 0) {
switch ((file_info.flag & 0x6) / 2) {
case 0:
level= OZZipCompressionLevelDefault;
break;
case 1:
level= OZZipCompressionLevelBest;
break;
default:
level= OZZipCompressionLevelFastest;
break;
}
}
BOOL crypted= ((file_info.flag & 1) != 0);
NSDateComponents *components= [[NSDateComponents alloc] init];
[components setDay:file_info.tmu_date.tm_mday];
[components setMonth:file_info.tmu_date.tm_mon +1];
[components setYear:file_info.tmu_date.tm_year];
[components setHour:file_info.tmu_date.tm_hour];
[components setMinute:file_info.tmu_date.tm_min];
[components setSecond:file_info.tmu_date.tm_sec];
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDate *date= [calendar dateFromComponents:components];
OZFileInZipInfo *info= [[OZFileInZipInfo alloc] initWithName:name
length:file_info.uncompressed_size
level:level
crypted:crypted
size:file_info.compressed_size
date:date
crc32:file_info.crc];
return info;
}
#pragma mark -
#pragma mark File seeking and info (NSError variants)
- (BOOL) goToFirstFileInZipWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
[self goToFirstFileInZip];
return YES;
} ERROR_WRAP_END_AND_RETURN(error, NO);
}
- (BOOL) goToNextFileInZipWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self goToNextFileInZip];
} ERROR_WRAP_END_AND_RETURN(error, NO);
}
- (NSInteger) locateFileInZip:(NSString *)fileNameInZip error:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
BOOL located= [self locateFileInZip:fileNameInZip];
return (located ? OZLocateFileResultFound : OZLocateFileResultNotFound);
} ERROR_WRAP_END_AND_RETURN(error, 0);
}
- (NSUInteger) numFilesInZipWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self numFilesInZip];
} ERROR_WRAP_END_AND_RETURN(error, 0);
}
- (NSArray *) listFileInZipInfosWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self listFileInZipInfos];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
- (OZFileInZipInfo *) getCurrentFileInZipInfoWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self getCurrentFileInZipInfo];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
#pragma mark -
#pragma mark File reading
- (OZZipReadStream *) readCurrentFileInZip {
if (_mode != OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation permitted only in Unzip mode"];
char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
unz_file_info64 file_info;
// Support for legacy 32 bit mode: here we use the 64 bit version,
// as it also internally called from the 32 bit version
int err= unzGetCurrentFileInfo64(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error getting current file info of '%@'", _fileName];
NSString *fileNameInZip= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
err= unzOpenCurrentFilePassword(_unzFile, NULL);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error opening current file of '%@'", _fileName];
return [[OZZipReadStream alloc] initWithUnzFileStruct:_unzFile fileNameInZip:fileNameInZip];
}
- (OZZipReadStream *) readCurrentFileInZipWithPassword:(NSString *)password {
if (_mode != OZZipFileModeUnzip)
@throw [OZZipException zipExceptionWithReason:@"Operation permitted only in Unzip mode"];
char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
unz_file_info64 file_info;
// Support for legacy 32 bit mode: here we use the 64 bit version,
// as it also internally called from the 32 bit version
int err= unzGetCurrentFileInfo64(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error getting current file info of '%@'", _fileName];
NSString *fileNameInZip= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
err= unzOpenCurrentFilePassword(_unzFile, [password cStringUsingEncoding:NSUTF8StringEncoding]);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error opening current file of '%@'", _fileName];
return [[OZZipReadStream alloc] initWithUnzFileStruct:_unzFile fileNameInZip:fileNameInZip];
}
#pragma mark -
#pragma mark File reading (NSError variants)
- (OZZipReadStream *) readCurrentFileInZipWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self readCurrentFileInZip];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
- (OZZipReadStream *) readCurrentFileInZipWithPassword:(NSString *)password error:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
return [self readCurrentFileInZipWithPassword:password];
} ERROR_WRAP_END_AND_RETURN(error, nil);
}
#pragma mark -
#pragma mark Closing
- (void) close {
switch (_mode) {
case OZZipFileModeUnzip: {
int err= unzClose(_unzFile);
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error closing '%@'", _fileName];
break;
}
case OZZipFileModeCreate: {
int err= zipClose(_zipFile, NULL);
if (err != ZIP_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error closing '%@'", _fileName];
break;
}
case OZZipFileModeAppend: {
int err= zipClose(_zipFile, NULL);
if (err != ZIP_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error closing '%@'", _fileName];
break;
}
default:
@throw [OZZipException zipExceptionWithReason:@"Unknown mode %d", _mode];
}
}
#pragma mark -
#pragma mark Closing (NSError variants)
- (BOOL) closeWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
[self close];
return YES;
} ERROR_WRAP_END_AND_RETURN(error, NO);
}
#pragma mark -
#pragma mark Properties
@synthesize fileName= _fileName;
@synthesize mode= _mode;
@synthesize legacy32BitMode= _legacy32BitMode;
@end

77
Classes/Objective_ZipAppDelegate.h → Objective-Zip/OZZipFileMode.h
View File

@@ -1,47 +1,60 @@
//
// Objective_ZipAppDelegate.h
// Objective-Zip
// OZZipFileMode.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright Flying Dolphin Studio 2009. All rights reserved.
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import <UIKit/UIKit.h>
#ifndef Objective_Zip_OZZipFileMode_h
#define Objective_Zip_OZZipFileMode_h
@class Objective_ZipViewController;
/**
@brief Access mode for opening a zip file.
*/
typedef NS_ENUM(NSInteger, OZZipFileMode) {
/**
@brief Acces mode for opening the zip file for reading.
*/
OZZipFileModeUnzip,
/**
@brief Acces mode for opening the zip file for creation.
<br/>Note: if the file already exists the behavior is unspecified.
*/
OZZipFileModeCreate,
/**
@brief Acces mode for opening the zip file for writing.
*/
OZZipFileModeAppend
};
@interface Objective_ZipAppDelegate : NSObject <UIApplicationDelegate> {
UIWindow *window;
Objective_ZipViewController *viewController;
}
@property (nonatomic, retain) IBOutlet UIWindow *window;
@property (nonatomic, retain) IBOutlet Objective_ZipViewController *viewController;
@end
#endif

63
Classes/Objective_ZipViewController.h → Objective-Zip/OZZipReadStream+Internals.h
View File

@@ -1,51 +1,48 @@
//
// Objective_ZipViewController.h
// Objective-Zip
// OZZipReadStream+Internals.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright Flying Dolphin Studio 2009. All rights reserved.
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import <UIKit/UIKit.h>
#import "OZZipReadStream.h"
@interface Objective_ZipViewController : UIViewController {
IBOutlet UITextView *_textView;
#include "unzip.h"
@private
NSThread *_testThread;
}
- (IBAction) zipUnzip;
- (IBAction) zipUnzip2;
@interface OZZipReadStream (Internals)
#pragma mark -
#pragma mark Initialization
- (nonnull instancetype) initWithUnzFileStruct:(nonnull unzFile)unzFile fileNameInZip:(nonnull NSString *)fileNameInZip;
- (void) test;
- (void) test2;
- (void) log:(NSString *)text;
@end

77
Objective-Zip/OZZipReadStream+NSError.h Normal file
View File

@@ -0,0 +1,77 @@
//
// OZZipReadStream+NSError.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipReadStream.h"
/**
@brief Indicates the end of the file has been reached.
*/
static const NSInteger OZReadStreamResultEndOfFile= -1;
@interface OZZipReadStream (NSError)
#pragma mark -
#pragma mark Reading data (NSError variants)
/**
@brief Reads and uncompresses data from the file in the zip file and stores
them in the specified buffer.
@param buffer The buffer where read and uncompressed data must be stored.
@param error If passed, may be filled with an NSError is case data could
not be read.
@return The number of uncompressed bytes read, <code>OZReadStreamResultEndOfFile</code>
if the end of the file has been reached, or <code>0</code>
if data could not be read due to an error.
<br/>NOTE: return value convention is different in the standard (non-NSError
compliant) interface.
*/
- (NSInteger) __attribute__((swift_error(nonnull_error))) readDataWithBuffer:(nonnull NSMutableData *)buffer error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Closes the read steam.
<p>Once you have finished read data to the file, it is important to close
the stream so system resources may be freed.</p>
<p>Note: after the stream has been closed any subsequent read will result in
an error.</p>
@param error If passed, may be filled with an NSError is case the stream could
not be closed.
@return <code>YES</code> if the stream has been closed, <code>NO</code> if
the stream could not be closed due to an error.
*/
- (BOOL) finishedReadingWithError:(NSError * __autoreleasing __nullable * __nullable)error;
@end

66
Objective-Zip/OZZipReadStream+Standard.h Normal file
View File

@@ -0,0 +1,66 @@
//
// OZZipReadStream+Standard.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipReadStream.h"
@interface OZZipReadStream (Standard)
#pragma mark -
#pragma mark Reading data
/**
@brief Reads and uncompresses data from the file in the zip file and stores
them in the specified buffer.
@param buffer The buffer where read and uncompressed data must be stored.
@return The number of uncompressed bytes read, <code>0</code> if the end of
the file has been reached.
<br/>NOTE: return value convention is different in NSError compliant
interface.
@throws OZZipException If the data could not be read due to an error.
*/
- (NSUInteger) readDataWithBuffer:(nonnull NSMutableData *)buffer;
/**
@brief Closes the read steam.
<p>Once you have finished read data to the file, it is important to close
the stream so system resources may be freed.</p>
<p>Note: after the stream has been closed any subsequent read will result in
an error.</p>
@throws OZZipException If the stream could not be closed due to an error.
*/
- (void) finishedReading;
@end

23
Objective-Zip/ZipException.h → Objective-Zip/OZZipReadStream.h
View File

@@ -1,9 +1,9 @@
//
// ZipException.h
// Objective-Zip v. 0.8.2
// OZZipReadStream.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Created by Gianluca Bertani on 28/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -32,18 +32,13 @@
//
#import <Foundation/Foundation.h>
#import "ARCHelper.h"
@interface ZipException : NSException {
@private
NSInteger _error;
}
/**
@brief OZZipReadStream implements a read stream and provides services to
read content from a file in the zip file.
*/
@interface OZZipReadStream : NSObject
- (id) initWithReason:(NSString *)reason;
- (id) initWithError:(NSInteger)error reason:(NSString *)reason;
@property (nonatomic, readonly) NSInteger error;
@end

81
Objective-Zip/ZipReadStream.m → Objective-Zip/OZZipReadStream.m
View File

@@ -1,9 +1,9 @@
//
// ZipReadStream.m
// Objective-Zip v. 0.8.2
// OZZipReadStream.m
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 28/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -31,16 +31,38 @@
// POSSIBILITY OF SUCH DAMAGE.
//
#import "ZipReadStream.h"
#import "ZipException.h"
#include "unzip.h"
#import "OZZipReadStream.h"
#import "OZZipReadStream+Standard.h"
#import "OZZipReadStream+NSError.h"
#import "OZZipReadStream+Internals.h"
#import "OZZipException.h"
#import "OZZipException+Internals.h"
@implementation ZipReadStream
#pragma mark -
#pragma mark OZZipReadStream extension
@interface OZZipReadStream () {
NSString *_fileNameInZip;
@private
unzFile _unzFile;
}
- (id) initWithUnzFileStruct:(unzFile)unzFile fileNameInZip:(NSString *)fileNameInZip {
@end
#pragma mark -
#pragma mark OZZipReadStream implementation
@implementation OZZipReadStream
#pragma mark -
#pragma mark Initialization
- (instancetype) initWithUnzFileStruct:(unzFile)unzFile fileNameInZip:(NSString *)fileNameInZip {
if (self= [super init]) {
_unzFile= unzFile;
_fileNameInZip= fileNameInZip;
@@ -49,22 +71,45 @@
return self;
}
#pragma mark -
#pragma mark Reading data
- (NSUInteger) readDataWithBuffer:(NSMutableData *)buffer {
int err= unzReadCurrentFile(_unzFile, [buffer mutableBytes], [buffer length]);
if (err < 0) {
NSString *reason= [NSString stringWithFormat:@"Error in reading '%@' in the zipfile", _fileNameInZip];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
int err= unzReadCurrentFile(_unzFile, [buffer mutableBytes], (uInt) [buffer length]);
if (err < 0)
@throw [OZZipException zipExceptionWithError:err reason:@"Error reading '%@' in the zipfile", _fileNameInZip];
return err;
}
- (void) finishedReading {
int err= unzCloseCurrentFile(_unzFile);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in closing '%@' in the zipfile", _fileNameInZip];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
if (err != UNZ_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error closing '%@' in the zipfile", _fileNameInZip];
}
#pragma mark -
#pragma mark Reading data (NSError variants)
- (NSInteger) readDataWithBuffer:(NSMutableData *)buffer error:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
NSUInteger bytesRead= [self readDataWithBuffer:buffer];
return (bytesRead == 0) ? OZReadStreamResultEndOfFile : bytesRead;
} ERROR_WRAP_END_AND_RETURN(error, 0);
}
- (BOOL) finishedReadingWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
[self finishedReading];
return YES;
} ERROR_WRAP_END_AND_RETURN(error, NO);
}

48
Objective-Zip/OZZipWriteStream+Internals.h Normal file
View File

@@ -0,0 +1,48 @@
//
// OZZipWriteStream+Internals.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipWriteStream.h"
#include "zip.h"
@interface OZZipWriteStream (Internals)
#pragma mark -
#pragma mark Initialization
- (nonnull instancetype) initWithZipFileStruct:(nonnull zipFile)zipFile fileNameInZip:(nonnull NSString *)fileNameInZip;
@end

69
Objective-Zip/OZZipWriteStream+NSError.h Normal file
View File

@@ -0,0 +1,69 @@
//
// OZZipWriteStream+NSError.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipWriteStream.h"
@interface OZZipWriteStream (NSError)
#pragma mark -
#pragma mark Writing data (NSError variants)
/**
@brief Compresses and writes data to the new file in the zip file.
<p>Data are compressed depending on the choice of compression level specified
during creation of the write stream.</p>
@param data The data to be compressed and written.
@param error If passed, may be filled with an NSError is case data could
not be written.
@return <code>YES</code> if data has been written, <code>NO</code> if
data could not be written due to an error.
*/
- (BOOL) writeData:(nonnull NSData *)data error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Closes the write stream.
<p>Once you have finished writing data to the new file, it is important to
close the stream so system resources may be freed.</p>
<p>Note: after the stream has been closed any subsequent write will result in
an error.</p>
@param error If passed, may be filled with an NSError is case the stream could
not be closed.
@return <code>YES</code> if the stream has been closed, <code>NO</code> if
the stream could not be closed due to an error.
*/
- (BOOL) finishedWritingWithError:(NSError * __autoreleasing __nullable * __nullable)error;
@end

81
Classes/Objective_ZipAppDelegate.m → Objective-Zip/OZZipWriteStream+Standard.h
View File

@@ -1,56 +1,63 @@
//
// Objective_ZipAppDelegate.m
// Objective-Zip
// OZZipWriteStream+Standard.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright Flying Dolphin Studio 2009. All rights reserved.
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "Objective_ZipAppDelegate.h"
#import "Objective_ZipViewController.h"
@implementation Objective_ZipAppDelegate
@synthesize window;
@synthesize viewController;
#import "OZZipWriteStream.h"
- (void)applicationDidFinishLaunching:(UIApplication *)application {
[window addSubview:viewController.view];
[window makeKeyAndVisible];
}
@interface OZZipWriteStream (Standard)
- (void)dealloc {
[viewController release];
[window release];
[super dealloc];
}
#pragma mark -
#pragma mark Writing data
/**
@brief Compresses and writes data to the new file in the zip file.
<p>Data are compressed depending on the choice of compression level specified
during creation of the write stream.</p>
@param data The data to be compressed and written.
@throws OZZipException If the data could not be written due to an error.
*/
- (void) writeData:(nonnull NSData *)data;
/**
@brief Closes the write stream.
<p>Once you have finished writing data to the new file, it is important to
close the stream so system resources may be freed.</p>
<p>Note: after the stream has been closed any subsequent write will result in
an error.</p>
@throws OZZipException If the stream could not be closed due to an error.
*/
- (void) finishedWriting;
@end

24
main.m → Objective-Zip/OZZipWriteStream.h
View File

@@ -1,9 +1,9 @@
//
// main.m
// Objective-Zip
// OZZipWriteStream.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright Flying Dolphin Studio 2009. All rights reserved.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -31,12 +31,14 @@
// POSSIBILITY OF SUCH DAMAGE.
//
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
int main(int argc, char *argv[]) {
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
int retVal = UIApplicationMain(argc, argv, nil, nil);
[pool release];
return retVal;
}
/**
@brief OZZipWriteStream implements a write stream and provides services to
write content to a new file in the zip file.
*/
@interface OZZipWriteStream : NSObject
@end

82
Objective-Zip/ZipWriteStream.m → Objective-Zip/OZZipWriteStream.m
View File

@@ -1,9 +1,9 @@
//
// ZipWriteStream.m
// Objective-Zip v. 0.8.2
// OZZipWriteStream.m
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -31,16 +31,38 @@
// POSSIBILITY OF SUCH DAMAGE.
//
#import "ZipWriteStream.h"
#import "ZipException.h"
#include "zip.h"
#import "OZZipWriteStream.h"
#import "OZZipWriteStream+Standard.h"
#import "OZZipWriteStream+NSError.h"
#import "OZZipWriteStream+Internals.h"
#import "OZZipException.h"
#import "OZZipException+Internals.h"
@implementation ZipWriteStream
#pragma mark -
#pragma mark OZZipWriteStream extension
@interface OZZipWriteStream () {
NSString *_fileNameInZip;
@private
zipFile _zipFile;
}
- (id) initWithZipFileStruct:(zipFile)zipFile fileNameInZip:(NSString *)fileNameInZip {
@end
#pragma mark -
#pragma mark OZZipWriteStream implementation
@implementation OZZipWriteStream
#pragma mark -
#pragma mark Initialization
- (instancetype) initWithZipFileStruct:(zipFile)zipFile fileNameInZip:(NSString *)fileNameInZip {
if (self= [super init]) {
_zipFile= zipFile;
_fileNameInZip= fileNameInZip;
@@ -49,20 +71,44 @@
return self;
}
#pragma mark -
#pragma mark Writing data
- (void) writeData:(NSData *)data {
int err= zipWriteInFileInZip(_zipFile, [data bytes], [data length]);
if (err < 0) {
NSString *reason= [NSString stringWithFormat:@"Error in writing '%@' in the zipfile", _fileNameInZip];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
int err= zipWriteInFileInZip(_zipFile, [data bytes], (uInt) [data length]);
if (err < 0)
@throw [OZZipException zipExceptionWithError:err reason:@"Error writing '%@' in the zipfile", _fileNameInZip];
}
- (void) finishedWriting {
int err= zipCloseFileInZip(_zipFile);
if (err != ZIP_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in closing '%@' in the zipfile", _fileNameInZip];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
if (err != ZIP_OK)
@throw [OZZipException zipExceptionWithError:err reason:@"Error closing '%@' in the zipfile", _fileNameInZip];
}
#pragma mark -
#pragma mark Writing data (NSError variants)
- (BOOL) writeData:(NSData *)data error:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
[self writeData:data];
return YES;
} ERROR_WRAP_END_AND_RETURN(error, NO);
}
- (BOOL) finishedWritingWithError:(NSError * __autoreleasing *)error {
ERROR_WRAP_BEGIN {
[self finishedWriting];
return YES;
} ERROR_WRAP_END_AND_RETURN(error, NO);
}

43
Objective-Zip/Objective-Zip+NSError.h Normal file
View File

@@ -0,0 +1,43 @@
//
// Objective-Zip+NSError.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipFile.h"
#import "OZZipFile+NSError.h"
#import "OZZipFileMode.h"
#import "OZZipCompressionLevel.h"
#import "OZZipException.h"
#import "OZZipWriteStream.h"
#import "OZZipWriteStream+NSError.h"
#import "OZZipReadStream.h"
#import "OZZipReadStream+NSError.h"
#import "OZFileInZipInfo.h"

43
Objective-Zip/Objective-Zip.h Normal file
View File

@@ -0,0 +1,43 @@
//
// Objective-Zip.h
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "OZZipFile.h"
#import "OZZipFile+Standard.h"
#import "OZZipFileMode.h"
#import "OZZipCompressionLevel.h"
#import "OZZipException.h"
#import "OZZipWriteStream.h"
#import "OZZipWriteStream+Standard.h"
#import "OZZipReadStream.h"
#import "OZZipReadStream+Standard.h"
#import "OZFileInZipInfo.h"

88
Objective-Zip/ZipFile.h
View File

@@ -1,88 +0,0 @@
//
// ZipFile.h
// Objective-Zip v.0.8.2
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import <Foundation/Foundation.h>
#import "ARCHelper.h"
#include "zip.h"
#include "unzip.h"
typedef enum {
ZipFileModeUnzip,
ZipFileModeCreate,
ZipFileModeAppend
} ZipFileMode;
typedef enum {
ZipCompressionLevelDefault= -1,
ZipCompressionLevelNone= 0,
ZipCompressionLevelFastest= 1,
ZipCompressionLevelBest= 9
} ZipCompressionLevel;
@class ZipReadStream;
@class ZipWriteStream;
@class FileInZipInfo;
@interface ZipFile : NSObject {
NSString *_fileName;
ZipFileMode _mode;
@private
zipFile _zipFile;
unzFile _unzFile;
}
- (id) initWithFileName:(NSString *)fileName mode:(ZipFileMode)mode;
- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip compressionLevel:(ZipCompressionLevel)compressionLevel;
- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel;
- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel password:(NSString *)password crc32:(NSUInteger)crc32;
- (NSString*) fileName;
- (NSUInteger) numFilesInZip;
- (NSArray *) listFileInZipInfos;
- (void) goToFirstFileInZip;
- (BOOL) goToNextFileInZip;
- (BOOL) locateFileInZip:(NSString *)fileNameInZip;
- (FileInZipInfo *) getCurrentFileInZipInfo;
- (ZipReadStream *) readCurrentFileInZip;
- (ZipReadStream *) readCurrentFileInZipWithPassword:(NSString *)password;
- (void) close;
@end

428
Objective-Zip/ZipFile.m
View File

@@ -1,428 +0,0 @@
//
// ZipFile.m
// Objective-Zip v. 0.8.2
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Gianluca Bertani nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
#import "ZipFile.h"
#import "ZipException.h"
#import "ZipReadStream.h"
#import "ZipWriteStream.h"
#import "FIleInZipInfo.h"
#define FILE_IN_ZIP_MAX_NAME_LENGTH (256)
@implementation ZipFile
- (id) initWithFileName:(NSString *)fileName mode:(ZipFileMode)mode {
if (self= [super init]) {
_fileName= [fileName ah_retain];
_mode= mode;
switch (mode) {
case ZipFileModeUnzip:
_unzFile= unzOpen([_fileName cStringUsingEncoding:NSUTF8StringEncoding]);
if (_unzFile == NULL) {
NSString *reason= [NSString stringWithFormat:@"Can't open '%@'", _fileName];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
break;
case ZipFileModeCreate:
_zipFile= zipOpen([_fileName cStringUsingEncoding:NSUTF8StringEncoding], APPEND_STATUS_CREATE);
if (_zipFile == NULL) {
NSString *reason= [NSString stringWithFormat:@"Can't open '%@'", _fileName];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
break;
case ZipFileModeAppend:
_zipFile= zipOpen([_fileName cStringUsingEncoding:NSUTF8StringEncoding], APPEND_STATUS_ADDINZIP);
if (_zipFile == NULL) {
NSString *reason= [NSString stringWithFormat:@"Can't open '%@'", _fileName];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
break;
default: {
NSString *reason= [NSString stringWithFormat:@"Unknown mode %d", _mode];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
}
}
return self;
}
- (void) dealloc {
[_fileName release];
[super ah_dealloc];
}
- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip compressionLevel:(ZipCompressionLevel)compressionLevel {
if (_mode == ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted with Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
NSDate *now= [NSDate date];
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:now];
zip_fileinfo zi;
zi.tmz_date.tm_sec= [date second];
zi.tmz_date.tm_min= [date minute];
zi.tmz_date.tm_hour= [date hour];
zi.tmz_date.tm_mday= [date day];
zi.tmz_date.tm_mon= [date month] -1;
zi.tmz_date.tm_year= [date year];
zi.internal_fa= 0;
zi.external_fa= 0;
zi.dosDate= 0;
int err= zipOpenNewFileInZip3(
_zipFile,
[fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
&zi,
NULL, 0, NULL, 0, NULL,
(compressionLevel != ZipCompressionLevelNone) ? Z_DEFLATED : 0,
compressionLevel, 0,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
NULL, 0);
if (err != ZIP_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in opening '%@' in zipfile", fileNameInZip];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return [[[ZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip] autorelease];
}
- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel {
if (_mode == ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted with Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:fileDate];
zip_fileinfo zi;
zi.tmz_date.tm_sec= [date second];
zi.tmz_date.tm_min= [date minute];
zi.tmz_date.tm_hour= [date hour];
zi.tmz_date.tm_mday= [date day];
zi.tmz_date.tm_mon= [date month] -1;
zi.tmz_date.tm_year= [date year];
zi.internal_fa= 0;
zi.external_fa= 0;
zi.dosDate= 0;
int err= zipOpenNewFileInZip3(
_zipFile,
[fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
&zi,
NULL, 0, NULL, 0, NULL,
(compressionLevel != ZipCompressionLevelNone) ? Z_DEFLATED : 0,
compressionLevel, 0,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
NULL, 0);
if (err != ZIP_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in opening '%@' in zipfile", fileNameInZip];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return [[[ZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip] autorelease];
}
- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel password:(NSString *)password crc32:(NSUInteger)crc32 {
if (_mode == ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted with Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:fileDate];
zip_fileinfo zi;
zi.tmz_date.tm_sec= [date second];
zi.tmz_date.tm_min= [date minute];
zi.tmz_date.tm_hour= [date hour];
zi.tmz_date.tm_mday= [date day];
zi.tmz_date.tm_mon= [date month] -1;
zi.tmz_date.tm_year= [date year];
zi.internal_fa= 0;
zi.external_fa= 0;
zi.dosDate= 0;
int err= zipOpenNewFileInZip3(
_zipFile,
[fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
&zi,
NULL, 0, NULL, 0, NULL,
(compressionLevel != ZipCompressionLevelNone) ? Z_DEFLATED : 0,
compressionLevel, 0,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
[password cStringUsingEncoding:NSUTF8StringEncoding], crc32);
if (err != ZIP_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in opening '%@' in zipfile", fileNameInZip];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return [[[ZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip] autorelease];
}
- (NSString*) fileName {
return _fileName;
}
- (NSUInteger) numFilesInZip {
if (_mode != ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
unz_global_info gi;
int err= unzGetGlobalInfo(_unzFile, &gi);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in getting global info in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return gi.number_entry;
}
- (NSArray *) listFileInZipInfos {
int num= [self numFilesInZip];
if (num < 1)
return [[[NSArray alloc] init] autorelease];
NSMutableArray *files= [[[NSMutableArray alloc] initWithCapacity:num] autorelease];
[self goToFirstFileInZip];
for (int i= 0; i < num; i++) {
FileInZipInfo *info= [self getCurrentFileInZipInfo];
[files addObject:info];
if ((i +1) < num)
[self goToNextFileInZip];
}
return files;
}
- (void) goToFirstFileInZip {
if (_mode != ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
int err= unzGoToFirstFile(_unzFile);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in going to first file in zip in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
}
- (BOOL) goToNextFileInZip {
if (_mode != ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
int err= unzGoToNextFile(_unzFile);
if (err == UNZ_END_OF_LIST_OF_FILE)
return NO;
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in going to next file in zip in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return YES;
}
- (BOOL) locateFileInZip:(NSString *)fileNameInZip {
if (_mode != ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
int err= unzLocateFile(_unzFile, [fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding], NULL);
if (err == UNZ_END_OF_LIST_OF_FILE)
return NO;
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in going to next file in zip in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return YES;
}
- (FileInZipInfo *) getCurrentFileInZipInfo {
if (_mode != ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
unz_file_info file_info;
int err= unzGetCurrentFileInfo(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in getting current file info in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
NSString *name= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
ZipCompressionLevel level= ZipCompressionLevelNone;
if (file_info.compression_method != 0) {
switch ((file_info.flag & 0x6) / 2) {
case 0:
level= ZipCompressionLevelDefault;
break;
case 1:
level= ZipCompressionLevelBest;
break;
default:
level= ZipCompressionLevelFastest;
break;
}
}
BOOL crypted= ((file_info.flag & 1) != 0);
NSDateComponents *components= [[[NSDateComponents alloc] init] autorelease];
[components setDay:file_info.tmu_date.tm_mday];
[components setMonth:file_info.tmu_date.tm_mon +1];
[components setYear:file_info.tmu_date.tm_year];
[components setHour:file_info.tmu_date.tm_hour];
[components setMinute:file_info.tmu_date.tm_min];
[components setSecond:file_info.tmu_date.tm_sec];
NSCalendar *calendar= [NSCalendar currentCalendar];
NSDate *date= [calendar dateFromComponents:components];
FileInZipInfo *info= [[FileInZipInfo alloc] initWithName:name length:file_info.uncompressed_size level:level crypted:crypted size:file_info.compressed_size date:date crc32:file_info.crc];
return [info autorelease];
}
- (ZipReadStream *) readCurrentFileInZip {
if (_mode != ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
unz_file_info file_info;
int err= unzGetCurrentFileInfo(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in getting current file info in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
NSString *fileNameInZip= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
err= unzOpenCurrentFilePassword(_unzFile, NULL);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in opening current file in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return [[[ZipReadStream alloc] initWithUnzFileStruct:_unzFile fileNameInZip:fileNameInZip] autorelease];
}
- (ZipReadStream *) readCurrentFileInZipWithPassword:(NSString *)password {
if (_mode != ZipFileModeUnzip) {
NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
unz_file_info file_info;
int err= unzGetCurrentFileInfo(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in getting current file info in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
NSString *fileNameInZip= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
err= unzOpenCurrentFilePassword(_unzFile, [password cStringUsingEncoding:NSUTF8StringEncoding]);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in opening current file in '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
return [[[ZipReadStream alloc] initWithUnzFileStruct:_unzFile fileNameInZip:fileNameInZip] autorelease];
}
- (void) close {
switch (_mode) {
case ZipFileModeUnzip: {
int err= unzClose(_unzFile);
if (err != UNZ_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in closing '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
break;
}
case ZipFileModeCreate: {
int err= zipClose(_zipFile, NULL);
if (err != ZIP_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in closing '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
break;
}
case ZipFileModeAppend: {
int err= zipClose(_zipFile, NULL);
if (err != ZIP_OK) {
NSString *reason= [NSString stringWithFormat:@"Error in closing '%@'", _fileName];
@throw [[[ZipException alloc] initWithError:err reason:reason] autorelease];
}
break;
}
default: {
NSString *reason= [NSString stringWithFormat:@"Unknown mode %d", _mode];
@throw [[[ZipException alloc] initWithReason:reason] autorelease];
}
}
}
@end

BIN
ObjectiveZipIcon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

401
Objective_ZipViewController.xib
View File

@@ -1,401 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">2083</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUIImageView</string>
<string>IBUITextView</string>
<string>IBUIView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="843779117">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="774585933">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIImageView" id="296619241">
<reference key="NSNextResponder" ref="774585933"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, -20}, {320, 480}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="422324197"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUIContentMode">4</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Default.png</string>
</object>
</object>
<object class="IBUIButton" id="422324197">
<reference key="NSNextResponder" ref="774585933"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 20}, {280, 37}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="690801101"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">Zip &amp; Unzip</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="884333554">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="114389561">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="975473552">
<string key="name">Helvetica-Bold</string>
<string key="family">Helvetica</string>
<int key="traits">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont" id="64712977">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIButton" id="690801101">
<reference key="NSNextResponder" ref="774585933"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 64}, {280, 37}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="261814878"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">4 GB Zip &amp; Unzip (use with caution)</string>
<reference key="IBUIHighlightedTitleColor" ref="884333554"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="114389561"/>
<reference key="IBUIFontDescription" ref="975473552"/>
<reference key="IBUIFont" ref="64712977"/>
</object>
<object class="IBUIView" id="261814878">
<reference key="NSNextResponder" ref="774585933"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 108}, {280, 332}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="718446055"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<float key="IBUIAlpha">0.5</float>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUITextView" id="718446055">
<reference key="NSNextResponder" ref="774585933"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{20, 108}, {280, 332}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
<bool key="IBUIDelaysContentTouches">NO</bool>
<bool key="IBUICanCancelContentTouches">NO</bool>
<bool key="IBUIBouncesZoom">NO</bool>
<bool key="IBUIEditable">NO</bool>
<string key="IBUIText"/>
<reference key="IBUITextColor" ref="884333554"/>
<object class="IBUITextInputTraits" key="IBUITextInputTraits">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">17</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica</string>
<double key="NSSize">17</double>
<int key="NSfFlags">16</int>
</object>
</object>
</object>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="296619241"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC43NQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="774585933"/>
</object>
<int key="connectionID">7</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">_textView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="718446055"/>
</object>
<int key="connectionID">11</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">zipUnzip</string>
<reference key="source" ref="422324197"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">14</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">zipUnzip2</string>
<reference key="source" ref="690801101"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">17</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<object class="NSArray" key="object" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="843779117"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="774585933"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="422324197"/>
<reference ref="261814878"/>
<reference ref="718446055"/>
<reference ref="296619241"/>
<reference ref="690801101"/>
</object>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">8</int>
<reference key="object" ref="422324197"/>
<reference key="parent" ref="774585933"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="261814878"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="774585933"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="718446055"/>
<reference key="parent" ref="774585933"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="296619241"/>
<reference key="parent" ref="774585933"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">15</int>
<reference key="object" ref="690801101"/>
<reference key="parent" ref="774585933"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-1.IBPluginDependency</string>
<string>-2.CustomClassName</string>
<string>-2.IBPluginDependency</string>
<string>10.IBPluginDependency</string>
<string>13.IBPluginDependency</string>
<string>15.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Objective_ZipViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIResponder</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">17</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">Objective_ZipViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>zipUnzip</string>
<string>zipUnzip2</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>zipUnzip</string>
<string>zipUnzip2</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">zipUnzip</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">zipUnzip2</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">_textView</string>
<string key="NS.object.0">UITextView</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">_textView</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">_textView</string>
<string key="candidateClassName">UITextView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/Objective_ZipViewController.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3100" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">Default.png</string>
<string key="NS.object.0">{320, 480}</string>
</object>
<string key="IBCocoaTouchPluginVersion">2083</string>
</data>
</archive>

9
Objective_Zip_Prefix.pch
View File

@@ -1,9 +0,0 @@
//
// Prefix header for all source files of the 'Objective-Zip' target in the 'Objective-Zip' project
//
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <Security/Security.h>
#endif

300
README.md
View File

@@ -14,12 +14,11 @@ an object-oriented friendly way.
What is contained here
----------------------
The source repository contains a sample application with full
sources for ZLib, MiniZip and Objective-Zip, together with a unit test
UI. The versions included are:
The source repository contains full sources for ZLib, MiniZip and
Objective-Zip, together with some unit tests. The versions included are:
- 1.2.8 for [ZLib](http://zlib.net)
- 1.1 for [MiniZip](https://github.com/nmoinvaz/minizip)
- 1.2.8 for [ZLib](http://zlib.net).
- 1.1 for [MiniZip](https://github.com/nmoinvaz/minizip).
- latest version for Objective-Zip.
Please note that ZLib and MiniZip are included here only to provide a
@@ -30,24 +29,297 @@ informations.
Getting started
---------------
===============
Please see **GETTING_STARTED.md**.
Objective-Zip exposes basic functionalities to read and write zip files,
encapsulating both ZLib for the compression mechanism and MiniZip for
the zip wrapping.
Adding Objective-Zip to your project
------------------------------------
The library is distributed via CocoaPods, you can add a dependency in you pod
file with the following line:
pod 'objective-zip', '~> 1.0'
You can then access Objective-Zip classes with the following import
statement if you plan to use exception handling:
```objective-c
#import "Objective-Zip.h"
```
Alternatively you can use the following import statement if you plan to use
Apple's NSError pattern:
```objective-c
#import "Objective-Zip+NSError.h"
```
More on error handling at the end of this document.
Main concepts
-------------
Objective-Zip is centered on a class called (with a lack of fantasy)
OZZipFile. It can be created with the common Objective-C procedure of an
alloc followed by an init, specifying in the latter if the zip file is
being created, appended or unzipped:
```objective-c
OZZipFile *zipFile= [[OZZipFile alloc] initWithFileName:@"test.zip"
mode:OZZipFileModeCreate];
```
Creating and appending are both write-only modalities, while unzipping
is a read-only modality. You can not request reading operations on a
write-mode zip file, nor request writing operations on a read-mode zip
file.
Adding a file to a zip file
---------------------------
The ZipFile class has a couple of methods to add new files to a zip
file, one of which keeps the file in clear and the other encrypts it
with a password. Both methods return an instance of a OZZipWriteStream
class, which will be used solely for the scope of writing the content of
the file, and then must be closed:
```objective-c
OZZipWriteStream *stream= [zipFile writeFileInZipWithName:@"abc.txt"
compressionLevel:OZZipCompressionLevelBest];
[stream writeData:abcData];
[stream finishedWriting];
```
Reading a file from a zip file
------------------------------
The OZZipFile class, when used in unzip mode, must be treated like a
cursor: you position the instance on a file at a time, either by
step-forwarding or by locating the file by name. Once you are on the
correct file, you can obtain an instance of a OZZipReadStream that will
let you read the content (and then must be closed).
Since the file may not fit into memory, you can read it block by block using
a buffer:
```objective-c
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:@"test.zip"
mode:OZZipFileModeUnzip];
[unzipFile goToFirstFileInZip];
OZZipReadStream *read= [unzipFile readCurrentFileInZip];
NSMutableData *data= [[NSMutableData alloc] initWithLength:BUFFER_SIZE];
do {
// Reset buffer length
[buffer setLength:BUFFER_SIZE];
// Read bytes and check for end of file
int bytesRead= [read readDataWithBuffer:data];
if (bytesRead <= 0)
break;
[buffer setLength:bytesRead];
// Do something with buffer
} while (YES);
[read finishedReading];
```
Alternatively, if you know in advance the file will fit into memory, you may
preallocate a buffer big enough and read the all file at once. In the example
below the buffer is preallocated with precisely the uncompressed size of the
file:
```objective-c
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:@"test.zip"
mode:OZZipFileModeUnzip];
[unzipFile goToFirstFileInZip];
OZFileInZipInfo *info= [unzipFile getCurrentFileInZipInfo];
OZZipReadStream *read= [unzipFile readCurrentFileInZip];
NSMutableData *data= [[NSMutableData alloc] initWithLength:info.length];
[read readDataWithBuffer:data];
// Do something with data
[read finishedReading];
```
Note that the NSMutableData instance that acts as the read buffer must
have been set with a length greater than 0: the `readDataWithBuffer` API
will use that length to know how many bytes it can fetch from the zip
file.
Listing files in a zip file
---------------------------
When the ZipFile class is used in unzip mode, it can also list the files
contained in zip by filling an NSArray with instances of FileInZipInfo
class. You can then use its name property to locate the file inside the
zip and expand it:
```objective-c
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:@"test.zip"
mode:OZZipFileModeUnzip];
NSArray *infos= [unzipFile listFileInZipInfos];
for (OZFileInZipInfo *info in infos) {
NSLog(@"- %@ %@ %llu (%d)", info.name, info.date, info.size, info.level);
// Locate the file in the zip
[unzipFile locateFileInZip:info.name];
// Expand the file in memory
OZZipReadStream *read= [unzipFile readCurrentFileInZip];
NSMutableData *data= [[NSMutableData alloc] initWithLength:info.length];
int bytesRead= [read readDataWithBuffer:data];
[read finishedReading];
}
```
Note that the OZFileInZipInfo class provide two sizes:
- **length** is the original (uncompressed) file size, while
- **size** is the compressed file size.
Closing the zip file
--------------------
Remember, when you are done, to close your OZZipFile instance to avoid
file corruption problems:
```objective-c
[zipFile close];
```
File/folder hierarchy inide the zip
-----------------------------------
Please note that inside the zip files there is no representation of a
file-folder hierarchy: it is simply embedded in file names (i.e.: a file
with a name like "x/y/z/file.txt"). It is up to the program that
extracts files to consider these file names as expressing a structure and
rebuild it on the file system (and viceversa during creation). Common
zippers/unzippers simply follow this rule.
Error handling
--------------
Objective-Zip provides two kinds of error handling:
- standard exception handling;
- Apple's NSError pattern.
With standard exception handling, Objective-Zip will throw an exception of
class OZZipException any time an error occurs (programmer or runtime errors).
To use standard exception handling import Objective-Zip in your project with
this statement:
```objective-c
#import "Objective-Zip.h"
```
With Apple's NSError pattern, Objective-Zip will expect a NSError
pointer-to-pointer argument and will fill it with an NSError instance
whenever a runtime error occurs. Will revert to throwing an exception (of
OZZipException class) in case of programmer errors.
To use Apple's NSError pattern import Objective-Zip in your project with this
statement:
```objective-c
#import "Objective-Zip+NSError.h"
```
Apple's NSError pattern is of course mandatory with Swift programming
language, since it does not support exception handling.
Differences in the interface
----------------------------
Note that a few minor differences exist in the standard interface vs. the
NSError pattern interface. Specifically:
* `[OZZipFile locateFileInZip:error:]` returns a `NSInteger` in place of a
`BOOL`. Here the special values `OZLocateFileResultNotFound` and
`OZLocateFileResultNotFound`, respectively `1` and `-1`, are used in place of
`YES` and `NO`, since `0` is reserved for the case where an error occurred.
* `[OZZipReadStream readDataWithBuffer:error:]` similarly returns a
`NSInteger` in place of a `NSUInteger`. Here the special value
`OZReadStreamResultEndOfFile`, corresponding to `-1`, is used for the
end-of-file case, since `0` is again reserved for error occurrence.
License
-------
=======
The library is distributed under the New BSD License.
Version history
---------------
===============
Version 1.0.3:
- Fixed some memory leaks in MiniZip (contributed by @SheffieldKevin)
- Silenced a warning about shifting a negative value in ZLib (contributed by Martin Winter)
- Fixed throwing of errors so that it is compatible with Swift 3 (contributed by @andyj-at-aspin)
- Fixed typos and errors in README (contributed by @deni2s)
Version 1.0.2:
- Fixed interface for `locateFileInZip` and `readDataWithBuffer` in NSError
version so that they correctly support Swift error handling.
Version 1.0.1:
- Fixed compatibility bugs with Swift
- Added Swift unit tests
- Merged back GETTING STARTED in README
Version 1.0.0:
- Added official podspec to distribute via CocoaPods.
- Added API docs.
- Added nullability annotations.
- Refactored DIY tests as unit tests.
- Added targets for static libraries.
- Added alternative interfaces with NSError pattern in place of exceptions.
- Added support for legacy 32-bit zip files.
- Added class prefix "OZ" to make Objective-Zip a good citizen.
- Fully ARC-ified (removed ARCHelper)
- Some code clean-up.
Version 0.8.3:
- Finally used correctly the 64 bit APIs. Thanks to Nathan Moinvaziri for advicing.
- Updated test code to zip & unzip up to 5 GB.
- Added tests with unzip & check of zip files create with Mac OS X 10.8 and Windows 7.
Version 0.8.2:
- Updated ZLib to 1.2.8
- Updated MiniZip to Nathan Moinvaziri's Version
- Updated MiniZip to Nathan Moinvaziri's Version (thanks [Sergio](http://mrsergio.com) for the suggestions)
- Added test code to zip & unzip up to (slighlty less than) 4 GB:
the library is able to create and expand files up to
4,293,387,000 bytes (compressed); use the test with caution,
@@ -83,9 +355,9 @@ Version 0.7.0:
Compatibility
-------------
=============
Version 0.8.2 has been tested with iOS from 5.1 to 6.1, but should be
compatible with earlier versions too. Le me know of any issues that
should arise.
Version 1.0.3 has been tested with iOS up to 9.3 and OS X up to 10.11, but
should be compatible with earlier versions too, down to iOS 5.1 and OS X 10.7.
Le me know of any issues that should arise.

6
ZLib/gzlib.c
View File

@@ -253,7 +253,7 @@ local gzFile gz_open(path, fd, mode)
/* save the current position for rewinding (only if reading) */
if (state->mode == GZ_READ) {
state->start = LSEEK(state->fd, 0, SEEK_CUR);
state->start = (z_off64_t) LSEEK(state->fd, 0, SEEK_CUR);
if (state->start == -1) state->start = 0;
}
@@ -393,7 +393,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
/* if within raw area while reading, just go there */
if (state->mode == GZ_READ && state->how == COPY &&
state->x.pos + offset >= 0) {
ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
ret = (z_off64_t) LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
if (ret == -1)
return -1;
state->x.have = 0;
@@ -489,7 +489,7 @@ z_off64_t ZEXPORT gzoffset64(file)
return -1;
/* compute and return effective offset in file */
offset = LSEEK(state->fd, 0, SEEK_CUR);
offset = (z_off64_t) LSEEK(state->fd, 0, SEEK_CUR);
if (offset == -1)
return -1;
if (state->mode == GZ_READ) /* reading */

2
ZLib/gzread.c
View File

@@ -27,7 +27,7 @@ local int gz_load(state, buf, len, have)
*have = 0;
do {
ret = read(state->fd, buf + *have, len - *have);
ret = (int) read(state->fd, buf + *have, len - *have);
if (ret <= 0)
break;
*have += ret;

4
ZLib/gzwrite.c
View File

@@ -81,7 +81,7 @@ local int gz_comp(state, flush)
/* write directly if requested */
if (state->direct) {
got = write(state->fd, strm->next_in, strm->avail_in);
got = (int) write(state->fd, strm->next_in, strm->avail_in);
if (got < 0 || (unsigned)got != strm->avail_in) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;
@@ -98,7 +98,7 @@ local int gz_comp(state, flush)
if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
(flush != Z_FINISH || ret == Z_STREAM_END))) {
have = (unsigned)(strm->next_out - state->x.next);
if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
if (have && ((got = (int) write(state->fd, state->x.next, have)) < 0 ||
(unsigned)got != have)) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;

5
ZLib/inflate.c
View File

@@ -1504,9 +1504,10 @@ z_streamp strm;
{
struct inflate_state FAR *state;
if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
if (strm == Z_NULL || strm->state == Z_NULL)
return (long)(((unsigned long)0 - 1) << 16);
state = (struct inflate_state FAR *)strm->state;
return ((long)(state->back) << 16) +
return (long)(((unsigned long)((long)state->back)) << 16) +
(state->mode == COPY ? state->length :
(state->mode == MATCH ? state->was - state->length : 0));
}

66
objective-zip.podspec Normal file
View File

@@ -0,0 +1,66 @@
Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.name = "objective-zip"
s.version = "1.0.3"
s.summary = "An object-oriented friendly wrapper library for ZLib and MiniZip, in Objective-C for iOS and OS X"
s.description = <<-DESC
Objective-Zip is a small Objective-C library that wraps ZLib and
MiniZip in an object-oriented friendly way. It supports:
* Zipping and unzipping of common zip file formats.
* Multi-GB zip files thanks to 64-bit APIs, even with limited memory available.
* Per-file compression level and encryption.
Objective-Zip includes sources of latest versions of ZLib and MiniZip.
DESC
s.homepage = "https://github.com/gianlucabertani/Objective-Zip"
# ――― Spec License ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.license = { :type => "BSD 2.0", :file => "LICENSE.md" }
# ――― Author Metadata ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.author = { "Gianluca Bertani" => "gianluca.bertani@email.it" }
s.social_media_url = "https://twitter.com/self_vs_this"
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.ios.deployment_target = "5.1"
s.osx.deployment_target = "10.7"
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.source = { :git => "https://github.com/gianlucabertani/Objective-Zip.git",
:tag => s.version.to_s }
# ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.source_files = "Objective-Zip/**/*.{h,m}", "MiniZip/**/*.{h,c}", "ZLib/**/*.{h,c}"
# ――― Publich Headers ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.public_header_files = ["Objective-Zip/OZZipFile.h", "Objective-Zip/OZZipFile+Standard.h", "Objective-Zip/OZZipFile+NSError.h",
"Objective-Zip/OZZipFileMode.h", "Objective-Zip/OZZipCompressionLevel.h", "Objective-Zip/OZZipException.h",
"Objective-Zip/OZZipWriteStream.h", "Objective-Zip/OZZipWriteStream+Standard.h",
"Objective-Zip/OZZipWriteStream+NSError.h", "Objective-Zip/OZZipReadStream.h",
"Objective-Zip/OZZipReadStream+Standard.h", "Objective-Zip/OZZipReadStream+NSError.h",
"Objective-Zip/OZFileInZipInfo.h", "Objective-Zip/Objective-Zip.h", "Objective-Zip/Objective-Zip+NSError.h"]
# ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.requires_arc = true
s.xcconfig = { "OTHER_LDFLAGS" => "-ObjC" }
end