Parse HTML items (events) separately if possible

Author: nkl-kst

MMM-OnThisDay.js

@@ -33,6 +33,11 @@ const moduleDefinition = {
      */
     events: null,
 
+    /**
+     * Separate items parsed from the HTML data.
+     */
+    items: null,
+
     /**
      * Module scripts.
      *
@@ -85,6 +90,7 @@ const moduleDefinition = {
         return {
             config: this.config,
             events: this.events,
+            items: this.items,
         };
     },
 
@@ -124,6 +130,7 @@ const moduleDefinition = {
             // Set content
             this.title = payload.title;
             this.events = payload.events;
+            this.items = payload.items;
 
             // Update module
             Log.info('Update DOM with new title and events ...');

src/HtmlParser.js

@@ -17,14 +17,30 @@ module.exports = class {
         const eventsSelector = WIKI_CSS_SELECTORS[language].events;
         const events = dom.querySelector(eventsSelector);
 
+        // Get items
+        const itemSelector = WIKI_CSS_SELECTORS[language].items;
+        const items = [];
+
+        if (itemSelector !== undefined) {
+            const domItems = dom.querySelectorAll(itemSelector);
+            for (const domItem of domItems) {
+                items.push(this._removeWhitespaces(domItem.textContent));
+            }
+        }
+
         // Check data
         if (!events) {
             return {};
         }
 
         return {
-            title: title ? title.innerHTML : null,
+            title: title ? this._removeWhitespaces(title.textContent) : null,
             events: events.outerHTML,
+            items: items,
         };
     }
+
+    _removeWhitespaces(text) {
+        return text.replace(/\s+/g, ' ').trim();
+    }
 };

src/WikiCssSelectors.js

@@ -14,6 +14,7 @@ const WIKI_CSS_SELECTORS = {
     de: {
         title: '#ereignisse .hauptseite-box-title',
         events: '#ereignisse > .hauptseite-box-content > ul:first-of-type',
+        items: '#ereignisse > .hauptseite-box-content > ul:first-of-type > li',
     },
 
     fr: {

template/MMM-OnThisDay.njk

@@ -9,16 +9,24 @@
 {# Wrapper #}
 <div class="{{ config.textSize }}" style="max-width: {{ config.maxWidth }};">
 
-    {% if not events %}
+    {% if items %}
 
-        {# No data #}
-        {{ 'TEXT_NODATA' | translate }}
+        <ul>
+            {% for item in items %}
+                <li>{{ item }}</li>
+            {% endfor %}
+        </ul>
 
-    {% else %}
+    {% elseif events %}
 
         {# Data loaded #}
         {{ events | safe }}
 
+    {% else %}
+
+        {# No data #}
+        {{ 'TEXT_NODATA' | translate }}
+
     {% endif %}
 
 </div>

test/functional/WikiSiteTest.js

@@ -19,6 +19,7 @@ describe('Wikipedia HTML', () => {
 
         const titleSelector = WIKI_CSS_SELECTORS[language].title;
         const eventsSelector = WIKI_CSS_SELECTORS[language].events;
+        const itemsSelector = WIKI_CSS_SELECTORS[language].items;
 
         it(`should return HTML with necessary CSS selectors from Wikipedia (${language})`, async function () {
             this.timeout(5000);
@@ -34,6 +35,10 @@ describe('Wikipedia HTML', () => {
             // Assert
             assert.ok(document.querySelector(titleSelector));
             assert.ok(document.querySelector(eventsSelector));
+
+            if (itemsSelector) {
+                assert.ok(document.querySelector(itemsSelector));
+            }
         });
     }
 });

test/unit/HtmlParserTest.js

@@ -30,9 +30,7 @@ describe('HtmlParser', () => {
             assert.ok(typeof result.title === 'string');
             assert.ok(typeof result.events === 'string');
 
-            assert.ok(
-                result.title.includes('Was geschah am 26. Februar?'),
-            );
+            assert.ok(result.title.includes('Was geschah am 26. Februar?'));
             assert.ok(result.events.includes('Alexandra Povòrina'));
             assert.ok(result.events.includes('Robert Watson-Watt'));
             assert.ok(result.events.includes('Nick Leeson'));

test/unit/node_helperTest.js

@@ -41,6 +41,7 @@ describe('node_helper', () => {
                 helper.sendSocketNotification.calledWith('EVENTS_LOADED', {
                     title: 'test title for en',
                     events: '<ul><li>test events for en</li></ul>',
+                    items: [],
                 }),
             );
         });
@@ -55,6 +56,7 @@ describe('node_helper', () => {
             assert.deepStrictEqual(events, {
                 title: 'test title for en',
                 events: '<ul><li>test events for en</li></ul>',
+                items: [],
             });
         });
     });