obsidian-plugin/heroblackink_ultimate-todoist-sync-for-obsidian
1
0
Fork 0
mirror of https://github.com/heroblackink/ultimate-todoist-sync-for-obsidian.git synced 2026-07-22 07:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(conflict): preserve todoist tag and guard empty due-date parsing

Browse source
This commit is contained in:
HeroBlackInk 2026-02-26 19:33:42 +08:00
parent c9c5deef60
commit 3e57581b2d
2 changed files with 6 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/data/taskParser.ts
View file

@ -466,11 +466,14 @@ export class TaskParser {
//this.plugin.debugLog(dateStr); // 输出 2023-03-27
ISOStringToLocalDateString(utcTimeString:string) {
try {
if(utcTimeString === null){
if(!utcTimeString){
return null
}
let utcDateString = utcTimeString;
let dateObj = new Date(utcDateString); // 将UTC格式字符串转换为Date对象
if (Number.isNaN(dateObj.getTime())) {
return null
}
let year = dateObj.getFullYear();
let month = (dateObj.getMonth() + 1).toString().padStart(2, '0');
let date = dateObj.getDate().toString().padStart(2, '0');

63
src/ui/modals.ts
View file

@ -1120,69 +1120,10 @@ export class TaskManagerModal extends Modal {
}
const todoistDueDate = task.due?.date || '';
await fileOperation.syncTaskDueDateToFile(taskId, todoistDueDate);
// Invalidate file cache after content/date writes so tag/priority sync reads fresh data
await fileOperation.syncTaskLabelsToFile(taskId, task.labels || []);
await fileOperation.syncTaskPriorityToFile(taskId, task.priority || 1);
this._fileCache.delete(filePath);
// Sync tags (labels) from Todoist to file
const todoistLabels = taskParser.normalizeLabelsForCompare([...(task.labels || []), 'todoist']);
let currentLine = await this.getTaskLine(taskId, filePath);
if (currentLine && todoistLabels.length > 0) {
const existingTags = taskParser.getAllTagsFromLineText(currentLine);
let updatedLine = currentLine;
for (const tag of existingTags) {
updatedLine = updatedLine.replace(new RegExp(`#${tag}\\b`, 'g'), '');
}
// Add Todoist labels as tags before #todoist
const todoistTagPos = updatedLine.indexOf('#todoist');
if (todoistTagPos > 0) {
const labelTags = todoistLabels.map((l: string) => `#${l}`).join(' ');
updatedLine = updatedLine.substring(0, todoistTagPos) + labelTags + ' ' + updatedLine.substring(todoistTagPos);
}
// Clean up multiple spaces
updatedLine = updatedLine.replace(/ +/g, ' ');
if (updatedLine !== currentLine) {
const file = this.app.vault.getAbstractFileByPath(filePath);
if (file instanceof TFile) {
const fileContent = await this.app.vault.read(file);
const newContent = fileContent.replace(currentLine, updatedLine);
await this.app.vault.modify(file, newContent);
this._fileCache.delete(filePath);
}
}
}
// Sync priority from Todoist to file
currentLine = await this.getTaskLine(taskId, filePath);
if (currentLine) {
const todoistPriority = task.priority || 1;
const existingPriorityMatch = currentLine.match(/\s!!(\d)\s/);
const existingPriority = existingPriorityMatch ? parseInt(existingPriorityMatch[1]) : 1;
if (todoistPriority !== existingPriority) {
let updatedLine: string;
if (existingPriorityMatch) {
updatedLine = currentLine.replace(/\s!!(\d)\s/, ` !!${todoistPriority} `);
} else if (todoistPriority > 1) {
// Insert priority before #todoist
const todoistTagPos = currentLine.indexOf('#todoist');
if (todoistTagPos > 0) {
updatedLine = currentLine.substring(0, todoistTagPos) + `!!${todoistPriority} ` + currentLine.substring(todoistTagPos);
} else {
updatedLine = currentLine + ` !!${todoistPriority}`;
}
} else {
updatedLine = currentLine;
}
if (updatedLine !== currentLine) {
const file = this.app.vault.getAbstractFileByPath(filePath);
if (file instanceof TFile) {
const fileContent = await this.app.vault.read(file);
const newContent = fileContent.replace(currentLine, updatedLine);
await this.app.vault.modify(file, newContent);
this._fileCache.delete(filePath);
}
}
}
}
// Sync completion status
currentLine = await this.getTaskLine(taskId, filePath);
const obsidianChecked = currentLine ? /\[(x|X)\]/.test(currentLine) : false;
const todoistChecked = task.checked || false;
if (todoistChecked && !obsidianChecked) {