From a7cca3242ad7adc5163d70aa2cc8ee23c92211e5 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 18 Aug 2023 04:07:40 +0000
Subject: [PATCH] deref symlink on quartz sync
---
content/features/upcoming features.md | 6 ------
quartz/bootstrap-cli.mjs | 36 ++++++++++++++++++++++++++++--------
2 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/content/features/upcoming features.md b/content/features/upcoming features.md
index 28ee48a..48acf60 100644
--- a/content/features/upcoming features.md
+++ b/content/features/upcoming features.md
@@ -1,12 +1,6 @@
---
draft: true
---
-
-## todo
-
-- dereference symlink for npx quartz sync
- - prompt user as to whether to do it (it's expensive for large vaults)
-
## high priority backlog
- block links: https://help.obsidian.md/Linking+notes+and+files/Internal+links#Link+to+a+block+in+a+note
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 8efa7b0..f7c7bee 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -112,6 +112,7 @@
}
async function stashContentFolder(contentFolder) {
+ await fs.promises.rm(contentCacheFolder, { force: true, recursive: true })
await fs.promises.cp(contentFolder, contentCacheFolder, {
force: true,
recursive: true,
@@ -150,7 +151,7 @@
message: `Choose how to initialize the content in \`${contentFolder}\``,
options: [
{ value: "new", label: "Empty Quartz" },
- { value: "copy", label: "Replace with an existing folder", hint: "overwrites `content`" },
+ { value: "copy", label: "Copy an existing folder", hint: "overwrites `content`" },
{
value: "symlink",
label: "Symlink an existing folder",
@@ -163,12 +164,10 @@
async function rmContentFolder() {
const contentStat = await fs.promises.lstat(contentFolder)
- if (contentStat) {
- if (contentStat.isSymbolicLink()) {
- await fs.promises.unlink(contentFolder)
- } else {
- await rimraf(contentFolder)
- }
+ if (contentStat.isSymbolicLink()) {
+ await fs.promises.unlink(contentFolder)
+ } else {
+ await rimraf(contentFolder)
}
}
@@ -274,11 +273,32 @@
console.log("Backing up your content")
if (argv.commit) {
+ const contentStat = await fs.promises.lstat(contentFolder)
+ if (contentStat.isSymbolicLink()) {
+ console.log(chalk.yellow("Detected symlink, trying to dereference before committing"))
+
+ // stash symlink file
+ await stashContentFolder(contentFolder)
+
+ // follow symlink and copy content
+ const linkTarg = await fs.promises.readlink(contentFolder)
+ await fs.promises.cp(linkTarg, contentFolder, {
+ force: true,
+ recursive: true,
+ preserveTimestamps: true,
+ })
+ }
+
const currentTimestamp = new Date().toLocaleString("en-US", {
dateStyle: "medium",
timeStyle: "short",
})
spawnSync("git", ["commit", "-am", `Quartz sync: ${currentTimestamp}`], { stdio: "inherit" })
+
+ if (contentStat.isSymbolicLink()) {
+ // put symlink back
+ await popContentFolder()
+ }
}
await stashContentFolder(contentFolder)
@@ -466,7 +486,7 @@
rebuild(clientRefresh)
})
} else {
- await build(() => {})
+ await build(() => { })
ctx.dispose()
}
})
--
Gitblit v1.10.0