diff options
Diffstat (limited to 'gallery_dl/extractor/girlswithmuscle.py')
| -rw-r--r-- | gallery_dl/extractor/girlswithmuscle.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gallery_dl/extractor/girlswithmuscle.py b/gallery_dl/extractor/girlswithmuscle.py index 51b979f..e61e472 100644 --- a/gallery_dl/extractor/girlswithmuscle.py +++ b/gallery_dl/extractor/girlswithmuscle.py @@ -5,7 +5,7 @@ # published by the Free Software Foundation. from .common import Extractor, Message -from .. import text, util, exception +from .. import text, exception from ..cache import cache BASE_PATTERN = r"(?:https?://)?(?:www\.)?girlswithmuscle\.com" @@ -60,7 +60,7 @@ class GirlswithmuscleExtractor(Extractor): class GirlswithmusclePostExtractor(GirlswithmuscleExtractor): """Extractor for individual posts on girlswithmuscle.com""" subcategory = "post" - pattern = BASE_PATTERN + r"/(\d+)" + pattern = rf"{BASE_PATTERN}/(\d+)" example = "https://www.girlswithmuscle.com/12345/" def items(self): @@ -80,7 +80,7 @@ class GirlswithmusclePostExtractor(GirlswithmuscleExtractor): metadata["type"] = "video" text.nameext_from_url(url, metadata) - yield Message.Directory, metadata + yield Message.Directory, "", metadata yield Message.Url, url, metadata def metadata(self, page): @@ -101,9 +101,8 @@ class GirlswithmusclePostExtractor(GirlswithmuscleExtractor): "model": model, "model_list": self._parse_model_list(model), "tags": text.split_html(tags)[1::2], - "date": text.parse_datetime( - text.extr(page, 'class="hover-time" title="', '"')[:19], - "%Y-%m-%d %H:%M:%S"), + "date": self.parse_datetime_iso(text.extr( + page, 'class="hover-time" title="', '"')[:19]), "is_favorite": self._parse_is_favorite(page), "source_filename": source, "uploader": uploader, @@ -144,7 +143,7 @@ class GirlswithmusclePostExtractor(GirlswithmuscleExtractor): class GirlswithmuscleSearchExtractor(GirlswithmuscleExtractor): """Extractor for search results on girlswithmuscle.com""" subcategory = "search" - pattern = BASE_PATTERN + r"/images/(.*)" + pattern = rf"{BASE_PATTERN}/images/(.*)" example = "https://www.girlswithmuscle.com/images/?name=MODEL" def pages(self): @@ -156,7 +155,7 @@ class GirlswithmuscleSearchExtractor(GirlswithmuscleExtractor): raise exception.AuthorizationError(msg) page = response.text - match = util.re(r"Page (\d+) of (\d+)").search(page) + match = text.re(r"Page (\d+) of (\d+)").search(page) current, total = match.groups() current, total = text.parse_int(current), text.parse_int(total) |