waifu2x 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e1df8ba5bb6c368d96d4b46dd58aa401912a20
-  data.tar.gz: 2b05f77ed8f83831ae2874ecc6f101e60f1e0cd8
+  metadata.gz: bf8325f34e31f4bcb3fbed92ddf27eff4587c4ec
+  data.tar.gz: 162f69e37cdba67e0514fa823186692b590a2349
 SHA512:
-  metadata.gz: f821376a0163a1c2ff02c1954b5758eda9d20e57449639fadbc764a2d3a1b05b2f8ca994a5a663965f5227964535797869817dd671e43ee3d0d2243f9e0b5cd4
-  data.tar.gz: 818ec0ddf70ac893dac9b55dbc0f4326fe4587bd5f74f4c7a420a4cc38602a4bef89f15b3e4c97f0ed2e9ab6f9d62215911e5164d59185ffe73e3b7d19b834d8
+  metadata.gz: c4f21ede2d6db88f989eeeb985c2eda287f5641d856308d9aa9caadd536f735b20adfac6a38bb6188e94d2fafd81ff286b130f432895d6b509e9be2d69863ce0
+  data.tar.gz: cc509bdc1db7fb7e8ba624f85722fdfb300802fdba57a97e71895c7f1cd78aa6416fc9f7a146834dec4de813953e227e2df2d8530eeb77cb0d4abb60d15d27eb

data/exe/waifu2x

@@ -10,14 +10,18 @@ optparse = OptionParser.new do |opts|
   opts.separator ''
   opts.separator 'Options:'
 
-  opts.on_tail('-n', '--noise NOISE', 'Noise reduction (0 - none, 1 - low, 2 - high), default: 2') do |noise|
+  opts.on_tail('-n', '--noise NOISE', 'Noise reduction (0 - none, 1 - medium, 2 - high), default: 1') do |noise|
     options[:noise] = noise.to_i
   end
 
-  opts.on_tail('-s', '--scale SCALE', 'Upscaling (0 - none, 1 - 1.6x, 2 - 2x), default: 0') do |scale|
+  opts.on_tail('-s', '--scale SCALE', 'Upscaling (1 - none, 2 - 2x), default: 2') do |scale|
     options[:scale] = scale.to_i
   end
 
+  opts.on_tail('-r', '--raw RAW', 'Return URL of the converted image (0 - no, 1 - yes), default: 0') do |raw|
+    options[:raw] = raw.to_i == 1
+  end
+
   opts.on_tail('-h', '--help', 'Prints this help message') do
     puts opts
     exit
@@ -56,4 +60,10 @@ end
 finish_time = Time.now.to_i
 duration = finish_time - start_time
 
-puts "Upload took ~#{duration} seconds. Created file #{waifu2x}"
+print "Upload took ~#{duration} seconds. "
+
+if options[:raw]
+  puts "Converted file URL: #{waifu2x}"
+else
+  puts "Created file #{waifu2x}"
+end

data/lib/waifu2x.rb

@@ -1,53 +1,90 @@
 require 'waifu2x/version'
 require 'waifu2x/errors'
+require 'open-uri'
 require 'typhoeus'
 
 module Waifu2x
   USER_AGENT = "Waifu2x Ruby Gem #{Waifu2x::VERSION}".freeze
-  API_ENDPOINT = 'http://waifu2x.udp.jp/api'.freeze
+  API_ENDPOINT = 'https://waifu2x.booru.pics'.freeze
 
-  # Converts image from a local file or URL
+  # Converts image from a local file or remote URL
   #
   # @param  [String] source Source of image to convert (url or filename)
-  # @param  [String, nil] output_file Name of output image file (with extension)
+  # @param  [String, nil] output_file Filename of the converted image file (with extension)
   # @param  [Hash] options
-  # @option options [Integer] :noise Noise reduction (0 - none, 1 - low, 2 - high), default: 2
-  # @option options [Integer] :scale Upscaling (0 - none, 1 - 1.6x, 2 - 2x), default: 0
-  # @option options [Boolean] :raw When true will return a converted image in raw data (binary)
-  # @return [String] converted image in raw data (binary) or output filename
+  # @option options [Integer] :noise Noise reduction (0 - none, 1 - medium, 2 - high), default: 1
+  # @option options [Integer] :scale Upscaling (1 - none, 2 - 2x), default: 2
+  # @option options [Boolean] :raw When true will return URL of the converted image
+  # @return [String] converted image URL or filename
   def self.convert(source, output_file=nil, options={})
-    noise = options[:noise] || 2
-    scale = options[:scale] || 0
-
-    validate_options! noise, scale
-
-    if source.downcase.start_with?('http://', 'https://', 'ftp://')
-      source_params = { url: source }
+    if source =~ /\A(https?|ftp):\/\//i
+      converted_url = handle_request(source, options)
     else
       begin
-        source_params = { file: File.open(source) }
-      rescue
+        converted_url = handle_request(File.open(source), options)
+      rescue Errno::ENOENT, Errno::EACCES
         raise InvalidImage, "Can't open image file: #{source}"
       end
     end
 
-    response = Typhoeus.post(API_ENDPOINT,
-      headers: { 'User-Agent' => USER_AGENT },
-      body: { noise: noise, scale: scale }.merge(source_params)
-    )
-
-    raise InvalidImage, response.body if response.body.include?('ERROR')
-    raise Waifu2x::ServerError, "Request to Waifu2x API failed with response code: #{response.code}" if response.code != 200
-
     if options[:raw]
-      response.body
+      converted_url
     else
       output_file = output_filename(source) if output_file.to_s.strip.empty?
-      File.write(output_file, response.body)
+      IO.copy_stream(open(converted_url), output_file)
       output_file
     end
   end
 
+  # Performs request to the Waifu2x API for image conversion
+  #
+  # @param  [File, String] Image file or URL of an image to convert
+  # @param  [Hash] options
+  # @option options [Integer] :noise Noise reduction (0 - none, 1 - medium, 2 - high), default: 1
+  # @option options [Integer] :scale Upscaling (1 - none, 2 - 2x), default: 2
+  # @return [String] converted image URL
+  def self.handle_request(file_or_url, options)
+    noise = options[:noise] || 1
+    scale = options[:scale] || 2
+
+    validate_options! noise, scale
+
+    default_request_options = {
+      followlocation: true,
+      headers: { 'User-Agent' => USER_AGENT }
+    }
+
+    request = if file_or_url.is_a?(File)
+                Typhoeus::Request.new(
+                  "#{API_ENDPOINT}/Home/upload",
+                  default_request_options.merge(
+                    method: :post,
+                    body: { denoise: noise, scale: scale, img: file_or_url }
+                  )
+                )
+              else
+                Typhoeus::Request.new(
+                  "#{API_ENDPOINT}/Home/fromlink",
+                  default_request_options.merge(
+                    method: :get,
+                    params: { denoise: noise, scale: scale, url: file_or_url }
+                  )
+                )
+              end
+    response = request.run
+
+    if response.body.include?('File not found') || response.body.include?('Image file is not of type')
+      raise InvalidImage, response.body
+    end
+
+    if response.code != 200
+      raise Waifu2x::ServerError, "Request to Waifu2x API failed with response code: #{response.code}"
+    end
+
+    hash = response.effective_url.match(/hash=(\S+)/)[1]
+    "#{API_ENDPOINT}/outfiles/#{hash}.jpg"
+  end
+
   # @private
   def self.output_filename(file)
     file_ext  = File.extname(file)

data/lib/waifu2x/version.rb

@@ -1,3 +1,3 @@
 module Waifu2x
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waifu2x
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Nihad Abbasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper and CLI for waifu2x