DebaucheryLibrarian
/
ripunzel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed YAML index file parser failing on duplicate keys.

This commit is contained in:
DebaucheryLibrarian 2024-09-11 05:16:58 +02:00
parent aec5ce292d
commit afaa428fec
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/methods/self.js
View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
function curateComments(comments) { function curateComments(comments) {
return comments.map(comment => ({ return comments.map((comment) => ({
id: comment.id, id: comment.id,
url: `https://reddit.com${comment.permalink}`, url: `https://reddit.com${comment.permalink}`,
author: comment.author.name, author: comment.author.name,
@ -31,7 +31,7 @@ async function getFullPost(postId, reddit) {
.fetch(); .fetch();
} }
async function self(host, originalPost, reddit) { async function self(host, originalPost, { reddit }) {
const post = await getFullPost(originalPost.id, reddit) || originalPost; const post = await getFullPost(originalPost.id, reddit) || originalPost;
const curatedComments = curateComments(post.comments); const curatedComments = curateComments(post.comments);

7
src/save/save.js
View File

@ -41,7 +41,12 @@ async function writeBufferToFile(target, buffer, item) {
async function save(requestedFilepath, bufferOrBuffers, item) { async function save(requestedFilepath, bufferOrBuffers, item) {
const pathElements = getPathElements(requestedFilepath); const pathElements = getPathElements(requestedFilepath);
const buffers = [].concat(bufferOrBuffers); // allow for single stream argument const buffers = [].concat(bufferOrBuffers).filter(Boolean); // allow for single stream argument
if (buffers.length === 0) {
logger.warn(`Received undefined buffer (${item.url})`);
return null;
}
await fs.ensureDir(pathElements.dir); await fs.ensureDir(pathElements.dir);

4
src/sources/getIndex.js
View File

@ -13,9 +13,9 @@ async function getIndex(user) {
try { try {
const indexFile = await fs.readFile(indexFilePath, 'utf8'); const indexFile = await fs.readFile(indexFilePath, 'utf8');
return yaml.safeLoad(indexFile); return yaml.safeLoad(indexFile, { json: true }); // allow duplicate keys
} catch (error) { } catch (error) {
logger.info(`No index file found for '${user.name}' at '${indexFilePath}'`); logger.info(`No index file found for '${user.name}' at '${indexFilePath}': ${error.message}`);
return { profile: { image: null, description: null }, posts: [] }; return { profile: { image: null, description: null }, posts: [] };
} }