Merge pull request #592 from ueokande/repeat-last-operation

Add "repeat last operation" command

4 files changed, 139 insertions, 0 deletions

diff --git a/src/background/usecases/CommandUseCase.ts b/src/background/usecases/CommandUseCase.ts
index 921a779..a526cfc 100644
--- a/src/background/usecases/CommandUseCase.ts
+++ b/src/background/usecases/CommandUseCase.ts
@@ -1,4 +1,5 @@
 import { injectable } from 'tsyringe';
+import * as operations from '../../shared/operations';
 import * as parsers from './parsers';
 import * as urls from '../../shared/urls';
 import TabPresenter from '../presenters/TabPresenter';
@@ -7,6 +8,7 @@ import SettingRepository from '../repositories/SettingRepository';
 import BookmarkRepository from '../repositories/BookmarkRepository';
 import ConsoleClient from '../infrastructures/ConsoleClient';
 import ContentMessageClient from '../infrastructures/ContentMessageClient';
+import RepeatUseCase from '../usecases/RepeatUseCase';
 
 @injectable()
 export default class CommandIndicator {
@@ -17,21 +19,36 @@ export default class CommandIndicator {
     private bookmarkRepository: BookmarkRepository,
     private consoleClient: ConsoleClient,
     private contentMessageClient: ContentMessageClient,
+    private repeatUseCase: RepeatUseCase,
   ) {
   }
 
   async open(keywords: string): Promise<browser.tabs.Tab> {
     let url = await this.urlOrSearch(keywords);
+    this.repeatUseCase.storeLastOperation({
+      type: operations.INTERNAL_OPEN_URL,
+      url,
+    });
     return this.tabPresenter.open(url);
   }
 
   async tabopen(keywords: string): Promise<browser.tabs.Tab> {
     let url = await this.urlOrSearch(keywords);
+    this.repeatUseCase.storeLastOperation({
+      type: operations.INTERNAL_OPEN_URL,
+      url,
+      newTab: true,
+    });
     return this.tabPresenter.create(url);
   }
 
   async winopen(keywords: string): Promise<browser.windows.Window> {
     let url = await this.urlOrSearch(keywords);
+    this.repeatUseCase.storeLastOperation({
+      type: operations.INTERNAL_OPEN_URL,
+      url,
+      newWindow: true,
+    });
     return this.windowPresenter.create(url);
   }
 
diff --git a/src/background/usecases/NavigateUseCase.ts b/src/background/usecases/NavigateUseCase.ts
new file mode 100644
index 0000000..152339a
--- /dev/null
+++ b/src/background/usecases/NavigateUseCase.ts
@@ -0,0 +1,57 @@
+import { injectable } from 'tsyringe';
+import NavigateClient from '../clients/NavigateClient';
+import TabPresenter from '../presenters/TabPresenter';
+
+@injectable()
+export default class NavigateUseCase {
+  constructor(
+    private tabPresenter: TabPresenter,
+    private navigateClient: NavigateClient,
+  ) {
+  }
+
+  async openHistoryNext(): Promise<void> {
+    let tab = await this.tabPresenter.getCurrent();
+    await this.navigateClient.historyNext(tab.id!!);
+  }
+
+  async openHistoryPrev(): Promise<void> {
+    let tab = await this.tabPresenter.getCurrent();
+    await this.navigateClient.historyPrev(tab.id!!);
+  }
+
+  async openLinkNext(): Promise<void> {
+    let tab = await this.tabPresenter.getCurrent();
+    await this.navigateClient.linkNext(tab.id!!);
+  }
+
+  async openLinkPrev(): Promise<void> {
+    let tab = await this.tabPresenter.getCurrent();
+    await this.navigateClient.linkPrev(tab.id!!);
+  }
+
+  async openParent(): Promise<void> {
+    let tab = await this.tabPresenter.getCurrent();
+    let url = new URL(tab.url!!);
+    if (url.hash.length > 0) {
+      url.hash = '';
+    } else if (url.search.length > 0) {
+      url.search = '';
+    } else {
+      const basenamePattern = /\/[^/]+$/;
+      const lastDirPattern = /\/[^/]+\/$/;
+      if (basenamePattern.test(url.pathname)) {
+        url.pathname = url.pathname.replace(basenamePattern, '/');
+      } else if (lastDirPattern.test(url.pathname)) {
+        url.pathname = url.pathname.replace(lastDirPattern, '/');
+      }
+    }
+    await this.tabPresenter.open(url.href);
+  }
+
+  async openRoot(): Promise<void> {
+    let tab = await this.tabPresenter.getCurrent();
+    let url = new URL(tab.url!!);
+    await this.tabPresenter.open(url.origin);
+  }
+}
diff --git a/src/background/usecases/RepeatUseCase.ts b/src/background/usecases/RepeatUseCase.ts
new file mode 100644
index 0000000..d78de34
--- /dev/null
+++ b/src/background/usecases/RepeatUseCase.ts
@@ -0,0 +1,50 @@
+import { injectable } from 'tsyringe';
+import * as operations from '../../shared/operations';
+import RepeatRepository from '../repositories/RepeatRepository';
+
+type Operation = operations.Operation;
+
+@injectable()
+export default class RepeatUseCase {
+  constructor(
+    private repeatRepository: RepeatRepository,
+  ) {
+  }
+
+  storeLastOperation(op: Operation): void {
+    this.repeatRepository.setLastOperation(op);
+  }
+
+  getLastOperation(): operations.Operation | undefined {
+    return this.repeatRepository.getLastOperation();
+  }
+
+  // eslint-disable-next-line complexity
+  isRepeatable(op: Operation): boolean {
+    switch (op.type) {
+    case operations.NAVIGATE_HISTORY_PREV:
+    case operations.NAVIGATE_HISTORY_NEXT:
+    case operations.NAVIGATE_LINK_PREV:
+    case operations.NAVIGATE_LINK_NEXT:
+    case operations.NAVIGATE_PARENT:
+    case operations.NAVIGATE_ROOT:
+    case operations.PAGE_SOURCE:
+    case operations.PAGE_HOME:
+    case operations.TAB_CLOSE:
+    case operations.TAB_CLOSE_FORCE:
+    case operations.TAB_CLOSE_RIGHT:
+    case operations.TAB_REOPEN:
+    case operations.TAB_RELOAD:
+    case operations.TAB_PIN:
+    case operations.TAB_UNPIN:
+    case operations.TAB_TOGGLE_PINNED:
+    case operations.TAB_DUPLICATE:
+    case operations.ZOOM_IN:
+    case operations.ZOOM_OUT:
+    case operations.ZOOM_NEUTRAL:
+    case operations.INTERNAL_OPEN_URL:
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/src/background/usecases/TabUseCase.ts b/src/background/usecases/TabUseCase.ts
index 0239a87..31112a9 100644
--- a/src/background/usecases/TabUseCase.ts
+++ b/src/background/usecases/TabUseCase.ts
@@ -1,11 +1,13 @@
 import { injectable } from 'tsyringe';
 import TabPresenter from '../presenters/TabPresenter';
+import WindowPresenter from '../presenters/WindowPresenter';
 import BrowserSettingRepository from '../repositories/BrowserSettingRepository';
 
 @injectable()
 export default class TabUseCase {
   constructor(
     private tabPresenter: TabPresenter,
+    private windowPresenter: WindowPresenter,
     private browserSettingRepository: BrowserSettingRepository,
   ) {
   }
@@ -77,4 +79,17 @@ export default class TabUseCase {
       this.tabPresenter.create(url);
     }
   }
+
+  async openURL(
+    url: string, newTab?: boolean, newWindow?: boolean,
+  ): Promise<void> {
+    if (newWindow) {
+      await this.windowPresenter.create(url);
+    } else if (newTab) {
+      await this.tabPresenter.create(url);
+    } else {
+      let tab = await this.tabPresenter.getCurrent();
+      await this.tabPresenter.open(url, tab.id);
+    }
+  }
 }