From f93a77f8ac218c4c2ac57c9fa0f0d5acca546992 Mon Sep 17 00:00:00 2001
From: Kylart <Kylart.dev@gmail.com>
Date: Wed, 10 Apr 2019 00:24:09 +0200
Subject: [PATCH] Fix torrent opening from external when app already opened

---
 package.json                                 | 2 +-
 src/background/events.js                     | 4 +++-
 src/background/index.js                      | 6 ++++--
 src/components/info/layout.vue               | 4 ++--
 src/components/info/modal.vue                | 6 ++++++
 src/components/settings/sections/torrent.vue | 2 +-
 src/components/torrents/dialog.vue           | 5 ++++-
 src/components/video/modal.vue               | 4 ----
 8 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 111abed..966d6f8 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "kawanime",
+  "name": "KawAnime",
   "version": "0.4.0",
   "main": "background.js",
   "repository": "https://github.com/Kylart/KawAnime.git",
diff --git a/src/background/events.js b/src/background/events.js
index b62f833..8911a63 100644
--- a/src/background/events.js
+++ b/src/background/events.js
@@ -13,5 +13,7 @@ export default function (e, args) {
 
   sendToWindows(eventsList.externalOpen.success, Array.isArray(args) ? args : [args])
 
-  setTimeout(BrowserWindow.getAllWindows()[0].focus, 100)
+  setTimeout(() => {
+    BrowserWindow.getAllWindows()[0].focus()
+  }, 100)
 }
diff --git a/src/background/index.js b/src/background/index.js
index 3a5986a..74feb7c 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -58,6 +58,8 @@ function createWindow () {
 
   win.once('ready-to-show', () => {
     win.show()
+
+    if (process.argv.length) external(null, process.argv)
   })
 
   win.on('close', () => {
@@ -87,6 +89,8 @@ if (!gotTheLock) {
     if (win) {
       if (win.isMinimized()) win.restore()
       win.focus()
+
+      if (process.argv.length) external(null, process.argv)
     }
   })
 
@@ -173,8 +177,6 @@ app.on('quit', () => {
   })
 })
 
-if (process.argv.length) external(null, process.argv)
-
 app.on('open-file', external)
 app.on('open-url', external)
 
diff --git a/src/components/info/layout.vue b/src/components/info/layout.vue
index 7ffb78c..06db90e 100644
--- a/src/components/info/layout.vue
+++ b/src/components/info/layout.vue
@@ -142,10 +142,10 @@
 </template>
 
 <script>
+import NotFoundImage from '../../../public/images/not-found.png'
 import Episodes from '@/mixins/info/currentEps.js'
 
 import { mapGetters } from 'vuex'
-import { join } from 'path'
 
 export default {
   name: 'Info-Displayer',
@@ -242,7 +242,7 @@ export default {
     sanitize (link) {
       // This redirects unwanted picture links to fallback picture
       return /(questionmark)/.test(link)
-        ? join(process.env.BASE_URL, 'images', 'not-found.png')
+        ? NotFoundImage
         : link
     },
     openLink (link) {
diff --git a/src/components/info/modal.vue b/src/components/info/modal.vue
index dfde364..560f708 100644
--- a/src/components/info/modal.vue
+++ b/src/components/info/modal.vue
@@ -44,6 +44,11 @@
       p Grabbing those data...
       p Please bear with us for a moment.
 
+      v-divider
+      v-card-actions
+        v-spacer
+        v-btn(@click='back') Cancel
+
     v-card(v-else)
       v-toolbar(dense, color='indigo')
         v-spacer
@@ -114,6 +119,7 @@ export default {
       this.isRemote = false
     },
     back () {
+      this.searching = false
       this.current = null
     },
     getPictureUrl (url) {
diff --git a/src/components/settings/sections/torrent.vue b/src/components/settings/sections/torrent.vue
index f87ecd3..0d4db1c 100644
--- a/src/components/settings/sections/torrent.vue
+++ b/src/components/settings/sections/torrent.vue
@@ -32,7 +32,7 @@ export default {
   mounted () {
     const { app } = this.$electron.remote
 
-    this.isDefault = this.protocols.some((protocol) => app.isDefaultProtocolClient(protocol))
+    this.isDefault = this.protocols.every((protocol) => app.isDefaultProtocolClient(protocol))
   },
 
   computed: {
diff --git a/src/components/torrents/dialog.vue b/src/components/torrents/dialog.vue
index 6ec9f2b..e939628 100644
--- a/src/components/torrents/dialog.vue
+++ b/src/components/torrents/dialog.vue
@@ -52,9 +52,12 @@ export default {
 
   created () {
     this.$ipc.on(this.$eventsList.externalOpen.success, (e, args) => {
-      const toAdd = args.filter((e) => ['magnet', '.torrent'].includes(e))
+      const toAdd = args.filter(
+        (e) => ['magnet:', '.torrent'].some((id) => e.includes(id))
+      )
 
       if (toAdd.length) {
+        this.$log('External torrents opening', toAdd)
         this.addTorrentsFromPath(toAdd)
         this.show = true
       }
diff --git a/src/components/video/modal.vue b/src/components/video/modal.vue
index e362e6d..5d3d8c5 100644
--- a/src/components/video/modal.vue
+++ b/src/components/video/modal.vue
@@ -28,10 +28,6 @@ export default {
     Player
   },
 
-  beforeDestroy () {
-    this.$ipc.send(this.$eventsList.video.close.main)
-  },
-
   data () {
     return {
       videoPort: null,