Add default metadata #40
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
lebouquetin
requested changes
Jul 23, 2024
jssg/models.py
Outdated
| data = {} | ||
| json_data = "" | ||
| content = StringIO() | ||
|
|
||
| with settings.JFME_DEFAULT_METADATA_PATH.open() as f: | ||
| for line in f : | ||
| key, value = map(str.strip, re.split("[\s]", line, maxsplit=1)) |
There was a problem hiding this comment.
It would be interesting to reuse the comment possibility that is implemented in content descriptor (lines starting with a #)
Look at model source code:
if line.startswith("#"):
continue # remove comment lines
I suggest to refactor/factorize parsing source code in a function.
It means in global parsing algorithm, replace:
if line.strip() == "": # ignore empty lines
continue
if line.startswith("#"): # ignore comment lines
continue
# Parse a metadata key value pair
# key, value = map(str.strip, line.split("", maxsplit=1))
import re
key, value = map(str.strip, re.split("[\s]", line, maxsplit=1))
# FIXME print("KEY {} : {} (line is: {})".format(key, value, line))
metadata[key] = value
with something like:
try:
key, value = parse_metadata_line(line)
metadata[key] = value
except EmptyLine:
[...]
except CommentLine as comment:
[...]
And reuse the algorithm/function for default metadata file parsing
jssg/settings.py
Outdated
| @@ -52,7 +52,8 @@ | |||
| JFME_POSTS_DIRS = [path / "posts" for path in JFME_CONTENT_DIRS] | |||
| JFME_TEMPLATES_DIRS = [path / "templates" for path in JFME_CONTENT_DIRS] | |||
| JFME_STATIC_DIRS = [path / "static" for path in JFME_CONTENT_DIRS] | |||
|
|
|||
| JFME_DEFAULT_METADATA_DICT = {"slug": "index", } # The order of include is : JFME_DEFAULT_METADATA_DICT then JFME_DEFAULT_METADATA_PATH then page metadata | |||
| JFME_DEFAULT_METADATA_PATH = BASE_DIR / "jssg" / "default_metadata.txt" # If a metadata is specified more than once, the last included is retained | |||
There was a problem hiding this comment.
JFME_DEFAULT_METADATA_PATH -> JFME_DEFAULT_METADATA_FILEPATH
ClmntBcqt
force-pushed
the
feat__19_add_default_metadata
branch
from
3e8cf4d to
8e01bea
Compare
lebouquetin
approved these changes
Jul 24, 2024
|
Lets squash and merge @ClmntBcqt |
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.
PR for issue #19