mirror of
https://github.com/lllin000/PaperForge.git
synced 2026-07-22 06:50:53 +00:00
fix: add --version to CLI, fix plugin version detection to use python -c
This commit is contained in:
parent
5dc1b720eb
commit
fa3187519d
2 changed files with 6 additions and 3 deletions
|
|
@ -116,10 +116,13 @@ def _import_worker_functions() -> None:
|
|||
# Build parser
|
||||
# ---------------------------------------------------------------------------
|
||||
def build_parser() -> argparse.ArgumentParser:
|
||||
from paperforge import __version__
|
||||
|
||||
parser = argparse.ArgumentParser(
|
||||
prog="paperforge",
|
||||
description="PaperForge — Obsidian + Zotero literature pipeline CLI",
|
||||
description="PaperForge \u2014 Obsidian + Zotero literature pipeline CLI",
|
||||
)
|
||||
parser.add_argument("--version", action="version", version=f"paperforge {__version__}")
|
||||
parser.add_argument(
|
||||
"--vault",
|
||||
metavar="VAULT",
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ class PaperForgeStatusView extends ItemView {
|
|||
_fetchVersion() {
|
||||
const vp = this.app.vault.adapter.basePath;
|
||||
const pythonExe = resolvePythonExecutable(vp);
|
||||
execFile(pythonExe, ['-m', 'paperforge', '--version'], { cwd: vp, timeout: 10000 }, (err, stdout) => {
|
||||
execFile(pythonExe, ['-c', 'import paperforge; print(paperforge.__version__)'], { cwd: vp, timeout: 10000 }, (err, stdout) => {
|
||||
if (!err && stdout) {
|
||||
const v = stdout.trim();
|
||||
this._paperforgeVersion = v.startsWith('v') ? v : 'v' + v;
|
||||
|
|
@ -2157,7 +2157,7 @@ class PaperForgeSetupModal extends Modal {
|
|||
try {
|
||||
let hasPaperforge = true;
|
||||
try {
|
||||
await runPython(['-m', 'paperforge', '--version']);
|
||||
await runPython(['-c', 'import paperforge']);
|
||||
} catch {
|
||||
hasPaperforge = false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue