Skip to content

Commit

Permalink
[poringa] improvements and fixes
Browse files Browse the repository at this point in the history 
- add 'num' and 'count' metadata fields
- prevent crash for "private" posts
- prevent crash when there's no 'main-info'
- update tests
  • Loading branch information
@mikf @bradenhilton
mikf authored and bradenhilton committed Feb 5, 2024
1 parent b3bb369 commit 6b1093a
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 29 deletions.
47 changes: 28 additions & 19 deletions gallery_dl/extractor/poringa.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
class PoringaExtractor(Extractor):
category = "poringa"
directory_fmt = ("{category}", "{user}", "{post_id}")
filename_fmt = "{post_id}_{title}_{filename}.{extension}"
archive_fmt = "{post_id}"
filename_fmt = "{post_id}_{title}_{num:>03}_{filename}.{extension}"
archive_fmt = "{post_id}_{num}"
root = "http://www.poringa.net"

def __init__(self, match):
Expand All @@ -31,36 +31,45 @@ def items(self):
url = "{}/posts/imagenes/{}".format(self.root, post_id)

try:
page = self.request(url).text
response = self.request(url)
except exception.HttpError as exc:
self.log.warning(
"Unable to fetch posts for '%s' (%s)", post_id, exc)
continue

if "/registro-login?" in response.url:
self.log.warning("Private post '%s'", post_id)
continue

page = response.text
title, pos = text.extract(
page, 'property="og:title" content="', '"')
pos = page.index('<div class="main-info', pos)
user, pos = text.extract(
page, 'href="http://www.poringa.net/', '"', pos)

try:
pos = page.index('<div class="main-info', pos)
user, pos = text.extract(
page, 'href="http://www.poringa.net/', '"', pos)
except ValueError:
user = None

if not user:
user = "poringa"

data = {
"post_id" : post_id,
"post_id" : post_id,
"title" : text.unescape(title),
"user" : text.unquote(user),
"_http_headers": {"Referer": url},
}

yield Message.Directory, data
main_post = text.extr(
page, 'property="dc:content" role="main">', '</div>')
for url in text.extract_iter(
main_post,
'<img class="imagen" border="0" src="',
'"',
):
urls = list(text.extract_iter(
main_post, '<img class="imagen" border="0" src="', '"'))
data["count"] = len(urls)

yield Message.Directory, data
for data["num"], url in enumerate(urls, 1):
yield Message.Url, url, text.nameext_from_url(url, data)

def posts(self):
Expand Down Expand Up @@ -95,21 +104,21 @@ def _pagination(self, url, params):
class PoringaPostExtractor(PoringaExtractor):
"""Extractor for posts on poringa.net"""
subcategory = "post"
pattern = BASE_PATTERN + r"/posts/imagenes/(\d+)/[a-zA-Z0-9_-]+\.html"
example = "http://www.poringa.net/posts/imagenes/12/TITLE.html"
pattern = BASE_PATTERN + r"/posts/imagenes/(\d+)"
example = "http://www.poringa.net/posts/imagenes/12345/TITLE.html"

def posts(self):
return (self.item,)


class PoringaUserExtractor(PoringaExtractor):
subcategory = "user"
pattern = BASE_PATTERN + r"/([a-zA-Z0-9_-]+)$"
pattern = BASE_PATTERN + r"/(\w+)$"
example = "http://www.poringa.net/USER"

def posts(self):
url = "{}/buscar/".format(self.root)
params = {"q": text.unquote(self.item)}
url = self.root + "/buscar/"
params = {"q": self.item}
return self._pagination(url, params)


Expand All @@ -120,7 +129,7 @@ class PoringaSearchExtractor(PoringaExtractor):

def posts(self):
url = self.root + "/buscar/"
params = {"q": text.unquote(self.item)}
params = {"q": self.item}
return self._pagination(url, params)


Expand Down
27 changes: 17 additions & 10 deletions test/results/poringa.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,43 @@
"#url" : "http://www.poringa.net/posts/imagenes/3051081/Turrita-alto-ojete.html",
"#category": ("", "poringa", "post"),
"#class" : poringa.PoringaPostExtractor,
"#pattern" : r"http://www\.poringa\.net/posts/imagenes/3051081/[a-zA-Z0-9_-]+\.html",
"#count" : 26,

"post_id" : "3051081",
"title" : "turrita alto ojete...",
"user" : "vipower1top",
"count" : 26,
"num" : range(1, 26),
"post_id" : "3051081",
"title" : "turrita alto ojete...",
"user" : "vipower1top",
},

{
"#url" : "http://www.poringa.net/posts/imagenes/3095554/Otra-culona-de-instagram.html",
"#category": ("", "poringa", "post"),
"#class" : poringa.PoringaPostExtractor,
"#pattern" : r"http://www\.poringa\.net/posts/imagenes/3095554/[a-zA-Z0-9_-]+\.html",
"#count" : 15,

"post_id" : "3095554",
"title" : "Otra culona de instagram",
"user" : "Expectro007",
"count" : 15,
"num" : range(1, 15),
"post_id" : "3095554",
"title" : "Otra culona de instagram",
"user" : "Expectro007",
},

{
"#url" : "http://www.poringa.net/Expectro007",
"#category": ("", "poringa", "user"),
"#class" : poringa.PoringaUserExtractor,
"#pattern" : r"https?://img-[0-9]\.poringa\.net/poringa/img/[a-zA-Z0-9/{2}]{12}[a-zA-Z0-9-_]+/[a-zA-Z0-9-_]+\.jpg",
"#pattern" : r"https?://img-\d+\.poringa\.net/poringa/img/././././././Expectro007/\w{3}\.(jpg|png|gif)",
"#count" : range(500, 600),
},

{
"#url" : "http://www.poringa.net/buscar/?&q=yuslopez",
"#category": ("", "poringa", "search"),
"#class" : poringa.PoringaSearchExtractor,
"#pattern" : r"https?://img-[0-9]\.poringa\.net/poringa/img/[a-zA-Z0-9/{2}]{12}[a-zA-Z0-9-_]+/[a-zA-Z0-9-_]+\.jpg",
"#pattern" : r"https?://img-\d+\.poringa\.net/poringa/img/././././././\w+/\w{3}\.(jpg|png|gif)",
"#range" : "1-50",
"#count" : 50,
},

)

0 comments on commit 6b1093a

Please sign in to comment.