Skip to content

Commit a07dbae

Browse files
author
s-pace
committed
fix(deployer): remove default value and superfluous checks for urls
refactor(deployer): spread reviewed changes from to_docusaurus_config to to_docusaurus_v2_config refactor(deployer): remove superfluous conditionnal behavior based on urls existence config_creator: addd checks against empty list refactor(config_creator): better flow as reviewed refactor(config_creator): remove unused input refactor: enhance variable and method naming refactor: spread log into comments
1 parent 06c2379 commit a07dbae

File tree

1 file changed

+28
-27
lines changed

1 file changed

+28
-27
lines changed

deployer/src/config_creator.py

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,26 @@ def extract_root_from_input(input_string):
3333
return domain.group() if domain else input_string
3434

3535

36-
def to_docusaurus_config(config, urls=None):
37-
if urls:
38-
config["sitemap_urls"] = [
39-
extract_root_from_input(urls[0]) + "sitemap.xml"]
40-
config["sitemap_alternate_links"] = True
41-
config["custom_settings"] = {"attributesForFaceting": ["language",
42-
"version"]
36+
def assert_list_non_empty(list_to_check):
37+
# Check if the input is not None or empty. Otherwise, it raises an exception
38+
if not list_to_check or len(list_to_check) == 0:
39+
raise Exception('{} is None or empty'.format(list_to_check))
40+
41+
42+
def to_docusaurus_config(config, urls):
43+
assert_list_non_empty(urls)
44+
config["sitemap_urls"] = [
45+
extract_root_from_input(urls[0]) + "sitemap.xml"]
46+
config["sitemap_alternate_links"] = True
47+
config["custom_settings"] = {"attributesForFaceting": ["language",
48+
"version"]
4349
}
4450
start_url = urls[0]
4551
if '/docs/' not in start_url:
4652
if not start_url.endswith('/'):
47-
start_url = start_url + '/'
48-
49-
config["start_urls"] = [start_url + 'docs/']
50-
else:
51-
config["start_urls"] = [start_url]
52-
53+
start_url += '/'
54+
start_url += 'docs/'
55+
config["start_urls"] = [start_url]
5356
config["selectors"]["lvl0"] = OrderedDict((
5457
("selector",
5558
"//*[contains(@class,'navGroups')]//*[contains(@class,'navListItemActive')]/preceding::h3[1]"),
@@ -68,19 +71,17 @@ def to_docusaurus_config(config, urls=None):
6871
return config
6972

7073

71-
def to_docusaurus_v2_config(config, urls=None):
72-
if urls:
73-
config["sitemap_urls"] = [
74-
extract_root_from_input(urls[0]) + "sitemap.xml"]
75-
config["sitemap_alternate_links"] = True
74+
def to_docusaurus_v2_config(config, urls):
75+
assert_list_non_empty(urls)
76+
config["sitemap_urls"] = [
77+
extract_root_from_input(urls[0]) + "sitemap.xml"]
78+
config["sitemap_alternate_links"] = True
7679
start_url = urls[0]
7780
if '/docs/' not in start_url:
7881
if not start_url.endswith('/'):
79-
start_url = start_url + '/'
80-
81-
config["start_urls"] = [start_url + 'docs/']
82-
else:
83-
config["start_urls"] = [start_url]
82+
start_url += '/'
83+
start_url += 'docs/'
84+
config["start_urls"] = [start_url]
8485

8586
config["selectors"]["lvl0"] = OrderedDict((
8687
("selector",
@@ -127,14 +128,14 @@ def to_pkgdown_config(config, urls=None):
127128
"tags": [
128129
"reference"
129130
]
130-
},
131+
},
131132
{
132133
"url": root + "articles",
133134
"selectors_key": "articles",
134135
"tags": [
135136
"articles"
136137
]
137-
}]
138+
}]
138139

139140
config["sitemap_urls"] = [
140141
root + "sitemap.xml"]
@@ -272,7 +273,7 @@ def to_publii_config(config, urls=None):
272273
return config
273274

274275

275-
def to_jsdoc_config(config, urls=None):
276+
def to_jsdoc_config(config):
276277
config["stop_urls"] = ["\\.js\\.html",
277278
"/index\\.html$"]
278279

@@ -341,7 +342,7 @@ def create_config(u=None):
341342
elif helpdesk_helper.is_publii_conversation(conversation):
342343
config = to_publii_config(config, urls)
343344
elif helpdesk_helper.is_jsdoc_conversation(conversation):
344-
config = to_jsdoc_config(config, urls)
345+
config = to_jsdoc_config(config)
345346

346347
config["conversation_id"] = [cuid]
347348

0 commit comments

Comments
 (0)