kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Fixes encoding issues: #125 & #126

Browse Source
This commit is contained in:
Michael Teeuw 2016-04-03 23:16:58 +02:00
parent 864106d336
commit a4d5b74b57
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
for (var d in dates) { for (var d in dates) {
startDate = moment(new Date(dates[d])); startDate = moment(new Date(dates[d]));
newEvents.push({ newEvents.push({
title: event.summary, title: (typeof event.summary.val !== 'undefined') ? event.summary.val : event.summary,
startDate: startDate.format('x') startDate: startDate.format('x')
}); });
} }
@ -80,7 +80,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
if (startDate > today && startDate <= today.add(maximumNumberOfDays, 'days')) { if (startDate > today && startDate <= today.add(maximumNumberOfDays, 'days')) {
newEvents.push({ newEvents.push({
title: event.summary, title: (typeof event.summary.val !== 'undefined') ? event.summary.val : event.summary,
startDate: startDate.format('x') startDate: startDate.format('x')
}); });
} }

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

@ -7,6 +7,7 @@
var FeedMe = require('feedme'); var FeedMe = require('feedme');
var request = require('request'); var request = require('request');
var iconv = require('iconv-lite');
var NewsFetcher = function() { var NewsFetcher = function() {
var self = this; var self = this;
@ -19,7 +20,6 @@ var NewsFetcher = function() {
var parser = new FeedMe(); var parser = new FeedMe();
parser.on('item', function(item) { parser.on('item', function(item) {
//console.log(item);
self.items.push({ self.items.push({
title: item.title, title: item.title,
pubdate: item.pubdate, pubdate: item.pubdate,
@ -46,7 +46,7 @@ var NewsFetcher = function() {
self.fetchNews = function(url, success, error) { self.fetchNews = function(url, success, error) {
self.successCallback = success; self.successCallback = success;
self.errorCallback = error; self.errorCallback = error;
request(url).pipe(parser); request({uri:url, encoding:null}).pipe(iconv.decodeStream('ISO-8859-1')).pipe(parser);
}; };
}; };

3
package.json
View File

@ -34,6 +34,7 @@
"feedme": "latest", "feedme": "latest",
"valid-url": "latest", "valid-url": "latest",
"ical": "latest", "ical": "latest",
"moment": "latest" "moment": "latest",
"iconv-lite": "latest"
} }
} }