clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance/api storages for graph assets (#6488)

Browse Source 
* improve(api): assets storage for plugin

Co-authored-by: charlie <xyhp915@qq.com>
This commit is contained in:
Tienson Qin
2022-10-04 12:30:19 +08:00
committed by GitHub
parent 3bf9e1a262
commit f4262cf919
11 changed files with 208 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/electron/electron/handler.cljs
View File

@@ -55,8 +55,13 @@
(defmethod handle :readdir [_window [_ dir]]
(readdir dir))
(defmethod handle :listdir [_window [_ dir flat?]]
(when (and dir (fs-extra/pathExistsSync dir))
(js-utils/deepReadDir dir (if (boolean? flat?) flat? true))))
(defmethod handle :unlink [_window [_ repo-dir path]]
(if (plugin/dotdir-file? path)
(if (or (plugin/dotdir-file? path)
(plugin/assetsdir-file? path))
(fs/unlinkSync path)
(try
(logger/info ::unlink {:path path})
@@ -374,8 +379,10 @@
(defmethod handle :getAssetsFiles [^js win [_ {:keys [exts]}]]
(when-let [graph-path (state/get-window-graph-path win)]
(p/let [^js files (js-utils/getAllFiles (.join path graph-path "assets") (clj->js exts))]
files)))
(when-let [assets-path (.join path graph-path "assets")]
(when (fs-extra/pathExistsSync assets-path)
(p/let [^js files (js-utils/getAllFiles assets-path (clj->js exts))]
files)))))
(defn close-watcher-when-orphaned!
"When it's the last window for the directory, close the watcher."

4
src/electron/electron/plugin.cljs
View File

@@ -23,6 +23,10 @@
[file]
(and file (string/starts-with? (path/normalize file) cfgs/dot-root)))
(defn assetsdir-file?
[file]
(and (string? file) (string/includes? file "assets/storages")))
;; Get a release by tag name: /repos/{owner}/{repo}/releases/tags/{tag}
;; Get the latest release: /repos/{owner}/{repo}/releases/latest
;; Zipball https://api.github.com/repos/{owner}/{repo}/zipball

2
src/electron/electron/utils.cljs
View File

@@ -35,7 +35,7 @@
(defn get-ls-dotdir-root
[]
(let [lg-dir (str (.getPath app "home") "/.logseq")]
(let [lg-dir (path/join (.getPath app "home") ".logseq")]
(if-not (fs/existsSync lg-dir)
(do (fs/mkdirSync lg-dir) lg-dir)
lg-dir)))

42
src/electron/electron/utils.js
View File

@@ -1,5 +1,5 @@
import path from "path";
import fs from 'fs';
import path from 'path'
import fse from 'fs-extra'
// workaround from https://github.com/electron/electron/issues/426#issuecomment-658901422
// We set an intercept on incoming requests to disable x-frame-options
@@ -20,13 +20,13 @@ export const disableXFrameOptions = (win) => {
}
export async function getAllFiles (dir, exts) {
const dirents = await readdir(dir, { withFileTypes: true })
const dirents = await fse.readdir(dir, { withFileTypes: true })
if (exts) {
if (exts != null) {
!Array.isArray(exts) && (exts = [exts])
exts = exts.map(it => {
if (it && !it.startsWith('.')) {
if (typeof it === 'string' && it !== '' && !it.startsWith('.')) {
it = '.' + it
}
@@ -35,12 +35,18 @@ export async function getAllFiles (dir, exts) {
}
const files = await Promise.all(dirents.map(async (dirent) => {
if (exts && !exts.includes(path.extname(dirent.name))) {
const filePath = path.resolve(dir, dirent.name)
if (dirent.isDirectory()) {
return getAllFiles(filePath, exts)
}
if (exts && !exts.includes(path.extname(dirent.name)?.toLowerCase())) {
return null
}
const filePath = path.resolve(dir, dirent.name)
const fileStats = await lstat(filePath)
const fileStats = await fse.lstat(filePath)
const stats = {
size: fileStats.size,
accessTime: fileStats.atimeMs,
@@ -48,9 +54,23 @@ export async function getAllFiles (dir, exts) {
changeTime: fileStats.ctimeMs,
birthTime: fileStats.birthtimeMs
}
return dirent.isDirectory() ? getAllFiles(filePath) : {
path: filePath, ...stats
}
return { path: filePath, ...stats }
}))
return files.flat().filter(it => it != null)
}
export async function deepReadDir (dirPath, flat = true) {
const ret = await Promise.all(
(await fse.readdir(dirPath)).map(async (entity) => {
const root = path.join(dirPath, entity)
return (await fse.lstat(root)).isDirectory() ? await deepReadDir(root) : root
})
)
if (flat) {
return ret?.flat()
}
return ret
}

6
src/main/frontend/config.cljs
View File

@@ -420,6 +420,12 @@
(string/replace
source "../assets" (util/format "%s://%s/assets" protocol (get-repo-dir (state/get-current-repo))))))
(defn get-current-repo-assets-root
[]
(when-let [repo-root (and (local-db? (state/get-current-repo))
(get-repo-dir (state/get-current-repo)))]
(util/node-path.join repo-root "assets")))
(defn get-custom-js-path
([]
(get-custom-js-path (state/get-current-repo)))

152
src/main/logseq/api.cljs
View File

@@ -147,86 +147,136 @@
path (util/node-path.join path "package.json")]
(fs/write-file! repo "" path (js/JSON.stringify data nil 2) {:skip-compare? true}))))
(defn ^:private write_rootdir_file
[file content sub-root root-dir]
(p/let [repo ""
path (util/node-path.join root-dir sub-root)
exist? (fs/file-exists? path "")
_ (when-not exist? (fs/mkdir-recur! path))
user-path (util/node-path.join path file)
sub-dir? (string/starts-with? user-path path)
_ (when-not sub-dir?
(log/info :debug user-path)
(throw "write file denied"))
user-path-root (util/node-path.dirname user-path)
exist? (fs/file-exists? user-path-root "")
_ (when-not exist? (fs/mkdir-recur! user-path-root))
_ (fs/write-file! repo "" user-path content {:skip-compare? true})]
user-path))
(defn ^:private write_dotdir_file
[file content sub-root]
(p/let [repo ""
path (plugin-handler/get-ls-dotdir-root)
path (util/node-path.join path sub-root)
exist? (fs/file-exists? path "")
_ (when-not exist? (fs/mkdir-recur! path))
(some-> (plugin-handler/get-ls-dotdir-root)
(p/then #(write_rootdir_file file content sub-root %))))
(defn ^:private write_assetsdir_file
[file content sub-root]
(if-let [assets-dir (config/get-current-repo-assets-root)]
(write_rootdir_file file content sub-root assets-dir)
false))
(defn ^:private read_rootdir_file
[file sub-root root-dir]
(p/let [path (util/node-path.join root-dir sub-root)
user-path (util/node-path.join path file)
sub-dir? (string/starts-with? user-path path)
_ (when-not sub-dir?
(log/info :debug user-path)
(throw "write file denied"))
user-path-root (util/node-path.dirname user-path)
exist? (fs/file-exists? user-path-root "")
_ (when-not exist? (fs/mkdir-recur! user-path-root))
_ (fs/write-file! repo "" user-path content {:skip-compare? true})]
user-path))
sub-dir? (string/starts-with? user-path path)
_ (when-not sub-dir? (log/info :debug user-path) (throw "read file denied"))
exist? (fs/file-exists? "" user-path)
_ (when-not exist? (log/info :debug user-path) (throw "file not existed"))
content (fs/read-file "" user-path)]
content))
(defn ^:private read_dotdir_file
[file sub-root]
(p/let [path (plugin-handler/get-ls-dotdir-root)
path (util/node-path.join path sub-root)
(some-> (plugin-handler/get-ls-dotdir-root)
(p/then #(read_rootdir_file file sub-root %))))
(defn ^:private read_assetsdir_file
[file sub-root]
(when-let [root-dir (config/get-current-repo-assets-root)]
(read_rootdir_file file sub-root root-dir)))
(defn ^:private unlink_rootdir_file!
[file sub-root root-dir]
(p/let [repo ""
path (util/node-path.join root-dir sub-root)
user-path (util/node-path.join path file)
sub-dir? (string/starts-with? user-path path)
_ (when-not sub-dir? (log/info :debug user-path) (throw "read file denied"))
exist? (fs/file-exists? "" user-path)
_ (when-not exist? (log/info :debug user-path) (throw "file not existed"))
content (fs/read-file "" user-path)]
content))
sub-dir? (string/starts-with? user-path path)
_ (when-not sub-dir? (log/info :debug user-path) (throw "access file denied"))
exist? (fs/file-exists? "" user-path)
_ (when-not exist? (log/info :debug user-path) (throw "file not existed"))
_ (fs/unlink! repo user-path {})]))
(defn ^:private unlink_dotdir_file!
[file sub-root]
(p/let [repo ""
path (plugin-handler/get-ls-dotdir-root)
path (util/node-path.join path sub-root)
user-path (util/node-path.join path file)
sub-dir? (string/starts-with? user-path path)
_ (when-not sub-dir? (log/info :debug user-path) (throw "access file denied"))
exist? (fs/file-exists? "" user-path)
_ (when-not exist? (log/info :debug user-path) (throw "file not existed"))
_ (fs/unlink! repo user-path {})]))
(some-> (plugin-handler/get-ls-dotdir-root)
(p/then #(unlink_rootdir_file! file sub-root %))))
(defn ^:private unlink_assetsdir_file!
[file sub-root]
(when-let [root-dir (config/get-current-repo-assets-root)]
(unlink_rootdir_file! file sub-root root-dir)))
(def ^:export write_user_tmp_file
(fn [file content]
(write_dotdir_file file content "tmp")))
(def ^:export write_plugin_storage_file
(fn [plugin-id file content]
(write_dotdir_file
file content
(let [plugin-id (util/node-path.basename plugin-id)]
(util/node-path.join "storages" plugin-id)))))
(fn [plugin-id file content assets?]
(let [plugin-id (util/node-path.basename plugin-id)
sub-root (util/node-path.join "storages" plugin-id)]
(if (true? assets?)
(write_assetsdir_file file content sub-root)
(write_dotdir_file file content sub-root)))))
(def ^:export read_plugin_storage_file
(fn [plugin-id file]
(let [plugin-id (util/node-path.basename plugin-id)]
(read_dotdir_file
file (util/node-path.join "storages" plugin-id)))))
(fn [plugin-id file assets?]
(let [plugin-id (util/node-path.basename plugin-id)
sub-root (util/node-path.join "storages" plugin-id)]
(if (true? assets?)
(read_assetsdir_file file sub-root)
(read_dotdir_file file sub-root)))))
(def ^:export unlink_plugin_storage_file
(fn [plugin-id file]
(let [plugin-id (util/node-path.basename plugin-id)]
(unlink_dotdir_file!
file (util/node-path.join "storages" plugin-id)))))
(fn [plugin-id file assets?]
(let [plugin-id (util/node-path.basename plugin-id)
sub-root (util/node-path.join "storages" plugin-id)]
(if (true? assets?)
(unlink_assetsdir_file! file sub-root)
(unlink_dotdir_file! file sub-root)))))
(def ^:export exist_plugin_storage_file
(fn [plugin-id file]
(p/let [root (plugin-handler/get-ls-dotdir-root)
(fn [plugin-id file assets?]
(p/let [root (if (true? assets?)
(config/get-current-repo-assets-root)
(plugin-handler/get-ls-dotdir-root))
plugin-id (util/node-path.basename plugin-id)
exist? (fs/file-exists?
(util/node-path.join root "storages" plugin-id)
file)]
exist? (fs/file-exists?
(util/node-path.join root "storages" plugin-id)
file)]
exist?)))
(def ^:export clear_plugin_storage_files
(fn [plugin-id]
(p/let [root (plugin-handler/get-ls-dotdir-root)
(fn [plugin-id assets?]
(p/let [root (if (true? assets?)
(config/get-current-repo-assets-root)
(plugin-handler/get-ls-dotdir-root))
plugin-id (util/node-path.basename plugin-id)]
(fs/rmdir! (util/node-path.join root "storages" plugin-id)))))
(def ^:export list_plugin_storage_files
(fn [plugin-id assets?]
(p/let [root (if (true? assets?)
(config/get-current-repo-assets-root)
(plugin-handler/get-ls-dotdir-root))
plugin-id (util/node-path.basename plugin-id)
files-path (util/node-path.join root "storages" plugin-id)
^js files (ipc/ipc :listdir files-path)]
(when (js-iterable? files)
(bean/->js
(map #(some-> (string/replace-first % files-path "")
(string/replace #"^/+" "")) files))))))
(def ^:export load_user_preferences
(fn []
(p/let [repo ""