Refactoring markdown updating.
This commit is contained in:
Chris McCormick
parent
d3629d8b30
commit
d12b1a9d56
1 changed files with 135 additions and 141 deletions
266
index.html
266
index.html
|
|
@ -687,110 +687,112 @@ chmod 755 kbtd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function updateLineInFile(lineNum, newText) {
|
async function modifyFileLines(fn) {
|
||||||
console.log('updateLineInFile:', lineNum, newText);
|
|
||||||
const file = await state.fileHandle.getFile();
|
const file = await state.fileHandle.getFile();
|
||||||
const text = await file.text();
|
const text = await file.text();
|
||||||
const lines = text.split('\n');
|
const lines = text.split('\n');
|
||||||
lines[lineNum] = newText;
|
fn(lines);
|
||||||
await writeFile(lines.join('\n'));
|
await writeFile(lines.join('\n'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function updateLineInFile(lineNum, newText) {
|
||||||
|
console.log('updateLineInFile:', lineNum, newText);
|
||||||
|
await modifyFileLines(lines => {
|
||||||
|
lines[lineNum] = newText;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async function moveLineInFile(fromLine, toLine, targetColumnIndex, insertPosition) {
|
async function moveLineInFile(fromLine, toLine, targetColumnIndex, insertPosition) {
|
||||||
console.log('moveLineInFile: from line', fromLine, 'to line', toLine, 'targetColumnIndex:', targetColumnIndex, 'insertPosition:', insertPosition);
|
console.log('moveLineInFile: from line', fromLine, 'to line', toLine, 'targetColumnIndex:', targetColumnIndex, 'insertPosition:', insertPosition);
|
||||||
const file = await state.fileHandle.getFile();
|
await modifyFileLines(lines => {
|
||||||
const text = await file.text();
|
const section = state.sections[state.currentSectionIndex];
|
||||||
const lines = text.split('\n');
|
const targetColumn = section.columns[targetColumnIndex];
|
||||||
|
const targetColumnIsEmpty = targetColumn.cards.length === 0;
|
||||||
|
const isInsertingAtBottom = insertPosition === targetColumn.cards.length;
|
||||||
|
|
||||||
const section = state.sections[state.currentSectionIndex];
|
console.log('Before move, source line', fromLine, '=', lines[fromLine]);
|
||||||
const targetColumn = section.columns[targetColumnIndex];
|
console.log('Target column is empty:', targetColumnIsEmpty);
|
||||||
const targetColumnIsEmpty = targetColumn.cards.length === 0;
|
console.log('Inserting at bottom:', isInsertingAtBottom);
|
||||||
const isInsertingAtBottom = insertPosition === targetColumn.cards.length;
|
|
||||||
|
|
||||||
console.log('Before move, source line', fromLine, '=', lines[fromLine]);
|
const [movedLine] = lines.splice(fromLine, 1);
|
||||||
console.log('Target column is empty:', targetColumnIsEmpty);
|
|
||||||
console.log('Inserting at bottom:', isInsertingAtBottom);
|
|
||||||
|
|
||||||
const [movedLine] = lines.splice(fromLine, 1);
|
let actualInsertLine;
|
||||||
|
|
||||||
let actualInsertLine;
|
if (targetColumnIsEmpty) {
|
||||||
|
console.log('Moving to empty column - inserting after header');
|
||||||
if (targetColumnIsEmpty) {
|
|
||||||
console.log('Moving to empty column - inserting after header');
|
|
||||||
actualInsertLine = targetColumn.headerLineNumber + 1;
|
|
||||||
|
|
||||||
if (actualInsertLine < lines.length && lines[actualInsertLine].trim() === '') {
|
|
||||||
lines.splice(actualInsertLine, 0, movedLine);
|
|
||||||
} else {
|
|
||||||
lines.splice(actualInsertLine, 0, '', movedLine);
|
|
||||||
}
|
|
||||||
|
|
||||||
const afterLine = actualInsertLine + (lines[actualInsertLine].trim() === '' ? 2 : 1);
|
|
||||||
if (afterLine >= lines.length || lines[afterLine].trim() !== '') {
|
|
||||||
lines.splice(afterLine, 0, '');
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (insertPosition === 0) {
|
|
||||||
console.log('Inserting at start of column');
|
|
||||||
actualInsertLine = targetColumn.headerLineNumber + 1;
|
actualInsertLine = targetColumn.headerLineNumber + 1;
|
||||||
|
|
||||||
if (actualInsertLine < lines.length && lines[actualInsertLine].trim() === '') {
|
if (actualInsertLine < lines.length && lines[actualInsertLine].trim() === '') {
|
||||||
actualInsertLine++;
|
|
||||||
}
|
|
||||||
|
|
||||||
lines.splice(actualInsertLine, 0, movedLine);
|
|
||||||
} else {
|
|
||||||
console.log('Inserting at position', insertPosition);
|
|
||||||
const cardBefore = targetColumn.cards[insertPosition - 1];
|
|
||||||
actualInsertLine = cardBefore.lineNumber + 1;
|
|
||||||
if (cardBefore.nestedLines.length > 0) {
|
|
||||||
actualInsertLine += cardBefore.nestedLines.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fromLine < actualInsertLine) {
|
|
||||||
actualInsertLine--;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (actualInsertLine > 0 && lines[actualInsertLine - 1].trim() === '') {
|
|
||||||
console.log('Line before target is blank, replacing it');
|
|
||||||
lines[actualInsertLine - 1] = movedLine;
|
|
||||||
} else {
|
|
||||||
console.log('Inserting at target position');
|
|
||||||
lines.splice(actualInsertLine, 0, movedLine);
|
lines.splice(actualInsertLine, 0, movedLine);
|
||||||
|
} else {
|
||||||
|
lines.splice(actualInsertLine, 0, '', movedLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isInsertingAtBottom) {
|
const afterLine = actualInsertLine + (lines[actualInsertLine].trim() === '' ? 2 : 1);
|
||||||
const movedLineIndex = lines[actualInsertLine - 1] === movedLine ? actualInsertLine - 1 : actualInsertLine;
|
if (afterLine >= lines.length || lines[afterLine].trim() !== '') {
|
||||||
const afterLine = movedLineIndex + 1;
|
lines.splice(afterLine, 0, '');
|
||||||
if (afterLine >= lines.length || lines[afterLine].trim() !== '') {
|
}
|
||||||
console.log('Inserting at bottom - ensuring blank line after moved item at line', afterLine);
|
} else {
|
||||||
lines.splice(afterLine, 0, '');
|
if (insertPosition === 0) {
|
||||||
|
console.log('Inserting at start of column');
|
||||||
|
actualInsertLine = targetColumn.headerLineNumber + 1;
|
||||||
|
|
||||||
|
if (actualInsertLine < lines.length && lines[actualInsertLine].trim() === '') {
|
||||||
|
actualInsertLine++;
|
||||||
|
}
|
||||||
|
|
||||||
|
lines.splice(actualInsertLine, 0, movedLine);
|
||||||
|
} else {
|
||||||
|
console.log('Inserting at position', insertPosition);
|
||||||
|
const cardBefore = targetColumn.cards[insertPosition - 1];
|
||||||
|
actualInsertLine = cardBefore.lineNumber + 1;
|
||||||
|
if (cardBefore.nestedLines.length > 0) {
|
||||||
|
actualInsertLine += cardBefore.nestedLines.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fromLine < actualInsertLine) {
|
||||||
|
actualInsertLine--;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (actualInsertLine > 0 && lines[actualInsertLine - 1].trim() === '') {
|
||||||
|
console.log('Line before target is blank, replacing it');
|
||||||
|
lines[actualInsertLine - 1] = movedLine;
|
||||||
|
} else {
|
||||||
|
console.log('Inserting at target position');
|
||||||
|
lines.splice(actualInsertLine, 0, movedLine);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isInsertingAtBottom) {
|
||||||
|
const movedLineIndex = lines[actualInsertLine - 1] === movedLine ? actualInsertLine - 1 : actualInsertLine;
|
||||||
|
const afterLine = movedLineIndex + 1;
|
||||||
|
if (afterLine >= lines.length || lines[afterLine].trim() !== '') {
|
||||||
|
console.log('Inserting at bottom - ensuring blank line after moved item at line', afterLine);
|
||||||
|
lines.splice(afterLine, 0, '');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
console.log('After move, lines around target:');
|
console.log('After move, lines around target:');
|
||||||
for (let i = Math.max(0, actualInsertLine - 2); i <= Math.min(lines.length - 1, actualInsertLine + 2); i++) {
|
for (let i = Math.max(0, actualInsertLine - 2); i <= Math.min(lines.length - 1, actualInsertLine + 2); i++) {
|
||||||
console.log(` line ${i}: "${lines[i]}"`);
|
console.log(` line ${i}: "${lines[i]}"`);
|
||||||
}
|
}
|
||||||
|
});
|
||||||
await writeFile(lines.join('\n'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function createProject(projectName) {
|
async function createProject(projectName) {
|
||||||
console.log('Creating project:', projectName);
|
console.log('Creating project:', projectName);
|
||||||
const file = await state.fileHandle.getFile();
|
await modifyFileLines(lines => {
|
||||||
const text = await file.text();
|
const text = lines.join('\n');
|
||||||
|
let newText;
|
||||||
let newText;
|
if (text.trim() === '') {
|
||||||
if (text.trim() === '') {
|
newText = `# ${projectName}\n\n## TODO\n\n## In Progress\n\n## Done\n`;
|
||||||
newText = `# ${projectName}\n\n## TODO\n\n## In Progress\n\n## Done\n`;
|
} else {
|
||||||
} else {
|
newText = text + (text.endsWith('\n') ? '' : '\n') + `\n# ${projectName}\n\n## TODO\n\n## In Progress\n\n## Done\n`;
|
||||||
newText = text + (text.endsWith('\n') ? '' : '\n') + `\n# ${projectName}\n\n## TODO\n\n## In Progress\n\n## Done\n`;
|
}
|
||||||
}
|
lines.length = 0;
|
||||||
|
lines.push(...newText.split('\n'));
|
||||||
await writeFile(newText);
|
});
|
||||||
|
|
||||||
const newSectionIndex = state.sections.findIndex(s => s.name === projectName);
|
const newSectionIndex = state.sections.findIndex(s => s.name === projectName);
|
||||||
if (newSectionIndex !== -1) {
|
if (newSectionIndex !== -1) {
|
||||||
|
|
@ -800,79 +802,71 @@ chmod 755 kbtd
|
||||||
|
|
||||||
async function createColumn(columnName) {
|
async function createColumn(columnName) {
|
||||||
console.log('Creating column:', columnName);
|
console.log('Creating column:', columnName);
|
||||||
const file = await state.fileHandle.getFile();
|
await modifyFileLines(lines => {
|
||||||
const text = await file.text();
|
const section = state.sections[state.currentSectionIndex];
|
||||||
const lines = text.split('\n');
|
|
||||||
|
|
||||||
const section = state.sections[state.currentSectionIndex];
|
let insertLine;
|
||||||
|
if (section.columns.length === 0) {
|
||||||
|
insertLine = section.headerLineNumber + 1;
|
||||||
|
} else {
|
||||||
|
const lastColumn = section.columns[section.columns.length - 1];
|
||||||
|
insertLine = lastColumn.headerLineNumber + 1;
|
||||||
|
|
||||||
let insertLine;
|
while (insertLine < lines.length) {
|
||||||
if (section.columns.length === 0) {
|
const line = lines[insertLine];
|
||||||
insertLine = section.headerLineNumber + 1;
|
if (line.startsWith('# ') || line.startsWith('## ')) {
|
||||||
} else {
|
break;
|
||||||
const lastColumn = section.columns[section.columns.length - 1];
|
}
|
||||||
insertLine = lastColumn.headerLineNumber + 1;
|
insertLine++;
|
||||||
|
|
||||||
while (insertLine < lines.length) {
|
|
||||||
const line = lines[insertLine];
|
|
||||||
if (line.startsWith('# ') || line.startsWith('## ')) {
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
insertLine++;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
console.log('Inserting new column at line', insertLine);
|
console.log('Inserting new column at line', insertLine);
|
||||||
|
|
||||||
if (insertLine > 0 && lines[insertLine - 1].trim() !== '') {
|
if (insertLine > 0 && lines[insertLine - 1].trim() !== '') {
|
||||||
lines.splice(insertLine, 0, '');
|
lines.splice(insertLine, 0, '');
|
||||||
insertLine++;
|
|
||||||
}
|
|
||||||
|
|
||||||
lines.splice(insertLine, 0, `## ${columnName}`);
|
|
||||||
|
|
||||||
if (insertLine + 1 >= lines.length || lines[insertLine + 1].trim() !== '') {
|
|
||||||
lines.splice(insertLine + 1, 0, '');
|
|
||||||
}
|
|
||||||
|
|
||||||
await writeFile(lines.join('\n'));
|
|
||||||
}
|
|
||||||
|
|
||||||
async function createCard(columnIndex, cardText) {
|
|
||||||
console.log('Creating card in column', columnIndex, ':', cardText);
|
|
||||||
const file = await state.fileHandle.getFile();
|
|
||||||
const text = await file.text();
|
|
||||||
const lines = text.split('\n');
|
|
||||||
|
|
||||||
const section = state.sections[state.currentSectionIndex];
|
|
||||||
const column = section.columns[columnIndex];
|
|
||||||
|
|
||||||
let insertLine;
|
|
||||||
if (column.cards.length === 0) {
|
|
||||||
insertLine = column.headerLineNumber + 1;
|
|
||||||
|
|
||||||
if (insertLine < lines.length && lines[insertLine].trim() === '') {
|
|
||||||
insertLine++;
|
insertLine++;
|
||||||
}
|
}
|
||||||
|
|
||||||
lines.splice(insertLine, 0, `- [ ] ${cardText}`);
|
lines.splice(insertLine, 0, `## ${columnName}`);
|
||||||
|
|
||||||
if (insertLine + 1 >= lines.length || lines[insertLine + 1].trim() !== '') {
|
if (insertLine + 1 >= lines.length || lines[insertLine + 1].trim() !== '') {
|
||||||
lines.splice(insertLine + 1, 0, '');
|
lines.splice(insertLine + 1, 0, '');
|
||||||
}
|
}
|
||||||
} else {
|
});
|
||||||
const lastCard = column.cards[column.cards.length - 1];
|
}
|
||||||
insertLine = lastCard.lineNumber + 1;
|
|
||||||
if (lastCard.nestedLines.length > 0) {
|
async function createCard(columnIndex, cardText) {
|
||||||
insertLine += lastCard.nestedLines.length;
|
console.log('Creating card in column', columnIndex, ':', cardText);
|
||||||
|
await modifyFileLines(lines => {
|
||||||
|
const section = state.sections[state.currentSectionIndex];
|
||||||
|
const column = section.columns[columnIndex];
|
||||||
|
|
||||||
|
let insertLine;
|
||||||
|
if (column.cards.length === 0) {
|
||||||
|
insertLine = column.headerLineNumber + 1;
|
||||||
|
|
||||||
|
if (insertLine < lines.length && lines[insertLine].trim() === '') {
|
||||||
|
insertLine++;
|
||||||
|
}
|
||||||
|
|
||||||
|
lines.splice(insertLine, 0, `- [ ] ${cardText}`);
|
||||||
|
|
||||||
|
if (insertLine + 1 >= lines.length || lines[insertLine + 1].trim() !== '') {
|
||||||
|
lines.splice(insertLine + 1, 0, '');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const lastCard = column.cards[column.cards.length - 1];
|
||||||
|
insertLine = lastCard.lineNumber + 1;
|
||||||
|
if (lastCard.nestedLines.length > 0) {
|
||||||
|
insertLine += lastCard.nestedLines.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
lines.splice(insertLine, 0, `- [ ] ${cardText}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
lines.splice(insertLine, 0, `- [ ] ${cardText}`);
|
console.log('Inserted new card at line', insertLine);
|
||||||
}
|
});
|
||||||
|
|
||||||
console.log('Inserted new card at line', insertLine);
|
|
||||||
|
|
||||||
await writeFile(lines.join('\n'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadFile() {
|
async function loadFile() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue