Clean up

Author: Kapeli

Dash/DHAppDelegate.m

@@ -115,60 +115,30 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)actualURL sour
             [[NSNotificationCenter defaultCenter] postNotificationName:DHPerformURLSearch object:[actualURL absoluteString]];
         });
     }
-    else if([[actualURL pathExtension] caseInsensitiveCompare:@".docset"])
+    else if([[actualURL pathExtension] isCaseInsensitiveEqual:@"docset"])
     {
-        NSError *regexError;
-        NSString *fileName = [[actualURL URLByDeletingPathExtension] lastPathComponent];
+        NSError *error;
+        NSString *fileName = [actualURL lastPathComponent];
         NSURL *copyToURL = [[NSURL fileURLWithPath:transfersPath] URLByAppendingPathComponent:fileName isDirectory:NO];
-        if ([[NSFileManager defaultManager] fileExistsAtPath:copyToURL.path])
-        {
-            NSURL *duplicateURL = copyToURL;
-            copyToURL = [copyToURL URLByDeletingPathExtension];
-            NSString *fileNameWithoutExtension = [copyToURL lastPathComponent];
-            NSString *fileExtension = [actualURL pathExtension];
-            for (int i = 1; [[NSFileManager defaultManager] fileExistsAtPath:duplicateURL.path]; i++)
-            {
-                copyToURL=[[copyToURL URLByDeletingLastPathComponent] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@–%i",fileNameWithoutExtension,i]];
-                copyToURL =[copyToURL URLByAppendingPathExtension:fileExtension];
-                duplicateURL = copyToURL;
-            }
-        }
-        [[NSFileManager defaultManager] moveItemAtURL:actualURL toURL:copyToURL error:&regexError];
+        [[NSFileManager defaultManager] removeItemAtPath:copyToURL.path error:nil];
+        [[NSFileManager defaultManager] moveItemAtURL:actualURL toURL:copyToURL error:&error];
         NSString *title;
         NSString *message;
-        if (regexError)
+        if(error)
         {
-            title = @"Import failed!";
-            message = @"Could not properly import the docset. Please try again!";
-            NSLog(@"%@", regexError.localizedDescription);
+            title = @"Import Failed";
+            message = @"Could not import the docset. Please try again!";
+            NSLog(@"%@", error.localizedDescription);
         }
         else
         {
-            title = @"Import successfull!";
-            message = @"You can find the docset in the Transfer-Docset section";
+            title = @"Import Successful";
+            message = @"You can find the docset in Settings, under the Transfer Docsets section.";
             NSLog(@"Docset successfully imported");
         }
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle: UIAlertControllerStyleAlert];
-        [alert addAction:[UIAlertAction actionWithTitle: @"Done" style: UIAlertActionStyleDestructive handler: nil]];
-        [[self topViewController] presentViewController: alert animated:YES completion:nil];
-    }
-    else
-    {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            NSError *regexError;
-            NSRegularExpression* regex = [NSRegularExpression regularExpressionWithPattern:@"Inbox/.+[\\.docset]$" options:0 error:&regexError];
-            NSArray *matches;
-            if (regexError) {
-                NSLog(@"%@", regexError.localizedDescription);
-            }
-	    else
-	    {
-                matches = [regex matchesInString:[actualURL absoluteString] options:0 range:NSMakeRange(0, [actualURL absoluteString].length)];
-            }
-            if (matches.count) {
-                [self moveInboxContentsToDocuments];
-            }
-        });
+        [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleDefault handler:nil]];
+        [[self topViewController] presentViewController:alert animated:YES completion:nil];
     }
     return YES;
 }
@@ -309,22 +279,6 @@ - (DHWindow *)window
     return self._window;
 }
 
-- (void)moveInboxContentsToDocuments
-{
-    NSError *fileManagerError;
-    NSString *inboxDirectory = [NSString stringWithFormat:@"%@/Inbox", transfersPath];
-    NSArray *inboxContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:inboxDirectory error:&fileManagerError];
-    for (int i = 0; i != [inboxContents count]; i++)
-    {
-        NSString *oldPath = [NSString stringWithFormat:@"%@/%@", inboxDirectory, [inboxContents objectAtIndex:i]];
-        NSString *newPath = [NSString stringWithFormat:@"%@/%@", transfersPath, [inboxContents objectAtIndex:i]];
-        [[NSFileManager defaultManager] moveItemAtPath:oldPath toPath:newPath error:&fileManagerError];
-        if (fileManagerError) {
-            NSLog(@"%@",fileManagerError.localizedDescription);
-        }
-    }
-}
-
 - (UIViewController *)topViewController
 {
     return [self topViewController:[UIApplication sharedApplication].keyWindow.rootViewController];

Dash/DHDocsetDownloader.m

@@ -708,7 +708,7 @@ - (BOOL)canInstallFeed:(DHFeed *)feed
     else if([feed.feedURL isEqualToString:@"http://kapeli.com/feeds/Apple_API_Reference.xml"])
     {
         title = @"Apple API Reference";
-        message = @"To install the Apple API Reference docset you need to:\n\n1. Use Dash for macOS to install the Apple API Reference docset from Preferences > Downloads\n2. Go to Preferences > Docsets, right click the Apple API Reference docset and select \"Generate iOS Compatible Docset\"\n3. Transfer the resulting docset using iTunes File Sharing";
+        message = @"To install the Apple API Reference docset you need to:\n\n1. Use Dash for macOS to install the Apple API Reference docset from Preferences > Downloads\n2. Go to Preferences > Docsets, right click the Apple API Reference docset and select \"Generate iOS Compatible Docset\"\n3. Transfer the resulting docset using iTunes File Sharing or AirDrop";
     }
     else if([feed.feedURL isEqualToString:@"http://kapeli.com/feeds/Swift.xml"])
     {
@@ -719,7 +719,7 @@ - (BOOL)canInstallFeed:(DHFeed *)feed
     {
         title = @"Apple API Reference";
         NSString *name = [[[feed.feedURL lastPathComponent] stringByDeletingPathExtension] stringByReplacingOccurrencesOfString:@"_" withString:@" "];
-        message = [NSString stringWithFormat:@"There is no %@ docset. The documentation for %@ can be found inside the Apple API Reference docset. \n\nTo install the Apple API Reference docset you need to:\n\n1. Use Dash for macOS to install the docset from Preferences > Downloads\n2. Go to Preferences > Docsets, right click the Apple API Reference docset and select \"Generate iOS-compatible Docset\"\n3. Transfer the resulting docset using iTunes File Sharing", name, name];
+        message = [NSString stringWithFormat:@"There is no %@ docset. The documentation for %@ can be found inside the Apple API Reference docset. \n\nTo install the Apple API Reference docset you need to:\n\n1. Use Dash for macOS to install the docset from Preferences > Downloads\n2. Go to Preferences > Docsets, right click the Apple API Reference docset and select \"Generate iOS-compatible Docset\"\n3. Transfer the resulting docset using iTunes File Sharing or AirDrop", name, name];
     }
 
     if(title && message)

Dash/DHDocsetTransferrer.m

@@ -209,7 +209,7 @@ - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
 
 - (NSAttributedString *)descriptionForEmptyDataSet:(UIScrollView *)scrollView {
 
-    NSString *text = @"You can transfer docsets using iTunes File Sharing.\n\nFor best results, docsets that are available for download should always be downloaded instead of transferred.";
+    NSString *text = @"You can transfer docsets using iTunes File Sharing or AirDrop.\n\nFor best results, docsets that are available for download should always be downloaded instead of transferred.";
     NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
     paragraph.lineBreakMode = NSLineBreakByWordWrapping;
     paragraph.alignment = NSTextAlignmentCenter;