Skip to content

Commit c6701cd

Browse files
swisspolswisspol
committed
Renamed "showHiddenFiles" property to "allowHiddenItems"
1 parent b6866be commit c6701cd

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎GCDWebDAVServer/GCDWebDAVServer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
*
103103
* The default value is NO.
104104
*/
105-
@property(nonatomic) BOOL showHiddenFiles;
105+
@property(nonatomic) BOOL allowHiddenItems;
106106

107107
/**
108108
* This method is the designated initializer for the class.

‎GCDWebDAVServer/GCDWebDAVServer.m

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ @interface GCDWebDAVServer () {
5555
@private
5656
NSString* _uploadDirectory;
5757
NSArray* _allowedExtensions;
58-
BOOL _showHidden;
58+
BOOL _allowHidden;
5959
}
6060
@end
6161

@@ -92,7 +92,7 @@ - (GCDWebServerResponse*)performGET:(GCDWebServerRequest*)request {
9292
}
9393

9494
NSString* itemName = [absolutePath lastPathComponent];
95-
if (([itemName hasPrefix:@"."] && !_showHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
95+
if (([itemName hasPrefix:@"."] && !_allowHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
9696
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Downlading item name \"%@\" is not allowed", itemName];
9797
}
9898

@@ -130,7 +130,7 @@ - (GCDWebServerResponse*)performPUT:(GCDWebServerFileRequest*)request {
130130
}
131131

132132
NSString* fileName = [absolutePath lastPathComponent];
133-
if (([fileName hasPrefix:@"."] && !_showHidden) || ![self _checkFileExtension:fileName]) {
133+
if (([fileName hasPrefix:@"."] && !_allowHidden) || ![self _checkFileExtension:fileName]) {
134134
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Uploading file name \"%@\" is not allowed", fileName];
135135
}
136136

@@ -166,7 +166,7 @@ - (GCDWebServerResponse*)performDELETE:(GCDWebServerRequest*)request {
166166
}
167167

168168
NSString* itemName = [absolutePath lastPathComponent];
169-
if (([itemName hasPrefix:@"."] && !_showHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
169+
if (([itemName hasPrefix:@"."] && !_allowHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
170170
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Deleting item name \"%@\" is not allowed", itemName];
171171
}
172172

@@ -203,7 +203,7 @@ - (GCDWebServerResponse*)performMKCOL:(GCDWebServerDataRequest*)request {
203203
}
204204

205205
NSString* directoryName = [absolutePath lastPathComponent];
206-
if (!_showHidden && [directoryName hasPrefix:@"."]) {
206+
if (!_allowHidden && [directoryName hasPrefix:@"."]) {
207207
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Creating directory name \"%@\" is not allowed", directoryName];
208208
}
209209

@@ -264,7 +264,7 @@ - (GCDWebServerResponse*)performCOPY:(GCDWebServerRequest*)request isMove:(BOOL)
264264
}
265265

266266
NSString* itemName = [dstAbsolutePath lastPathComponent];
267-
if ((!_showHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
267+
if ((!_allowHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
268268
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"%@ to item name \"%@\" is not allowed", isMove ? @"Moving" : @"Copying", itemName];
269269
}
270270

@@ -430,7 +430,7 @@ - (GCDWebServerResponse*)performPROPFIND:(GCDWebServerDataRequest*)request {
430430
}
431431

432432
NSString* itemName = [absolutePath lastPathComponent];
433-
if (([itemName hasPrefix:@"."] && !_showHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
433+
if (([itemName hasPrefix:@"."] && !_allowHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
434434
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Retrieving properties for item name \"%@\" is not allowed", itemName];
435435
}
436436

@@ -454,7 +454,7 @@ - (GCDWebServerResponse*)performPROPFIND:(GCDWebServerDataRequest*)request {
454454
relativePath = [relativePath stringByAppendingString:@"/"];
455455
}
456456
for (NSString* item in items) {
457-
if (_showHidden || ![item hasPrefix:@"."]) {
457+
if (_allowHidden || ![item hasPrefix:@"."]) {
458458
[self _addPropertyResponseForItem:[absolutePath stringByAppendingPathComponent:item] resource:[relativePath stringByAppendingString:item] properties:properties xmlString:xmlString];
459459
}
460460
}
@@ -525,7 +525,7 @@ - (GCDWebServerResponse*)performLOCK:(GCDWebServerDataRequest*)request {
525525
}
526526

527527
NSString* itemName = [absolutePath lastPathComponent];
528-
if ((!_showHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
528+
if ((!_allowHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
529529
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Locking item name \"%@\" is not allowed", itemName];
530530
}
531531

@@ -585,7 +585,7 @@ - (GCDWebServerResponse*)performUNLOCK:(GCDWebServerRequest*)request {
585585
}
586586

587587
NSString* itemName = [absolutePath lastPathComponent];
588-
if ((!_showHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
588+
if ((!_allowHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
589589
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Unlocking item name \"%@\" is not allowed", itemName];
590590
}
591591

@@ -597,7 +597,7 @@ - (GCDWebServerResponse*)performUNLOCK:(GCDWebServerRequest*)request {
597597

598598
@implementation GCDWebDAVServer
599599

600-
@synthesize uploadDirectory=_uploadDirectory, allowedFileExtensions=_allowedExtensions, showHiddenFiles=_showHidden;
600+
@synthesize uploadDirectory=_uploadDirectory, allowedFileExtensions=_allowedExtensions, allowHiddenItems=_allowHidden;
601601

602602
- (instancetype)initWithUploadDirectory:(NSString*)path {
603603
if ((self = [super init])) {

‎GCDWebUploader/GCDWebUploader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
*
9898
* The default value is NO.
9999
*/
100-
@property(nonatomic) BOOL showHiddenFiles;
100+
@property(nonatomic) BOOL allowHiddenItems;
101101

102102
/**
103103
* Sets the title for the uploader interface.

‎GCDWebUploader/GCDWebUploader.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ @interface GCDWebUploader () {
4646
@private
4747
NSString* _uploadDirectory;
4848
NSArray* _allowedExtensions;
49-
BOOL _showHidden;
49+
BOOL _allowHidden;
5050
NSString* _title;
5151
NSString* _header;
5252
NSString* _prologue;
@@ -94,7 +94,7 @@ - (GCDWebServerResponse*)listDirectory:(GCDWebServerRequest*)request {
9494
}
9595

9696
NSString* directoryName = [absolutePath lastPathComponent];
97-
if (!_showHidden && [directoryName hasPrefix:@"."]) {
97+
if (!_allowHidden && [directoryName hasPrefix:@"."]) {
9898
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Listing directory name \"%@\" is not allowed", directoryName];
9999
}
100100

@@ -106,7 +106,7 @@ - (GCDWebServerResponse*)listDirectory:(GCDWebServerRequest*)request {
106106

107107
NSMutableArray* array = [NSMutableArray array];
108108
for (NSString* item in [contents sortedArrayUsingSelector:@selector(localizedStandardCompare:)]) {
109-
if (_showHidden || ![item hasPrefix:@"."]) {
109+
if (_allowHidden || ![item hasPrefix:@"."]) {
110110
NSDictionary* attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[absolutePath stringByAppendingPathComponent:item] error:NULL];
111111
NSString* type = [attributes objectForKey:NSFileType];
112112
if ([type isEqualToString:NSFileTypeRegular] && [self _checkFileExtension:item]) {
@@ -138,7 +138,7 @@ - (GCDWebServerResponse*)downloadFile:(GCDWebServerRequest*)request {
138138
}
139139

140140
NSString* fileName = [absolutePath lastPathComponent];
141-
if (([fileName hasPrefix:@"."] && !_showHidden) || ![self _checkFileExtension:fileName]) {
141+
if (([fileName hasPrefix:@"."] && !_allowHidden) || ![self _checkFileExtension:fileName]) {
142142
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Downlading file name \"%@\" is not allowed", fileName];
143143
}
144144

@@ -155,7 +155,7 @@ - (GCDWebServerResponse*)uploadFile:(GCDWebServerMultiPartFormRequest*)request {
155155
NSString* contentType = (range.location != NSNotFound ? @"application/json" : @"text/plain; charset=utf-8"); // Required when using iFrame transport (see https://github.com/blueimp/jQuery-File-Upload/wiki/Setup)
156156

157157
GCDWebServerMultiPartFile* file = [request.files objectForKey:@"files[]"];
158-
if ((!_showHidden && [file.fileName hasPrefix:@"."]) || ![self _checkFileExtension:file.fileName]) {
158+
if ((!_allowHidden && [file.fileName hasPrefix:@"."]) || ![self _checkFileExtension:file.fileName]) {
159159
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Uploaded file name \"%@\" is not allowed", file.fileName];
160160
}
161161
NSString* relativePath = [(GCDWebServerMultiPartArgument*)[request.arguments objectForKey:@"path"] string];
@@ -190,7 +190,7 @@ - (GCDWebServerResponse*)moveItem:(GCDWebServerURLEncodedFormRequest*)request {
190190
NSString* newAbsolutePath = [self _uniquePathForPath:[_uploadDirectory stringByAppendingPathComponent:newRelativePath]];
191191

192192
NSString* itemName = [newAbsolutePath lastPathComponent];
193-
if ((!_showHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
193+
if ((!_allowHidden && [itemName hasPrefix:@"."]) || (!isDirectory && ![self _checkFileExtension:itemName])) {
194194
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Moving to item name \"%@\" is not allowed", itemName];
195195
}
196196

@@ -220,7 +220,7 @@ - (GCDWebServerResponse*)deleteItem:(GCDWebServerURLEncodedFormRequest*)request
220220
}
221221

222222
NSString* itemName = [absolutePath lastPathComponent];
223-
if (([itemName hasPrefix:@"."] && !_showHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
223+
if (([itemName hasPrefix:@"."] && !_allowHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
224224
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Deleting item name \"%@\" is not allowed", itemName];
225225
}
226226

@@ -246,7 +246,7 @@ - (GCDWebServerResponse*)createDirectory:(GCDWebServerURLEncodedFormRequest*)req
246246
NSString* absolutePath = [self _uniquePathForPath:[_uploadDirectory stringByAppendingPathComponent:relativePath]];
247247

248248
NSString* directoryName = [absolutePath lastPathComponent];
249-
if (!_showHidden && [directoryName hasPrefix:@"."]) {
249+
if (!_allowHidden && [directoryName hasPrefix:@"."]) {
250250
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Creating directory name \"%@\" is not allowed", directoryName];
251251
}
252252

@@ -271,7 +271,7 @@ - (GCDWebServerResponse*)createDirectory:(GCDWebServerURLEncodedFormRequest*)req
271271

272272
@implementation GCDWebUploader
273273

274-
@synthesize uploadDirectory=_uploadDirectory, allowedFileExtensions=_allowedExtensions, showHiddenFiles=_showHidden,
274+
@synthesize uploadDirectory=_uploadDirectory, allowedFileExtensions=_allowedExtensions, allowHiddenItems=_allowHidden,
275275
title=_title, header=_header, prologue=_prologue, epilogue=_epilogue, footer=_footer;
276276

277277
- (instancetype)initWithUploadDirectory:(NSString*)path {

‎iOS/AppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
5757
NSString* documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
5858
_webServer = [[GCDWebUploader alloc] initWithUploadDirectory:documentsPath];
5959
_webServer.delegate = self;
60-
_webServer.showHiddenFiles = YES;
60+
_webServer.allowHiddenItems = YES;
6161
[_webServer start];
6262

6363
return YES;

0 commit comments

Comments
 (0)