FIX: writeFileSafelyの一時ファイルが既存のファイルを上書きしないようにする
#2454
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
ファイル移動に失敗した場合一時ファイルを削除する
|
🚀 プレビュー用ページを作成しました 🚀 更新時点でのコミットハッシュ： |
Hiroshiba
reviewed
Jan 1, 2025
src/backend/electron/fileHelper.ts
Outdated
Comment on lines
13
to
31
| let tmpPath: string; | ||
| let maxRetries = 16; | ||
| while (true) { | ||
| maxRetries--; | ||
| try { | ||
| // ランダムな文字列を8文字生成 | ||
| const randStr = Math.floor(Math.random() * 36 ** 8) | ||
| .toString(36) | ||
| .padStart(8, "0"); | ||
| tmpPath = `${path}-${randStr}.tmp`; | ||
| fs.writeFileSync(tmpPath, data, { flag: "wx" }); | ||
| break; | ||
| } catch (error) { | ||
| const e = error as NodeJS.ErrnoException; | ||
| if (e.code !== "EEXIST" || maxRetries <= 0) { | ||
| throw e; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
結構ややこしさが上がってしまうので、重ならないランダムであるuuid4を使っちゃいますか！！
こうなるはず！
Suggested change
| let tmpPath: string; | |
| let maxRetries = 16; | |
| while (true) { | |
| maxRetries--; | |
| try { | |
| // ランダムな文字列を8文字生成 | |
| const randStr = Math.floor(Math.random() * 36 ** 8) | |
| .toString(36) | |
| .padStart(8, "0"); | |
| tmpPath = `${path}-${randStr}.tmp`; | |
| fs.writeFileSync(tmpPath, data, { flag: "wx" }); | |
| break; | |
| } catch (error) { | |
| const e = error as NodeJS.ErrnoException; | |
| if (e.code !== "EEXIST" || maxRetries <= 0) { | |
| throw e; | |
| } | |
| } | |
| } | |
| const tmpPath = `${path}-${uuid4()}.tmp`; | |
| fs.writeFileSync(tmpPath, data, { flag: "wx" }); |
（８桁数字を提案したのは僕なのですみません 🙇 ）
src/backend/electron/fileHelper.ts
Outdated
| }); | ||
| } catch (error) { | ||
| fs.promises.unlink(tmpPath).catch((reason) => { | ||
| log.warn("Fail to remove %s\n %o", tmpPath, reason); |
There was a problem hiding this comment.
こうかも
Suggested change
| log.warn("Fail to remove %s\n %o", tmpPath, reason); | |
| log.warn("Failed to remove %s\n %o", tmpPath, reason); |
src/backend/electron/fileHelper.ts
Outdated
| overwrite: true, | ||
| }); | ||
| } catch (error) { | ||
| fs.promises.unlink(tmpPath).catch((reason) => { |
Hiroshiba
approved these changes
Jan 1, 2025
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.
内容
writeFileSafelyの一時ファイルが既存のファイルを上書きしないようにします。また、ファイル移動に失敗した場合一時ファイルを削除するようにします。
関連 Issue
その他
一時ファイル名のランダム文字列部には
Math.rand()を使っています。これでも十分なはず？
とりあえず一時ファイルの作成試行回数は16回にしてあります。
あまり回数を増やし過ぎるとメインスレッドを長時間ブロックしてしまいます。