Skip to content

Commit 047ebf6

Browse files
NSProgrammerNSProgrammer
committed
reformat long lines of code to use multiple lines
1 parent 9963783 commit 047ebf6

26 files changed

+537
-184
lines changed

‎ZipUtilities/NOZCompress.h‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,12 @@ NS_ASSUME_NONNULL_BEGIN
3939
@protocol NOZCompressDelegate;
4040

4141
//! Block for when `NOZCompressOperation` completes
42-
typedef void(^NOZCompressCompletionBlock)(NOZCompressOperation* op, NOZCompressResult* result);
42+
typedef void(^NOZCompressCompletionBlock)(NOZCompressOperation* op,
43+
NOZCompressResult* result);
4344
//! Block for dynamically selecting an `NOZCompressionMethod` and `NOZCompressionLevel` for a `NOZCompressOperation` when using `[NOZCompressionRequest addEntriesInDirectory:filterBlock:compressionSelectionBlock:]`
44-
typedef void(^NOZCompressionSelectionBlock)(NSString* filePath, NOZCompressionMethod* compressionMethodOut, NOZCompressionLevel* compressionLevelOut);
45+
typedef void(^NOZCompressionSelectionBlock)(NSString* filePath,
46+
NOZCompressionMethod* compressionMethodOut,
47+
NOZCompressionLevel* compressionLevelOut);
4548
//! Block for dynamically filtering out files when using `[NOZCompressionRequest addEntriesInDirectory:filterBlock:compressionSelectionBlock:]`.
4649
typedef BOOL(^NOZCompressionShouldExcludeFileBlock)(NSString* filePath);
4750

@@ -66,15 +69,17 @@ typedef BOOL(^NOZCompressionShouldExcludeFileBlock)(NSString* filePath);
6669
@param request The `NOZCompressRequest` of the what and how for compressing.
6770
@param delegate The `NOZCompressDelegate` for callbacks.
6871
*/
69-
- (instancetype)initWithRequest:(NOZCompressRequest *)request delegate:(nullable id<NOZCompressDelegate>)delegate NS_DESIGNATED_INITIALIZER;
72+
- (instancetype)initWithRequest:(NOZCompressRequest *)request
73+
delegate:(nullable id<NOZCompressDelegate>)delegate NS_DESIGNATED_INITIALIZER;
7074

7175
/**
7276
Convenience initializer
7377
7478
@param request The `NOZCompressRequest` of the what and how for compressing.
7579
@param completion The `NOZCompressCompletionBlock` to call once operation is finished.
7680
*/
77-
- (instancetype)initWithRequest:(NOZCompressRequest *)request completion:(nullable NOZCompressCompletionBlock)completion;
81+
- (instancetype)initWithRequest:(NOZCompressRequest *)request
82+
completion:(nullable NOZCompressCompletionBlock)completion;
7883

7984
/** Unavailable */
8085
- (instancetype)init NS_UNAVAILABLE;
@@ -98,14 +103,16 @@ typedef BOOL(^NOZCompressionShouldExcludeFileBlock)(NSString* filePath);
98103
@param op The `NOZCompressOperation` that finished.
99104
@param result The `NOZCompressResult` for the operation.
100105
*/
101-
- (void)compressOperation:(NOZCompressOperation *)op didCompleteWithResult:(NOZCompressResult *)result;
106+
- (void)compressOperation:(NOZCompressOperation *)op
107+
didCompleteWithResult:(NOZCompressResult *)result;
102108

103109
/**
104110
Called when the operation updates it's overall progress.
105111
106112
_progress_ will be between `0.0f` and `1.0f`. A negative value indicates progress is indeterminant.
107113
*/
108-
- (void)compressOperation:(NOZCompressOperation *)op didUpdateProgress:(float)progress;
114+
- (void)compressOperation:(NOZCompressOperation *)op
115+
didUpdateProgress:(float)progress;
109116

110117
@end
111118

@@ -132,9 +139,12 @@ typedef BOOL(^NOZCompressionShouldExcludeFileBlock)(NSString* filePath);
132139
/** Add an entry via `NSData` with a _name_ for the entry (used as the file name when decompressed) */
133140
- (void)addDataEntry:(NSData *)data name:(NSString *)name;
134141
/** Recursively add a directory of files as entries */
135-
- (void)addEntriesInDirectory:(NSString *)directoryPath filterBlock:(nullable NOZCompressionShouldExcludeFileBlock)filterBlock compressionSelectionBlock:(nullable NOZCompressionSelectionBlock)selectionBlock;
142+
- (void)addEntriesInDirectory:(NSString *)directoryPath
143+
filterBlock:(nullable NOZCompressionShouldExcludeFileBlock)filterBlock
144+
compressionSelectionBlock:(nullable NOZCompressionSelectionBlock)selectionBlock;
136145
/** See `addEntriesInDirectory:filterBlock:compressionSelectionBlock:` */
137-
- (void)addEntriesInDirectory:(NSString *)directoryPath compressionSelectionBlock:(nullable NOZCompressionSelectionBlock)block;
146+
- (void)addEntriesInDirectory:(NSString *)directoryPath
147+
compressionSelectionBlock:(nullable NOZCompressionSelectionBlock)block;
138148

139149
/**
140150
Designated initializer

‎ZipUtilities/NOZCompress.m‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ - (NOZCompressRequest *)request
106106
return [_request copy];
107107
}
108108

109-
- (instancetype)initWithRequest:(NOZCompressRequest *)request delegate:(id<NOZCompressDelegate>)delegate
109+
- (instancetype)initWithRequest:(NOZCompressRequest *)request
110+
delegate:(id<NOZCompressDelegate>)delegate
110111
{
111112
if (self = [super init]) {
112113
if ([delegate isKindOfClass:[NOZCompressDelegateInternal class]]) {
@@ -119,7 +120,8 @@ - (instancetype)initWithRequest:(NOZCompressRequest *)request delegate:(id<NOZCo
119120
return self;
120121
}
121122

122-
- (instancetype)initWithRequest:(NOZCompressRequest *)request completion:(NOZCompressCompletionBlock)completion
123+
- (instancetype)initWithRequest:(NOZCompressRequest *)request
124+
completion:(NOZCompressCompletionBlock)completion
123125
{
124126
NOZCompressDelegateInternal *delegate = (completion) ? [[NOZCompressDelegateInternal alloc] initWithCompletion:completion] : nil;
125127
return [self initWithRequest:request delegate:delegate];
@@ -194,7 +196,9 @@ - (void)handleProgressUpdated:(float)progress
194196
- (void)handleFinishing
195197
{
196198
id<NOZCompressDelegate> delegate = self.delegate;
197-
dispatch_queue_t completionQueue = [delegate respondsToSelector:@selector(completionQueue)] ? [delegate completionQueue] : NULL;
199+
dispatch_queue_t completionQueue = [delegate respondsToSelector:@selector(completionQueue)] ?
200+
[delegate completionQueue] :
201+
NULL;
198202
if (!completionQueue) {
199203
completionQueue = dispatch_get_main_queue();
200204
}
@@ -247,7 +251,11 @@ - (NSError *)private_openFile
247251

248252
NSError *error = nil;
249253
NSString *path = [_request.destinationPath stringByStandardizingPath];
250-
if ([[NSFileManager defaultManager] createDirectoryAtPath:[path stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:nil error:&error]) {
254+
const BOOL didCreateDir = [[NSFileManager defaultManager] createDirectoryAtPath:[path stringByDeletingLastPathComponent]
255+
withIntermediateDirectories:YES
256+
attributes:nil
257+
error:&error];
258+
if (didCreateDir) {
251259
_zipper = [[NOZZipper alloc] initWithZipFile:path];
252260
_zipper.globalComment = _request.comment;
253261
[_zipper openWithMode:NOZZipperModeCreate error:&error];
@@ -358,7 +366,8 @@ - (instancetype)initWithCompletion:(NOZCompressCompletionBlock)completion
358366
return self;
359367
}
360368

361-
- (void)compressOperation:(NOZCompressOperation *)op didCompleteWithResult:(NOZCompressResult *)result
369+
- (void)compressOperation:(NOZCompressOperation *)op
370+
didCompleteWithResult:(NOZCompressResult *)result
362371
{
363372
if (_completionBlock) {
364373
_completionBlock(op, result);
@@ -459,12 +468,17 @@ - (void)addEntry:(id<NOZZippableEntry>)entry
459468
[_mutableEntries addObject:[entry copy]];
460469
}
461470

462-
- (void)addEntriesInDirectory:(NSString *)directoryPath compressionSelectionBlock:(NOZCompressionSelectionBlock)block
471+
- (void)addEntriesInDirectory:(NSString *)directoryPath
472+
compressionSelectionBlock:(NOZCompressionSelectionBlock)block
463473
{
464-
[self addEntriesInDirectory:directoryPath filterBlock:NULL compressionSelectionBlock:block];
474+
[self addEntriesInDirectory:directoryPath
475+
filterBlock:NULL
476+
compressionSelectionBlock:block];
465477
}
466478

467-
- (void)addEntriesInDirectory:(NSString *)directoryPath filterBlock:(NOZCompressionShouldExcludeFileBlock)filterBlock compressionSelectionBlock:(NOZCompressionSelectionBlock)selectionBlock
479+
- (void)addEntriesInDirectory:(NSString *)directoryPath
480+
filterBlock:(NOZCompressionShouldExcludeFileBlock)filterBlock
481+
compressionSelectionBlock:(NOZCompressionSelectionBlock)selectionBlock
468482
{
469483
for (NOZFileZipEntry *entry in NOZEntriesFromDirectory(directoryPath)) {
470484
if (filterBlock) {

‎ZipUtilities/NOZCompression.h‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,17 @@ static const NOZCompressionLevel NOZCompressionLevelMin = 0.f;
4040
static const NOZCompressionLevel NOZCompressionLevelDefault = -1.f;
4141

4242
FOUNDATION_EXTERN NSUInteger NOZCompressionLevelsForEncoder(id<NOZEncoder> __nullable encoder);
43-
FOUNDATION_EXTERN NSUInteger NOZCompressionLevelToEncoderSpecificLevel(id<NOZEncoder> __nullable encoder, NOZCompressionLevel level);
44-
FOUNDATION_EXTERN NOZCompressionLevel NOZCompressionLevelFromEncoderSpecificLevel(id<NOZEncoder> __nullable encoder, NSUInteger encoderSpecificLevel);
45-
FOUNDATION_EXTERN NSUInteger NOZCompressionLevelToCustomEncoderLevel(NOZCompressionLevel level, NSUInteger firstCustomLevel, NSUInteger lastCustomLevel, NSUInteger defaultCustomLevel);
46-
FOUNDATION_EXTERN NOZCompressionLevel NOZCompressionLevelFromCustomEncoderLevel(NSUInteger firstCustomLevel, NSUInteger lastCustomLevel, NSUInteger customLevel);
43+
FOUNDATION_EXTERN NSUInteger NOZCompressionLevelToEncoderSpecificLevel(id<NOZEncoder> __nullable encoder,
44+
NOZCompressionLevel level);
45+
FOUNDATION_EXTERN NOZCompressionLevel NOZCompressionLevelFromEncoderSpecificLevel(id<NOZEncoder> __nullable encoder,
46+
NSUInteger encoderSpecificLevel);
47+
FOUNDATION_EXTERN NSUInteger NOZCompressionLevelToCustomEncoderLevel(NOZCompressionLevel level,
48+
NSUInteger firstCustomLevel,
49+
NSUInteger lastCustomLevel,
50+
NSUInteger defaultCustomLevel);
51+
FOUNDATION_EXTERN NOZCompressionLevel NOZCompressionLevelFromCustomEncoderLevel(NSUInteger firstCustomLevel,
52+
NSUInteger lastCustomLevel,
53+
NSUInteger customLevel);
4754

4855
/**
4956
The compression method to use.
@@ -102,4 +109,7 @@ typedef NS_ENUM(UInt16, NOZCompressionMethod)
102109
};
103110

104111
//! Block for flushing a buffer of bytes
105-
typedef BOOL(^NOZFlushCallback)(id __nonnull coder, id __nonnull context, const Byte* __nonnull bufferToFlush, size_t length);
112+
typedef BOOL(^NOZFlushCallback)(id __nonnull coder,
113+
id __nonnull context,
114+
const Byte* __nonnull bufferToFlush,
115+
size_t length);

‎ZipUtilities/NOZDecompress.h‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
NS_ASSUME_NONNULL_BEGIN
3939

4040
//! Callback block when the `NOZDecompressOperation` completes
41-
typedef void(^NOZDecompressCompletionBlock)(NOZDecompressOperation * op, NOZDecompressResult * result);
41+
typedef void(^NOZDecompressCompletionBlock)(NOZDecompressOperation * op,
42+
NOZDecompressResult * result);
4243

4344
/**
4445
`NOZDecompressOperation` is an `NSOperation` for decompressing a zip archive on disk into unarchived files on disk.
@@ -60,15 +61,17 @@ typedef void(^NOZDecompressCompletionBlock)(NOZDecompressOperation * op, NOZDeco
6061
@param request The `NOZDecompressRequest` to operate on
6162
@param delegate The `NOZDecompressDelegate` for callbacks
6263
*/
63-
- (instancetype)initWithRequest:(NOZDecompressRequest *)request delegate:(nullable id<NOZDecompressDelegate>)delegate NS_DESIGNATED_INITIALIZER;
64+
- (instancetype)initWithRequest:(NOZDecompressRequest *)request
65+
delegate:(nullable id<NOZDecompressDelegate>)delegate NS_DESIGNATED_INITIALIZER;
6466

6567
/**
6668
Convenience initializer
6769
6870
@param request The `NOZDecompressRequest` to operate on
6971
@param completion The `NOZDecompressCompletionBlock` block that will be called when the operation finishes
7072
*/
71-
- (instancetype)initWithRequest:(NOZDecompressRequest *)request completion:(NOZDecompressCompletionBlock)completion;
73+
- (instancetype)initWithRequest:(NOZDecompressRequest *)request
74+
completion:(NOZDecompressCompletionBlock)completion;
7275

7376
/** Unavailable */
7477
- (instancetype)init NS_UNAVAILABLE;
@@ -92,14 +95,16 @@ typedef void(^NOZDecompressCompletionBlock)(NOZDecompressOperation * op, NOZDeco
9295
@param op The `NOZDecompressOperation` that finished.
9396
@param result The `NOZDecompressResult` for the operation.
9497
*/
95-
- (void)decompressOperation:(NOZDecompressOperation *)op didCompleteWithResult:(NOZDecompressResult *)result;
98+
- (void)decompressOperation:(NOZDecompressOperation *)op
99+
didCompleteWithResult:(NOZDecompressResult *)result;
96100

97101
/**
98102
Called when the operation updates it's overall progress.
99103
100104
_progress_ will be between `0.0f` and `1.0f`. A negative value indicates progress is indeterminant.
101105
*/
102-
- (void)decompressOperation:(NOZDecompressOperation *)op didUpdateProgress:(float)progress;
106+
- (void)decompressOperation:(NOZDecompressOperation *)op
107+
didUpdateProgress:(float)progress;
103108

104109
/**
105110
Called when unarchive a file would overwrite an existing file on disk.
@@ -110,7 +115,8 @@ typedef void(^NOZDecompressCompletionBlock)(NOZDecompressOperation * op, NOZDeco
110115
111116
@return `YES` to overwrite.
112117
*/
113-
- (BOOL)shouldDecompressOperation:(NOZDecompressOperation *)op overwriteFileAtPath:(NSString *)path;
118+
- (BOOL)shouldDecompressOperation:(NOZDecompressOperation *)op
119+
overwriteFileAtPath:(NSString *)path;
114120

115121
@end
116122

@@ -137,7 +143,8 @@ typedef void(^NOZDecompressCompletionBlock)(NOZDecompressOperation * op, NOZDeco
137143
@param path The `sourceFilePath`
138144
@param destinationDirectoryPath The `destinationDirectoryPath`
139145
*/
140-
- (instancetype)initWithSourceFilePath:(NSString *)path destinationDirectoryPath:(NSString *)destinationDirectoryPath;
146+
- (instancetype)initWithSourceFilePath:(NSString *)path
147+
destinationDirectoryPath:(NSString *)destinationDirectoryPath;
141148

142149
/** Unavailable */
143150
- (instancetype)init NS_UNAVAILABLE;

‎ZipUtilities/NOZDecompress.m‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ - (NOZDecompressRequest *)request
111111
return [_request copy];
112112
}
113113

114-
- (instancetype)initWithRequest:(NOZDecompressRequest *)request delegate:(id<NOZDecompressDelegate>)delegate
114+
- (instancetype)initWithRequest:(NOZDecompressRequest *)request
115+
delegate:(id<NOZDecompressDelegate>)delegate
115116
{
116117
if (self = [super init]) {
117118
if ([delegate isKindOfClass:[NOZDecompressDelegateInternal class]]) {
@@ -125,7 +126,8 @@ - (instancetype)initWithRequest:(NOZDecompressRequest *)request delegate:(id<NOZ
125126
return self;
126127
}
127128

128-
- (instancetype)initWithRequest:(NOZDecompressRequest *)request completion:(NOZDecompressCompletionBlock)completion
129+
- (instancetype)initWithRequest:(NOZDecompressRequest *)request
130+
completion:(NOZDecompressCompletionBlock)completion
129131
{
130132
NOZDecompressDelegateInternal *delegate = (completion) ? [[NOZDecompressDelegateInternal alloc] initWithCompletion:completion] : nil;
131133
return [self initWithRequest:request delegate:delegate];
@@ -282,7 +284,9 @@ - (NSError *)private_readExpectedSizes
282284
- (NSError *)private_unzipAllEntries
283285
{
284286
__block NSError *stackError = nil;
285-
[_unzipper enumerateManifestEntriesUsingBlock:^(NOZCentralDirectoryRecord * __nonnull record, NSUInteger index, BOOL * __nonnull stop) {
287+
[_unzipper enumerateManifestEntriesUsingBlock:^(NOZCentralDirectoryRecord * __nonnull record,
288+
NSUInteger index,
289+
BOOL * __nonnull stop) {
286290

287291
// Skip these entries
288292
if (record.isZeroLength || record.isMacOSXDSStore || record.isMacOSXAttribute) {
@@ -291,14 +295,18 @@ - (NSError *)private_unzipAllEntries
291295

292296
BOOL overwrite = NO;
293297
if (self->_flags.delegateHasOverwriteCheck) {
294-
overwrite = [self.delegate shouldDecompressOperation:self overwriteFileAtPath:[self->_sanitizedDestinationDirectoryPath stringByAppendingPathComponent:record.name]];
298+
overwrite = [self.delegate shouldDecompressOperation:self
299+
overwriteFileAtPath:[self->_sanitizedDestinationDirectoryPath stringByAppendingPathComponent:record.name]];
295300
}
296301

297302
NSError *innerError = nil;
298303
[self->_unzipper saveRecord:record
299304
toDirectory:self->_sanitizedDestinationDirectoryPath
300305
options:(overwrite) ? NOZUnzipperSaveRecordOptionOverwriteExisting : NOZUnzipperSaveRecordOptionsNone
301-
progressBlock:^(int64_t totalBytes, int64_t bytesComplete, int64_t byteWrittenThisPass, BOOL *abort) {
306+
progressBlock:^(int64_t totalBytes,
307+
int64_t bytesComplete,
308+
int64_t byteWrittenThisPass,
309+
BOOL *abort) {
302310
if (self.isCancelled) {
303311
stackError = kCancelledError;
304312
*abort = YES;
@@ -368,7 +376,8 @@ - (instancetype)initWithSourceFilePath:(NSString *)path
368376
return self;
369377
}
370378

371-
- (instancetype)initWithSourceFilePath:(NSString *)path destinationDirectoryPath:(NSString *)destinationDirectoryPath
379+
- (instancetype)initWithSourceFilePath:(NSString *)path
380+
destinationDirectoryPath:(NSString *)destinationDirectoryPath
372381
{
373382
if (self = [self initWithSourceFilePath:path]) {
374383
_destinationDirectoryPath = [destinationDirectoryPath copy];
@@ -401,7 +410,8 @@ - (instancetype)initWithCompletion:(NOZDecompressCompletionBlock)completion
401410
return self;
402411
}
403412

404-
- (void)decompressOperation:(NOZDecompressOperation *)op didCompleteWithResult:(NOZDecompressResult *)result
413+
- (void)decompressOperation:(NOZDecompressOperation *)op
414+
didCompleteWithResult:(NOZDecompressResult *)result
405415
{
406416
if (_completionBlock) {
407417
_completionBlock(op, result);

‎ZipUtilities/NOZDeflateCoders.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,5 +421,8 @@ - (BOOL)finalizeDecoderContext:(NOZDeflateDecoderContext *)context
421421

422422
static UInt16 NOZCompressionLevelToDeflateLevel(NOZCompressionLevel level)
423423
{
424-
return (UInt16)NOZCompressionLevelToCustomEncoderLevel(level, Z_BEST_SPEED, Z_BEST_COMPRESSION, kDEFLATE_DEFAULT_COMPRESSION_LEVEL);
424+
return (UInt16)NOZCompressionLevelToCustomEncoderLevel(level,
425+
Z_BEST_SPEED,
426+
Z_BEST_COMPRESSION,
427+
kDEFLATE_DEFAULT_COMPRESSION_LEVEL);
425428
}

‎ZipUtilities/NOZSyncStepOperation.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,10 @@ + (NSError *)operationCancelledError
151151
{
152152
@throw [NSException exceptionWithName:NSInvalidArgumentException
153153
reason:@"does not recognize selector!"
154-
userInfo:@{ @"Class" : NSStringFromClass(self), @"selector" : NSStringFromSelector(_cmd) }];
154+
userInfo:@{
155+
@"Class" : NSStringFromClass(self),
156+
@"selector" : NSStringFromSelector(_cmd)
157+
}];
155158
}
156159

157160
#pragma mark Override methods

‎ZipUtilities/NOZUnzipper.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@
3535
@class NOZCentralDirectoryRecord;
3636

3737
//! Callback when enumerating Central Directory Record. Set _stop_ to `YES` to end the enumeration early.
38-
typedef void(^NOZUnzipRecordEnumerationBlock)(NOZCentralDirectoryRecord * __nonnull record, NSUInteger index, BOOL * __nonnull stop);
38+
typedef void(^NOZUnzipRecordEnumerationBlock)(NOZCentralDirectoryRecord * __nonnull record,
39+
NSUInteger index,
40+
BOOL * __nonnull stop);
3941
//! Callback when enumerating bytes being decompressed for an entry. Set _stop_ to `YES` to end the enumeration early.
40-
typedef void(^NOZUnzipByteRangeEnumerationBlock)(const void * __nonnull bytes, NSRange byteRange, BOOL * __nonnull stop);
42+
typedef void(^NOZUnzipByteRangeEnumerationBlock)(const void * __nonnull bytes,
43+
NSRange byteRange,
44+
BOOL * __nonnull stop);
4145

4246
//! Values for options when saving a record to disk
4347
typedef NS_OPTIONS(NSInteger, NOZUnzipperSaveRecordOptions)

0 commit comments

Comments
 (0)