Update data managment and printing

README.md

@@ -37,4 +37,3 @@ _Alpha version_
 - [ ] Full name and description
 - [ ] Logo and styles ([example](https://github.com/sindresorhus/refined-github/tree/master/media))
 - [ ] Parse data from https://github.com/mdiplo/Medias_francais
-- [ ] Add extra data (ref)

source/background.js

@@ -3,11 +3,23 @@ import { isEmpty } from './libs/utils'
 
 localforage.setDriver([localforage.INDEXEDDB, localforage.WEBSQL])
 
+const sitesStore = localforage.createInstance({name: "sites"})
+const entitiesStore = localforage.createInstance({name: "entities"})
+
+browser.runtime.onInstalled.addListener(async event => {
+  if (event.reason === 'install') {
+    const { default: data } = await import(/* webpackChunkName: "sites" */ './data/sites.json')
+    for (const site in data) {
+      sitesStore.setItem(site, data[site])
+    }
+  }
+})
+
 browser.runtime.onInstalled.addListener(async event => {
   if (event.reason === 'install') {
-    const { default: data } = await import(/* webpackChunkName: "data" */ './data.json')
-    for (let site in data) {
-      localforage.setItem(site, data[site])
+    const { default: data } = await import(/* webpackChunkName: "entities" */ './data/entities.json')
+    for (const ref in data) {
+      entitiesStore.setItem(ref, data[ref])
     }
   }
 })
@@ -16,10 +28,11 @@ browser.runtime.onMessage.addListener(async message => {
   if (!message || message.action !== 'request') {
     return
   }
-  const data = await localforage.getItem(message.hostname)
-  if (isEmpty(data)) {
+  const site = await sitesStore.getItem(message.hostname)
+  if (isEmpty(site)) {
     return
   }
   // await browser.tabs.insertCSS({ file: 'content.css' })
-  return data
+  let dad = await Promise.all(site.map(async name => ((await entitiesStore.getItem(name)) || {name})))
+  return dad
 })

source/content.js

@@ -7,14 +7,7 @@ import { safeElementReady, isEmpty } from './libs/utils'
 window.select = select
 
 function dataToString(data) {
-  if (isEmpty(data)) {
-    return  ''
-  }
-  if (!Array.isArray(data)) {
-    return data
-  }
-  const lastEl = data.pop()
-  return [data.join(', '), lastEl].join(' et ')
+  return data.reduce((acc, entity) => entity.link ? `${acc} <a href="${entity.link}">${entity.name}</a>,` : `${acc} ${entity.name},`, '')
 }
 
 async function init () {
@@ -32,9 +25,7 @@ async function init () {
 
   const box = document.createElement('p')
   box.className = 'capitext-box'
-  box.innerHTML = `Ce média appartient
-      aux groupes ${dataToString(boxData['group'])}
-      et aux actionnaires ${dataToString(boxData['holders'])}.`
+  box.innerHTML = `Ce média appartient à ${dataToString(boxData)}.`
   select('body').append(box)
 }