use vscode API instead of Node module #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* use `vscode.workspace.fs` API * pathes are `vscode.Uri`, not `string` * use `child_process.execFile` instead of `child_process.exec`
takahashim
commented
May 27, 2021
| @@ -17,7 +15,7 @@ const output = vscode.window.createOutputChannel("Novel"); | |||
| let html: Buffer; | |||
|
|
|||
| //コマンド登録 | |||
| export function activate(context: vscode.ExtensionContext) { | |||
| export function activate(context: vscode.ExtensionContext): void { | |||
There was a problem hiding this comment.
ここはeslint対策でvoidを明示させてみました
takahashim
commented
May 27, 2021
| @@ -29,7 +27,10 @@ export function activate(context: vscode.ExtensionContext) { | |||
| context.subscriptions.push(controller); | |||
| context.subscriptions.push(characterCounter); | |||
|
|
|||
| html = fs.readFileSync(path.join(context.extensionPath, 'htdocs', 'index.html')); | |||
| const fileUri = vscode.Uri.joinPath(context.extensionUri, 'htdocs', 'index.html'); | |||
There was a problem hiding this comment.
vscode.workspace.fsはパス等の指定にstringではなくvscode.Uriを取るようなので、それに合わせてjoinPathやextensionUriなどに置き換えました。
takahashim
commented
May 27, 2021
Comment on lines
+31
to
+33
| vscode.workspace.fs.readFile(fileUri).then((data) => { | ||
| html = Buffer.from(data); | ||
| }); |
There was a problem hiding this comment.
Buffer型ではなくバイナリ型（Uint8Array）が返ってくるので変換しています。
takahashim
commented
May 27, 2021
| //https://docs.vivliostyle.org/#/ja/vivliostyle-cli | ||
| output.appendLine(`saving pdf to ${vivlioCommand}`); | ||
| cp.exec(vivlioCommand, (err, stdout, stderr) => { | ||
| if (!vscode.workspace.workspaceFolders) { |
There was a problem hiding this comment.
vscode.workspace.workspaceFoldersがnullだったときのエラー処理を追加してeslintの警告に対応しています
takahashim
commented
May 27, 2021
Comment on lines
+184
to
+186
| const folderUri = vscode.workspace.workspaceFolders[0].uri; | ||
| const myPath = vscode.Uri.joinPath(folderUri, 'publish.html'); | ||
| const myWorkingDirectory = folderUri; |
There was a problem hiding this comment.
この辺もみんなvscode.Uriにしています
takahashim
commented
May 27, 2021
Comment on lines
+187
to
+191
| const vivlioCommand = 'vivliostyle'; | ||
| const vivlioSubCommand = 'build'; | ||
|
|
||
| output.appendLine(`starting to publish: ${myPath}`); | ||
| const vivlioParams = [vivlioSubCommand, myPath.fsPath, '-o', vscode.Uri.joinPath(myWorkingDirectory, "output.pdf").fsPath]; |
There was a problem hiding this comment.
この辺りについては、execではなくexecFileを使うようにしたための変更で、引数を配列で渡せるようになるため、vivlioCommandは実行ファイルだけにして、vivlioParamsという配列を追加しています。
takahashim
commented
May 27, 2021
| output.appendLine(`starting to publish: ${vivlioCommand} ${vivlioParams}`); | ||
| const myHtmlBinary = Buffer.from(myHtml, 'utf8'); | ||
|
|
||
| vscode.workspace.fs.writeFile(myPath, myHtmlBinary).then(() => { |
There was a problem hiding this comment.
APIが代わりpromiseが渡されるようになったので、then()で受けるようにしています。
takahashim
commented
May 27, 2021
|
|
||
| vscode.workspace.fs.writeFile(myPath, myHtmlBinary).then(() => { | ||
| output.appendLine(`saving pdf to ${vivlioCommand}`); | ||
| cp.execFile(vivlioCommand, vivlioParams, (err, stdout, stderr) => { |
There was a problem hiding this comment.
ここがexecからexecFileに変更されています
|
ありがとうございます。マージします。 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
vscode.workspace.fsAPIvscode.Uri, notstringchild_process.execFileinstead ofchild_process.exec#18 についての修正で、extension.tsを置き換えてみました。
PDFが生成できることまでは確認できました。
また、パスのエスケープが大変そうだったので、vivliostyleのコマンド実行のところを
execFileを使うように修正しています。