opendmm 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4cc51892b1ce7dc742b3a9511332505a77fea8f
-  data.tar.gz: 43c47037f3312b1ac32438e3c0d0724742df5a76
+  metadata.gz: c9fd109fd9892fc2cfc406afc24cef8a5e9ea074
+  data.tar.gz: 75c288cb6b2f99207cee3732979eb0872d5000de
 SHA512:
-  metadata.gz: 86f019f10244507568eceea1b3c45d38d95fb38d94e0bde0c0155c6715b30608a1ef327105357fb66c52317f8586fcb07daf623550855f85ac28cd7faad5457a
-  data.tar.gz: 88fc41d5cf2936d1ecccd846fc52235d67f5ec567913f14a5f9b67adef9a48fe306d47e0c7f4ed5a62694026d7a62ff2809a166d5ec492d289f3dc2037dca913
+  metadata.gz: 0df748805f49ad23c4810348dccdc10b705089794a91fa4eeab3acbf12c2c8df36e2303e8222857b1a29ac6ecf3210961b951576c229ed9a16c15400284972e4
+  data.tar.gz: 2cc330c9b81004a9588961a7b97cc86db347f98bb97eeb5e430da293cc7adf990537898abe3f79b14e479dc7634c57c3366c486cb1a6374627e939bc88f3e62e

data/lib/opendmm.rb

@@ -1,8 +1,10 @@
 require 'opendmm/engines/av_entertainments.rb'
 require 'opendmm/engines/caribbean.rb'
 require 'opendmm/engines/caribbean_pr.rb'
+require 'opendmm/engines/dmm.rb'
 require 'opendmm/engines/heyzo.rb'
 require 'opendmm/engines/jav_library.rb'
+require 'opendmm/engines/mgstage.rb'
 require 'opendmm/engines/one_pondo.rb'
 require 'opendmm/engines/tokyo_hot.rb'
 require 'opendmm/version.rb'
@@ -13,11 +15,18 @@ module OpenDMM
       Engine::CaribbeanPr,
       Engine::Heyzo,
       Engine::OnePondo,
-      Engine::TokyoHot,
       Engine::JavLibrary,
       Engine::AvEntertainments,
+      Engine::DMM,
+      Engine::MGStage,
+      Engine::TokyoHot,
     ].lazy.map do |engine|
-      engine.search(query)
+      begin
+        engine.search(query)
+      rescue StandardError => e
+        LOGGER.info e
+        nil
+      end
     end.find(&:present?)
   end
 end

data/lib/opendmm/engines/av_entertainments.rb

@@ -12,7 +12,8 @@ module OpenDMM
           begin
             Movie.new(query).details
           rescue StandardError => e
-            LOGGER.info e
+            LOGGER.debug query
+            LOGGER.debug e
             nil
           end
         end.find(&:present?)
@@ -21,8 +22,14 @@ module OpenDMM
       private
 
       def self.normalize(query)
-        query.scan(/((?:S2)?[a-z]{2,5})[-_\s]?(S?\d{2,5})/i).map do |pair|
-          "#{pair[0].upcase}-#{pair[1]}"
+        query.scan(/((?:S2|2D|3D|[a-z]){2,6}?)[-_\s]?(S?\d{2,5})/i).map do |pair|
+          alpha = pair[0].upcase
+          digit = pair[1]
+          case alpha
+          when /SMBD/, /CWPBD/
+            digit = digit.to_i.to_s.rjust(2, '0')
+          end
+          "#{alpha}-#{digit}"
         end
       end
 
@@ -55,7 +62,7 @@ module OpenDMM
           search = Search.new(query, Site.search(query))
           super(query, Site.get(search.result))
 
-          @details.title       = @html.css('#mini-tabet > h2').inner_text
+          @details.title       = @html.css('#mini-tabet > h2').text
           @details.cover_image = @html.at_css('#titlebox > div.list-cover > img')['src'].gsub('jacket_images', 'bigcover')
           @details.code        = @html.css('#mini-tabet > div').text.remove('商品番号:')
           @details.categories  = @html.xpath('//*[@id="TabbedPanels1"]/div/div[2]/div[2]//ol').map(&:text)
@@ -69,9 +76,9 @@ module OpenDMM
             when /シリーズ/
               @details.series = li.css('a').text
             when /発売日/
-              @details.release_date = li.inner_text
+              @details.release_date = li.text
             when /収録時間/
-              @details.movie_length = li.inner_text
+              @details.movie_length = li.text
             end
           end
         end

data/lib/opendmm/engines/caribbean.rb

@@ -36,7 +36,7 @@ module OpenDMM
           @details.maker           = 'Caribbean'
           @details.thumbnail_image = './images/l_s.jpg'
 
-          @details.title           = @html.css('#main-content > div.main-content-movieinfo > div.video-detail > span.movie-title').text
+          @details.title           = @html.css('#main-content > div.main-content-movieinfo > div.video-detail > h1').text
           @details.description     = @html.css('#main-content > div.main-content-movieinfo > div.movie-comment').text
           @details.sample_images   = @html.css('#main-content > div.detail-content.detail-content-gallery-old > table > tr > td > a').map do |a|
             a['href']
@@ -85,17 +85,17 @@ module OpenDMM
 
           @html.css('#main-content > div.main-content-movieinfo > div.movie-info > dl').map do |dl|
             case dl.at_css('dt').text
-            when '出演:'
+            when /出演/
               @details.actresses = dl.css('dd').map(&:text)
-            when 'カテゴリー:'
+            when /カテゴリー/
               @details.categories = dl.css('dd').map(&:text)
-            when '販売日:'
+            when /販売日/
               @details.release_date = dl.css('dd').text
-            when '再生時間:'
+            when /再生時間/
               @details.movie_length = dl.css('dd').text
-            when 'スタジオ:'
+            when /スタジオ/
               @details.maker = dl.css('dd').text
-            when 'シリーズ:'
+            when /シリーズ/
               @details.series = dl.css('dd').text
             end
           end

data/lib/opendmm/engines/caribbean_pr.rb

@@ -44,17 +44,17 @@ module OpenDMM
 
           @html.css('#main-content > div.main-content-movieinfo > div.movie-info > dl').map do |dl|
             case dl.at_css('dt').text
-            when '出演:'
+            when /出演/
               @details.actresses = dl.css('dd').map(&:text)
-            when 'カテゴリー:'
+            when /カテゴリー/
               @details.categories = dl.css('dd').map(&:text)
-            when '販売日:'
+            when /販売日/
               @details.release_date = dl.css('dd').text
-            when '再生時間:'
+            when /再生時間/
               @details.movie_length = dl.css('dd').text
-            when 'スタジオ:'
+            when /スタジオ/
               @details.maker = dl.css('dd').text
-            when 'シリーズ:'
+            when /シリーズ/
               @details.series = dl.css('dd').text
             end
           end

data/lib/opendmm/engines/dmm.rb

@@ -0,0 +1,103 @@
+require 'opendmm/movie'
+require 'opendmm/utils/httparty'
+
+module OpenDMM
+  module Engine
+    module DMM
+      def self.search(query)
+        queries = normalize(query)
+        LOGGER.debug queries
+        queries.lazy.map do |query|
+          begin
+            Movie.new(query).details
+          rescue StandardError => e
+            LOGGER.debug query
+            LOGGER.debug e
+            nil
+          end
+        end.find(&:present?)
+      end
+
+      private
+
+      def self.normalize(query)
+        query.scan(/(?<!S2)([a-z]{2,6})-?(\d{2,5})/i).map do |pair|
+          alpha = pair[0].upcase
+          5.downto(3).map do |len|
+            digit = pair[1].rjust(len, '0')
+            "#{alpha}#{digit}"
+          end
+        end.flatten
+      end
+
+      module Site
+        include HTTParty
+        base_uri 'www.dmm.co.jp'
+
+        def self.search(query)
+          get "/search/=/searchstr=#{CGI::escape(query)}"
+        end
+      end
+
+      class Search
+        def initialize(query, response)
+          @query = query
+          @response = response
+          @html = Nokogiri.HTML @response
+        end
+
+        def result
+          candidate = @html.at_css('#list > li > div > p.tmb > a')['href']
+          URI.join(@response.request.last_uri.to_s, candidate).to_s
+        end
+      end
+
+      class Movie < OpenDMM::Movie
+        def initialize(query)
+          search = Search.new(query, Site.search(query))
+          super(query, Site.get(search.result))
+
+          @details.thumbnail_image = @html.at_css('#sample-video img')['src']
+          @details.title           = @html.css('#title').text
+          begin
+            @details.cover_image   = @html.at_css('#sample-video a')['href']
+          rescue StandardError
+            @details.cover_image   = @details.thumbnail_image
+          end
+
+          details_table = @html.at_xpath('//div[@class="page-detail"]/table/tr/td[1]/table')
+          details_table.css('tr').each do |tr|
+            first = tr.css('td')[0]
+            second = tr.css('td')[1]
+            case first.text
+            when /配信開始日/
+              @details.release_date = second.text
+            when /収録時間/
+              @details.movie_length = second.text
+            when /出演者/
+              @details.actresses = second.css('span').map(&:text)
+            when /監督/
+              @details.directors = second.css('span').map(&:text)
+            when /シリーズ/
+              @details.series = second.text
+            when /メーカー/
+              @details.maker = second.text
+            when /レーベル/
+              @details.label = second.text
+            when /ジャンル/
+              @details.genres = second.css('span').map(&:text)
+            when /品番/
+              if second.text =~ /([a-z]+)(\d+)/i
+                @details.code = "#{$1.upcase}-#{$2.to_i.to_s.rjust(3, '0')}"
+              else
+                @details.code = second.text
+              end
+            end
+          end
+
+          @details.description = details_table.next_element.next_element.xpath('text()').text
+        end
+      end
+    end
+  end
+end

data/lib/opendmm/engines/jav_library.rb

@@ -12,7 +12,8 @@ module OpenDMM
           begin
             Movie.new(query).details
           rescue StandardError => e
-            LOGGER.info e
+            LOGGER.debug query
+            LOGGER.debug e
             nil
           end
         end.find(&:present?)
@@ -21,7 +22,7 @@ module OpenDMM
       private
 
       def self.normalize(query)
-        query.scan(/(?<!S2)([a-z]{2,5})-?(\d{2,5})/i).map do |pair|
+        query.scan(/((?:S2|2D|3D|[a-z]){2,6})-?(\d{2,5})/i).map do |pair|
           "#{pair[0].upcase}-#{pair[1]}"
         end
       end

data/lib/opendmm/engines/mgstage.rb

@@ -0,0 +1,75 @@
+require 'opendmm/movie'
+require 'opendmm/utils/httparty'
+
+module OpenDMM
+  module Engine
+    module MGStage
+      def self.search(query)
+        queries = normalize(query)
+        LOGGER.debug queries
+        queries.lazy.map do |query|
+          begin
+            Movie.new(query).details
+          rescue StandardError => e
+            LOGGER.debug query
+            LOGGER.debug e
+            nil
+          end
+        end.find(&:present?)
+      end
+
+      private
+
+      def self.normalize(query)
+        query.scan(/(?<!S2)([a-z]{2,6})-?(\d{2,5})/i).map do |pair|
+          "#{pair[0].upcase}-#{pair[1]}"
+        end
+      end
+
+      module Site
+        include HTTParty
+        base_uri 'www.mgstage.com'
+        cookies(adc: 1, coc: 1)
+        headers({
+          "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.153 Safari/537.36"
+        })
+
+        def self.movie(query)
+          get "/ppv/video/#{query}/"
+        end
+      end
+
+      class Movie < OpenDMM::Movie
+        def initialize(query)
+          super(query, Site.movie(query))
+
+          @details.title = @html.css('.title_detail_layout h1').text
+          @details.cover_image = @html.at_css('a.enlarge_image')['href']
+          @details.thumbnail_image = @html.at_css('a.enlarge_image > img')['src']
+          @details.description = @html.css('#introduction_text > p.introduction').text
+          @details.sample_images = @html.css('a.sample_imageN').map { |a| a['href'] }
+
+          @html.css('#CONTENT_DETAIL dl.spec_layout dt').each do |dt|
+            dd = dt.next_element
+            case dt.text
+            when /配信開始日/
+              @details.release_date = dd.text
+            when /収録時間/
+              @details.movie_length = dd.text
+            when /品番/
+              @details.code = dd.text
+            when /出演/
+              @details.actresses = dd.css('a').map(&:text)
+            when /メーカー/
+              @details.maker = dd.text
+            when /シリーズ名/
+              @details.series = dd.text
+            when /ジャンル/
+              @details.genres = dd.css('a').map(&:text)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opendmm/engines/one_pondo.rb

@@ -42,7 +42,7 @@ module OpenDMM
 
           @details.title         = @html.css('head > title').text.remove(/^.*「/, /」.*$/)
           @details.actresses     = @html.css('#profile-area > div > ul.bgoose > li > a > h2').map(&:text)
-          @details.description   = @html.css('#profile-area > div.rr2').inner_text
+          @details.description   = @html.css('#profile-area > div.rr2').text
           @details.sample_images = @html.css('#movie-main > div.pics > table > tr > td > img').map do |img|
             img['src']
           end

data/lib/opendmm/engines/tokyo_hot.rb

@@ -24,11 +24,11 @@ module OpenDMM
         base_uri 'www.tokyo-hot.com'
 
         def self.list_n
-          get '/j/new_video0000_j.html'
+          @@list_n ||= get '/j/new_video0000_j.html'
         end
 
         def self.list_k
-          get '/j/k_video0000_j.html'
+          @@list_k ||= get '/j/k_video0000_j.html'
         end
       end
 

data/lib/opendmm/movie.rb

@@ -94,7 +94,7 @@ module OpenDMM
 
       def normalize_title
         if actresses = self[:actresses]
-          pieces = self[:title].squish.split
+          pieces = self[:title].gsub(/[\/,:：]/, ' ').squish.split
           while pieces.last.in?(actresses) || pieces.last =~ /^-+$/
             pieces.pop
           end

data/lib/opendmm/utils/logger.rb

@@ -2,5 +2,9 @@ require 'logger'
 
 module OpenDMM
   LOGGER = Logger.new STDERR
+  LOGGER.formatter = proc do |severity, datetime, progname, msg|
+    file = caller[4][/.*\/(.*):.*/, 1]
+    "[#{severity[0]}, #{datetime}, #{file}]: #{msg}\n"
+  end
   LOGGER.level = Logger::FATAL
 end

data/lib/opendmm/version.rb

@@ -1,3 +1,3 @@
 module OpenDMM
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opendmm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jun Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,8 +154,10 @@ files:
 - lib/opendmm/engines/av_entertainments.rb
 - lib/opendmm/engines/caribbean.rb
 - lib/opendmm/engines/caribbean_pr.rb
+- lib/opendmm/engines/dmm.rb
 - lib/opendmm/engines/heyzo.rb
 - lib/opendmm/engines/jav_library.rb
+- lib/opendmm/engines/mgstage.rb
 - lib/opendmm/engines/one_pondo.rb
 - lib/opendmm/engines/tokyo_hot.rb
 - lib/opendmm/movie.rb
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'OpenDMM: an open-source Japanese AV search engine'