Merge pull request #433 from toasted-nutbread/extra-dictionary-information

Extra dictionary information

2 files changed, 70 insertions, 7 deletions

diff --git a/ext/bg/js/dictionary-importer.js b/ext/bg/js/dictionary-importer.js
index 589e7656..f9e173ea 100644
--- a/ext/bg/js/dictionary-importer.js
+++ b/ext/bg/js/dictionary-importer.js
@@ -150,13 +150,7 @@ class DictionaryImporter {
         }
 
         // Add dictionary
-        const summary = {
-            title: dictionaryTitle,
-            revision: index.revision,
-            sequenced: index.sequenced,
-            version,
-            prefixWildcardsSupported
-        };
+        const summary = this._createSummary(dictionaryTitle, version, index, {prefixWildcardsSupported});
 
         database.bulkAdd('dictionaries', [summary], 0, 1);
 
@@ -199,6 +193,25 @@ class DictionaryImporter {
         return {result: summary, errors};
     }
 
+    _createSummary(dictionaryTitle, version, index, details) {
+        const summary = {
+            title: dictionaryTitle,
+            revision: index.revision,
+            sequenced: index.sequenced,
+            version
+        };
+
+        const {author, url, description, attribution} = index;
+        if (typeof author === 'string') { summary.author = author; }
+        if (typeof url === 'string') { summary.url = url; }
+        if (typeof description === 'string') { summary.description = description; }
+        if (typeof attribution === 'string') { summary.attribution = attribution; }
+
+        Object.assign(summary, details);
+
+        return summary;
+    }
+
     async _getSchema(fileName) {
         let schemaPromise = this._schemas.get(fileName);
         if (typeof schemaPromise !== 'undefined') {
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 5e59cc3d..b9e4fe82 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -199,11 +199,16 @@ class SettingsDictionaryEntryUI {
         this.allowSecondarySearchesCheckbox = this.content.querySelector('.dict-allow-secondary-searches');
         this.priorityInput = this.content.querySelector('.dict-priority');
         this.deleteButton = this.content.querySelector('.dict-delete-button');
+        this.detailsToggleLink = this.content.querySelector('.dict-details-toggle-link');
+        this.detailsContainer = this.content.querySelector('.dict-details');
+        this.detailsTable = this.content.querySelector('.dict-details-table');
 
         if (this.dictionaryInfo.version < 3) {
             this.content.querySelector('.dict-outdated').hidden = false;
         }
 
+        this.setupDetails(dictionaryInfo);
+
         this.content.querySelector('.dict-title').textContent = this.dictionaryInfo.title;
         this.content.querySelector('.dict-revision').textContent = `rev.${this.dictionaryInfo.revision}`;
         this.content.querySelector('.dict-prefix-wildcard-searches-supported').checked = !!this.dictionaryInfo.prefixWildcardsSupported;
@@ -214,6 +219,45 @@ class SettingsDictionaryEntryUI {
         this.eventListeners.addEventListener(this.allowSecondarySearchesCheckbox, 'change', this.onAllowSecondarySearchesChanged.bind(this), false);
         this.eventListeners.addEventListener(this.priorityInput, 'change', this.onPriorityChanged.bind(this), false);
         this.eventListeners.addEventListener(this.deleteButton, 'click', this.onDeleteButtonClicked.bind(this), false);
+        this.eventListeners.addEventListener(this.detailsToggleLink, 'click', this.onDetailsToggleLinkClicked.bind(this), false);
+    }
+
+    setupDetails(dictionaryInfo) {
+        const targets = [
+            ['Author', 'author'],
+            ['URL', 'url'],
+            ['Description', 'description'],
+            ['Attribution', 'attribution']
+        ];
+
+        let count = 0;
+        for (const [label, key] of targets) {
+            const info = dictionaryInfo[key];
+            if (typeof info !== 'string') { continue; }
+
+            const n1 = document.createElement('div');
+            n1.className = 'dict-details-entry';
+            n1.dataset.type = key;
+
+            const n2 = document.createElement('span');
+            n2.className = 'dict-details-entry-label';
+            n2.textContent = `${label}:`;
+            n1.appendChild(n2);
+
+            const n3 = document.createElement('span');
+            n3.className = 'dict-details-entry-info';
+            n3.textContent = info;
+            n1.appendChild(n3);
+
+            this.detailsTable.appendChild(n1);
+
+            ++count;
+        }
+
+        if (count === 0) {
+            this.detailsContainer.hidden = true;
+            this.detailsToggleLink.hidden = true;
+        }
     }
 
     cleanup() {
@@ -318,6 +362,12 @@ class SettingsDictionaryEntryUI {
         document.querySelector('#dict-remove-modal-dict-name').textContent = title;
         $(n).modal('show');
     }
+
+    onDetailsToggleLinkClicked(e) {
+        e.preventDefault();
+
+        this.detailsContainer.hidden = !this.detailsContainer.hidden;
+    }
 }
 
 class SettingsDictionaryExtraUI {