git @ Cat's Eye Technologies Feedmark / 919ad7b
Remove gratuitous use of kwargs in these methods, for readability. Chris Pressey 3 months ago
1 changed file(s) with 20 addition(s) and 17 deletion(s). Raw diff Collapse all Expand all
135135 def global_link_ref_defs(self):
136136 return self.link_ref_defs
137137
138 def to_json_data(self, **kwargs):
138 def to_json_data(self, htmlize=False, ordered=False, link_ref_defs=None):
139139 preamble = self.preamble.strip()
140140 properties = self.properties
141141
142 if kwargs.get("htmlize", False):
143 if "link_ref_defs" not in kwargs:
144 kwargs["link_ref_defs"] = self.global_link_ref_defs()
145 preamble = markdown_to_html5(
146 preamble, link_ref_defs=kwargs["link_ref_defs"]
142 if htmlize:
143 if not link_ref_defs:
144 link_ref_defs = self.global_link_ref_defs()
145 preamble = markdown_to_html5(preamble, link_ref_defs=link_ref_defs)
146 properties = markdown_to_html5_deep(
147 self.properties, link_ref_defs=link_ref_defs
147148 )
148 properties = markdown_to_html5_deep(
149 self.properties, link_ref_defs=kwargs["link_ref_defs"]
150 )
151
152 if kwargs.get("ordered", False):
149
150 if ordered:
153151 properties_list = []
154152 for key, value in properties.items():
155153 properties_list.append([key, value])
162160 "title": self.title,
163161 "properties": properties,
164162 "preamble": preamble,
165 "sections": [s.to_json_data(**kwargs) for s in self.sections],
163 "sections": [
164 section.to_json_data(
165 htmlize=htmlize, ordered=ordered, link_ref_defs=link_ref_defs
166 )
167 for section in self.sections
168 ],
166169 }
167170
168171
237240 title = re.sub(r"[^\w\s\/\.\'-]", "", title)
238241 return re.sub(r"[\s\/\.\'-]+", "-", title)
239242
240 def to_json_data(self, **kwargs):
243 def to_json_data(self, htmlize=False, ordered=False, link_ref_defs=None):
241244 body = self.body
242245 properties = self.properties
243246
244 if kwargs.get("htmlize", False):
245 body = markdown_to_html5(body, link_ref_defs=kwargs["link_ref_defs"])
247 if htmlize:
248 body = markdown_to_html5(body, link_ref_defs=link_ref_defs)
246249 properties = markdown_to_html5_deep(
247 self.properties, link_ref_defs=kwargs["link_ref_defs"]
250 self.properties, link_ref_defs=link_ref_defs
248251 )
249252
250 if kwargs.get("ordered", False):
253 if ordered:
251254 properties_list = []
252255 for key, value in properties.items():
253256 properties_list.append([key, value])