code clean

DeveloperLx · Oct 11, 2017 · 9527707 · 9527707
1 parent 02df93d
commit 9527707
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/LxFTPRequest/LxFTPRequest.m b/LxFTPRequest/LxFTPRequest.m
@@ -13,7 +13,7 @@ @implementation NSString (ftp)
 
 - (BOOL)isValidateFTPURLString {
     if (self.length > 0) {
-        return [[NSPredicate predicateWithFormat:@"SELF MATCHES %@", @"^[Ff][Tt][Pp]://(\\w*(:[=_0-9a-zA-Z\\$\\(\\)\\*\\+\\-\\.\\[\\]\\?\\\\\\^\\{\\}\\|`~!#%&\'\",<>/]*)?@)?([0-9a-zA-Z]+\\.)+[0-9a-zA-Z]+(:(6553[0-5]|655[0-2]\\d|654\\d\\d|64\\d\\d\\d|[0-5]?\\d?\\d?\\d?\\d))?(/?|((/[=_0-9a-zA-Z\\-%]+)+(/|\\.[_0-9a-zA-Z]+)?))$"] evaluateWithObject:self];
+        return [[NSPredicate predicateWithFormat:@"SELF MATCHES %@", @"^[Ff][Tt][Pp]://(\\w*(:[=_0-9a-zA-Z\\$\\(\\)\\*\\+\\-\\.\\[\\]\\?\\\\\\^\\{\\}\\|`~!#%&\'\",<>/]*)?@)?([0-9a-zA-Z\\-]+\\.)+[0-9a-zA-Z]+(:(6553[0-5]|655[0-2]\\d|654\\d\\d|64\\d\\d\\d|[0-5]?\\d?\\d?\\d?\\d))?(/?|((/[=_0-9a-zA-Z\\-%]+)+(/|\\.[_0-9a-zA-Z]+)?))$"] evaluateWithObject:self];
     } else {
         return NO;
     }
@@ -29,8 +29,11 @@ - (BOOL)isValidateFileURLString {
 
 - (NSString *)stringByDeletingScheme {
     NSRange range = [self rangeOfString:@"://"];
-
-    return [self substringFromIndex:(range.location + range.length)];
+    if (range.location != NSNotFound) {
+        return [self substringFromIndex:(range.location + range.length)];
+    } else {
+        return nil;
+    }    
 }
 
 - (NSString *)stringDecorateWithUsername:(NSString *)username password:(NSString *)password {