From ed1413631ae85590940f76526400569551c2442b Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 5 Sep 2021 16:32:27 +0200 Subject: [PATCH 01/27] update travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 737fe7c..cea160d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,9 @@ os: - windows language: node_js node_js: - - '10' - '12' - '14' - '16' - - 'node' sudo: required before_script: - export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1) From 4436cf0c96830b369cd0429f0661924142c19740 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 5 Sep 2021 17:00:42 +0200 Subject: [PATCH 02/27] Update github action --- .github/workflows/test-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 570cd1e..6a52f85 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -56,7 +56,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - node-version: [10.x, 12.x, 14.x, 16.x] + node-version: [12.x, 14.x, 16.x] os: [ubuntu-latest, windows-latest, macos-latest] steps: From 14955872324a57a54ad2bd9fa98281b5db4438b3 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 1 Oct 2021 01:39:44 +0000 Subject: [PATCH 03/27] fix: upgrade csv-parse from 4.16.2 to 4.16.3 Snyk has created this PR to upgrade csv-parse from 4.16.2 to 4.16.3. See this package in npm: https://www.npmjs.com/package/csv-parse See this project in Snyk: https://app.snyk.io/org/jack-blackson/project/9c73e64a-9a2c-4f5e-b872-feaf7d353ee2?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f4f8fb6..78e586f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@iobroker/adapter-core": "^2.5.1", "@iobroker/testing": "^2.5.1", "bent": "^7.3.12", - "csv-parse": "4.16.2", + "csv-parse": "^4.16.3", "moment": "2.29.1", "xml2js": "^0.4.22" }, @@ -1558,9 +1558,9 @@ "dev": true }, "node_modules/csv-parse": { - "version": "4.16.2", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.2.tgz", - "integrity": "sha512-eq2BhB6JiIJaNv61pH5EC+o/iyCBxT+g6ukLu2UoNyS5daCN8YlzhOsLHGt/t9sGraMYt/aizaXPLQoNvxlIMw==" + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz", + "integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==" }, "node_modules/d": { "version": "1.0.1", @@ -7409,9 +7409,9 @@ "dev": true }, "csv-parse": { - "version": "4.16.2", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.2.tgz", - "integrity": "sha512-eq2BhB6JiIJaNv61pH5EC+o/iyCBxT+g6ukLu2UoNyS5daCN8YlzhOsLHGt/t9sGraMYt/aizaXPLQoNvxlIMw==" + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz", + "integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==" }, "d": { "version": "1.0.1", diff --git a/package.json b/package.json index a32cb2e..c657018 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@iobroker/testing": "^2.5.1", "moment": "2.29.1", "bent": "^7.3.12", - "csv-parse": "4.16.2", + "csv-parse": "4.16.3", "xml2js": "^0.4.22" }, "scripts": { From 066eee856d50c90c8c0276aee0c710bd8a95f85d Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 30 Nov 2021 21:33:02 +0100 Subject: [PATCH 04/27] var --- README.md | 3 +++ io-package.json | 14 +++++++++++++- package.json | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dd99d6b..cd61556 100755 --- a/README.md +++ b/README.md @@ -107,6 +107,9 @@ If you don't find your country, please create an issue on github, and I will be ## Changelog +## 2.0.10 (2021-11-27) +* (jack-blackson) Calculate date in words correctly - this time for real :) + ## 2.0.9 (2021-11-27) * (jack-blackson) Calculate date in words correctly - this time for real :) diff --git a/io-package.json b/io-package.json index e3f6b57..a73e9d9 100755 --- a/io-package.json +++ b/io-package.json @@ -1,8 +1,20 @@ { "common": { "name": "meteoalarm", - "version": "2.0.9", + "version": "2.0.10", "news": { + "2.0.10": { + "en": "Bugfixes", + "de": "Fehlerbehebung", + "ru": "Исправление ошибок", + "pt": "Correções de bugs", + "nl": "Bugfixes", + "fr": "Corrections de bugs", + "it": "Correzioni di bug", + "es": "Corrección de errores", + "pl": "Poprawki", + "zh-cn": "Bug修复" + }, "2.0.9": { "en": "Bugfixes", "de": "Fehlerbehebung", diff --git a/package.json b/package.json index 39e21a5..859f413 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iobroker.meteoalarm", - "version": "2.0.9", + "version": "2.0.10", "description": "Meteolaram", "main": "main.js", "repository": { From f170557cada36bffdd5d7e970924b9d7307a7bc5 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 30 Nov 2021 21:34:18 +0100 Subject: [PATCH 05/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 13ac7a3..279a54c 100755 --- a/main.js +++ b/main.js @@ -308,7 +308,6 @@ async function getData(){ maxAlarmLevel = Number(level.val) } } - adapter.log.debug('10.1: Added Alarm for ' + headline.val) if (!adapter.config.noIcons){ // Dummy cell to move picture away from the left side @@ -342,6 +341,7 @@ async function getData(){ htmlCode += '' if (headline && headline.val){ + adapter.log.debug('10.1: Added Alarm for ' + headline.val) htmlCode += '

' + headline.val + ': ' } if (effectiveDate && effectiveDate.val && expiresDate && expiresDate.val){ From 7da1e8d2481482db48b28d32334aa2cbc82be376 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 30 Nov 2021 21:42:20 +0100 Subject: [PATCH 06/27] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cd61556..fb7dd7c 100755 --- a/README.md +++ b/README.md @@ -108,10 +108,11 @@ If you don't find your country, please create an issue on github, and I will be ## Changelog ## 2.0.10 (2021-11-27) -* (jack-blackson) Calculate date in words correctly - this time for real :) +* (jack-blackson) Bugfix Sentry IOBROKER-METEOALARM-2K ## 2.0.9 (2021-11-27) * (jack-blackson) Calculate date in words correctly - this time for real :) +* (jack-blackson) Bugfix Sentry IOBROKER-METEOALARM-2N ## 2.0.8 (2021-11-26) * (jack-blackson) Added new datapoint "No. of active alarms" From 12970db895b20b08d7269f28e11abe4c9af96769 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 10:46:56 +0100 Subject: [PATCH 07/27] Update main.js --- main.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/main.js b/main.js index 279a54c..8dc529d 100755 --- a/main.js +++ b/main.js @@ -239,6 +239,29 @@ async function getData(){ adapter.log.error("Fehler: " + err); adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { + for (var j = 0, l = result.alert.info.length; j < l; j++){ + var element = result.alert.info[i] + if (element.language == xmlLanguage){ + element.parameter.forEach(function (parameter){ + if (parameter.valueName == "awareness_type") { + awarenesstype =parameter.value + var n = awarenesstype.indexOf(";"); + awarenesstype = awarenesstype.substring(0, n) + typeRelevant = checkTypeRelevant(awarenesstype) + adapter.log.debug('Alarm ' + countURL + ' with type ' + awarenesstype + ' relevant: ' + typeRelevant) + + } + }) + jsonResult = element + + } + } + + + + + + /* result.alert.info.forEach(function (element){ if (element.language == xmlLanguage){ element.parameter.forEach(function (parameter){ @@ -255,6 +278,7 @@ async function getData(){ } }) + */ } }); From b543524f754133c32a33b5040339722db292dcbb Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 10:51:08 +0100 Subject: [PATCH 08/27] Update main.js --- main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/main.js b/main.js index 8dc529d..e2acb24 100755 --- a/main.js +++ b/main.js @@ -241,6 +241,7 @@ async function getData(){ } else { for (var j = 0, l = result.alert.info.length; j < l; j++){ var element = result.alert.info[i] + adapter.log.debug('TEMP: ' + element.language) if (element.language == xmlLanguage){ element.parameter.forEach(function (parameter){ if (parameter.valueName == "awareness_type") { From 0e50dd88888d381613597e5c9c7c80dcf6a317ec Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 10:53:04 +0100 Subject: [PATCH 09/27] Update main.js --- main.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index e2acb24..2895bd3 100755 --- a/main.js +++ b/main.js @@ -239,9 +239,11 @@ async function getData(){ adapter.log.error("Fehler: " + err); adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { + adapter.log.debug('TEMP: ' + result.alert.info.length) + for (var j = 0, l = result.alert.info.length; j < l; j++){ - var element = result.alert.info[i] - adapter.log.debug('TEMP: ' + element.language) + var element = result.alert.info[j] + adapter.log.debug('TEMP1: ' + element.language) if (element.language == xmlLanguage){ element.parameter.forEach(function (parameter){ if (parameter.valueName == "awareness_type") { From e2889281234a508573450cb36e2214ba30ef224a Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 10:57:32 +0100 Subject: [PATCH 10/27] Update main.js --- main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.js b/main.js index 2895bd3..5a3e1b1 100755 --- a/main.js +++ b/main.js @@ -239,9 +239,8 @@ async function getData(){ adapter.log.error("Fehler: " + err); adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { - adapter.log.debug('TEMP: ' + result.alert.info.length) - for (var j = 0, l = result.alert.info.length; j < l; j++){ + for (var j = 0, l = countURL; j < l; j++){ var element = result.alert.info[j] adapter.log.debug('TEMP1: ' + element.language) if (element.language == xmlLanguage){ From 8186f803afa5b51828aea4400a214e6df0b2b585 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:07:18 +0100 Subject: [PATCH 11/27] Update main.js --- main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 5a3e1b1..d5d28f1 100755 --- a/main.js +++ b/main.js @@ -242,7 +242,8 @@ async function getData(){ for (var j = 0, l = countURL; j < l; j++){ var element = result.alert.info[j] - adapter.log.debug('TEMP1: ' + element.language) + adapter.log.debug('TEMP1: ' + result.alert.info[j].language) + adapter.log.debug('TEMP2: ' + element.language) if (element.language == xmlLanguage){ element.parameter.forEach(function (parameter){ if (parameter.valueName == "awareness_type") { From 89a8dc05d7404fd0326b0c618bbdf4634f200861 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:11:13 +0100 Subject: [PATCH 12/27] Update main.js --- main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/main.js b/main.js index d5d28f1..d3e45ab 100755 --- a/main.js +++ b/main.js @@ -239,6 +239,7 @@ async function getData(){ adapter.log.error("Fehler: " + err); adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { + adapter.log.debug('7.1 Content: ' + util.inspect(result.alert, {showHidden: false, depth: null, colors: true})) for (var j = 0, l = countURL; j < l; j++){ var element = result.alert.info[j] From 5b0696c3e2ed91451f2121bc61612d94afc9e29d Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:15:06 +0100 Subject: [PATCH 13/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index d3e45ab..85be778 100755 --- a/main.js +++ b/main.js @@ -239,7 +239,7 @@ async function getData(){ adapter.log.error("Fehler: " + err); adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { - adapter.log.debug('7.1 Content: ' + util.inspect(result.alert, {showHidden: false, depth: null, colors: true})) + adapter.log.debug('7.1 Content: ' + util.inspect(result.alert.info[0], {showHidden: false, depth: null, colors: true})) for (var j = 0, l = countURL; j < l; j++){ var element = result.alert.info[j] From 0c1cb5d35efcd35fcc6eea50cd1830d3fc9f8fb2 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:19:19 +0100 Subject: [PATCH 14/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 85be778..ac0dba2 100755 --- a/main.js +++ b/main.js @@ -239,7 +239,7 @@ async function getData(){ adapter.log.error("Fehler: " + err); adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { - adapter.log.debug('7.1 Content: ' + util.inspect(result.alert.info[0], {showHidden: false, depth: null, colors: true})) + adapter.log.debug('7.1 Content: ' + util.inspect(result.alert.info, {showHidden: false, depth: null, colors: true})) for (var j = 0, l = countURL; j < l; j++){ var element = result.alert.info[j] From 79acb77f8438a8106a184aa58dbbbd4e04c2b3a8 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:23:01 +0100 Subject: [PATCH 15/27] Update main.js --- main.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index ac0dba2..cfd2e27 100755 --- a/main.js +++ b/main.js @@ -240,8 +240,17 @@ async function getData(){ adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { adapter.log.debug('7.1 Content: ' + util.inspect(result.alert.info, {showHidden: false, depth: null, colors: true})) + var info = [] - for (var j = 0, l = countURL; j < l; j++){ + if (result.alert.info[0]){ + info = result.alert.info + } + else { + info = [result.alert.info] + } + + + for (var j = 0, l = info.length; j < l; j++){ var element = result.alert.info[j] adapter.log.debug('TEMP1: ' + result.alert.info[j].language) adapter.log.debug('TEMP2: ' + element.language) From ee45f25d9e8e903e173bcd768e12ad47065c2482 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:24:35 +0100 Subject: [PATCH 16/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index cfd2e27..91763b8 100755 --- a/main.js +++ b/main.js @@ -251,7 +251,7 @@ async function getData(){ for (var j = 0, l = info.length; j < l; j++){ - var element = result.alert.info[j] + var element = info[j] adapter.log.debug('TEMP1: ' + result.alert.info[j].language) adapter.log.debug('TEMP2: ' + element.language) if (element.language == xmlLanguage){ From 5531d963a778a80bbb386a0b135f3617d326df18 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:28:53 +0100 Subject: [PATCH 17/27] Update main.js --- main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/main.js b/main.js index 91763b8..0c94ca6 100755 --- a/main.js +++ b/main.js @@ -248,6 +248,7 @@ async function getData(){ else { info = [result.alert.info] } + adapter.log.debug('TEMP1: ' + info[0]) for (var j = 0, l = info.length; j < l; j++){ From 8a211163264cca5079a915b12596186bf170089c Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:29:02 +0100 Subject: [PATCH 18/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 0c94ca6..b6cff0d 100755 --- a/main.js +++ b/main.js @@ -248,7 +248,7 @@ async function getData(){ else { info = [result.alert.info] } - adapter.log.debug('TEMP1: ' + info[0]) + adapter.log.debug('TEMP0: ' + info[0]) for (var j = 0, l = info.length; j < l; j++){ From 8c6d6729742da7ee91f4ae27dac3f81fda98ebdd Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:30:23 +0100 Subject: [PATCH 19/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index b6cff0d..d2638f4 100755 --- a/main.js +++ b/main.js @@ -248,7 +248,7 @@ async function getData(){ else { info = [result.alert.info] } - adapter.log.debug('TEMP0: ' + info[0]) + adapter.log.debug('TEMP0: ' + util.inspect(info[0], {showHidden: false, depth: null, colors: true})) for (var j = 0, l = info.length; j < l; j++){ From 16b5ba13bf82c1a2d3f9cd7f16e2598476acbd04 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:30:48 +0100 Subject: [PATCH 20/27] Update main.js --- main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/main.js b/main.js index d2638f4..cf25cb2 100755 --- a/main.js +++ b/main.js @@ -249,6 +249,7 @@ async function getData(){ info = [result.alert.info] } adapter.log.debug('TEMP0: ' + util.inspect(info[0], {showHidden: false, depth: null, colors: true})) + adapter.log.debug('Length:: ' + info.length) for (var j = 0, l = info.length; j < l; j++){ From ad518ead2faee95702ceba206c01bf4d80b4f17f Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:32:46 +0100 Subject: [PATCH 21/27] Update main.js --- main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/main.js b/main.js index cf25cb2..63d65ab 100755 --- a/main.js +++ b/main.js @@ -254,7 +254,6 @@ async function getData(){ for (var j = 0, l = info.length; j < l; j++){ var element = info[j] - adapter.log.debug('TEMP1: ' + result.alert.info[j].language) adapter.log.debug('TEMP2: ' + element.language) if (element.language == xmlLanguage){ element.parameter.forEach(function (parameter){ From 41efcb1860e9ccd87758a97e54cf40f2b97c8ad7 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:34:43 +0100 Subject: [PATCH 22/27] Update main.js --- main.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/main.js b/main.js index 63d65ab..ad186a8 100755 --- a/main.js +++ b/main.js @@ -239,22 +239,16 @@ async function getData(){ adapter.log.error("Fehler: " + err); adapter.terminate ? adapter.terminate(0) : process.exit(0); } else { - adapter.log.debug('7.1 Content: ' + util.inspect(result.alert.info, {showHidden: false, depth: null, colors: true})) var info = [] - if (result.alert.info[0]){ info = result.alert.info } else { info = [result.alert.info] } - adapter.log.debug('TEMP0: ' + util.inspect(info[0], {showHidden: false, depth: null, colors: true})) - adapter.log.debug('Length:: ' + info.length) - for (var j = 0, l = info.length; j < l; j++){ var element = info[j] - adapter.log.debug('TEMP2: ' + element.language) if (element.language == xmlLanguage){ element.parameter.forEach(function (parameter){ if (parameter.valueName == "awareness_type") { @@ -263,7 +257,6 @@ async function getData(){ awarenesstype = awarenesstype.substring(0, n) typeRelevant = checkTypeRelevant(awarenesstype) adapter.log.debug('Alarm ' + countURL + ' with type ' + awarenesstype + ' relevant: ' + typeRelevant) - } }) jsonResult = element @@ -271,10 +264,6 @@ async function getData(){ } } - - - - /* result.alert.info.forEach(function (element){ if (element.language == xmlLanguage){ From c6a01490025f655a96f2027ad120a75d43b5da76 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 11:36:46 +0100 Subject: [PATCH 23/27] Update main.js --- main.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/main.js b/main.js index ad186a8..536a6fa 100755 --- a/main.js +++ b/main.js @@ -263,25 +263,6 @@ async function getData(){ } } - - /* - result.alert.info.forEach(function (element){ - if (element.language == xmlLanguage){ - element.parameter.forEach(function (parameter){ - if (parameter.valueName == "awareness_type") { - awarenesstype =parameter.value - var n = awarenesstype.indexOf(";"); - awarenesstype = awarenesstype.substring(0, n) - typeRelevant = checkTypeRelevant(awarenesstype) - adapter.log.debug('Alarm ' + countURL + ' with type ' + awarenesstype + ' relevant: ' + typeRelevant) - - } - }) - jsonResult = element - - } - }) - */ } }); From 0a66188e02cb704176cfa8b112b52e2f0222cd61 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Dec 2021 14:49:51 +0100 Subject: [PATCH 24/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 536a6fa..e822f02 100755 --- a/main.js +++ b/main.js @@ -1072,7 +1072,7 @@ function getXMLLanguage(country){ return 'is-IS' break; case 'IE': - return '' + return 'en-GB' break; case 'IL': return 'he-IL' From 4bd6287cd217a490b2e838d776e78f334965be05 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 10 Dec 2021 06:52:35 +0100 Subject: [PATCH 25/27] Update main.js --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index e822f02..f6b89f1 100755 --- a/main.js +++ b/main.js @@ -169,7 +169,7 @@ async function getData(){ adapter.log.debug('4: Process Atom') var newdate = moment(new Date()).local().format('DD.MM.YYYY HH:mm') adapter.setState({device: '' , channel: '',state: 'lastUpdate'}, {val: newdate, ack: true}); - adapter.log.debug('4.1 Content: ' + util.inspect(result.feed.entry, {showHidden: false, depth: null, colors: true})) + //adapter.log.debug('4.1 Content: ' + util.inspect(result.feed.entry, {showHidden: false, depth: null, colors: true})) if (result.feed.entry){ if (result.feed.entry[0]){ adapter.log.debug('4.1.1: Check Entries') From d59604ee388e9280499719ae452e7ee8d19b6006 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 10 Dec 2021 06:58:36 +0100 Subject: [PATCH 26/27] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fb7dd7c..13bd6e3 100755 --- a/README.md +++ b/README.md @@ -107,8 +107,9 @@ If you don't find your country, please create an issue on github, and I will be ## Changelog -## 2.0.10 (2021-11-27) +## 2.0.10 (2021-12-10) * (jack-blackson) Bugfix Sentry IOBROKER-METEOALARM-2K +* (jack-blackson) BUgfix for Ireland ## 2.0.9 (2021-11-27) * (jack-blackson) Calculate date in words correctly - this time for real :) From ba0b18c975a9b5beab5930dd4b7ec841650f792b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 18:02:42 +0000 Subject: [PATCH 27/27] Bump follow-redirects from 1.14.4 to 1.14.7 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78e586f..e6dcf0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "iobroker.meteoalarm", - "version": "2.0.6", + "version": "2.0.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "iobroker.meteoalarm", - "version": "2.0.6", + "version": "2.0.10", "license": "MIT", "dependencies": { "@iobroker/adapter-core": "^2.5.1", "@iobroker/testing": "^2.5.1", "bent": "^7.3.12", - "csv-parse": "^4.16.3", + "csv-parse": "4.16.3", "moment": "2.29.1", "xml2js": "^0.4.22" }, @@ -2213,9 +2213,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", - "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==", + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "dev": true, "funding": [ { @@ -7939,9 +7939,9 @@ } }, "follow-redirects": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", - "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==", + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "dev": true }, "for-in": {