1
0
Fork 0

Manual backup: 2024-03-10 22:48:34

This commit is contained in:
Alexander Schäferdiek 2024-03-10 22:48:34 +01:00
parent 05e27deb22
commit 9cd5ce16ce
6 changed files with 2047 additions and 1081 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
{
"id": "obsidian-git",
"name": "Obsidian Git",
"name": "Git",
"description": "Backup your vault with Git.",
"isDesktopOnly": false,
"fundingUrl": "https://ko-fi.com/vinzent",
"js": "main.js",
"version": "2.22.1"
"version": "2.24.0"
}

View file

@ -8,20 +8,20 @@
}
}
.workspace-leaf-content[data-type='git-view'] .button-border {
.workspace-leaf-content[data-type="git-view"] .button-border {
border: 2px solid var(--interactive-accent);
border-radius: var(--radius-s);
}
.workspace-leaf-content[data-type='git-view'] .view-content {
.workspace-leaf-content[data-type="git-view"] .view-content {
padding: 0;
}
.workspace-leaf-content[data-type='git-history-view'] .view-content {
.workspace-leaf-content[data-type="git-history-view"] .view-content {
padding: 0;
}
.loading>svg {
.loading > svg {
animation: 2s linear infinite loading;
transform-origin: 50% 50%;
display: inline-block;
@ -77,6 +77,18 @@
height: auto;
}
.git-author {
color: var(--text-accent);
}
.git-date {
color: var(--text-accent);
}
.git-ref {
color: var(--text-accent);
}
.workspace-leaf-content[data-type="diff-view"] .d2h-d-none {
display: none;
}
@ -228,12 +240,18 @@
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
del {
background-color: #ffb6ba;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
del {
background-color: #8d232881;
}
@ -249,13 +267,19 @@
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
ins {
background-color: #97f295;
text-align: left;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
ins {
background-color: #1d921996;
text-align: left;
}
@ -376,19 +400,31 @@
color: var(--text-normal);
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
background-color: #fdf2d0;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
background-color: #55492480;
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-ins.d2h-change {
background-color: #ded;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-ins.d2h-change {
background-color: rgba(37, 78, 37, 0.418);
}
@ -401,7 +437,9 @@
text-decoration: none;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a:visited {
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-list-wrapper
a:visited {
color: #3572b0;
}
@ -427,13 +465,13 @@
padding: 0;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li {
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li {
border-bottom: 1px solid var(--background-modifier-border);
margin: 0;
padding: 5px 10px;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li:last-child {
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li:last-child {
border-bottom: none;
}
@ -501,9 +539,10 @@
background-color: var(--background-secondary);
}
.cm-gutterElement.obs-git-blame-gutter > div, .line-author-settings-preview {
.cm-gutterElement.obs-git-blame-gutter > div,
.line-author-settings-preview {
/* delegate text color to settings */
color: var(--obs-git-gutter-text);
color: var(--obs-git-gutter-text);
font-family: monospace;
height: 100%; /* ensure, that age-based background color occupies entire parent */
text-align: right;

View file

@ -1743,6 +1743,12 @@ function arraymove(arr, fromIndex, toIndex) {
function get_active_file(app2) {
return app2.workspace.activeEditor?.file ?? app2.workspace.getActiveFile();
}
function get_folder_path_from_file_path(path) {
const path_separator = path.lastIndexOf("/");
if (path_separator !== -1)
return path.slice(0, path_separator);
return "";
}
// src/settings/suggesters/FileSuggester.ts
var FileSuggestMode;
@ -2663,7 +2669,10 @@ var InternalModuleHooks = class extends InternalModule {
}
generate_on_all_templates_executed() {
return (callback_function) => {
const event_ref = app.workspace.on("templater:all-templates-executed", () => callback_function());
const event_ref = app.workspace.on("templater:all-templates-executed", async () => {
await delay(1);
callback_function();
});
if (event_ref) {
this.event_refs.push(event_ref);
}
@ -2704,7 +2713,7 @@ var PromptModal = class extends import_obsidian9.Modal {
onClose() {
this.contentEl.empty();
if (!this.submitted) {
this.reject();
this.reject(new TemplaterError("Cancelled prompt"));
}
}
createForm() {
@ -2734,15 +2743,8 @@ var PromptModal = class extends import_obsidian9.Modal {
if (evt.isComposing || evt.keyCode === 229)
return;
if (this.multi_line) {
if (import_obsidian9.Platform.isDesktop) {
if (evt.shiftKey && evt.key === "Enter") {
} else if (evt.key === "Enter") {
this.resolveAndClose(evt);
}
} else {
if (evt.key === "Enter") {
evt.preventDefault();
}
if (import_obsidian9.Platform.isDesktop && evt.key === "Enter" && !evt.shiftKey) {
this.resolveAndClose(evt);
}
} else {
if (evt.key === "Enter") {
@ -2988,8 +2990,8 @@ var UserScriptFunctions = class {
exports: exp
};
const file_content = await app.vault.read(file);
const wrapping_fn = window.eval("(function anonymous(require, module, exports){" + file_content + "\n})");
try {
const wrapping_fn = window.eval("(function anonymous(require, module, exports){" + file_content + "\n})");
wrapping_fn(req, mod, exp);
} catch (err) {
throw new TemplaterError(`Failed to load user script at "${file.path}".`, err.message);
@ -3587,7 +3589,15 @@ var Templater = class {
break;
}
}
const created_note = await errorWrapper(async () => app.fileManager.createNewMarkdownFile(folder, filename ?? "Untitled"), "Couldn't create markdown file.");
const extension = template instanceof import_obsidian12.TFile ? template.extension || "md" : "md";
const created_note = await errorWrapper(async () => {
const path = app.vault.getAvailablePath((0, import_obsidian12.normalizePath)(`${folder?.path ?? ""}/${filename || "Untitled"}`), extension);
const folder_path = get_folder_path_from_file_path(path);
if (folder_path && !app.vault.getAbstractFileByPathInsensitive(folder_path)) {
await app.vault.createFolder(folder_path);
}
return app.vault.create(path, "");
}, `Couldn't create ${extension} file.`);
if (created_note == null) {
await this.end_templater_task();
return;
@ -3667,7 +3677,7 @@ var Templater = class {
return;
}
await app.vault.modify(file, output_content);
if (active_file?.path !== file.path && active_editor && active_editor.editor) {
if (active_file?.path === file.path && active_editor && active_editor.editor) {
const editor = active_editor.editor;
editor.setSelection({ line: 0, ch: 0 }, { line: 0, ch: 0 });
}

View file

@ -1,7 +1,7 @@
{
"id": "templater-obsidian",
"name": "Templater",
"version": "2.1.1",
"version": "2.2.3",
"description": "Create and use templates",
"minAppVersion": "1.5.0",
"author": "SilentVoid",

View file

@ -4,11 +4,11 @@
"type": "split",
"children": [
{
"id": "47897c4d1315cd5a",
"id": "d44494af75811809",
"type": "tabs",
"children": [
{
"id": "7af4969d59fe9883",
"id": "71e7b4a13fe35619",
"type": "leaf",
"state": {
"type": "empty",
@ -128,8 +128,10 @@
"templater-obsidian:Templater": false
}
},
"active": "7af4969d59fe9883",
"active": "71e7b4a13fe35619",
"lastOpenFiles": [
"KB/Linux/Desktop/GPG - PGP.md",
"KB/Linux/Server/Hetzner/Storagebox.md",
"KB/Linux/Desktop/ArchLinux/Theming Qt and Gtk.md",
"KB/Linux/Desktop/ArchLinux/sway.md",
"KB/Linux/Desktop/ArchLinux/i3.md",
@ -140,7 +142,6 @@
"KB/Linux/Desktop/ArchLinux/Tweaks.md",
"KB/Linux/Desktop/ArchLinux/Audio/aptx and pulseaudio.md",
"KB/Linux/Server/systemd.md",
"KB/Linux/Desktop/GPG - PGP.md",
"KB/Linux/Desktop/ArchLinux/Fonts.md",
"KB/Linux/Desktop/ArchLinux/Firewall.md",
"KB/Linux/Desktop/ArchLinux/Install.md",
@ -150,7 +151,6 @@
"KB/Linux/Server/Docker Volume Migration.md",
"KB/Linux/Server/DNS.md",
"KB/Linux/Server/Client certificate generation.md",
"KB/Linux/Server/Hetzner/Storagebox.md",
"KB/Linux/Server/ArchLinux/Remote unlocking at boot.md",
"KB/Linux/Server/ArchLinux/Security hardening.md",
"KB/Linux/Server/ArchLinux/Bootstrap.md",