jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3049 from evazion/fix-3046

Browse Source 
Fix #3046: Server Only Grabbing/Using First Character of Pixiv Tags/Tools
This commit is contained in:
Albert Yi
2017-05-15 16:01:32 -07:00
committed by GitHub
parent cf1d8e595c 61a37a09cc
commit 0fd760fdf2
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/logical/sources/strategies/pixiv.rb
View File

@@ -79,7 +79,9 @@ module Sources
@profile_url = get_profile_from_page(page) @profile_url = get_profile_from_page(page)
@pixiv_moniker = @metadata.moniker @pixiv_moniker = @metadata.moniker
@zip_url, @ugoira_frame_data, @ugoira_content_type = get_zip_url_from_page(page) @zip_url, @ugoira_frame_data, @ugoira_content_type = get_zip_url_from_page(page)
@tags = @metadata.tags @tags = @metadata.tags.map do |tag|
[tag, "https://www.pixiv.net/search.php?s_mode=s_tag_full&#{{word: tag}.to_param}"]
end
@page_count = @metadata.page_count @page_count = @metadata.page_count
@artist_commentary_title = @metadata.artist_commentary_title @artist_commentary_title = @metadata.artist_commentary_title
@artist_commentary_desc = @metadata.artist_commentary_desc @artist_commentary_desc = @metadata.artist_commentary_desc
@@ -299,30 +301,6 @@ module Sources
end end
end end
def get_tags_from_page(page)
# puts page.root.to_xhtml
links = page.search("ul.tags a.text").find_all do |node|
node["href"] =~ /search\.php/
end
original_flag = page.search("a.original-works")
if links.any?
links.map! do |node|
[node.inner_text, "http://www.pixiv.net" + node.attr("href")]
end
if original_flag.any?
links << ["オリジナル", "http://www.pixiv.net/search.php?s_mode=s_tag_full&word=%E3%82%AA%E3%83%AA%E3%82%B8%E3%83%8A%E3%83%AB"]
end
links
else
[]
end
end
def get_page_count_from_page(page) def get_page_count_from_page(page)
elements = page.search("ul.meta li").find_all do |node| elements = page.search("ul.meta li").find_all do |node|
node.text =~ /Manga|漫画|複数枚投稿|Multiple images/ node.text =~ /Manga|漫画|複数枚投稿|Multiple images/