nicoscraper 0.2.1 → 0.2.2

data/lib/converter.rb

@@ -2,7 +2,7 @@
 require 'xml'
 require 'time'
 
-module Convert
+module Nicos::Converter
   def iso8601ToUnix(str)
     Time.strptime(str, "%Y-%m-%dT%H:%M:%S").to_i
   end
@@ -30,7 +30,7 @@ module Convert
   module_function :commaRemover
 end
 
-module Extract
+module Nicos::Extractor
   def mylistId(str)
     /(mylist\/)([0-9]{1,})/ =~ str
     $2.to_i
@@ -50,7 +50,7 @@ module Extract
   module_function :videoId
 end
 
-module Unicode
+module Nicos::Unicode
   def escape(str)
     ary = str.unpack("U*").map!{|i| "\\u#{i.to_s(16)}"}
     ary.join

data/lib/movie.rb

@@ -9,8 +9,8 @@ require 'kconv'
 require 'parser.rb'
 require 'mylist.rb'
 require 'connector.rb'
-  
-class Movie  
+
+class Nicos::Movie  
   def initialize(video_id)
     @video_id   = video_id
     @available  = false
@@ -23,7 +23,7 @@ class Movie
   # 指定されたマイリストに自分が入っていれば、真を返す。  
   def isBelongsTo (mylistId, &block)
     isBelongs = false
-    thisMl = Mylist.new(mylistId)
+    thisMl = Nicos::Mylist.new(mylistId)
     thisMl.getInfoLt
     
     thisMl.movies.each { |movie|
@@ -76,8 +76,7 @@ class Movie
     }
     
     sMylistIdAry.each { |mylistId|
-      puts mylistId
-      mlObjAry.push( Mylist.new(mylistId) )
+      mlObjAry.push( Nicos::Mylist.new(mylistId) )
     }
     
     puts "\sDiscern logic terminated."
@@ -105,7 +104,7 @@ class Movie
   end
   
   def getInfo
-    con = GetThumbInfoConnector.new()
+    con = Nicos::Connector::GetThumbInfo.new()
     host = 'ext.nicovideo.jp'
     entity = '/api/getthumbinfo/' + @video_id
     con.setWait(nil)
@@ -114,8 +113,9 @@ class Movie
     if
       result["order"] == "success"
     then
-      parsed = NicoParser.getThumbInfo(result["body"])
+      parsed = Nicos::Parser::getThumbInfo(result["body"])
       set(parsed)
+      p self
       @available = true
     else
       @available = false

data/lib/mylist.rb

@@ -9,8 +9,7 @@ require 'parser.rb'
 require 'movie.rb'
 require 'connector.rb'
 
-
-class Mylist
+class Nicos::Mylist
   def initialize (mylist_id)
     @mylist_id  = mylist_id    
     @movies     = []
@@ -57,7 +56,7 @@ class Mylist
   end
 
   def getInfo
-    con = Connector.new('mech')
+    con = Nicos::Connector::Html.new('mech')
     reqUrl = 'http://www.nicovideo.jp' +
       '/mylist/' + @mylist_id.to_s
     con.setWait(nil)
@@ -129,12 +128,12 @@ class Mylist
     mvJson = mvJson.scan(/\".{1,}/)[0]
     mvJson = mvJson.slice(0, mvJson.length - 5)
     #mvJson = mvJson.split('},{')
-    mvJson = Unicode.unescape(mvJson).split('},{')
+    mvJson = Nicos::Unicode.unescape(mvJson).split('},{')
     
     mvJson.each { |e|
       e = "{" + e + "}"
       param = JSON.parse(e) 
-      movie = Movie.new(param['item_data']['video_id'])
+      movie = Nicos::Movie.new(param['item_data']['video_id'])
       movie.set(param)
       
       @movies.push(movie)
@@ -142,7 +141,7 @@ class Mylist
   end
   
   def getInfoLt
-    con = MylistAtomConnector.new()
+    con = Nicos::Connector::MylistAtom.new()
     host = 'www.nicovideo.jp'
     puts @mylist_id
     entity = '/mylist/' + @mylist_id.to_s + '?rss=atom&numbers=1'
@@ -152,17 +151,18 @@ class Mylist
     if
       result["order"] == "success"
     then
-      parsed = NicoParser.mylistRss(result["body"])
+      parsed = Nicos::Parser::mylistAtom(result["body"])
       
       parsed["entry"].each { |e|
-        movie = Movie.new(e["video_id"])
+        movie = Nicos::Movie.new(e["video_id"])
         e["available"] = true
         movie.set(e)
         @movies.push(movie)
       }
-      
-      set(parsed["mylist"])
+
       @available = true
+      set(parsed["mylist"])
+      p self
     else
       @available = false
     end  
@@ -220,4 +220,4 @@ class Mylist
   attr_accessor :author   
   
   attr_accessor :movies     
-end
+end

data/lib/nicos.rb

@@ -0,0 +1,9 @@
+# -*- encoding: utf-8 -*-
+$:.unshift File.dirname(__FILE__) + "/../lib"
+
+module Nicos
+end
+
+require 'movie.rb'
+require 'mylist.rb'
+require 'searcher.rb'

data/lib/parser.rb

@@ -6,9 +6,7 @@ require 'xml'
 require 'time'
 require 'converter.rb'
 
-module NicoParser
-  public
-  
+module Nicos::Parser
   def getThumbInfo(xml)
     doc = XML::Reader.string(
       xml,
@@ -37,7 +35,7 @@ module NicoParser
         when "first_retrieve"
           label = doc.name
           doc.read
-          parsed[label] =  Convert.iso8601ToUnix(doc.value)        
+          parsed[label] =  Nicos::Converter.iso8601ToUnix(doc.value)        
         when "length"
           doc.read
           lengthStr = doc.value.split(/\:/)
@@ -60,7 +58,7 @@ module NicoParser
     parsed
   end
   
-  def tagRss(xml)
+  def tagAtom(xml)
     doc = XML::Reader.string(
       xml,
       :options => XML::Parser::Options::NOBLANKS |
@@ -85,7 +83,7 @@ module NicoParser
         when "published", "updated"
           label = doc.name
           doc.read
-          parsed[n][label] =  Convert.iso8601ToUnix(doc.value)
+          parsed[n][label] =  Nicos::Converter.iso8601ToUnix(doc.value)
         when "p"
           doc.move_to_attribute("class")
           case doc.value
@@ -119,7 +117,7 @@ module NicoParser
     parsed
   end
  
-  def mylistRss(xml)    
+  def mylistAtom(xml)    
     doc = XML::Reader.string(
       xml,
       :options => XML::Parser::Options::NOBLANKS |
@@ -150,7 +148,7 @@ module NicoParser
           if n != -1
             doc.move_to_attribute("href")
             parsed["entry"][n]["video_id"] =
-              Extract.videoId(doc.value)
+              Nicos::Extractor.videoId(doc.value)
           end
         when "subtitle"  
           doc.read
@@ -159,16 +157,16 @@ module NicoParser
           if n == -1
             doc.read
             parsed["mylist"]["mylist_id"] = 
-              Extract.mylistId(doc.value)
+              Nicos::Extractor.mylistId(doc.value)
           else
             doc.read
             parsed["entry"][n]["item_id"] =
-              Extract.itemId(doc.value)
+              Nicos::Extractor.itemId(doc.value)
           end    
         when "updated"
           doc.read
           parsed["mylist"]["updated"] = 
-            Convert.iso8601ToUnix(doc.value)
+            Nicos::Converter.iso8601ToUnix(doc.value)
         when "name"
           doc.read
           parsed["mylist"]["author"] = doc.value              
@@ -220,7 +218,7 @@ module NicoParser
     parsed
   end
     
-  module_function :tagRss
-  module_function :mylistRss
+  module_function :tagAtom
+  module_function :mylistAtom
   module_function :getThumbInfo
 end

data/lib/searcher.rb

@@ -10,147 +10,148 @@ require 'kconv'
 
 require 'parser.rb'
 
+module Nicos::Searcher
+  class ByTagSuper
+    private
 
-class SearchByTagSuper
-  private
+    def get(tag, sort, page, method, waitObj)
+      paramAry = []
+      
+      case sort
+        when 'comment_new'
+          sortStr = ''
+        when 'comment_old'
+          sortStr = 'order=a'
+        when 'view_many'
+          sortStr = 'sort=v'
+        when 'view_few'
+          sortStr = 'sort=v&order=a'
+        when 'comment_many'
+          sortStr = 'sort=r'
+        when 'comment_few'
+          sortStr = 'sort=r&order=a'
+        when 'mylist_many'
+          sortStr = 'sort=m'
+        when 'mylist_few'
+          sortStr = 'sort=m&order=a'
+        when 'post_new'
+          sortStr = 'sort=f'
+        when 'post_old'
+          sortStr = 'sort=f&order=a'
+        when 'length_long'
+          sortStr = 'sort=l'
+        when 'length_short'
+          sortStr = 'sort=l&order=a'
+      end
+      
+      paramAry.push("page=#{page}") if page != 1
+      paramAry.push(sortStr)
+      if method == "atom" then paramAry.push("rss=atom&numbers=1") end
+      param = tag + "?" + paramAry.join('&')
+      
+      host = 'www.nicovideo.jp'
+      entity = '/tag/' + param
 
-  def get(tag, sort, page, method, waitObj)
-    paramAry = []
-    
-    case sort
-      when 'comment_new'
-        sortStr = ''
-      when 'comment_old'
-        sortStr = 'order=a'
-      when 'view_many'
-        sortStr = 'sort=v'
-      when 'view_few'
-        sortStr = 'sort=v&order=a'
-      when 'comment_many'
-        sortStr = 'sort=r'
-      when 'comment_few'
-        sortStr = 'sort=r&order=a'
-      when 'mylist_many'
-        sortStr = 'sort=m'
-      when 'mylist_few'
-        sortStr = 'sort=m&order=a'
-      when 'post_new'
-        sortStr = 'sort=f'
-      when 'post_old'
-        sortStr = 'sort=f&order=a'
-      when 'length_long'
-        sortStr = 'sort=l'
-      when 'length_short'
-        sortStr = 'sort=l&order=a'
+      @connector.setWait(waitObj)
+      @connector.get(host, entity)
     end
-    
-    paramAry.push("page=#{page}") if page != 1
-    paramAry.push(sortStr)
-    if method == "atom" then paramAry.push("rss=atom&numbers=1") end
-    param = tag + "?" + paramAry.join('&')
-    
-    host = 'www.nicovideo.jp'
-    entity = '/tag/' + param
 
-    @connector.setWait(waitObj)
-    @connector.get(host, entity)
-  end
-
-  def loop(tag, sort, method, waitObj, &block)
-    termFlag    = false
-    page        = 1
-    movieObjAry = []
-   
-    begin
-       response = get(
-        tag,
-        sort,
-        page,
-        method,
-        waitObj
-      )
+    def loop(tag, sort, method, waitObj, &block)
+      termFlag    = false
+      page        = 1
+      movieObjAry = []
+     
+      begin
+         response = get(
+          tag,
+          sort,
+          page,
+          method,
+          waitObj
+        )
 
-      if response["order"] == "success"
-        result = parse(response["body"])
-        result.each { |each|
-          movie = Movie.new(each["video_id"]) 
-          each["available"] = true
-          movie.set(each)
-          movieObjAry.push(movie)
-        }
+        if response["order"] == "success"
+          result = parse(response["body"])
+          result.each { |each|
+            movie = Nicos::Movie.new(each["video_id"]) 
+            each["available"] = true
+            movie.set(each)
+            movieObjAry.push(movie)
+          }
 
-        termFlag = block.call(movieObjAry, page)
-      else
-        termFlag = true
-      end
- 
-      page += 1
-    end until termFlag
+          termFlag = block.call(movieObjAry, page)
+        else
+          termFlag = true
+        end
+   
+        page += 1
+      end until termFlag
+    end
   end
-end
 
-class SearchByTag < SearchByTagSuper
-  def initialize
-    @numOfSearched = 32
-    @incrAmt = 0.2
+  class ByTag < ByTagSuper
+    def initialize
+      @numOfSearched = 32
+      @incrAmt = 0.2
 
-    @connector = Connector.new('mech')
-    
-    # HTML中の各パラメータの所在を示すXPath
-    @videoIdXP  = "//div[@class='uad_thumbfrm']/table/tr/td/p/a"
-    @lengthXP   = "//div[@class='uad_thumbfrm']/table/tr/td/p[2]/span"
-    @viewXP     = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[1]/strong"
-    @resXP      = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[2]/strong"
-    @mylistXP   = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[3]/a/strong"
-    @adXP       = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[4]/a/strong"
-  end
-    
-  def parse(movieNum)
-    result = []
-    
-    video_id  = /(sm|nm)[0-9]{1,}/.match(@connector.mech.page.search(@videoIdXP)[movieNum]['href'])[0]
-      lengthStr = @connector.mech.page.search(@lengthXP)[movieNum].text.split(/\:/)
-    length    = lengthStr[0].to_i * 60 + lengthStr[1].to_i
-    view      = @connector.mech.page.search(@viewXP)[movieNum]
-                .text.gsub(/\,/, '').to_i
-    res       = @connector.mech.page.search(@resXP)[movieNum]
-                .text.gsub(/\,/, '').to_i
-    mylist    = @connector.mech.page.search(@mylistXP)[movieNum]
-                .text.gsub(/\,/, '').to_i
-    ad        = @connector.mech.page.search(@adXP)[movieNum]
-                .text.gsub(/\,/, '').to_i
+      @connector = Nicos::Connector.new('mech')
+      
+      # HTML中の各パラメータの所在を示すXPath
+      @videoIdXP  = "//div[@class='uad_thumbfrm']/table/tr/td/p/a"
+      @lengthXP   = "//div[@class='uad_thumbfrm']/table/tr/td/p[2]/span"
+      @viewXP     = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[1]/strong"
+      @resXP      = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[2]/strong"
+      @mylistXP   = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[3]/a/strong"
+      @adXP       = "//div[@class='uad_thumbfrm']/table/tr/td[2]/div/nobr[4]/a/strong"
+    end
+      
+    def parse(movieNum)
+      result = []
+      
+      video_id  = /(sm|nm)[0-9]{1,}/.match(@connector.mech.page.search(@videoIdXP)[movieNum]['href'])[0]
+        lengthStr = @connector.mech.page.search(@lengthXP)[movieNum].text.split(/\:/)
+      length    = lengthStr[0].to_i * 60 + lengthStr[1].to_i
+      view      = @connector.mech.page.search(@viewXP)[movieNum]
+                  .text.gsub(/\,/, '').to_i
+      res       = @connector.mech.page.search(@resXP)[movieNum]
+                  .text.gsub(/\,/, '').to_i
+      mylist    = @connector.mech.page.search(@mylistXP)[movieNum]
+                  .text.gsub(/\,/, '').to_i
+      ad        = @connector.mech.page.search(@adXP)[movieNum]
+                  .text.gsub(/\,/, '').to_i
 
-    result.push({
-      "video_id"  => video_id,
-      "length"    => length,
-      "view"      => view,
-      "res"       => res,
-      "mylist"    => mylist,
-      "ad"        => ad
-    })
-  end
-  
-  def execute(tag, sort, waitObj, &block) 
-    loop(tag, sort, "mech", waitObj) { |result, page|
-      block.call(result, page)
-    }
+      result.push({
+        "video_id"  => video_id,
+        "length"    => length,
+        "view"      => view,
+        "res"       => res,
+        "mylist"    => mylist,
+        "ad"        => ad
+      })
+    end
+    
+    def execute(tag, sort, waitObj, &block) 
+      loop(tag, sort, "mech", waitObj) { |result, page|
+        block.call(result, page)
+      }
+    end
   end
-end
 
-class SearchByTagLt < SearchByTagSuper
-  def initialize
-    @numOfSearched = 32
-    @incrAmt = 0.2
-    @connector = SearchByTagAtomConnector.new()
-  end
+  class ByTagLt < ByTagSuper
+    def initialize
+      @numOfSearched = 32
+      @incrAmt = 0.2
+      @connector = Nicos::Connector::TagAtom.new()
+    end
 
-  def parse(xml)
-    NicoParser.tagRss(xml)
-  end
-   
-  def execute(tag, sort, waitObj, &block) 
-    loop(tag, sort, "atom", waitObj) { |result, page|
-      block.call(result, page)
-    }
+    def parse(xml)
+      Nicos::Parser.tagAtom(xml)
+    end
+     
+    def execute(tag, sort, waitObj, &block) 
+      loop(tag, sort, "atom", waitObj) { |result, page|
+        block.call(result, page)
+      }
+    end
   end
 end