Merge branch 'unzip-single-files+fix_asn1' into develop

Cocoanetics · Aug 5, 2013 · 7d54db0 · 7d54db0
2 parents 1d9baa4 + 31b5cac
commit 7d54db0
Show file tree

Hide file tree

Showing 7 changed files with 401 additions and 218 deletions.
diff --git a/Core/Source/DTZipArchive/DTZipArchive.h b/Core/Source/DTZipArchive/DTZipArchive.h
@@ -60,11 +60,6 @@ extern NSString * const DTZipArchiveErrorDomain;
 */
 @property (nonatomic, copy, readonly) NSString *path;
 
-/**
- All files and directories in zip archive
- */
-@property (nonatomic, strong, readonly) NSArray *listOfEntries;
-
 /**-------------------------------------------------------------------------------------
  @name Creating A Zip Archive
  ---------------------------------------------------------------------------------------
@@ -88,9 +83,9 @@ extern NSString * const DTZipArchiveErrorDomain;
 - (void)enumerateUncompressedFilesAsDataUsingBlock:(DTZipArchiveEnumerationResultsBlock)enumerationBlock;
 
 /**
- Creates a file tree with all given DTZipArchiveNodes starting with files and folders on root level
+  The nodes at the root level of the archive. Each node is a DTZipArchiveNode and can represent either a folder or a file. This forms the directory hierarchy of the archive.
  */
-- (NSArray *)createFileTree;
+@property (nonatomic, readonly) NSArray *nodes;
 
 @end
 

diff --git a/Core/Source/DTZipArchive/DTZipArchive.m b/Core/Source/DTZipArchive/DTZipArchive.m
@@ -27,8 +27,7 @@ - (id)initWithFileAtPath:(NSString *)path;
 
 @implementation DTZipArchive
 {
-    NSString *_path;
-
+	NSString *_path;
 	NSArray *_fileTree;
 }
 
@@ -81,7 +80,7 @@ - (void)enumerateUncompressedFilesAsDataUsingBlock:(DTZipArchiveEnumerationResul
 
 #pragma mark - FileTree
 
-- (NSArray *)createFileTree
+- (NSArray *)nodes
 {
 	if (!_fileTree)
 	{
@@ -131,7 +130,6 @@ - (NSArray *)createFileTree
 #pragma mark - Properties
 
 @synthesize path;
-@synthesize listOfEntries = _listOfEntries;
 
 @end