ryanmwangi
/
CalMerger
1
0
Fork 1
Code Issues 2 Pull Requests Releases Activity

Fetch calendar data from URL

This commit is contained in:
Ryan Mwangi 2024-11-04 13:56:48 +03:00
parent f677014cb1
commit 1631ba3478
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server.js
View File

@ -52,7 +52,7 @@ app.post('/merge', async (req, res) => {
// Read calendar data from local file
const data = fs.readFileSync(path.resolve(calendar.url), 'utf-8');
return Promise.resolve({
url: data,
data: data,
prefix: calendar.prefix,
override: calendar.override,
});
@ -62,18 +62,19 @@ app.post('/merge', async (req, res) => {
return Promise.resolve(null);
}
} else {
return axios.get(calendar.url)
.then((response) => {
return {
data: response.data,
prefix: calendar.prefix,
override: calendar.override,
};
})
.catch((error) => {
console.error(`Error fetching calendar from ${calendar.url}:`, error);
return null;
});
// Fetch calendar data from URL
return axios.get(calendar.url)
.then((response) => {
return {
data: response.data,
prefix: calendar.prefix,
override: calendar.override,
};
})
.catch((error) => {
console.error(`Error fetching calendar from ${calendar.url}:`, error);
return null;
});
}
});