Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

made targets for macOS and tvOS, some cleanups #31

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

made targets for macOS and tvOS, some cleanups #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78b412c
made targets for macOS and tvOS, some cleanups
ssbmaccom Dec 7, 2017
b3f4273
do not log in without user and pass, fixes
ssbmaccom Dec 12, 2017
43cb2d7
remove NSString addition categorie -> moved the code accordingly, old…
ssbmaccom Dec 12, 2017
1e51d41
cleanups
ssbmaccom Dec 12, 2017
cb27bc7
smaller changes for iOS target
ssbmaccom Jan 4, 2018
504f6e4
small fixes
ssbmaccom Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DerivedData/FTPKit/Build
DerivedData
FTPKit.xcodeproj/project.xcworkspace/xcuserdata
FTPKit.xcodeproj/xcuserdata/ssb.xcuserdatad
2 changes: 1 addition & 1 deletion FTPKit Tests/FTPKit Tests-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.upstart-illustration-llc.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down
582 changes: 576 additions & 6 deletions FTPKit.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

234 changes: 121 additions & 113 deletions FTPKit/Categories/NSError+Additions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,127 +7,135 @@ @implementation NSError (NSError_FTPKitAdditions)

+ (NSString *)FTPKitErrorMessageFromCode:(int)errorCode
{
// http://en.wikipedia.org/wiki/List_of_FTP_server_return_codes
NSString *message = NSLocalizedString(@"Undefined error has occurred.", @"");
switch (errorCode) {
case 331:
message = NSLocalizedString(@"User name okay, need password.", @"");
break;
case 332:
message = NSLocalizedString(@"Need account for login.", @"");
break;
case 350:
message = NSLocalizedString(@"Requested file action pending further information.", @"");
break;
case 421:
message = NSLocalizedString(@"Service not available, closing control connection.", @"");
break;
case 425:
message = NSLocalizedString(@"Can't open data connection.", @"");
break;
case 426:
message = NSLocalizedString(@"Connection closed, transfer aborted.", @"");
break;
case 430:
message = NSLocalizedString(@"Invalid username or password.", @"");
break;
case 450:
message = NSLocalizedString(@"Requested file action not taken. File unavailable (e.g., file busy).", @"");
break;
case 451:
message = NSLocalizedString(@"Requested action aborted, local error in processing.", @"");
break;
case 452:
message = NSLocalizedString(@"Requested action not taken. Insufficient storage space in system.", @"");
break;
case 500:
message = NSLocalizedString(@"Syntax error, command unrecognized. This may include errors such as command line too long.", @"");
break;
case 501:
message = NSLocalizedString(@"Syntax error in parameters or arguments.", @"");
break;
case 502:
message = NSLocalizedString(@"Command not implemented.", @"");
break;
case 503:
message = NSLocalizedString(@"Bad sequence of commands.", @"");
break;
case 504:
message = NSLocalizedString(@"Command not implemented for that parameter.", @"");
break;
case 530:
message = NSLocalizedString(@"User not logged in.", @"");
break;
case 532:
message = NSLocalizedString(@"Need account for storing files.", @"");
break;
case 550:
message = NSLocalizedString(@"Requested action not taken. File unavailable (e.g., file not found, no access).", @"");
break;
case 551:
message = NSLocalizedString(@"Requested action aborted. Page type unknown.", @"");
break;
case 552:
message = NSLocalizedString(@"Requested file action aborted, storage allocation exceeded.", @"");
break;
case 553:
message = NSLocalizedString(@"Requested action not taken. File name not allowed.", @"");
break;
case 600:
message = NSLocalizedString(@"Replies regarding confidentiality and integrity.", @"");
break;
case 631:
message = NSLocalizedString(@"Integrity protected reply.", @"");
break;
case 632:
message = NSLocalizedString(@"Confidentiality and integrity protected reply.", @"");
break;
case 633:
message = NSLocalizedString(@"Confidentiality protected reply.", @"");
break;
// 1000 Series Common Winsock Error Codes
case 10054:
message = NSLocalizedString(@"Connection reset by peer. The connection was forcibly closed by the remote host.", @"");
break;
case 10060:
message = NSLocalizedString(@"Cannot connect to remote server.", @"");
break;
case 10061:
message = NSLocalizedString(@"Cannot connect to remote server. The connection is actively refused by the server.", @"");
break;
case 10066:
message = NSLocalizedString(@"Directory not empty.", @"");
break;
case 10068:
message = NSLocalizedString(@"Too many users, server is full.", @"");
break;
default:
break;
}
return message;
// http://en.wikipedia.org/wiki/List_of_FTP_server_return_codes
NSString *message = NSLocalizedString(@"Undefined error has occurred.", @"");
switch (errorCode) {
case 331:
message = NSLocalizedString(@"User name okay, need password.", @"");
break;
case 332:
message = NSLocalizedString(@"Need account for login.", @"");
break;
case 350:
message = NSLocalizedString(@"Requested file action pending further information.", @"");
break;
case 421:
message = NSLocalizedString(@"Service not available, closing control connection.", @"");
break;
case 425:
message = NSLocalizedString(@"Can't open data connection.", @"");
break;
case 426:
message = NSLocalizedString(@"Connection closed, transfer aborted.", @"");
break;
case 430:
message = NSLocalizedString(@"Invalid username or password.", @"");
break;
case 450:
message = NSLocalizedString(@"Requested file action not taken. File unavailable (e.g., file busy).", @"");
break;
case 451:
message = NSLocalizedString(@"Requested action aborted, local error in processing.", @"");
break;
case 452:
message = NSLocalizedString(@"Requested action not taken. Insufficient storage space in system.", @"");
break;
case 500:
message = NSLocalizedString(@"Syntax error, command unrecognized. This may include errors such as command line too long.", @"");
break;
case 501:
message = NSLocalizedString(@"Syntax error in parameters or arguments.", @"");
break;
case 502:
message = NSLocalizedString(@"Command not implemented.", @"");
break;
case 503:
message = NSLocalizedString(@"Bad sequence of commands.", @"");
break;
case 504:
message = NSLocalizedString(@"Command not implemented for that parameter.", @"");
break;
case 530:
message = NSLocalizedString(@"User not logged in.", @"");
break;
case 532:
message = NSLocalizedString(@"Need account for storing files.", @"");
break;
case 550:
message = NSLocalizedString(@"Requested action not taken. File unavailable (e.g., file not found, no access).", @"");
break;
case 551:
message = NSLocalizedString(@"Requested action aborted. Page type unknown.", @"");
break;
case 552:
message = NSLocalizedString(@"Requested file action aborted, storage allocation exceeded.", @"");
break;
case 553:
message = NSLocalizedString(@"Requested action not taken. File name not allowed.", @"");
break;
case 600:
message = NSLocalizedString(@"Replies regarding confidentiality and integrity.", @"");
break;
case 631:
message = NSLocalizedString(@"Integrity protected reply.", @"");
break;
case 632:
message = NSLocalizedString(@"Confidentiality and integrity protected reply.", @"");
break;
case 633:
message = NSLocalizedString(@"Confidentiality protected reply.", @"");
break;
// 1000 Series Common Winsock Error Codes
case 10054:
message = NSLocalizedString(@"Connection reset by peer. The connection was forcibly closed by the remote host.", @"");
break;
case 10060:
message = NSLocalizedString(@"Cannot connect to remote server.", @"");
break;
case 10061:
message = NSLocalizedString(@"Cannot connect to remote server. The connection is actively refused by the server.", @"");
break;
case 10066:
message = NSLocalizedString(@"Directory not empty.", @"");
break;
case 10068:
message = NSLocalizedString(@"Too many users, server is full.", @"");
break;
default:
break;
}
return message;
}

+ (NSError *)FTPKitErrorWithCode:(int)errorCode
{
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:[NSError FTPKitErrorMessageFromCode:errorCode]
forKey:NSLocalizedDescriptionKey];
return [[NSError alloc] initWithDomain:FTPErrorDomain code:errorCode userInfo:userInfo];
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:[NSError FTPKitErrorMessageFromCode:errorCode]
forKey:NSLocalizedDescriptionKey];
return [[NSError alloc] initWithDomain:FTPErrorDomain code:errorCode userInfo:userInfo];
}


+ (NSError *)FTPKitErrorWithResponse:(NSString *)response
{
// Extract the code and message from the reponse message.
// Ex: '500 Server error'
NSMutableArray *components = [[response componentsSeparatedByString:@" "] mutableCopy];
NSInteger code = 500;
if ([components[0] isIntegerValue]) {
code = [components[0] integerValue];
[components removeObjectAtIndex:0];
}
NSString *message = [components componentsJoinedByString:@" "];
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:message
forKey:NSLocalizedDescriptionKey];
return [[NSError alloc] initWithDomain:FTPErrorDomain code:code userInfo:userInfo];
// Extract the code and message from the reponse message.
// Ex: '500 Server error'
NSMutableArray *components = [[response componentsSeparatedByString:@" "] mutableCopy];
NSInteger code = 500;
BOOL isIntegerValue = NO;

NSScanner *scanner = [NSScanner scannerWithString:components[0]];
if ([scanner scanInteger:NULL]) {
isIntegerValue = [scanner isAtEnd];
}

if ( isIntegerValue) {
code = [components[0] integerValue];
[components removeObjectAtIndex:0];
}
NSString *message = [components componentsJoinedByString:@" "];
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:message
forKey:NSLocalizedDescriptionKey];
return [[NSError alloc] initWithDomain:FTPErrorDomain code:code userInfo:userInfo];
}

@end
4 changes: 2 additions & 2 deletions FTPKit/Categories/NSString+Additions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
- (NSString *)FTPKitURLEncodedString;
- (NSString *)FTPKitURLDecodedString;

- (BOOL)isIntegerValue;
//- (BOOL)isIntegerValue;

@end
@end
6 changes: 4 additions & 2 deletions FTPKit/Categories/NSString+Additions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ @implementation NSString (NSString_FTPKitAdditions)

+ (NSString *)FTPKitURLEncodeString:(NSString *)unescaped
{
NSString *result = (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (__bridge CFStringRef)unescaped, NULL, CFSTR("!*'();:@&=+$,?%#[]\" ") /* Removed '/' */, kCFStringEncodingUTF8);
// NSString *result = (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (__bridge CFStringRef)unescaped, NULL, CFSTR("!*'();:@&=+$,?%#[]\" ") /* Removed '/' */, kCFStringEncodingUTF8);
NSString *result = [unescaped stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLHostAllowedCharacterSet]];
return result;
}

+ (NSString *)FTPKitURLDecodeString:(NSString *)string
{
NSString *result = (__bridge_transfer NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(NULL, (__bridge CFStringRef)string, CFSTR(""), kCFStringEncodingUTF8);
// NSString *result = (__bridge_transfer NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(NULL, (__bridge CFStringRef)string, CFSTR(""), kCFStringEncodingUTF8);
NSString *result = [string stringByRemovingPercentEncoding];
return result;
}

Expand Down
Loading