[luscious] fix detection of unavailable galleries
This commit is contained in:
@@ -74,7 +74,7 @@ class LusciousAlbumExtractor(LusciousBase, GalleryExtractor):
|
|||||||
}),
|
}),
|
||||||
("https://members.luscious.net/albums/login-required_323871/", {
|
("https://members.luscious.net/albums/login-required_323871/", {
|
||||||
"options": (("username", None),),
|
"options": (("username", None),),
|
||||||
"exception": exception.AuthorizationError,
|
"exception": exception.HttpError,
|
||||||
}),
|
}),
|
||||||
("https://www.luscious.net/albums/okinami_277031/"),
|
("https://www.luscious.net/albums/okinami_277031/"),
|
||||||
("https://members.luscious.net/albums/okinami_277031/"),
|
("https://members.luscious.net/albums/okinami_277031/"),
|
||||||
@@ -88,14 +88,14 @@ class LusciousAlbumExtractor(LusciousBase, GalleryExtractor):
|
|||||||
GalleryExtractor.__init__(self, match, url)
|
GalleryExtractor.__init__(self, match, url)
|
||||||
|
|
||||||
def metadata(self, page):
|
def metadata(self, page):
|
||||||
pos = page.find("<h1>404 Not Found</h1>")
|
title, pos = text.extract(page, '"og:title" content="', '"')
|
||||||
if pos >= 0:
|
|
||||||
|
if title is None:
|
||||||
msg = text.extract(page, '<div class="content">', '</div>', pos)[0]
|
msg = text.extract(page, '<div class="content">', '</div>', pos)[0]
|
||||||
if msg and "content is not available" in msg:
|
if msg:
|
||||||
raise exception.AuthorizationError()
|
raise exception.AuthorizationError(msg)
|
||||||
raise exception.NotFoundError("album")
|
raise exception.NotFoundError("album")
|
||||||
|
|
||||||
title, pos = text.extract(page, '"og:title" content="', '"')
|
|
||||||
info , pos = text.extract(page, '<li class="user_info">', "", pos)
|
info , pos = text.extract(page, '<li class="user_info">', "", pos)
|
||||||
if info is None:
|
if info is None:
|
||||||
count, pos = text.extract(page, '>Pages:', '<', pos)
|
count, pos = text.extract(page, '>Pages:', '<', pos)
|
||||||
|
|||||||
Reference in New Issue
Block a user