|
@@ -1091,30 +1091,19 @@
|
|
|
[data writeToFile:fileNamePath atomically:YES];
|
|
|
}
|
|
|
|
|
|
-+ (NSString *)createDirectoyIDFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl
|
|
|
-{
|
|
|
- NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/", nil];
|
|
|
-
|
|
|
- for (NSString *currentCharacter in arrayForbiddenCharacters) {
|
|
|
- account = [account stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
|
|
|
- }
|
|
|
-
|
|
|
- for (NSString *currentCharacter in arrayForbiddenCharacters) {
|
|
|
- serverUrl = [serverUrl stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
|
|
|
- }
|
|
|
-
|
|
|
- return [[account stringByAppendingString:serverUrl] lowercaseString];
|
|
|
-}
|
|
|
-
|
|
|
-+ (NSString *)createMetadataIDFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl fileNameView:(NSString *)fileNameView directory:(BOOL)directory
|
|
|
++ (void)selectFileNameFrom:(UITextField *)textField
|
|
|
{
|
|
|
- NSString *metadataID = [[[self createDirectoyIDFromAccount:account serverUrl:serverUrl] stringByAppendingString:fileNameView] lowercaseString];
|
|
|
+ UITextPosition *endPosition;
|
|
|
+ NSRange rangeDot = [textField.text rangeOfString:@"." options:NSBackwardsSearch];
|
|
|
|
|
|
- if (directory) {
|
|
|
- return [metadataID stringByAppendingString:@"-dir"];
|
|
|
+ if (rangeDot.location != NSNotFound) {
|
|
|
+ endPosition = [textField positionFromPosition:textField.beginningOfDocument offset:rangeDot.location];
|
|
|
+ } else {
|
|
|
+ endPosition = textField.endOfDocument;
|
|
|
}
|
|
|
|
|
|
- return metadataID;
|
|
|
+ UITextRange *textRange = [textField textRangeFromPosition:textField.beginningOfDocument toPosition:endPosition];
|
|
|
+ textField.selectedTextRange = textRange;
|
|
|
}
|
|
|
|
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
@@ -1332,6 +1321,32 @@
|
|
|
return metadata;
|
|
|
}
|
|
|
|
|
|
++ (NSString *)createDirectoyIDFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl
|
|
|
+{
|
|
|
+ NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/", nil];
|
|
|
+
|
|
|
+ for (NSString *currentCharacter in arrayForbiddenCharacters) {
|
|
|
+ account = [account stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
|
|
|
+ }
|
|
|
+
|
|
|
+ for (NSString *currentCharacter in arrayForbiddenCharacters) {
|
|
|
+ serverUrl = [serverUrl stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
|
|
|
+ }
|
|
|
+
|
|
|
+ return [[account stringByAppendingString:serverUrl] lowercaseString];
|
|
|
+}
|
|
|
+
|
|
|
++ (NSString *)createMetadataIDFromAccount:(NSString *)account serverUrl:(NSString *)serverUrl fileNameView:(NSString *)fileNameView directory:(BOOL)directory
|
|
|
+{
|
|
|
+ NSString *metadataID = [[[self createDirectoyIDFromAccount:account serverUrl:serverUrl] stringByAppendingString:fileNameView] lowercaseString];
|
|
|
+
|
|
|
+ if (directory) {
|
|
|
+ return [metadataID stringByAppendingString:@"-dir"];
|
|
|
+ }
|
|
|
+
|
|
|
+ return metadataID;
|
|
|
+}
|
|
|
+
|
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
|
#pragma mark ===== Third parts =====
|
|
|
#pragma --------------------------------------------------------------------------------------------
|