调整自定义网站配置功能

Author: kscript

README.md

@@ -54,32 +54,31 @@ markdownDownload(websiteConfigs.juejin, {
 
 ## 自定义网站配置
 如果某网站没有被支持, 可以自定义网站配置.  
-在控制台选中插件环境, 或者在插件的选项页/背景页, 将示例代码修改为对应网站配置, 并执行
-自定义的网站配置的优先级, 要比默认的网站配置更高
+在文章页面打开控制台， 选中`插件环境`, 或者在插件的`选项页`和`背景页`打开控制台, 将示例代码修改为对应网站配置, 并执行  
 ``` js
-// 注意: 网站域名 和 文章内容选择器为必填项
+// 注释前面带*号的为必填项
 setWebsite(
-		'juejin',
-		{
-				// * 网站域名, 默认配置支持正则, 这里暂不支持
-				hosts: ['juejin.cn'],
-				link: true,
-				br: false,
-				code: false,
-				selectors: {
-						// 标题选择器
-						title: '.article-title',
-						// * 文章内容选择器
-						body: '.markdown-body',
-						// 文章作者用户名选择器
-						userName: '.username .name',
-						// 文章作者链接选择器
-						userLink: '.username',
-						// 无效内容的选择器
-						invalid: 'style',
-						// 文章标签选择器
-						tag: '.article-end .tag-list .tag-item'
-				}
+	'juejin',
+	{
+		// * 匹配域名 插件会将 文章页面的域名 与 数组的每一项元素 依次匹配, 匹配成功则该配置生效
+		hosts: ['juejin.cn'],
+		link: true,
+		br: false,
+		code: false,
+		selectors: {
+			// 标题选择器
+			title: '.article-title',
+			// * 文章内容选择器
+			body: '.markdown-body',
+			// 文章作者用户名选择器
+			userName: '.username .name',
+			// 文章作者链接选择器
+			userLink: '.username',
+			// 无效内容选择器, 文章内容在转换为markdown前会移除这些元素
+			invalid: 'style',
+			// 文章标签选择器
+			tag: '.article-end .tag-list .tag-item'
 		}
+	}
 )
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-downloader",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "markdown文章下载",
   "main": "dist/index.js",
   "scripts": {

src/background.js

@@ -47,26 +47,29 @@ chrome.action.onClicked.addListener(async (tab) => {
   const { host } = new URL(tab.url)
   const localWebsites = await getLocal('websites')
   const localConfigs = localWebsites instanceof Object ? Object.keys(localWebsites).reduce((acc, curr) => {
-    return localWebsites[curr] instanceof Object ? acc.concat({
+    const item = localWebsites[curr]
+    return item instanceof Object ? acc.concat({
       website: curr,
-      hosts: localWebsites[curr].hosts
+      hosts: Array.isArray(item.hosts) ? item.hosts.map(item => /^\/(.*?)\/$/.test(item) ? new RegExp(item.slice(1, -1)) : item) : [],
+      item
     }) : acc
-  }, []) : []
-  const matched = localConfigs.concat(configs).some(({ website, hosts }) => {
+  }, []).sort((a, b) => b.item.timestamp - a.item.timestamp) : []
+  const matched = localConfigs.concat(configs).some(({ website, hosts, item }) => {
     if (
       website && Array.isArray(hosts) && hosts.some(item => item instanceof RegExp ? item.test(host) : item === host)
     ) {
       sendMessage({
         type: 'download',
-        website
+        website,
+        from: item ? 'custom' : 'default'
       })
       return true
     }
   })
-  !matched && chrome.notifications.create(Date.now() + String(tab.id), { 
-    type : 'basic',
-    title : '下载提示',
-    message : '当前页面不支持下载',
-    iconUrl : '/icon.png'
+  !matched && chrome.notifications.create(Date.now() + String(tab.id), {
+    type: 'basic',
+    title: '下载提示',
+    message: '当前页面不支持下载',
+    iconUrl: '/icon.png'
   })
 })

src/index.js

@@ -1,5 +1,5 @@
 import { websites, hooks } from './websites'
-import { 
+import {
   isExtension,
   sendMessage,
   getLocal,
@@ -9,16 +9,16 @@ import downloadZip from './download'
 import { downloadMarkdown } from './markdown'
 import { getLocalOptions } from './options'
 
-const extract = async (options, customOptions = {}, hook = {}) => {
+const extract = async (options, customOptions = {}, hooks = {}) => {
   const localOptions = await getLocalOptions()
   const data = await downloadMarkdown(options, Object.assign(customOptions, {
     localOptions
-  }), hook)
+  }), hooks)
   if (data) {
     if (data.type === 'download') {
       const { fileName, files, options = {} } = data
       downloadZip(fileName, files, options)
-    }  else {
+    } else {
       sendMessage(data)
     }
   }
@@ -30,21 +30,23 @@ if (isExtension) {
     const localWebsites = await getLocal('websites')
     if (message instanceof Object) {
       if (message.type === 'download') {
-        if (typeof websites[message.website] === 'function') {
-          await websites[message.website](extract)
-        } else {
-          const localWebsite = localWebsites[message.website]
-          if (localWebsite instanceof Object) {
-            await extract(
-              localWebsite,
-              localWebsite.customOptions instanceof Object ? localWebsite.customOptions : {},
-              Object.assign({},
-                hooks[message.website] instanceof Object ? hooks[message.website] : {},
-                localWebsite.hooks instanceof Object ? localWebsite.hooks : {}
-              )
-            )
+        const localWebsite = localWebsites[message.website]
+        if (message.from === 'custom' && localWebsite instanceof Object) {
+          const hookName = message.website || localWebsite.website || localWebsite.origin
+          const customOptions = localWebsite.customOptions instanceof Object ? localWebsite.customOptions : {}
+          const customHooks = Object.assign({},
+            hooks[hookName] instanceof Object ? hooks[hookName] : {},
+            localWebsite.hooks instanceof Object ? localWebsite.hooks : {}
+          )
+          await extract(
+            localWebsite,
+            customOptions,
+            customHooks
+          )
+        } else
+          if (typeof websites[message.website] === 'function') {
+            await websites[message.website](extract)
           }
-        }
       }
     }
     sendResponse('')

src/option.js

@@ -3,24 +3,32 @@ const getLocal = (key) =>
     chrome.storage.local.get(key, (data) => {
       resolve(data[key])
     })
-})
+  })
 const setWebsite = async (website, options) => {
   const localWebsites = await getLocal('websites')
   const websites = Object.assign(
     {},
     localWebsites instanceof Object ? localWebsites : {}
   )
-  const valid = website
-    &&
-    options instanceof Object
-    &&
-    Array.isArray(options.hosts)
-    &&
-    options.hosts.length
-    &&
-    (options.selectors || {}).body
-  if (valid) {
+  const rules = [
+    [
+      website && typeof website === 'string',
+      '第一个参数应该是字符串类型, 并且不能为空'
+    ],
+    [
+      Array.isArray(options.hosts) && options.hosts.length,
+      'options.hosts应该是数组，并且长度不能为0'
+    ],
+    [
+      (options.selectors || {}).body,
+      'options.selectors.body不能为空'
+    ]
+  ]
+  const hit = rules.find(item => !item[0])
+  if (!hit) {
     options.origin = website
+    options.timestamp = Date.now()
+    options.hosts = options.hosts.map(item => item.toString())
     Object.assign(
       websites,
       {
@@ -35,6 +43,8 @@ const setWebsite = async (website, options) => {
     chrome.storage.local.set({
       websites
     })
+  } else {
+    hit[1] && console.warn(hit[1])
   }
   return websites
 }

src/utils.js

@@ -26,7 +26,7 @@ export const queryAll = (selector, context = document) => {
   return [].slice.apply(context.querySelectorAll(selector))
 }
 export const noop = (func, defaultFunc) => {
-  return typeof func === 'function' ? func : typeof defaultFunc === 'function' ? defaultFunc : () => {}
+  return typeof func === 'function' ? func : typeof defaultFunc === 'function' ? defaultFunc : () => { }
 }
 export const encodeUrlData = (data) => {
   let body = ''
@@ -75,23 +75,23 @@ export const formatDate = (str, t) => {
   const obj = {
     yyyyyyyy: t.getFullYear(),
     yy: t.getFullYear(),
-    MM: t.getMonth()+1,
+    MM: t.getMonth() + 1,
     dd: t.getDate(),
     HH: t.getHours(),
     hh: t.getHours() % 12,
     mm: t.getMinutes(),
     ss: t.getSeconds(),
     ww: '日一二三四五六'.split('')[t.getDay()]
-  };
-  return str.replace(/([a-z]+)/ig, function ($1){
-    return (obj[$1+$1] === 0 ? '0' : obj[$1+$1]) || ('0' + obj[$1]).slice(-2);
-  });
+  }
+  return str.replace(/([a-z]+)/ig, function ($1) {
+    return (obj[$1 + $1] === 0 ? '0' : obj[$1 + $1]) || ('0' + obj[$1]).slice(-2)
+  })
 }
 export const insertAfter = (newElement, targetElement) => {
   const parent = targetElement.parentNode
-  if(parent.lastChild === targetElement){
+  if (parent.lastChild === targetElement) {
     parent.appendChild(newElement)
-  }else{
+  } else {
     parent.insertBefore(newElement, targetElement.nextSibling)
   }
 }
@@ -106,14 +106,14 @@ export const getUrl = (prefix, link) => {
   return prefix + link
 }
 export const exec = async (...rest) => {
-    if (!rest.length) return exec.returnValue
-    exec.returnValue = false
-    try {
-        exec.returnValue = typeof rest[0] === 'function' && await rest[0](...rest.slice(1))
-    } catch (err) {
-        console.warn(err)
-    }
-    return exec.returnValue
+  if (!rest.length) return exec.returnValue
+  exec.returnValue = false
+  try {
+    exec.returnValue = typeof rest[0] === 'function' && await rest[0](...rest.slice(1))
+  } catch (err) {
+    console.warn(err)
+  }
+  return exec.returnValue
 }
 export const getLocal = (key) => {
   return new Promise((resolve) => {
@@ -128,17 +128,25 @@ export const setWebsite = async (website, options) => {
     {},
     localWebsites instanceof Object ? localWebsites : {}
   )
-  const valid = website
-    &&
-    options instanceof Object
-    &&
-    Array.isArray(options.hosts)
-    &&
-    options.hosts.length
-    &&
-    (options.selectors || {}).body
-  if (valid) {
+  const rules = [
+    [
+      website && typeof website === 'string',
+      '第一个参数应该是字符串类型, 并且不能为空'
+    ],
+    [
+      Array.isArray(options.hosts) && options.hosts.length,
+      'options.hosts应该是数组，并且长度不能为0'
+    ],
+    [
+      (options.selectors || {}).body,
+      'options.selectors.body不能为空'
+    ]
+  ]
+  const hit = rules.find(item => !item[0])
+  if (!hit) {
     options.origin = website
+    options.timestamp = Date.now()
+    options.hosts = options.hosts.map(item => item.toString())
     Object.assign(
       websites,
       {
@@ -153,6 +161,8 @@ export const setWebsite = async (website, options) => {
     chrome.storage.local.set({
       websites
     })
+  } else {
+    hit[1] && console.warn(hit[1])
   }
   return websites
 }