Skip to content

fix: resolve merge conflicts in taskModel.ts #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve merge conflicts in taskModel.ts #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions src/models/taskModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,12 +496,7 @@ export async function batchCreateOrUpdateTasks(
description: taskData.description,
notes: taskData.notes,
// 後面會處理 dependencies
<<<<<<< HEAD
updatedAt: getLocalDate(),
=======
// Dependencies will be processed later
updatedAt: new Date(),
>>>>>>> upstream/main
// 新增：保存實現指南（如果有）
// New: Save implementation guide (if any)
implementationGuide: taskData.implementationGuide,
Expand Down Expand Up @@ -618,12 +613,7 @@ export async function batchCreateOrUpdateTasks(
const allTasks = [...tasksToKeep, ...newTasks];

// 寫入更新後的任務列表
<<<<<<< HEAD
await writeTasks(allTasks, `Bulk task operation: ${updateMode} mode, ${newTasks.length} tasks`);
=======
// Write updated task list
await writeTasks(allTasks);
>>>>>>> upstream/main

return newTasks;
}
Expand Down Expand Up @@ -702,11 +692,7 @@ export async function deleteTask(
}

// 執行刪除操作
<<<<<<< HEAD
const deletedTask = tasks[taskIndex];
=======
// Execute delete operation
>>>>>>> upstream/main
tasks.splice(taskIndex, 1);
await writeTasks(tasks, `Delete task: ${deletedTask.name}`);

Expand Down Expand Up @@ -885,15 +871,8 @@ export async function clearAllTasks(): Promise<{
(task) => task.status === TaskStatus.COMPLETED
);

<<<<<<< HEAD
// 創建備份文件名 - 使用本地時間
const timestamp = getLocalISOString()
=======
// 創建備份文件名
// Create backup file name
const timestamp = new Date()
.toISOString()
>>>>>>> upstream/main
.replace(/:/g, "-")
.replace(/\..+/, "")
.replace(/[+\-]\d{2}-\d{2}$/, ""); // Remove timezone offset for filename
Expand All @@ -920,12 +899,7 @@ export async function clearAllTasks(): Promise<{
);

// 清空任務文件
<<<<<<< HEAD
await writeTasks([], `Clear all tasks (${allTasks.length} tasks removed)`);
=======
// Clear task file
await writeTasks([]);
>>>>>>> upstream/main

return {
success: true,
Expand Down Expand Up @@ -1115,7 +1089,6 @@ export async function searchTasksWithCommand(
// Pagination processing
const totalResults = allTasks.length;
const totalPages = Math.ceil(totalResults / pageSize);
const safePage = Math.max(1, Math.min(page, totalPages || 1)); // 確保頁碼有效
const safePage = Math.max(1, Math.min(page, totalPages || 1)); // Ensure page number is valid
const startIndex = (safePage - 1) * pageSize;
const endIndex = Math.min(startIndex + pageSize, totalResults);
Expand Down Expand Up @@ -1200,7 +1173,6 @@ function escapeShellArg(arg: string): string {
// Remove all control characters and special characters
return arg
.replace(/[\x00-\x1F\x7F]/g, "") // 控制字符
.replace(/[&;`$"'<>|]/g, ""); // Shell 特殊字符
.replace(/[&;`$"'<>|]/g, ""); // Shell special characters
}

Expand Down