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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
CaosDB Crawler
Commits
2eb36c70
Commit
2eb36c70
authored
2 years ago
by
Alexander Schlemmer
Browse files
Options
Downloads
Patches
Plain Diff
MAIN: Moved the definitions for the default converters to a separate file.
parent
7df30e6f
No related branches found
No related tags found
2 merge requests
!105
REL: v0.4.0
,
!95
F refactor default converters
Pipeline
#33422
failed
2 years ago
Stage: info
Stage: setup
Stage: cert
Stage: style
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
src/caoscrawler/crawl.py
+4
-68
4 additions, 68 deletions
src/caoscrawler/crawl.py
unittests/test_converters.py
+22
-0
22 additions, 0 deletions
unittests/test_converters.py
with
30 additions
and
68 deletions
CHANGELOG.md
+
4
−
0
View file @
2eb36c70
...
...
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ###
-
The definitions for the default converters were removed from crawl.py and placed into
a separate yaml file called
`default_converters.yml`
. There is a new test testing for
the correct loading behavior of that file.
### Deprecated ###
### Removed ###
...
...
This diff is collapsed.
Click to expand it.
src/caoscrawler/crawl.py
+
4
−
68
View file @
2eb36c70
...
...
@@ -328,77 +328,13 @@ class Crawler(object):
directory:
schema.yml file
README.md documentation
TODO: this function does not make use of self, so it could become static.
"""
# Defaults for the converter registry:
converter_registry
:
dict
[
str
,
dict
[
str
,
str
]]
=
{
"
Directory
"
:
{
"
converter
"
:
"
DirectoryConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
SimpleFile
"
:
{
"
converter
"
:
"
SimpleFileConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
MarkdownFile
"
:
{
"
converter
"
:
"
MarkdownFileConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
File
"
:
{
"
converter
"
:
"
SimpleFileConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
JSONFile
"
:
{
"
converter
"
:
"
JSONFileConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
YAMLFile
"
:
{
"
converter
"
:
"
YAMLFileConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
CSVTableConverter
"
:
{
"
converter
"
:
"
CSVTableConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
XLSXTableConverter
"
:
{
"
converter
"
:
"
XLSXTableConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
DictBooleanElement
"
:
{
"
converter
"
:
"
BooleanElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
BooleanElement
"
:
{
"
converter
"
:
"
BooleanElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
DictFloatElement
"
:
{
"
converter
"
:
"
FloatElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
FloatElement
"
:
{
"
converter
"
:
"
FloatElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
DictTextElement
"
:
{
"
converter
"
:
"
TextElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
TextElement
"
:
{
"
converter
"
:
"
TextElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
Date
"
:
{
"
converter
"
:
"
DateElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
DictIntegerElement
"
:
{
"
converter
"
:
"
IntegerElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
IntegerElement
"
:
{
"
converter
"
:
"
IntegerElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
DictListElement
"
:
{
"
converter
"
:
"
ListElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
ListElement
"
:
{
"
converter
"
:
"
ListElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
DictDictElement
"
:
{
"
converter
"
:
"
DictElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
DictElement
"
:
{
"
converter
"
:
"
DictElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
"
Dict
"
:
{
"
converter
"
:
"
DictElementConverter
"
,
"
package
"
:
"
caoscrawler.converters
"
},
}
with
open
(
str
(
files
(
'
caoscrawler
'
).
joinpath
(
'
default_converters.yml
'
)),
"
r
"
)
as
f
:
converter_registry
:
dict
[
str
,
dict
[
str
,
str
]]
=
yaml
.
safe_load
(
f
)
# More converters from definition file:
if
"
Converters
"
in
definition
:
...
...
This diff is collapsed.
Click to expand it.
unittests/test_converters.py
+
22
−
0
View file @
2eb36c70
...
...
@@ -595,3 +595,25 @@ def test_date_converter():
matches
=
dictconverter
.
match
(
TextElement
(
"
text
"
,
"
alve
"
))
assert
matches
is
None
def
test_load_converters
():
c
=
Crawler
()
converter_registry
=
c
.
load_converters
({})
# The previous function call actually already asserts that all defined
# converter classes can be loaded from their respective packages.
# Please adapt, if defaults change!
assert
len
(
converter_registry
)
==
22
# All of them are contained in caoscrawler.converters
for
conv_key
,
conv
in
converter_registry
.
items
():
assert
conv
[
"
package
"
]
==
"
caoscrawler.converters
"
# ... and their names all end in "Converter"
assert
conv
[
"
converter
"
].
endswith
(
"
Converter
"
)
# Some checks:
assert
"
CSVTableConverter
"
in
converter_registry
assert
"
SimpleFile
"
in
converter_registry
assert
"
Directory
"
in
converter_registry
assert
"
ListElement
"
in
converter_registry
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