Try to find opened shell first

leepro · Oct 11, 2017 · e68c92b · e68c92b
1 parent 3d78d39
commit e68c92b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/Blink/Info.plist b/Blink/Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>com.blink.cmdline</string>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>

diff --git a/Blink/SpaceController.m b/Blink/SpaceController.m
@@ -674,7 +674,35 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
 
 - (void)restoreUserActivityState:(NSUserActivity *)activity
 {
-  [self _createShellWithUserActivity:activity animated:YES completion:nil];
+  [super restoreUserActivityState:activity];
+
+  NSInteger idx = [_viewports indexOfObject:self.currentTerm];
+  if(idx == NSNotFound) {
+    [self _createShellWithUserActivity:activity animated:YES completion:nil];
+    return;
+  }
+
+  NSInteger targetIdx = [_viewports indexOfObjectPassingTest:^BOOL(TermController *term, NSUInteger idx, BOOL * _Nonnull stop) {
+    return [activity.title isEqualToString:term.activityKey];
+  }];
+
+  if (targetIdx == NSNotFound) {
+    [self _createShellWithUserActivity:activity animated:YES completion:nil];
+    return;
+  }
+
+  // we are already here
+  if (idx == targetIdx) {
+    return;
+  }
+
+  UIPageViewControllerNavigationDirection direction =
+  idx < targetIdx ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse;
+
+
+  [self switchShellIdx: targetIdx
+             direction: direction
+              animated: NO];
 }
 
 

diff --git a/Blink/TermController.h b/Blink/TermController.h
@@ -54,6 +54,7 @@
 @property (strong, nonatomic) TermView *terminal;
 @property (strong, nonatomic) UIScrollView *containerView;
 @property (weak) id<TermControlDelegate> delegate;
+@property (strong, nonatomic) NSString* activityKey;
 
 - (void)setRawMode:(BOOL)raw;
 - (BOOL)rawMode;

diff --git a/Blink/TermController.m b/Blink/TermController.m
@@ -182,9 +182,12 @@ - (void)indexCommand:(NSString *)cmdLine {
   activity.eligibleForSearch = YES;
   activity.eligibleForHandoff = YES;
 
-  [activity setTitle:[NSString stringWithFormat:@"run: %@ ", cmdLine]];
+
+  _activityKey = [NSString stringWithFormat:@"run: %@ ", cmdLine];
+  [activity setTitle:_activityKey];
 
   _activityUserInfo = @{BKUserActivityCommandLineKey: cmdLine ?: @"help"};
+
   activity.userInfo = _activityUserInfo;
 
   self.userActivity = activity;
@@ -193,8 +196,10 @@ - (void)indexCommand:(NSString *)cmdLine {
 
 - (void)updateUserActivityState:(NSUserActivity *)activity
 {
+  [activity setTitle:_activityKey];
   [activity addUserInfoEntriesFromDictionary:_activityUserInfo];
   activity.keywords = [NSSet setWithArray:@[@"blink", @"shell", @"mosh", @"ssh", @"terminal", @"remote"]];
+
   [activity setRequiredUserInfoKeys:[NSSet setWithArray:_activityUserInfo.allKeys]];
 }