Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f5e4a16aff | |||
| 9014f086d6 | |||
| d4f2af179f | |||
| aeb1d62895 | |||
| 9de2b00a2f | |||
| 66652afc90 | |||
| ad5b5e81bb | |||
| 951e9c5406 | |||
| 6dc4d2952d | |||
| 8e10724206 | |||
| d661466c81 | |||
| f634993637 |
13
README.md
13
README.md
@@ -4,7 +4,7 @@ A powerful task management and focus timer plugin for [Obsidian](https://obsidia
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
## 🎯 Overview
|
||||
|
||||
@@ -224,17 +224,6 @@ npm run dev
|
||||
ln -s $(pwd) /path/to/vault/.obsidian/plugins/focus-task
|
||||
```
|
||||
|
||||
## 📝 Roadmap
|
||||
|
||||
- [ ] Integration with Obsidian Tasks plugin
|
||||
- [ ] Calendar view for scheduled tasks
|
||||
- [ ] Weekly/Monthly reports
|
||||
- [ ] Task templates
|
||||
- [ ] Sync with external task managers
|
||||
- [ ] Mobile optimizations
|
||||
- [ ] Task dependencies
|
||||
- [ ] Time blocking in daily notes
|
||||
|
||||
## 📜 License
|
||||
|
||||
This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
|
||||
|
||||
128
main.js
128
main.js
@@ -44,7 +44,9 @@ var DEFAULT_SETTINGS = {
|
||||
{ id: "learning", name: "Learning", color: "#f59e0b", icon: "\u{1F4DA}" }
|
||||
],
|
||||
autoStartBreak: false,
|
||||
tickSoundEnabled: false
|
||||
tickSoundEnabled: false,
|
||||
// Daily note logging
|
||||
logToDaily: false
|
||||
};
|
||||
var DEFAULT_DATA = {
|
||||
tasks: [],
|
||||
@@ -640,6 +642,9 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
|
||||
if (this.settings.enableSounds) {
|
||||
this.playCompletionSound();
|
||||
}
|
||||
if (this.settings.logToDaily) {
|
||||
this.logTaskToDailyNote(task);
|
||||
}
|
||||
if (this.activeTaskId === taskId) {
|
||||
this.stopTimer();
|
||||
this.activeTaskId = null;
|
||||
@@ -878,6 +883,112 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
|
||||
console.log("Audio not available");
|
||||
}
|
||||
}
|
||||
// ============ Daily Note Logging ============
|
||||
async logTaskToDailyNote(task) {
|
||||
try {
|
||||
const list = this.settings.lists.find((l) => l.id === task.list);
|
||||
const timeDiff = task.actualMinutes - task.estimatedMinutes;
|
||||
let timeComparison = "";
|
||||
if (timeDiff < 0) {
|
||||
timeComparison = `${Math.abs(timeDiff)}min under estimate \u2728`;
|
||||
} else if (timeDiff > 0) {
|
||||
timeComparison = `${timeDiff}min over estimate`;
|
||||
} else {
|
||||
timeComparison = `exactly on target \u{1F3AF}`;
|
||||
}
|
||||
const completedTime = new Date(task.completedAt || Date.now()).toLocaleTimeString("en-US", {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
hour12: false
|
||||
});
|
||||
const taskEntry = `- [x] ${task.text} | ${(list == null ? void 0 : list.icon) || "\u{1F4CB}"} ${(list == null ? void 0 : list.name) || "Task"} | \u23F1\uFE0F ${this.formatTimeHuman(task.actualMinutes)} / ${this.formatTimeHuman(task.estimatedMinutes)} (${timeComparison}) | \u2705 ${completedTime}`;
|
||||
await this.appendToDailyNote(taskEntry);
|
||||
} catch (e) {
|
||||
console.error("Failed to log task to daily note:", e);
|
||||
new import_obsidian3.Notice("Failed to log task to daily note. Make sure Daily Notes core plugin is enabled.");
|
||||
}
|
||||
}
|
||||
getDailyNoteSettings() {
|
||||
var _a, _b, _c;
|
||||
const dailyNotesPlugin = (_b = (_a = this.app.internalPlugins) == null ? void 0 : _a.plugins) == null ? void 0 : _b["daily-notes"];
|
||||
if (!(dailyNotesPlugin == null ? void 0 : dailyNotesPlugin.enabled)) {
|
||||
return null;
|
||||
}
|
||||
const settings = (_c = dailyNotesPlugin.instance) == null ? void 0 : _c.options;
|
||||
return {
|
||||
folder: (settings == null ? void 0 : settings.folder) || "",
|
||||
format: (settings == null ? void 0 : settings.format) || "YYYY-MM-DD",
|
||||
template: (settings == null ? void 0 : settings.template) || ""
|
||||
};
|
||||
}
|
||||
formatDailyNoteDate(format) {
|
||||
const now = new Date();
|
||||
const year = now.getFullYear();
|
||||
const month = now.getMonth() + 1;
|
||||
const day = now.getDate();
|
||||
let result = format;
|
||||
result = result.replace(/YYYY/g, year.toString());
|
||||
result = result.replace(/YY/g, year.toString().slice(-2));
|
||||
result = result.replace(/MMMM/g, now.toLocaleDateString("en-US", { month: "long" }));
|
||||
result = result.replace(/MMM/g, now.toLocaleDateString("en-US", { month: "short" }));
|
||||
result = result.replace(/MM/g, month.toString().padStart(2, "0"));
|
||||
result = result.replace(/(?<![A-Za-z])M(?![A-Za-z])/g, month.toString());
|
||||
result = result.replace(/dddd/g, now.toLocaleDateString("en-US", { weekday: "long" }));
|
||||
result = result.replace(/ddd/g, now.toLocaleDateString("en-US", { weekday: "short" }));
|
||||
result = result.replace(/DD/g, day.toString().padStart(2, "0"));
|
||||
result = result.replace(/(?<![A-Za-z])D(?![A-Za-z])/g, day.toString());
|
||||
return result;
|
||||
}
|
||||
async getOrCreateDailyNote() {
|
||||
const { vault } = this.app;
|
||||
const dailySettings = this.getDailyNoteSettings();
|
||||
if (!dailySettings) {
|
||||
new import_obsidian3.Notice("Daily Notes core plugin is not enabled. Please enable it in Settings \u2192 Core plugins.");
|
||||
return null;
|
||||
}
|
||||
const filename = this.formatDailyNoteDate(dailySettings.format);
|
||||
const folder = dailySettings.folder ? `${dailySettings.folder}/` : "";
|
||||
const path = `${folder}${filename}.md`;
|
||||
let file = vault.getAbstractFileByPath(path);
|
||||
if (file && file instanceof import_obsidian3.TFile) {
|
||||
return file;
|
||||
}
|
||||
try {
|
||||
if (dailySettings.folder) {
|
||||
const folderExists = vault.getAbstractFileByPath(dailySettings.folder);
|
||||
if (!folderExists) {
|
||||
await vault.createFolder(dailySettings.folder);
|
||||
}
|
||||
}
|
||||
let content = "";
|
||||
if (dailySettings.template) {
|
||||
const templatePath = dailySettings.template.endsWith(".md") ? dailySettings.template : `${dailySettings.template}.md`;
|
||||
const templateFile = vault.getAbstractFileByPath(templatePath);
|
||||
if (templateFile && templateFile instanceof import_obsidian3.TFile) {
|
||||
content = await vault.read(templateFile);
|
||||
content = content.replace(/{{date}}/g, filename).replace(/{{time}}/g, new Date().toLocaleTimeString()).replace(/{{title}}/g, filename);
|
||||
}
|
||||
}
|
||||
const newFile = await vault.create(path, content);
|
||||
new import_obsidian3.Notice(`\u{1F4DD} Created daily note: ${filename}`);
|
||||
return newFile;
|
||||
} catch (e) {
|
||||
console.error("Failed to create daily note:", e);
|
||||
new import_obsidian3.Notice("Failed to create daily note");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
async appendToDailyNote(content) {
|
||||
const file = await this.getOrCreateDailyNote();
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
const { vault } = this.app;
|
||||
const existingContent = await vault.read(file);
|
||||
const newContent = existingContent.trimEnd() + "\n" + content + "\n";
|
||||
await vault.modify(file, newContent);
|
||||
new import_obsidian3.Notice("\u{1F4DD} Task logged to daily note");
|
||||
}
|
||||
// ============ Utilities ============
|
||||
formatTime(seconds) {
|
||||
const absSeconds = Math.abs(seconds);
|
||||
@@ -985,6 +1096,21 @@ var FocusTaskSettingTab = class extends import_obsidian3.PluginSettingTab {
|
||||
this.plugin.settings.enableCelebrations = value;
|
||||
await this.plugin.saveAllData();
|
||||
}));
|
||||
containerEl.createEl("h2", { text: "\u{1F4DD} Daily Note Integration" });
|
||||
new import_obsidian3.Setting(containerEl).setName("Log completed tasks to daily note").setDesc("When you complete a task, add an entry to your daily note. Uses the core Daily Notes plugin settings.").addToggle((toggle) => toggle.setValue(this.plugin.settings.logToDaily).onChange(async (value) => {
|
||||
this.plugin.settings.logToDaily = value;
|
||||
await this.plugin.saveAllData();
|
||||
}));
|
||||
const infoEl = containerEl.createEl("div", { cls: "setting-item-description" });
|
||||
infoEl.style.marginTop = "-10px";
|
||||
infoEl.style.marginBottom = "20px";
|
||||
infoEl.innerHTML = `
|
||||
<small>
|
||||
This feature uses the <strong>Daily Notes</strong> core plugin.
|
||||
Configure your daily note folder, date format, and template in
|
||||
<em>Settings \u2192 Core plugins \u2192 Daily notes</em>.
|
||||
</small>
|
||||
`;
|
||||
containerEl.createEl("h2", { text: "\u{1F4CB} Lists" });
|
||||
this.plugin.settings.lists.forEach((list, index) => {
|
||||
new import_obsidian3.Setting(containerEl).setName(`${list.icon} ${list.name}`).addText((text) => text.setValue(list.name).setPlaceholder("List name").onChange(async (value) => {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"id": "focus-task",
|
||||
"name": "Focus Task",
|
||||
"version": "1.0.2",
|
||||
"version": "1.0.4",
|
||||
"minAppVersion": "0.15.0",
|
||||
"description": "A Blitzit-inspired task management and focus timer plugin. Plan your day, track time with Pomodoro technique, and crush your tasks with satisfying checkoffs.",
|
||||
"author": "Crib",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "focus-task",
|
||||
"version": "1.0.2",
|
||||
"version": "1.0.4",
|
||||
"description": "A Blitzit-inspired task management and focus timer plugin for Obsidian",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
|
||||
186
src/main.ts
186
src/main.ts
@@ -4,6 +4,7 @@ import {
|
||||
Plugin,
|
||||
PluginSettingTab,
|
||||
Setting,
|
||||
TFile,
|
||||
WorkspaceLeaf,
|
||||
} from 'obsidian';
|
||||
|
||||
@@ -224,6 +225,11 @@ export default class FocusTaskPlugin extends Plugin {
|
||||
this.playCompletionSound();
|
||||
}
|
||||
|
||||
// Log to daily note
|
||||
if (this.settings.logToDaily) {
|
||||
this.logTaskToDailyNote(task);
|
||||
}
|
||||
|
||||
if (this.activeTaskId === taskId) {
|
||||
this.stopTimer();
|
||||
this.activeTaskId = null;
|
||||
@@ -541,6 +547,161 @@ export default class FocusTaskPlugin extends Plugin {
|
||||
}
|
||||
}
|
||||
|
||||
// ============ Daily Note Logging ============
|
||||
|
||||
async logTaskToDailyNote(task: FocusTask) {
|
||||
try {
|
||||
const list = this.settings.lists.find(l => l.id === task.list);
|
||||
|
||||
// Format the task entry
|
||||
const timeDiff = task.actualMinutes - task.estimatedMinutes;
|
||||
let timeComparison = '';
|
||||
if (timeDiff < 0) {
|
||||
timeComparison = `${Math.abs(timeDiff)}min under estimate ✨`;
|
||||
} else if (timeDiff > 0) {
|
||||
timeComparison = `${timeDiff}min over estimate`;
|
||||
} else {
|
||||
timeComparison = `exactly on target 🎯`;
|
||||
}
|
||||
|
||||
const completedTime = new Date(task.completedAt || Date.now()).toLocaleTimeString('en-US', {
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false
|
||||
});
|
||||
|
||||
const taskEntry = `- [x] ${task.text} | ${list?.icon || '📋'} ${list?.name || 'Task'} | ⏱️ ${this.formatTimeHuman(task.actualMinutes)} / ${this.formatTimeHuman(task.estimatedMinutes)} (${timeComparison}) | ✅ ${completedTime}`;
|
||||
|
||||
await this.appendToDailyNote(taskEntry);
|
||||
} catch (e) {
|
||||
console.error('Failed to log task to daily note:', e);
|
||||
new Notice('Failed to log task to daily note. Make sure Daily Notes core plugin is enabled.');
|
||||
}
|
||||
}
|
||||
|
||||
getDailyNoteSettings(): { folder: string; format: string; template: string } | null {
|
||||
// Access the core Daily Notes plugin settings
|
||||
const dailyNotesPlugin = (this.app as any).internalPlugins?.plugins?.['daily-notes'];
|
||||
|
||||
if (!dailyNotesPlugin?.enabled) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const settings = dailyNotesPlugin.instance?.options;
|
||||
return {
|
||||
folder: settings?.folder || '',
|
||||
format: settings?.format || 'YYYY-MM-DD',
|
||||
template: settings?.template || '',
|
||||
};
|
||||
}
|
||||
|
||||
formatDailyNoteDate(format: string): string {
|
||||
const now = new Date();
|
||||
const year = now.getFullYear();
|
||||
const month = now.getMonth() + 1;
|
||||
const day = now.getDate();
|
||||
|
||||
// Use placeholders to avoid replacement conflicts
|
||||
// Replace longer tokens first, use unique placeholders
|
||||
let result = format;
|
||||
|
||||
// Year tokens
|
||||
result = result.replace(/YYYY/g, year.toString());
|
||||
result = result.replace(/YY/g, year.toString().slice(-2));
|
||||
|
||||
// Month tokens (longer first)
|
||||
result = result.replace(/MMMM/g, now.toLocaleDateString('en-US', { month: 'long' }));
|
||||
result = result.replace(/MMM/g, now.toLocaleDateString('en-US', { month: 'short' }));
|
||||
result = result.replace(/MM/g, month.toString().padStart(2, '0'));
|
||||
// Only replace standalone M, not part of other tokens
|
||||
result = result.replace(/(?<![A-Za-z])M(?![A-Za-z])/g, month.toString());
|
||||
|
||||
// Day tokens (longer first)
|
||||
result = result.replace(/dddd/g, now.toLocaleDateString('en-US', { weekday: 'long' }));
|
||||
result = result.replace(/ddd/g, now.toLocaleDateString('en-US', { weekday: 'short' }));
|
||||
result = result.replace(/DD/g, day.toString().padStart(2, '0'));
|
||||
// Only replace standalone D, not part of other tokens
|
||||
result = result.replace(/(?<![A-Za-z])D(?![A-Za-z])/g, day.toString());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
async getOrCreateDailyNote(): Promise<TFile | null> {
|
||||
const { vault } = this.app;
|
||||
const dailySettings = this.getDailyNoteSettings();
|
||||
|
||||
if (!dailySettings) {
|
||||
new Notice('Daily Notes core plugin is not enabled. Please enable it in Settings → Core plugins.');
|
||||
return null;
|
||||
}
|
||||
|
||||
const filename = this.formatDailyNoteDate(dailySettings.format);
|
||||
const folder = dailySettings.folder ? `${dailySettings.folder}/` : '';
|
||||
const path = `${folder}${filename}.md`;
|
||||
|
||||
// Check if daily note exists
|
||||
let file = vault.getAbstractFileByPath(path);
|
||||
|
||||
if (file && file instanceof TFile) {
|
||||
return file;
|
||||
}
|
||||
|
||||
// Create the daily note
|
||||
try {
|
||||
// Ensure folder exists
|
||||
if (dailySettings.folder) {
|
||||
const folderExists = vault.getAbstractFileByPath(dailySettings.folder);
|
||||
if (!folderExists) {
|
||||
await vault.createFolder(dailySettings.folder);
|
||||
}
|
||||
}
|
||||
|
||||
// Check if template exists and use it
|
||||
let content = '';
|
||||
if (dailySettings.template) {
|
||||
const templatePath = dailySettings.template.endsWith('.md')
|
||||
? dailySettings.template
|
||||
: `${dailySettings.template}.md`;
|
||||
const templateFile = vault.getAbstractFileByPath(templatePath);
|
||||
|
||||
if (templateFile && templateFile instanceof TFile) {
|
||||
content = await vault.read(templateFile);
|
||||
// Replace template variables
|
||||
content = content
|
||||
.replace(/{{date}}/g, filename)
|
||||
.replace(/{{time}}/g, new Date().toLocaleTimeString())
|
||||
.replace(/{{title}}/g, filename);
|
||||
}
|
||||
}
|
||||
|
||||
// Create the file
|
||||
const newFile = await vault.create(path, content);
|
||||
new Notice(`📝 Created daily note: ${filename}`);
|
||||
return newFile;
|
||||
} catch (e) {
|
||||
console.error('Failed to create daily note:', e);
|
||||
new Notice('Failed to create daily note');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async appendToDailyNote(content: string) {
|
||||
const file = await this.getOrCreateDailyNote();
|
||||
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
|
||||
const { vault } = this.app;
|
||||
|
||||
// Read existing content and append to the end
|
||||
const existingContent = await vault.read(file);
|
||||
const newContent = existingContent.trimEnd() + '\n' + content + '\n';
|
||||
|
||||
await vault.modify(file, newContent);
|
||||
new Notice('📝 Task logged to daily note');
|
||||
}
|
||||
|
||||
// ============ Utilities ============
|
||||
|
||||
formatTime(seconds: number): string {
|
||||
@@ -726,6 +887,31 @@ class FocusTaskSettingTab extends PluginSettingTab {
|
||||
await this.plugin.saveAllData();
|
||||
}));
|
||||
|
||||
// Daily Note Integration
|
||||
containerEl.createEl('h2', { text: '📝 Daily Note Integration' });
|
||||
|
||||
new Setting(containerEl)
|
||||
.setName('Log completed tasks to daily note')
|
||||
.setDesc('When you complete a task, add an entry to your daily note. Uses the core Daily Notes plugin settings.')
|
||||
.addToggle(toggle => toggle
|
||||
.setValue(this.plugin.settings.logToDaily)
|
||||
.onChange(async value => {
|
||||
this.plugin.settings.logToDaily = value;
|
||||
await this.plugin.saveAllData();
|
||||
}));
|
||||
|
||||
// Show info about Daily Notes plugin
|
||||
const infoEl = containerEl.createEl('div', { cls: 'setting-item-description' });
|
||||
infoEl.style.marginTop = '-10px';
|
||||
infoEl.style.marginBottom = '20px';
|
||||
infoEl.innerHTML = `
|
||||
<small>
|
||||
This feature uses the <strong>Daily Notes</strong> core plugin.
|
||||
Configure your daily note folder, date format, and template in
|
||||
<em>Settings → Core plugins → Daily notes</em>.
|
||||
</small>
|
||||
`;
|
||||
|
||||
// Lists Management
|
||||
containerEl.createEl('h2', { text: '📋 Lists' });
|
||||
|
||||
|
||||
@@ -32,6 +32,8 @@ export interface FocusTaskSettings {
|
||||
lists: TaskList[];
|
||||
autoStartBreak: boolean;
|
||||
tickSoundEnabled: boolean;
|
||||
// Daily note logging
|
||||
logToDaily: boolean;
|
||||
}
|
||||
|
||||
export interface FocusTaskData {
|
||||
@@ -58,6 +60,8 @@ export const DEFAULT_SETTINGS: FocusTaskSettings = {
|
||||
],
|
||||
autoStartBreak: false,
|
||||
tickSoundEnabled: false,
|
||||
// Daily note logging
|
||||
logToDaily: false,
|
||||
};
|
||||
|
||||
export const DEFAULT_DATA: FocusTaskData = {
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"1.0.2": "0.15.0"
|
||||
"1.0.4": "0.15.0"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user