-
-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
perf(processor/post): improve processing speed when config.post_asset_folder
is enabled
#5473
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
9385c81
perf(processor/post): improve processing speed when `config.post_asse…
yoshinorin 44a14de
refactor: use `Post.findById` if `postAsset` exists
yoshinorin f782736
chore: add comment
yoshinorin 03379e8
chore: rename unclear variable name
yoshinorin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,14 @@ | ||
import { toDate, timezone, isExcludedFile, isTmpFile, isHiddenFile, isMatch } from './common'; | ||
import Promise from 'bluebird'; | ||
import { parse as yfm } from 'hexo-front-matter'; | ||
import { extname, join } from 'path'; | ||
import { extname, join, posix, sep } from 'path'; | ||
import { stat, listDir } from 'hexo-fs'; | ||
import { slugize, Pattern, Permalink } from 'hexo-util'; | ||
import { magenta } from 'picocolors'; | ||
import type { _File } from '../../box'; | ||
import type Hexo from '../../hexo'; | ||
import type { Stats } from 'fs'; | ||
import { PostSchema } from '../../types'; | ||
|
||
const postDir = '_posts/'; | ||
const draftDir = '_drafts/'; | ||
|
@@ -268,29 +269,41 @@ function processAsset(ctx: Hexo, file: _File) { | |
const PostAsset = ctx.model('PostAsset'); | ||
const Post = ctx.model('Post'); | ||
const id = file.source.substring(ctx.base_dir.length); | ||
const doc = PostAsset.findById(id); | ||
const postAsset = PostAsset.findById(id); | ||
|
||
if (file.type === 'delete') { | ||
if (doc) { | ||
return doc.remove(); | ||
if (file.type === 'delete' || Post.length === 0) { | ||
if (postAsset) { | ||
return postAsset.remove(); | ||
} | ||
|
||
return; | ||
} | ||
|
||
// TODO: Better post searching | ||
const post = Post.toArray().find(post => file.source.startsWith(post.asset_dir)); | ||
if (post != null && (post.published || ctx._showDrafts())) { | ||
const savePostAsset = (post: PostSchema) => { | ||
return PostAsset.save({ | ||
_id: id, | ||
slug: file.source.substring(post.asset_dir.length), | ||
post: post._id, | ||
modified: file.type !== 'skip', | ||
renderable: file.params.renderable | ||
}); | ||
}; | ||
|
||
if (postAsset) { | ||
// `postAsset.post` is `Post.id`. | ||
const post = Post.findById(postAsset.post); | ||
if (post != null && (post.published || ctx._showDrafts())) { | ||
return savePostAsset(post); | ||
} | ||
} | ||
|
||
const assetDir = id.slice(0, id.lastIndexOf(sep)); | ||
const post = Post.findOne(p => p.asset_dir.endsWith(posix.join(assetDir, '/'))); | ||
if (post != null && (post.published || ctx._showDrafts())) { | ||
return savePostAsset(post); | ||
} | ||
|
||
if (doc) { | ||
return doc.remove(); | ||
// NOTE: Probably, unreachable. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Probably, will not be reached here unless the user intentionally changes the values in |
||
if (postAsset) { | ||
return postAsset.remove(); | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I renamed unclear naming.