From 64350569c964ef6e9d231f77a2d531388270e3fb Mon Sep 17 00:00:00 2001 From: squidfunk Date: Thu, 31 Aug 2023 11:31:15 +0200 Subject: [PATCH] Moved parser to own module --- material/plugins/blog/readtime/__init__.py | 27 +------------ material/plugins/blog/readtime/parser.py | 45 ++++++++++++++++++++++ src/plugins/blog/readtime/__init__.py | 27 +------------ src/plugins/blog/readtime/parser.py | 45 ++++++++++++++++++++++ 4 files changed, 94 insertions(+), 50 deletions(-) create mode 100644 material/plugins/blog/readtime/parser.py create mode 100644 src/plugins/blog/readtime/parser.py diff --git a/material/plugins/blog/readtime/__init__.py b/material/plugins/blog/readtime/__init__.py index c21a582a6..a0c149b98 100644 --- a/material/plugins/blog/readtime/__init__.py +++ b/material/plugins/blog/readtime/__init__.py @@ -20,9 +20,10 @@ import re -from html.parser import HTMLParser from math import ceil +from .parser import ReadtimeParser + # ----------------------------------------------------------------------------- # Functions # ----------------------------------------------------------------------------- @@ -48,27 +49,3 @@ def readtime(html: str, words_per_minute: int): # Return readtime in minutes return ceil(seconds / 60) - -# ----------------------------------------------------------------------------- -# Classes -# ----------------------------------------------------------------------------- - -# Readtime parser -class ReadtimeParser(HTMLParser): - - # Initialize parser - def __init__(self): - super().__init__(convert_charrefs = True) - - # Keep track of text and images - self.text = [] - self.images = 0 - - # Collect images - def handle_starttag(self, tag, attrs): - if tag == "img": - self.images += 1 - - # Collect text - def handle_data(self, data): - self.text.append(data) diff --git a/material/plugins/blog/readtime/parser.py b/material/plugins/blog/readtime/parser.py new file mode 100644 index 000000000..b91a7b309 --- /dev/null +++ b/material/plugins/blog/readtime/parser.py @@ -0,0 +1,45 @@ +# Copyright (c) 2016-2023 Martin Donath + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +from html.parser import HTMLParser + +# ----------------------------------------------------------------------------- +# Classes +# ----------------------------------------------------------------------------- + +# Readtime parser +class ReadtimeParser(HTMLParser): + + # Initialize parser + def __init__(self): + super().__init__(convert_charrefs = True) + + # Keep track of text and images + self.text = [] + self.images = 0 + + # Collect images + def handle_starttag(self, tag, attrs): + if tag == "img": + self.images += 1 + + # Collect text + def handle_data(self, data): + self.text.append(data) diff --git a/src/plugins/blog/readtime/__init__.py b/src/plugins/blog/readtime/__init__.py index c21a582a6..a0c149b98 100644 --- a/src/plugins/blog/readtime/__init__.py +++ b/src/plugins/blog/readtime/__init__.py @@ -20,9 +20,10 @@ import re -from html.parser import HTMLParser from math import ceil +from .parser import ReadtimeParser + # ----------------------------------------------------------------------------- # Functions # ----------------------------------------------------------------------------- @@ -48,27 +49,3 @@ def readtime(html: str, words_per_minute: int): # Return readtime in minutes return ceil(seconds / 60) - -# ----------------------------------------------------------------------------- -# Classes -# ----------------------------------------------------------------------------- - -# Readtime parser -class ReadtimeParser(HTMLParser): - - # Initialize parser - def __init__(self): - super().__init__(convert_charrefs = True) - - # Keep track of text and images - self.text = [] - self.images = 0 - - # Collect images - def handle_starttag(self, tag, attrs): - if tag == "img": - self.images += 1 - - # Collect text - def handle_data(self, data): - self.text.append(data) diff --git a/src/plugins/blog/readtime/parser.py b/src/plugins/blog/readtime/parser.py new file mode 100644 index 000000000..b91a7b309 --- /dev/null +++ b/src/plugins/blog/readtime/parser.py @@ -0,0 +1,45 @@ +# Copyright (c) 2016-2023 Martin Donath + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +from html.parser import HTMLParser + +# ----------------------------------------------------------------------------- +# Classes +# ----------------------------------------------------------------------------- + +# Readtime parser +class ReadtimeParser(HTMLParser): + + # Initialize parser + def __init__(self): + super().__init__(convert_charrefs = True) + + # Keep track of text and images + self.text = [] + self.images = 0 + + # Collect images + def handle_starttag(self, tag, attrs): + if tag == "img": + self.images += 1 + + # Collect text + def handle_data(self, data): + self.text.append(data)