change icon getter

Author: Robin Jullian

app/main.js

@@ -4,6 +4,7 @@ const winston = require('winston')
 const {remote, ipcRenderer} = require('electron')
 const {app} = require('electron').remote;
 const lowdb = require('lowdb')
+const favicon = require('favicon');
 
 const locationMsg = require(`${__dirname}/../app/modules/lang.js`)
 const adapter = require(`${__dirname}/../app/modules/adapter.js`)
@@ -85,28 +86,37 @@ const shuttle = {
 
   /** Adds a bookmark to the bookmarks bar */
   addBookmarkToBar: (url, id) => {
+
+    let favurl = url
+
+    if (url.indexOf('http://') === -1 || url.indexOf('http://') === -1) {
+      favurl = `http://${url}`
+    }
+
     if (url.startsWith('mod:')) {
-      document.querySelector('.bookmarks-zone').innerHTML += `<a href="#" class="bubble-btn" id="id-${id}" onclick="shuttle.loadView('${url}', ${id})" oncontextmenu="shuttle.askToRemoveBookmark('${id}')" onmouseover="shuttle.showControlBar('id-${id}', 'show')" style="background-image: url(../app/modules/${url.replace('mod:', '')}/icon.png);"></a>`
+      document.querySelector('.bookmarks-zone').innerHTML += `<a href="#" class="bubble-btn" id="id-${id}" onclick="shuttle.loadView('${url}', ${id})" oncontextmenu="shuttle.askToRemoveBookmark(${id}, '${url}')" onmouseover="shuttle.showControlBar('id-${id}', 'show')" style="background-image: url(../app/modules/${url.replace('mod:', '')}/icon.png);"></a>`
     } else {
-      fetch(`http://besticon-demo.herokuapp.com/allicons.json?url=${url}`).then((resp) => resp.json()).then((data) => {
-        document.querySelector('.bookmarks-zone').innerHTML += `<a href="#" class="bubble-btn" id="id-${id}" onclick="shuttle.loadView('${url}', ${id})" oncontextmenu="shuttle.askToRemoveBookmark('${id}')" onmouseover="shuttle.showControlBar('id-${id}', 'show')" style="background-image: url(${data.icons[0].url});"></a>`
-      }).catch((error) => {
-        document.querySelector('.bookmarks-zone').innerHTML += `<a href="#" class="bubble-btn" id="id-${id}" onclick="shuttle.loadView('${url}', ${id})" oncontextmenu="shuttle.askToRemoveBookmark('${id}')" onmouseover="shuttle.showControlBar('id-${id}', 'show')" style="background-image: url(../../assets/img/no-icon.png);"></a>`
-      }).then(() => {
-        shuttle.reloadAddButton()
-      })
+
+      favicon(favurl, function(err, favicon_url) {
+        if (err || favicon_url === null) {
+          document.querySelector('.bookmarks-zone').innerHTML += `<a href="#" class="bubble-btn" id="id-${id}" title="${url}" onclick="shuttle.loadView('${url}', ${id})" oncontextmenu="shuttle.askToRemoveBookmark(${id}, '${url}')" onmouseover="shuttle.showControlBar('id-${id}', 'show')" style="background-image: url(../assets/img/no-icon.png);"></a>`
+        } else {
+          document.querySelector('.bookmarks-zone').innerHTML += `<a href="#" class="bubble-btn" id="id-${id}" title="${url}" onclick="shuttle.loadView('${url}', ${id})" oncontextmenu="shuttle.askToRemoveBookmark(${id}, '${url}')" onmouseover="shuttle.showControlBar('id-${id}', 'show')" style="background-image: url(${favicon_url});"></a>`
+        }
+      });
+
     }
     setTimeout(() => {
       shuttle.reloadAddButton()
     }, db.get('bookmarks').length * 1000)
   },
 
   /** Asks the user to confirm the removal of a given bookmark */
-  askToRemoveBookmark: (id) => {
+  askToRemoveBookmark: (id, url) => {
     vex.dialog.buttons.YES.text = locationMsg('continue')
     vex.dialog.buttons.NO.text = locationMsg('cancel')
     vex.dialog.confirm({
-      message: locationMsg('removeBookmarks'),
+      message:`${locationMsg('removeBookmarks')} : ${url}`,
       callback: function (removalConfirmed) {
         if (removalConfirmed) {
           bookmarkUrl = idToUrl[id]
@@ -304,6 +314,10 @@ shuttle.initBookmarks(bookmarks)
 shuttle.showFrame(settings.get('settings.ShowFrame').value())
 shuttle.reloadAddButton()
 
+setInterval(() => {
+  shuttle.reloadAddButton()
+}, 500)
+
 view.addEventListener('did-fail-load', (errorCode, errorDescription, validatedURL) => {
   console.log()
   currentBookmarkId = 'error'

main.js

@@ -56,7 +56,6 @@ const mb = menubar({
 mb.on('ready', () => {
   winston.log('Shuttle is ready')
   mb.tray.setContextMenu(contextMenu)
-  mb.window.openDevTools()
 })
 
 mb.on('after-create-window', () => {

package-lock.json

@@ -27,6 +27,7 @@
     "electron-localshortcut": "^3.1.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-updater": "^2.20.1",
+    "favicon": "0.0.2",
     "lowdb": "^1.0.0",
     "menubar": "^5.2.3",
     "os-locale": "^2.1.0",