kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Add fetcher_helper for calendar and newsfeed

Browse Source
This commit is contained in:
rejas
2021-03-28 14:17:03 +02:00
committed by veeck
parent a6879e853b
commit 90aa50bb11
7 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/default/newsfeed/newsfeed.js
View File

@@ -90,7 +90,7 @@ Module.register("newsfeed", {
this.loaded = true;
this.error = null;
} else if (notification === "FETCH_ERROR") {
this.error = `Could not fetch newsfeed ${payload.url}`;
this.error = `${payload.error}`;
this.scheduleUpdateInterval();
} else if (notification === "INCORRECT_URL") {
this.error = `Incorrect url: ${payload.url}`;

12
modules/default/newsfeed/newsfeedfetcher.js
View File

@@ -5,6 +5,7 @@
* MIT Licensed.
*/
const Log = require("logger");
const FetcherHelper = require("fetcher_helper");
const FeedMe = require("feedme");
const fetch = require("node-fetch");
const iconv = require("iconv-lite");
@@ -84,12 +85,13 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
};
fetch(url, { headers: headers })
.catch((error) => {
fetchFailedCallback(this, error);
scheduleTimer();
.then(FetcherHelper.checkStatus)
.then((response) => {
response.body.pipe(iconv.decodeStream(encoding)).pipe(parser);
})
.then((res) => {
res.body.pipe(iconv.decodeStream(encoding)).pipe(parser);
.catch((error) => {
fetchFailedCallback(this, error.message);
scheduleTimer();
});
};

4
modules/default/newsfeed/node_helper.js
View File

@@ -44,7 +44,7 @@ module.exports = NodeHelper.create({
let fetcher;
if (typeof this.fetchers[url] === "undefined") {
Log.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
Log.log("Create new newsfetcher for url: " + url + " - Interval: " + reloadInterval);
fetcher = new NewsfeedFetcher(url, reloadInterval, encoding, config.logFeedWarnings);
fetcher.onReceive(() => {
@@ -61,7 +61,7 @@ module.exports = NodeHelper.create({
this.fetchers[url] = fetcher;
} else {
Log.log("Use existing news fetcher for url: " + url);
Log.log("Use existing newsfetcher for url: " + url);
fetcher = this.fetchers[url];
fetcher.setReloadInterval(reloadInterval);
fetcher.broadcastItems();