Skip to content

Commit

Permalink
feat: update plugin version to 1.12.3
Browse files Browse the repository at this point in the history
  • Loading branch information
linyibing committed Mar 30, 2024
1 parent 172fd47 commit c8948fd
Show file tree
Hide file tree
Showing 7 changed files with 766 additions and 412 deletions.
884 changes: 587 additions & 297 deletions .obsidian/plugins/dataview/main.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion .obsidian/plugins/dataview/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"id": "dataview",
"name": "Dataview",
"version": "0.5.64",
"version": "0.5.66",
"minAppVersion": "0.13.11",
"description": "Complex data views for the data-obsessed.",
"author": "Michael Brenan <[email protected]>",
"authorUrl": "https://github.com/blacksmithgu",
"helpUrl": "https://blacksmithgu.github.io/obsidian-dataview/",
"isDesktopOnly": false
}
132 changes: 68 additions & 64 deletions .obsidian/plugins/obsidian-tasks-plugin/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .obsidian/plugins/obsidian-tasks-plugin/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-tasks-plugin",
"name": "Tasks",
"version": "6.1.2",
"version": "6.2.0",
"minAppVersion": "1.1.1",
"description": "Task management for Obsidian",
"helpUrl": "https://publish.obsidian.md/tasks/",
Expand Down
115 changes: 82 additions & 33 deletions .obsidian/plugins/periodic-para/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -8875,7 +8875,7 @@ var require_react_development = __commonJS({
var dispatcher = resolveDispatcher();
return dispatcher.useReducer(reducer, initialArg, init);
}
function useRef91(initialValue) {
function useRef92(initialValue) {
var dispatcher = resolveDispatcher();
return dispatcher.useRef(initialValue);
}
Expand Down Expand Up @@ -9668,7 +9668,7 @@ var require_react_development = __commonJS({
exports.useLayoutEffect = useLayoutEffect8;
exports.useMemo = useMemo57;
exports.useReducer = useReducer;
exports.useRef = useRef91;
exports.useRef = useRef92;
exports.useState = useState60;
exports.useSyncExternalStore = useSyncExternalStore;
exports.useTransition = useTransition;
Expand Down Expand Up @@ -36128,6 +36128,7 @@ var EN = {
[TAG]: "Tag",
[FOLDER]: "Folder",
[INDEX]: "Index",
QUICK_JUMP: "Double click to open periodic note for this ",
[`${TAG}ToolTip`]: "Tags in PARA notes serve as the unique identifiers for indexing tasks, notes, and files",
[`${FOLDER}ToolTip`]: "The folder where PARA notes are located, is used to store notes related to the corresponding theme",
[`${INDEX}ToolTip`]: "The index filename of PARA notes is used to index tasks, records, and files scattered across various locations. The required formats are LifeOS.README.md/README.md, or the same as the name of the folder it resides in",
Expand Down Expand Up @@ -36168,6 +36169,7 @@ var ZH = {
[TAG]: "\u6807\u7B7E",
[FOLDER]: "\u76EE\u5F55",
[INDEX]: "\u7D22\u5F15",
QUICK_JUMP: "\u53CC\u51FB\u6253\u5F00\u672C\u5468\u671F\u7684",
[`${TAG}ToolTip`]: "PARA \u7B14\u8BB0\u7684\u6807\u7B7E\uFF0C\u4F5C\u4E3A\u7D22\u5F15\u4EFB\u52A1\u3001\u8BB0\u5F55\u3001\u6587\u4EF6\u7684\u552F\u4E00\u6807\u8BC6",
[`${FOLDER}ToolTip`]: "PARA \u7B14\u8BB0\u6240\u5728\u7684\u6587\u4EF6\u5939\uFF0C\u7528\u4E8E\u5B58\u653E\u5BF9\u5E94\u4E3B\u9898\u7684\u7B14\u8BB0",
[`${INDEX}ToolTip`]: "PARA \u7B14\u8BB0\u7684\u7D22\u5F15\u6587\u4EF6\u540D\uFF0C\u7528\u4E8E\u7D22\u5F15\u6563\u843D\u5728\u5404\u5904\u7684\u4EFB\u52A1\u3001\u8BB0\u5F55\u3001\u6587\u4EF6\uFF0C\u8981\u6C42\u683C\u5F0F\u4E3A LifeOS.README.md/README.md\uFF0C\u6216\u4E0E\u6240\u5728\u76EE\u5F55\u540C\u540D",
Expand Down Expand Up @@ -36265,12 +36267,18 @@ function formatDailyRecord(record) {
}
targetFirstLine += ` #daily-record ^${timeStamp}`;
const targetOtherLine = (otherLine == null ? void 0 : otherLine.length) ? "\n" + otherLine.map((line2) => /^[ \t]/.test(line2) ? line2 : ` ${line2}`).join("\n").trimEnd() : "";
const targetResourceLine = (resourceList == null ? void 0 : resourceList.length) ? "\n" + (resourceList == null ? void 0 : resourceList.map(
(resource) => ` - ![[${generateFileName(resource)}]]`
).join("\n")) : "";
const targetResourceLine = (resourceList == null ? void 0 : resourceList.length) ? "\n" + (resourceList == null ? void 0 : resourceList.map((resource) => ` - ${generateFileLink(resource)}`).join("\n")) : "";
const finalTargetContent = targetFirstLine + targetOtherLine + targetResourceLine;
return [date4, timeStamp, finalTargetContent].map(String);
}
function generateFileLink(resource) {
var _a;
if (!resource.externalLink) {
return `![[${generateFileName(resource)}]]`;
}
const prefix = ((_a = resource.type) == null ? void 0 : _a.includes("image")) ? "!" : "";
return `${prefix}[${resource.name || resource.filename}](${resource.externalLink})`;
}
function generateFileName(resource) {
return `${resource.id}-${resource.filename.replace(/[/\\?%*:|"<>]/g, "-")}`;
}
Expand Down Expand Up @@ -36812,22 +36820,33 @@ var Bullet = class {
const from2 = tags.map((tag, index2) => {
return `#${tag} ${index2 === tags.length - 1 ? "" : "OR"}`;
}).join(" ").trim();
const where = tags.map((tag, index2) => {
return `(contains(L.tags, "#${tag}")) ${index2 === tags.length - 1 ? "" : "OR"}`;
}).join(" ");
const result = await this.dataview.tryQuery(
`
TABLE WITHOUT ID rows.L.text AS "Bullet", rows.L.link AS "Link"
FROM (${from2}) AND -"${periodicNotesPath}/Templates"
FLATTEN file.lists AS L
WHERE ${where} AND !L.task AND file.path != "${filepath}"
GROUP BY file.link
SORT rows.file.link DESC
`
);
const lists = await this.dataview.pages(
`(${from2}) and -"${periodicNotesPath}/Templates"`
).file.lists;
const result = lists.where((L) => {
let includeTag = false;
if (L.task || L.path === filepath)
return false;
for (const tag of tags) {
includeTag = L.tags.includes(`#${tag}`);
if (includeTag) {
break;
}
}
return includeTag;
});
const groupResult = result.groupBy((elem) => {
return elem.link;
});
const sortResult = groupResult.sort((elem) => elem.rows.link, "desc");
const tableResult = sortResult.map((k) => [
k.rows.text,
k.rows.link
]);
const tableValues = tableResult.array();
this.dataview.table(
result.headers,
result.values,
["Bullet", "Link"],
tableValues,
div,
component,
filepath
Expand Down Expand Up @@ -39152,6 +39171,9 @@ ${finalRecordContent}
if (Array.isArray(data)) {
await Promise.all(
data.map(async (resource) => {
if (resource.externalLink) {
return;
}
const folder = `${this.settings.periodicNotesPath}/Attachments`;
const resourcePath = (0, import_obsidian10.normalizePath)(
`${folder}/${generateFileName(resource)}`
Expand All @@ -39162,7 +39184,7 @@ ${finalRecordContent}
if (isResourceExists) {
return;
}
const resourceURL = resource.externalLink || `${origin}/o/r/${resource.name || resource.id}`;
const resourceURL = `${origin}/o/r/${resource.name || resource.id}`;
const { data: data2 } = await this.axios.get(resourceURL, {
responseType: "arraybuffer"
});
Expand Down Expand Up @@ -77279,6 +77301,7 @@ var CreateNote = (props) => {
);
setTagOptions(filteredOptions);
};
const singleClickRef = (0, import_react82.useRef)(null);
const handleTagInput = (item) => {
const itemTag = form.getFieldValue(`${item}Tag`).replace(/^#/, "");
const itemFolder = itemTag.replace(/\//g, "-");
Expand Down Expand Up @@ -77363,7 +77386,23 @@ var CreateNote = (props) => {
{
key: PERIODIC,
activeKey: periodicActiveTab,
onChange: setPeriodicActiveTab,
onTabClick: (key) => {
if (singleClickRef.current) {
clearTimeout(singleClickRef.current);
createPeriodicFile(
(0, import_dayjs5.default)(new Date()),
key,
settings.periodicNotesPath,
app
);
singleClickRef.current = null;
} else {
singleClickRef.current = window.setTimeout(() => {
setPeriodicActiveTab(key);
singleClickRef.current = null;
}, 200);
}
},
centered: true,
size: "small",
indicator: { size: 0 },
Expand All @@ -77379,7 +77418,14 @@ var CreateNote = (props) => {
const picker = pickerMap[periodic];
const label = localeMap3[periodic];
return {
label,
label: /* @__PURE__ */ React257.createElement(
tooltip_default,
{
mouseEnterDelay: 1,
title: `${localeMap3.QUICK_JUMP}${label.toLocaleLowerCase()}`
},
label
),
key: periodic,
children: /* @__PURE__ */ React257.createElement(form_default.Item, { name: periodic }, /* @__PURE__ */ React257.createElement(
date_picker_default,
Expand Down Expand Up @@ -77655,8 +77701,8 @@ var PeriodicPARA = class extends import_obsidian14.Plugin {
const callback = this.views[view] || this.views[legacyView];
return callback(view, el, ctx);
};
this.registerMarkdownCodeBlockProcessor("LifeOS", handler);
this.registerMarkdownCodeBlockProcessor("PeriodicPARA", handler);
this.registerMarkdownCodeBlockProcessor("periodic-para", handler);
}
loadDailyRecord() {
if (this.settings.usePeriodicNotes && this.settings.useDailyRecord) {
Expand Down Expand Up @@ -77756,15 +77802,18 @@ var PeriodicPARA = class extends import_obsidian14.Plugin {
);
}
loadGlobalHelpers() {
window.PeriodicPARA = {};
window.PeriodicPARA.Project = this.project;
window.PeriodicPARA.Area = this.area;
window.PeriodicPARA.Resource = this.resource;
window.PeriodicPARA.Archive = this.archive;
window.PeriodicPARA.Task = this.task;
window.PeriodicPARA.File = this.file;
window.PeriodicPARA.Bullet = this.bullet;
window.PeriodicPARA.Date = this.date;
const helpers = {
Project: this.project,
Area: this.area,
Resource: this.resource,
Archive: this.archive,
Task: this.task,
File: this.file,
Bullet: this.bullet,
Date: this.date
};
window.PeriodicPARA = helpers;
window.LifeOS = helpers;
}
};
/*! Bundled license information:
Expand Down
2 changes: 1 addition & 1 deletion .obsidian/plugins/periodic-para/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "periodic-para",
"name": "LifeOS",
"version": "1.12.1",
"version": "1.12.3",
"minAppVersion": "0.15.0",
"description": "Life management system(Assist in practicing the PARA method with periodic notes and usememos).",
"author": "YiBing Lin",
Expand Down
40 changes: 25 additions & 15 deletions .obsidian/workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@
"type": "split",
"children": [
{
"id": "e46db4e4899d0bda",
"id": "5e1f6547bf06333b",
"type": "tabs",
"children": [
{
"id": "77f2f76914c83bf4",
"id": "aaa2d832abe6d8a4",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
"type": "markdown",
"state": {
"file": "-1. Capture/README.md",
"mode": "source",
"backlinks": true,
"source": false
}
}
}
]
Expand Down Expand Up @@ -108,6 +113,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "-1. Capture/README.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
Expand All @@ -118,7 +124,9 @@
"type": "leaf",
"state": {
"type": "outline",
"state": {}
"state": {
"file": "-1. Capture/README.md"
}
}
},
{
Expand All @@ -127,6 +135,7 @@
"state": {
"type": "backlink",
"state": {
"file": "-1. Capture/README.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
Expand Down Expand Up @@ -169,8 +178,18 @@
"periodic-para:LifeOS": false
}
},
"active": "77f2f76914c83bf4",
"active": "aaa2d832abe6d8a4",
"lastOpenFiles": [
"5. Express/README.md",
"-1. Capture/README.md",
"-1. Capture/Advice for ambitious 19 year olds.md",
"-1. Capture/Quality software deserves your hard‑earned cash.md",
"-1. Capture/Predicting The Future.md",
"1. Projects/README.md",
"4. Archives/README.md",
"3. Resources/README.md",
"2. Areas/README.md",
"README.md",
"HOME.canvas",
"1. Projects/parenting-first-birthday-banquet/first-birthday-banquet.README.md",
"1. Projects/personal-brand-wot-sharing-meeting/wot-sharing-meeting.README.md",
Expand All @@ -191,23 +210,14 @@
"0. PeriodicNotes/2024/Quarterly/2024-Q1.md",
"0. PeriodicNotes/2024/Monthly/2024-02.md",
"0. PeriodicNotes/2024/Quarterly",
"0. PeriodicNotes/2024/Weekly/2024-W07.md",
"0. PeriodicNotes/2024/Monthly",
"0. PeriodicNotes/2024/Daily/02/2024-02-16.md",
"0. PeriodicNotes/2024/Weekly",
"0. PeriodicNotes/2024/Daily/02",
"0. PeriodicNotes/2024/Daily",
"0. PeriodicNotes/2024",
"5. Express/blogs/Building my second brain 🧠 with Obsidian.md",
"5. Express/blogs",
"4. Archives/parenting-take-a-name/program/package.json",
"4. Archives/parenting-take-a-name/program/nameCandidateList.md",
"4. Archives/parenting-take-a-name/program/index.js",
"4. Archives/parenting-take-a-name/program/README.md",
"4. Archives/parenting-take-a-name/take-a-name.README.md",
"4. Archives/parenting-take-a-name/candidate word.md",
"4. Archives/parenting-take-a-name/candidate list.md",
"3. Resources/photography/photography.README.md",
"1. Projects/personal-brand-wot-sharing-meeting/architecture diagram/Polyrepo.svg",
"4. Archives/parenting-take-a-name/baby-name.png",
"4. Archives/parenting-take-a-name/林奕如.png",
Expand Down

0 comments on commit c8948fd

Please sign in to comment.