Merge branch 'develop'

Author: marcelklehr

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v2.1.0
+ - NEW: Allow using an extension key to secure entered credentials
+ - FIX: Various fixes for Firefox
+
 ## v2.0.6
  - FIX: Correctly escape paths in tags
  - FIX: Wait a certain time before starting sync when detecting changes

gulpfile.js

@@ -7,14 +7,12 @@ var zip = require('gulp-zip')
 const VERSION = require('./package.json').version
 const paths = {
   zip: [
-    'dist/*'
-    , 'icons/*'
-    , 'views/*'
-    , 'CHANGELOG.md'
-    , 'README.md'
-    , 'manifest.json'
-    , 'package.json'
-    , 'LICENSE.txt'
+    '**'
+    , '!src/**'
+    , '!node_modules/**'
+    , '!img/**'
+    , '!ISSUE_TEMPLATE.md'
+    , '!gulpfile.js'
   ]
   , views: './views/*.html'
   , entries: 'src/entries/*.js'

manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus",
   "short_name": "floccus",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "Sync your bookmarks with nextcloud",
   "icons": {
     "48": "icons/logo.png"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "Sync your bookmarks with nextcloud",
   "main": "index.js",
   "scripts": {

src/entries/background-script.js

@@ -1,173 +1,4 @@
-import browser from '../lib/browser-api'
-import Account from '../lib/Account'
-import Tree from '../lib/Tree'
-import packageJson from '../../package.json'
-
-const STATUS_ERROR = Symbol('error')
-const STATUS_SYNCING = Symbol('syncing')
-const STATUS_ALLGOOD = Symbol('allgood')
-const INACTIVITY_TIMEOUT = 1000 * 60
-
-class AlarmManger {
-  constructor (ctl) {
-    this.ctl = ctl
-  }
-
-  syncAllAccounts () {
-    browser.storage.local.get('accounts')
-      .then((d) => {
-        var accounts = d['accounts']
-        for (var accountId in accounts) {
-          this.ctl.syncAccount(accountId)
-        }
-      })
-  }
-}
-
-class Controller {
-  constructor () {
-    this.syncing = {}
-    this.schedule = {}
-
-    this.alarms = new AlarmManger(this)
-
-    // set up change listener
-    browser.bookmarks.onChanged.addListener((localId, details) => this.onchange(localId, details))
-    browser.bookmarks.onMoved.addListener((localId, details) => this.onchange(localId, details))
-    browser.bookmarks.onRemoved.addListener((localId, details) => this.onchange(localId, details))
-    browser.bookmarks.onCreated.addListener((localId, details) => this.onchange(localId, details))
-
-    // Set up the alarms
-
-    browser.alarms.create('syncAllAccounts', {periodInMinutes: 15})
-    browser.alarms.onAlarm.addListener(alarm => {
-      this.alarms[alarm.name]()
-    })
-
-    window.syncAccount = (accountId) => this.syncAccount(accountId)
-    this.setEnabled(true)
-
-    browser.storage.local.get('currentVersion')
-      .then(async d => {
-        if (packageJson.version === d.currentVersion) return
-        const accounts = await Account.getAllAccounts()
-        await Promise.all(
-          accounts.map(account => account.init())
-        )
-        await browser.storage.local.set({
-          currentVersion: packageJson.version
-        })
-        browser.runtime.openOptionsPage()
-      })
-  }
-
-  setEnabled (enabled) {
-    this.enabled = enabled
-  }
-
-  async onchange (localId, details) {
-    if (!this.enabled) {
-      return
-    }
-    const allAccounts = await Account.getAllAccounts()
-
-    // Check which accounts contain the bookmark and which used to contain (track) it
-    var trackingAccountsFilter = await Promise.all(
-      allAccounts
-        .map(async account => {
-          return account.tracksBookmark(localId)
-        })
-    )
-
-    const accountsToSync = allAccounts
-    // Filter out any accounts that are not tracking the bookmark
-      .filter((account, i) => (trackingAccountsFilter[i]))
-      // Filter out any accounts that are presently syncing
-      .filter(account => !this.syncing[account.id])
-
-    // We should now sync all accounts that are involved in this change (2 at max)
-    accountsToSync.forEach((account) => {
-      this.scheduleSyncAccount(account.id)
-    })
-
-    var ancestors
-    try {
-      ancestors = await Tree.getIdPathFromLocalId(localId)
-    } catch (e) {
-      return
-    }
-
-    const containingAccount = await Account.getAccountContainingLocalId(localId, ancestors, allAccounts)
-    if (containingAccount &&
-      !this.syncing[containingAccount.id] &&
-      !accountsToSync.some(acc => acc.id === containingAccount.id)) {
-      this.scheduleSyncAccount(containingAccount.id)
-    }
-  }
-
-  scheduleSyncAccount (accountId) {
-    if (this.schedule[accountId]) {
-      clearTimeout(this.schedule[accountId])
-    }
-    this.schedule[accountId] = setTimeout(() => this.syncAccount(accountId), INACTIVITY_TIMEOUT)
-  }
-
-  syncAccount (accountId) {
-    if (!this.enabled) {
-      return
-    }
-    if (this.syncing[accountId]) {
-      return this.syncing[accountId].then(() => {
-        return this.syncAccount(accountId)
-      })
-    }
-    this.syncing[accountId] = Account.get(accountId)
-      .then((account) => {
-        setTimeout(() => this.updateBadge(), 500)
-        return account.sync()
-      })
-      .then(() => {
-        this.syncing[accountId] = false
-        this.updateBadge()
-      }, (error) => {
-        console.error(error)
-        this.syncing[accountId] = false
-        this.updateBadge()
-      })
-    return this.syncing[accountId]
-  }
-
-  async updateBadge () {
-    const accounts = await Account.getAllAccounts()
-    const overallStatus = accounts
-      .reduce((status, account) => {
-        const accData = account.getData()
-        if (accData.error && !accData.syncing) {
-          return STATUS_ERROR
-        } else if (accData.syncing && status !== STATUS_ERROR) {
-          return STATUS_SYNCING
-        } else {
-          return STATUS_ALLGOOD
-        }
-      }, STATUS_ALLGOOD)
-    this.setStatusBadge(overallStatus)
-  }
-
-  async setStatusBadge (status) {
-    switch (status) {
-      case STATUS_ALLGOOD:
-        browser.browserAction.setBadgeText({text: ''})
-        break
-      case STATUS_SYNCING:
-        browser.browserAction.setBadgeText({text: '<->'})
-        browser.browserAction.setBadgeBackgroundColor({color: '#0088dd'})
-        break
-      case STATUS_ERROR:
-        browser.browserAction.setBadgeText({text: '!'})
-        browser.browserAction.setBadgeBackgroundColor({color: '#dd4d00'})
-        break
-    }
-  }
-}
+import Controller from '../lib/Controller'
 
 window.controller = new Controller()
+window.syncAccount = (accountId) => window.controller.syncAccount(accountId)