10h30/wordpress-export-to-markdown
1
0
Fork 0
mirror of https://github.com/10h30/wordpress-export-to-markdown.git synced 2026-07-11 18:56:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Have writer use shared.buildPostPath()

Browse Source
This commit is contained in:
Will Boyd
2025-01-28 16:54:27 -05:00
parent afc22e7ba5
commit 896eaadb4f
2 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intake.js
+1
View File
@@ -75,6 +75,7 @@ function getCommandLineAnswers(questions) {
// normalize and validate default answer
const question = questions.find((question) => camelcase(question.name) === key);
answers[key] = normalize(value, question.type, (errorMessage) => {
// this is formatted to match how commander displays other errors
commander.program.error(`error: option '--${question.name} <${question.type}>' argument '${value}' is invalid. ${errorMessage}`);
});
}
src/writer.js
+8 -35
View File
@@ -3,7 +3,6 @@ import chalk from 'chalk';
import fs from 'fs';
import http from 'http';
import https from 'https';
import * as luxon from 'luxon';
import path from 'path';
import * as settings from './settings.js';
import * as shared from './shared.js';
@@ -47,7 +46,7 @@ async function writeMarkdownFilesPromise(posts, config) {
let skipCount = 0;
let delay = 0;
const payloads = posts.flatMap(post => {
const destinationPath = getPostPath(post, config);
const destinationPath = buildPostPath(post, config);
if (checkFile(destinationPath)) {
// already exists, don't need to save again
skipCount++;
@@ -105,7 +104,7 @@ async function writeImageFilesPromise(posts, config) {
let skipCount = 0;
let delay = 0;
const payloads = posts.flatMap(post => {
const postPath = getPostPath(post, config);
const postPath = buildPostPath(post, config);
const imagesDir = path.join(path.dirname(postPath), 'images');
return post.meta.imageUrls.flatMap(imageUrl => {
const filename = shared.getFilenameFromUrl(imageUrl);
@@ -171,39 +170,13 @@ async function loadImageFilePromise(imageUrl) {
return buffer;
}
function getPostPath(post, config) {
let dt;
if (settings.custom_date_formatting) {
dt = luxon.DateTime.fromFormat(post.frontmatter.date, settings.custom_date_formatting);
} else {
dt = luxon.DateTime.fromISO(post.frontmatter.date);
}
function buildPostPath(post, config) {
const outputDir = settings.output_directory;
const type = post.meta.type;
const date = post.frontmatter.date;
const slug = post.meta.slug;
// start with base output dir and post type
const pathSegments = [settings.output_directory, post.meta.type];
if (config.dateFolders === 'year' || config.dateFolders === 'year-month') {
pathSegments.push(dt.toFormat('yyyy'));
}
if (config.dateFolders === 'year-month') {
pathSegments.push(dt.toFormat('LL'));
}
// create slug fragment, possibly date prefixed
let slugFragment = post.meta.slug;
if (config.prefixDate) {
slugFragment = dt.toFormat('yyyy-LL-dd') + '-' + slugFragment;
}
// use slug fragment as folder or filename as specified
if (config.postFolders) {
pathSegments.push(slugFragment, 'index.md');
} else {
pathSegments.push(slugFragment + '.md');
}
return path.join(...pathSegments);
return shared.buildPostPath(outputDir, type, date, slug, config);
}
function checkFile(path) {