修正magnet的正则

xiandanin · xiandanin · commit e1ea242bef09 · 2019-12-31T21:13:24.000+08:00
diff --git a/src/index.ejs b/src/index.ejs
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title><%= htmlWebpackPlugin.options.title %> - <%= htmlWebpackPlugin.options.description %></title>
+    <title><%= htmlWebpackPlugin.options.title %></title>
     <meta name="robots" content="noindex,nofollow,noarchive">
     <meta name="format-detection" content="telephone=no,email=no,adress=no">
     <meta http-equiv="window-target" content="_top">
diff --git a/src/main/format-parser.js b/src/main/format-parser.js
@@ -62,7 +62,8 @@ module.exports = {
    */
   extractMagnet (url) {
     if (url) {
-      if (/magnet:?[^\\"]+/.test(url)) {
+      // 如果是磁力链 直接返回
+      if (/^(magnet:\?xt=urn:btih:)/.test(url)) {
         return url.toLowerCase()
       } else {
         // 如果不是磁力链 就提取 连续字母数字32-40位
diff --git a/src/main/ipc.js b/src/main/ipc.js
@@ -4,20 +4,24 @@ const logger = require('./logger')
 const path = require('path')
 const {ipcMain, app} = require('electron')
 const request = require('request-promise-native')
-const {reload, start, getProxyNetworkInfo} = require('./api')
+const {reload, start, isStarting, getProxyNetworkInfo} = require('./api')
 const {defaultConfig, extractConfigVariable, getConfig} = require('./process-config')
 const Store = require('electron-store')
 const store = new Store()
 
 async function registerServer () {
-  const configVariable = store.get('config_variable')
-  const newConfig = getConfig(configVariable)
-  configVariable ? console.info('使用自定义配置加载服务', configVariable, newConfig) : console.info('使用默认配置加载服务', configVariable, newConfig)
-  const {port, ip, local, message} = await start(newConfig, false)
-  if (message) {
-    console.error(message)
+  if (isStarting()) {
+    console.info('服务已启动')
   } else {
-    console.info(`启动成功，本地访问 http://${local}:${port}，IP访问 http://${ip}:${port}`)
+    const configVariable = store.get('config_variable')
+    const newConfig = getConfig(configVariable)
+    configVariable ? console.info('使用自定义配置加载服务', configVariable, newConfig) : console.info('使用默认配置加载服务', configVariable, newConfig)
+    const {port, ip, local, message} = await start(newConfig, false)
+    if (message) {
+      console.error(message)
+    } else {
+      console.info(`启动成功，本地访问 http://${local}:${port}，IP访问 http://${ip}:${port}`)
+    }
   }
 }
 
diff --git a/src/main/menu.js b/src/main/menu.js
@@ -25,6 +25,8 @@ module.exports = function (mainWindow) {
     {label: '重新加载', role: 'reload'},
     {label: '最小化', role: 'minimize'},
     {label: '最大化', click: () => mainWindow.isMaximized() ? mainWindow.unmaximize() : mainWindow.maximize()},
+    {type: 'separator'},
+    {label: '关闭', role: 'close'},
     ...(is.macOS() ? [
       {type: 'separator'},
       {label: '前置全部窗口', role: 'front'}
diff --git a/src/renderer/plugins/config.js b/src/renderer/plugins/config.js
@@ -10,14 +10,12 @@ Vue.use({
           baseUrl: `${baseURL}/favicon`,
           extension: 'ico'
         },
-        searchPlaceholder: ['火影忍者', '钢铁侠', '美国队长', '犬夜叉', '七龙珠', '奥特曼', '千与千寻', '你的名字。'],
+        searchPlaceholder: ['火影忍者', '钢铁侠', '美国队长', '犬夜叉', '七龙珠', '奥特曼', '英雄联盟'],
         proxyDocURL: `${baseURL}/guide/proxy.html`,
         guide: {
-          content: [
-          ]
+          content: []
         },
-        menu: [
-        ]
+        menu: []
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,12 @@ Vue.use({`
`10`	`10`	baseUrl: `${baseURL}/favicon`,
`11`	`11`	`extension: 'ico'`
`12`	`12`	`},`
`13`		`- searchPlaceholder: ['火影忍者', '钢铁侠', '美国队长', '犬夜叉', '七龙珠', '奥特曼', '千与千寻', '你的名字。'],`
	`13`	`+ searchPlaceholder: ['火影忍者', '钢铁侠', '美国队长', '犬夜叉', '七龙珠', '奥特曼', '英雄联盟'],`
`14`	`14`	proxyDocURL: `${baseURL}/guide/proxy.html`,
`15`	`15`	`guide: {`
`16`		`- content: [`
`17`		`- ]`
	`16`	`+ content: []`
`18`	`17`	`},`
`19`		`- menu: [`
`20`		`- ]`
	`18`	`+ menu: []`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`	`}`