Validator#2
Open
ematan wants to merge 3 commits into
Open
Conversation
raphendyr
reviewed
Jun 12, 2018
| from os import getcwd, path | ||
| from os.path import abspath, expanduser, expandvars | ||
| from sys import exit | ||
| from sys import exit, stderr, modules |
raphendyr
reviewed
Jun 12, 2018
| @@ -1,23 +1,37 @@ | |||
| import argparse | |||
| from os import getcwd | |||
| from os import getcwd, path | |||
raphendyr
reviewed
Jun 12, 2018
|
|
||
| def main(): | ||
|
|
||
|
|
raphendyr
reviewed
Jun 12, 2018
|
|
||
| #mystinen lista schema directoryja - course.yamlissa jossain kentässä, joka sijaitsee käyttäjän paketin juuressa | ||
| def get_folders(config): | ||
| folders = config.__config__.get("custom_schema_locations", []) |
Contributor
There was a problem hiding this comment.
Key schema_paths should be semantically better. In addition, it should be validated that it's a list.
if not isinstance(folders, list):
raise ValueError("Invalid type for 'schema_path' in config. Expected a llist.")
raphendyr
reviewed
Jun 12, 2018
| schema_path = os.path.join(ext[0], schema_fullname) | ||
| logger.info(" Starting validation of %s with %s", filename, schema_fullname) | ||
| result = self.assert_valid(schema_path, filename) | ||
| logger.info(" Validation done", filename) |
Contributor
There was a problem hiding this comment.
could probably contain the result
raphendyr
reviewed
Jun 12, 2018
| for ff in os.listdir(folder): | ||
| logger.debug(" File-------------%s", ff) | ||
| if prog.match(ff) is not None: | ||
| found = prog.match(ff).groups() |
Contributor
There was a problem hiding this comment.
match = prog.match(ff)
if match is not None:
major, minor, ext = match.groups()
...
better?
raphendyr
reviewed
Jun 12, 2018
| logger.debug(" File-------------%s", ff) | ||
| if prog.match(ff) is not None: | ||
| found = prog.match(ff).groups() | ||
| schema_index.setdefault(schema, {}) |
Contributor
There was a problem hiding this comment.
foo = schema_index.setdefault(...) store result in var and use it below in place of schema_index[schema].
raphendyr
reviewed
Jun 12, 2018
|
|
||
|
|
||
| #idea = { schema_name: {(major, minor): location}} | ||
| schema_index = {} |
raphendyr
reviewed
Jun 12, 2018
| logger.info(" Locating all valid schemas...") | ||
| self.find_all_matches(schema) | ||
| logger.info(" Locating matching version v%d...", major) | ||
| serial, ext = self.find_newest(schema, major, minor) |
Contributor
There was a problem hiding this comment.
this is required only when minor is not known version: '3'. If minor is known, then test (major, minor) in schema_index[schema] is sufficient.
raphendyr
reviewed
Jun 12, 2018
| logger.debug(" Index-------------%s", schema_index) | ||
| current = schema_index[schema].setdefault((int(found[0]), int(found[1])), None) | ||
| if current is None: | ||
| schema_index[schema][int(found[0]), int(found[1])] = (folder, found[2]) |
Contributor
There was a problem hiding this comment.
You can store os.path.join(folder, ff) and then the filename doesn't need to be reconstructed later.
raphendyr
reviewed
Jun 12, 2018
| return None | ||
|
|
||
| #filter(_ <= major.minor) and reduce(max(_,_)) | ||
| i = {k:v for k, v in schemas.items() if k[0]<major or k[0]==major and k[1]<=minor} |
Contributor
There was a problem hiding this comment.
Finding newest with major should be simple as:
ver = max((v for v in schems if v[0] == major), default=None)
file_ = schemas[ver]
Contributor
|
Files In addition, version could use do |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Created validator.py and some schemas for testing purposes.