Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CaosDB Crawler
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
CaosDB Crawler
Commits
7063cc31
Commit
7063cc31
authored
3 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
STY: fix style changes
parent
b813d56c
No related branches found
No related tags found
2 merge requests
!53
Release 0.1
,
!9
ENH: introduce JSON converter
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/newcrawler/converters.py
+6
-12
6 additions, 12 deletions
src/newcrawler/converters.py
tox.ini
+2
-0
2 additions, 0 deletions
tox.ini
with
8 additions
and
12 deletions
src/newcrawler/converters.py
+
6
−
12
View file @
7063cc31
...
@@ -197,8 +197,7 @@ class Converter(object):
...
@@ -197,8 +197,7 @@ class Converter(object):
converter_registry
:
dict
):
converter_registry
:
dict
):
if
"
type
"
not
in
definition
:
if
"
type
"
not
in
definition
:
raise
RuntimeError
(
raise
RuntimeError
(
"
Type is mandatory for converter entries in CFood definition.
"
)
"
Type is mandatory for converter entries in CFood definition.
"
)
if
definition
[
"
type
"
]
not
in
converter_registry
:
if
definition
[
"
type
"
]
not
in
converter_registry
:
raise
RuntimeError
(
"
Unknown Type: {}
"
.
format
(
definition
[
"
type
"
]))
raise
RuntimeError
(
"
Unknown Type: {}
"
.
format
(
definition
[
"
type
"
]))
...
@@ -265,8 +264,7 @@ class DirectoryConverter(Converter):
...
@@ -265,8 +264,7 @@ class DirectoryConverter(Converter):
def
create_children
(
self
,
generalStore
:
GeneralStore
,
def
create_children
(
self
,
generalStore
:
GeneralStore
,
element
:
StructureElement
):
element
:
StructureElement
):
if
not
isinstance
(
element
,
Directory
):
if
not
isinstance
(
element
,
Directory
):
raise
RuntimeError
(
raise
RuntimeError
(
"
Directory converters can only create children from directories.
"
)
"
Directory converters can only create children from directories.
"
)
return
self
.
create_children_from_directory
(
element
)
return
self
.
create_children_from_directory
(
element
)
...
@@ -336,8 +334,7 @@ class MarkdownFileConverter(Converter):
...
@@ -336,8 +334,7 @@ class MarkdownFileConverter(Converter):
if
not
isinstance
(
element
,
File
):
if
not
isinstance
(
element
,
File
):
raise
RuntimeError
(
"
A markdown file is needed to create children.
"
)
raise
RuntimeError
(
"
A markdown file is needed to create children.
"
)
header
=
yaml_header_tools
.
get_header_from_file
(
header
=
yaml_header_tools
.
get_header_from_file
(
element
.
path
,
clean
=
False
)
element
.
path
,
clean
=
False
)
children
:
list
[
StructureElement
]
=
[]
children
:
list
[
StructureElement
]
=
[]
for
name
,
entry
in
header
.
items
():
for
name
,
entry
in
header
.
items
():
...
@@ -346,8 +343,7 @@ class MarkdownFileConverter(Converter):
...
@@ -346,8 +343,7 @@ class MarkdownFileConverter(Converter):
elif
type
(
entry
)
==
str
:
elif
type
(
entry
)
==
str
:
children
.
append
(
DictTextElement
(
name
,
entry
))
children
.
append
(
DictTextElement
(
name
,
entry
))
else
:
else
:
raise
RuntimeError
(
raise
RuntimeError
(
"
Header entry {} has incompatible type.
"
.
format
(
name
))
"
Header entry {} has incompatible type.
"
.
format
(
name
))
return
children
return
children
def
typecheck
(
self
,
element
:
StructureElement
):
def
typecheck
(
self
,
element
:
StructureElement
):
...
@@ -476,8 +472,7 @@ class DictListElementConverter(Converter):
...
@@ -476,8 +472,7 @@ class DictListElementConverter(Converter):
def
create_children
(
self
,
generalStore
:
GeneralStore
,
def
create_children
(
self
,
generalStore
:
GeneralStore
,
element
:
StructureElement
):
element
:
StructureElement
):
if
not
isinstance
(
element
,
DictListElement
):
if
not
isinstance
(
element
,
DictListElement
):
raise
RuntimeError
(
raise
RuntimeError
(
"
This converter can only process DictListElements.
"
)
"
This converter can only process DictListElements.
"
)
return
[
TextElement
(
str
(
index
),
list_element
)
for
index
,
list_element
in
enumerate
(
element
.
value
)]
return
[
TextElement
(
str
(
index
),
list_element
)
for
index
,
list_element
in
enumerate
(
element
.
value
)]
def
typecheck
(
self
,
element
:
StructureElement
):
def
typecheck
(
self
,
element
:
StructureElement
):
...
@@ -490,8 +485,7 @@ class DictListElementConverter(Converter):
...
@@ -490,8 +485,7 @@ class DictListElementConverter(Converter):
if
m
is
None
:
if
m
is
None
:
return
None
return
None
if
"
match
"
in
self
.
definition
:
if
"
match
"
in
self
.
definition
:
raise
NotImplementedError
(
raise
NotImplementedError
(
"
Match is not implemented for DictListElement.
"
)
"
Match is not implemented for DictListElement.
"
)
return
m
.
groupdict
()
return
m
.
groupdict
()
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
2
−
0
View file @
7063cc31
...
@@ -7,3 +7,5 @@ deps = .
...
@@ -7,3 +7,5 @@ deps = .
pytest
pytest
pytest-cov
pytest-cov
commands
=
py.test --cov=caosdb -vv {posargs}
commands
=
py.test --cov=caosdb -vv {posargs}
[flake8]
max-line-length
=
100
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment