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

fixes #2299

Browse Source
This commit is contained in:
r888888888
2014-10-29 15:14:17 -07:00
parent d9b87655fa
commit 16f9a61d63
6 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/sources/site.rb
View File

@@ -3,7 +3,7 @@
module Sources
class Site
attr_reader :url, :strategy
delegate :get, :referer_url, :site_name, :artist_name, :profile_url, :image_url, :tags, :artist_record, :unique_id, :page_count, :file_url, :ugoira_frame_data, :ugoira_width, :ugoira_height, :to => :strategy
delegate :get, :referer_url, :site_name, :artist_name, :profile_url, :image_url, :tags, :artist_record, :unique_id, :page_count, :file_url, :ugoira_frame_data, :to => :strategy
def self.strategies
[Strategies::Pixiv, Strategies::NicoSeiga, Strategies::DeviantArt, Strategies::Nijie]

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

@@ -5,7 +5,7 @@ require 'csv'
module Sources
module Strategies
class Pixiv < Base
attr_reader :zip_url, :ugoira_frame_data, :ugoira_width, :ugoira_height, :ugoira_content_type
attr_reader :zip_url, :ugoira_frame_data, :ugoira_content_type
def self.url_match?(url)
url =~ /^https?:\/\/(?:\w+\.)?pixiv\.net/
@@ -45,7 +45,7 @@ module Sources
agent.get(URI.parse(normalized_url)) do |page|
@artist_name, @profile_url = get_profile_from_page(page)
@pixiv_moniker = get_moniker_from_page(page)
@zip_url, @ugoira_frame_data, @ugoira_width, @ugoira_height, @ugoira_content_type = get_zip_url_from_page(page)
@zip_url, @ugoira_frame_data, @ugoira_content_type = get_zip_url_from_page(page)
@tags = get_tags_from_page(page)
@page_count = get_page_count_from_page(page)
@@ -194,15 +194,7 @@ module Sources
frame_data = data["frames"]
content_type = data["mime_type"]
if javascript =~ /illustSize\s*=\s*\[\s*(\d+)\s*,\s*(\d+)\s*\]/
image_width = $1.to_i
image_height = $2.to_i
else
image_width = 600
image_height = 600
end
return [zip_url, frame_data, image_width, image_height, content_type]
return [zip_url, frame_data, content_type]
end
end