nv 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f8b27af310126a64b577f8bc0720f7b26b2dd06
-  data.tar.gz: 7cd30e5c8111192be2c391e2051c234061dec6f3
+  metadata.gz: c5f0c8bd1b296caf18b4fcce67f896e3349b2ff4
+  data.tar.gz: 2cf890bcaf3da97043709f15940ffdc986e53817
 SHA512:
-  metadata.gz: 0a7051e1beefe24355ef142acdb43557810cc88e561d9268c0b030556f1aa7aef219068b1e41428aa5ffa1d2e2370ff211ac51633adaf4a8d44e74fd5d7b15e5
-  data.tar.gz: eb829204f102156b78306425e3cff1d4a71de1b319438a38d1dc61aa069dd80c462823237e451cb38e6f2a057d2496d4ba106d54383e3f6a971311c2f491f023
+  metadata.gz: c9769a36ba372b6457831268ca13e2145db62b5fd502744d0012d7c7d158e0fc284745ec87bffc95bd9854bcb3ef84335b8c26eecda51e081ba7ecc12e349cb6
+  data.tar.gz: dc112b9d3c8909c694c732e6c9e17d077557be2090386414c460e84f1485f21b42cc84bf5c3d175172e1a58058952644c53c5d7574ef9040b8672c06d865d92b

data/README.md

@@ -17,7 +17,7 @@ $ nv config email john@example.com
 $ nv config password pAsSwoRd
 ```
 
-Default config file will be put on __$HOME/.config/nv__
+Default config file will be put on __~/.config/nv__
 
 ### Download
 
@@ -26,13 +26,28 @@ $ nv dl http://www.nicovideo.jp/watch/sm22538737
 $ nv dl http://www.nicovideo.jp/mylist/33435425
 ```
 
-Also you can use more easy way.
+You also can use more shorten addresses.
 
 ```session
 $ nv dl sm9
 $ nv dl mylist/33435425
 ```
 
+#### Options
+
+##### Directory
+
+```session
+$ nv dl sm9 --with-dir
+$ nv dl mylist/33435425 --without-dir
+```
+
+##### Comments
+
+```session
+$ nv dl sm9 --with-comments
+```
+
 ### Audit
 
 ```session

data/bin/nv

@@ -3,4 +3,9 @@
 
 require 'nv'
 
-Nv::CLI.start(ARGV)
+begin
+  Nv::CLI.start(ARGV)
+rescue SystemExit, Interrupt
+rescue Exception => e
+  puts e
+end

data/lib/nv.rb

@@ -5,18 +5,6 @@ require "nv/cli"
 
 =begin
 
-nico = Niconico.new.sign_in(...)
-video = nico.video('sm9')
-video.download('./')
-
-mylist = nico.mylist('482029')
-mylist.download()
-
-include Niconico::Helper
-if mylist? 'http://...'
-  ...
-end
-
    ##### Way #####
 
 1. nico = Niconico::Base.new.sign_in(...)
@@ -33,5 +21,5 @@ end
 module Nv
   class LackOfInformation < StandardError; end
 
-  CONFIG_PATH = File.join(ENV['HOME'], '.config', 'nv')
+  CONFIG_PATH = "#{ENV['HOME']}/.config/nv"
 end

data/lib/nv/cli.rb

@@ -3,7 +3,10 @@ require 'thor'
 class Nv::CLI < Thor
   include Niconico::Helper
 
-  desc "dl URL", "Download video"
+  desc 'dl URL', 'Download video'
+  method_option 'with-comments', :aliases => '-c', :desc => 'Download comments'
+  method_option 'with-dir', :aliases => '-d', :desc => 'Create directory'
+  method_option 'without-dir', :aliases => '-D', :desc => "Don't create directory"
   def dl(ptr, output=".")
     config = Nv::Config.new(Nv::CONFIG_PATH)
     config.verify_for_authentication!('dl')
@@ -14,7 +17,10 @@ class Nv::CLI < Thor
       mylist = nico.mylist(ptr)
 
       puts "Title : #{mylist.title}"
-      puts "Desc  : #{mylist.description}"
+      puts "Desc  : #{mylist.description}" unless mylist.description.empty?
+
+      escaped_title = escape_string(mylist.title)
+      output = options['without-dir'] ? '.' : escaped_title
 
       mylist.items.each do |item|
         dl(item.link, output)
@@ -25,14 +31,17 @@ class Nv::CLI < Thor
       # Inspect
       puts "Downloading... #{video.title}"
 
-      # Donwload
-      video.download
+      output ||= options['with-dir'] ? escape_string(video.title) : '.'
+
+      # Download
+      video.download output
+      video.download_comments output if options['with-comments']
 
       puts "+ done"
     end
   end
 
-  desc "info URL", "Show video/mylist info"
+  desc 'info URL', 'Show video/mylist info'
   def info(ptr)
     config = Nv::Config.new(Nv::CONFIG_PATH)
     config.verify_for_authentication!('info')
@@ -52,21 +61,27 @@ class Nv::CLI < Thor
       video = nico.video(ptr)
 
       puts video.title
-      puts "=" * 40
+      puts '=' * 40
       puts video.description
-      puts "=" * 40
+      puts '=' * 40
       puts "URL: #{video.watch_url}"
     end
   end
 
-  desc "config KEY VALUE", "Set config"
+  desc 'browse FILE', 'Open web-browser to show nicovideo page with given movie file'
+  def browse(filepath)
+    video_id = File.basename(filepath).match(/[^\w]([\w]{2}\d+)[^\w]/)[1]
+    system "open http://www.nicovideo.jp/watch/#{video_id}"
+  end
+
+  desc 'config KEY VALUE', 'Set config'
   def config(key=nil, value=nil)
     config = Nv::Config.new(Nv::CONFIG_PATH)
 
     unless key
-      puts "config:"
+      puts "=== config(#{Nv::CONFIG_PATH}) ==="
       config.to_h.each do |k, v|
-        puts "   #{k}=#{v}"
+        puts "#{k}=#{v}"
       end
       return
     end
@@ -76,6 +91,12 @@ class Nv::CLI < Thor
       config.save
     end
 
-    puts "config: #{key}=#{config[key]}"
+    puts "=== config(#{Nv::CONFIG_PATH}) ==="
+    puts "#{key}=#{config[key]}"
+  end
+
+  desc "version", "Show version"
+  def version
+    puts "nv version #{Nv::VERSION}"
   end
 end

data/lib/nv/config.rb

@@ -1,7 +1,6 @@
 require 'ostruct'
 require 'yaml'
 require 'fileutils'
-require 'active_support/core_ext'
 
 class String
   def undent
@@ -25,7 +24,7 @@ module Nv
 
     def save
       File.open(@config_path, 'w') do |f|
-        f.print YAML.dump(self.to_h.stringify_keys)
+        f.print YAML.dump(transform_keys(self.to_h){|k| k.to_s})
       end
     end
 
@@ -43,5 +42,15 @@ module Nv
         exit
       end
     end
+
+    private
+
+    def transform_keys(hs)
+      result = {}
+      hs.each_key do |key|
+        result[yield(key)] = hs[key]
+      end
+      result
+    end
   end
 end

data/lib/nv/niconico.rb

@@ -1,5 +1,6 @@
 require 'mechanize'
 require 'open-uri'
+require 'net/http'
 require 'uri'
 require 'cgi'
 require 'rexml/document'
@@ -7,14 +8,12 @@ require 'rss'
 require 'ostruct'
 require 'ruby-progressbar'
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'niconico/helper'
-require 'niconico/fabric'
-require 'niconico/base'
-require 'niconico/video'
-require 'niconico/mylist'
+require 'nv/niconico/helper'
+require 'nv/niconico/fabric'
+require 'nv/niconico/base'
+require 'nv/niconico/video'
+require 'nv/niconico/mylist'
 
 module Niconico
-
+  OUTPUT_NAME = "%{title} - [%{id}].%{extension}"
 end

data/lib/nv/niconico/helper.rb

@@ -4,5 +4,9 @@ module Niconico
       return true if url =~ /mylist\/\d+/
       false
     end
+
+    def escape_string(str)
+      str.gsub(/[\/\\?*:|><]/) {|m| [m.ord + 65248].pack('U*')}
+    end
   end
 end

data/lib/nv/niconico/mylist.rb

@@ -22,7 +22,7 @@ module Niconico
     end
 
     def fetch
-      doc = REXML::Document.new(@agent.get("http://www.nicovideo.jp/mylist/#{@id}?rss=2.0").body)
+      doc = REXML::Document.new(open("http://www.nicovideo.jp/mylist/#{@id}?rss=2.0").read)
 
       channel = doc.elements['/rss/channel']
 
@@ -42,14 +42,14 @@ module Niconico
       end
 
       @mylist = OpenStruct.new({
-        :title       => channel.elements['title/text()'],
-        :link        => channel.elements['link/text()'],
-        :description => channel.elements['description/text()'],
-        :created_at  => channel.elements['pubDate/text()'],
-        :updated_at  => channel.elements['lastBuildDate/text()'],
-        :generator   => channel.elements['generator/text()'],
-        :author      => channel.elements['dc:creator/text()'],
-        :language    => channel.elements['language/text()'],
+        :title       => channel.elements['title/text()'].to_s.gsub(/(^マイリスト\s|‐ニコニコ動画$)/, ''),
+        :link        => channel.elements['link/text()'].to_s,
+        :description => channel.elements['description/text()'].to_s,
+        :created_at  => channel.elements['pubDate/text()'].to_s,
+        :updated_at  => channel.elements['lastBuildDate/text()'].to_s,
+        :generator   => channel.elements['generator/text()'].to_s,
+        :author      => channel.elements['dc:creator/text()'].to_s,
+        :language    => channel.elements['language/text()'].to_s,
         :items       => items,
         :items_count => items.size
       })

data/lib/nv/niconico/video.rb

@@ -11,32 +11,118 @@ module Niconico
     end
 
     def download(output=".")
-      escapedTitle = thumb.title.gsub(/\//, "／")
-      filename = "#{escapedTitle} - [#{thumb.video_id}].#{thumb.extension}"
-      filepath = File.join(output, filename)
+      escaped_title  = escape_string(thumb.title)
+      escaped_output = escape_string(output)
 
-      Dir.mkdir(output) unless Dir.exist? output
+      filename = sprintf OUTPUT_NAME, {:title => escaped_title, :id => thumb.video_id, :extension => thumb.extension}
+      filepath = File.join(escaped_output, filename)
+      filepath_nvdownload = "#{filepath}.nvdownload"
 
+      # Return when video file is already exist
+      if File.exist? filepath
+        File.delete filepath_nvdownload if File.exist? filepath_nvdownload
+        return
+      end
+
+      # Create output dir
+      Dir.mkdir escaped_output unless Dir.exist? escaped_output
+
+      # Define request headers
+      options = {
+        'Cookie' => flv.history_cookies
+      }
+      if File.exist? filepath_nvdownload
+        options['Range'] = "bytes=#{File.size(filepath_nvdownload)}-"
+      end
+
+      # Download video
       progress_bar = nil
-      File.open(filepath, 'wb') do |fp|
-        open(flv.url, 'rb',
-          'Cookie' => flv.history_cookies,
-          :content_length_proc => lambda{ |content_length|
-            if content_length
-              progress_bar = ProgressBar.create(:total => content_length)
-            end
-          },
-          :progress_proc => lambda{ |transferred_bytes|
-            if progress_bar
-              progress_bar.progress = transferred_bytes
-            else
-              puts "#{transferred_bytes} / Total size is unknown"
+      url = URI.parse(flv.url)
+      begin
+        Net::HTTP.start(url.host, url.port) do |http|
+          header = http.request_head("#{url.path}?#{url.query}", options)
+          progress_bar = ProgressBar.create(:total => header['content-length'].to_i)
+          transferred_bytes = 0
+          request = Net::HTTP::Get.new(url, options)
+          http.request request do |response|
+            open(filepath_nvdownload, 'ab') do |io|
+              response.read_body do |chunk|
+                transferred_bytes += chunk.size
+                if progress_bar
+                  progress_bar.progress = transferred_bytes
+                else
+                  puts "#{transferred_bytes} / Total size is unknown"
+                end
+
+                io.write chunk
+              end
             end
-          }
-        ) do |f|
-          fp.print f.read
+          end
         end
+      rescue => e
+        puts "Failed download: #{e}"
+        return
+      end
+
+      # Rename .nvdownload to real file
+      File.rename(filepath_nvdownload, filepath)
+    end
+
+    # GET http://flapi.nicovideo.jp/api/getwaybackkey?thread=1345476375
+    # => waybackkey=1417346808.E9d0LUF9gvFvt3Rrf5TP91Pa0LA
+
+    # POST http://msg.nicovideo.jp/53/api/
+    # <packet><thread thread="1345476375" version="20090904" user_id="1501297" scores="1" nicoru="1" with_global="1"/><thread_leaves thread="1345476375" user_id="1501297" scores="1" nicoru="1">0-14:100,1000</thread_leaves></packet>
+    # <packet>
+    #   <thread thread="1345476375"
+    #           version="20090904"
+    #           waybackkey="1417346808.E9d0LUF9gvFvt3Rrf5TP91Pa0LA"
+    #           when="1417346804"
+    #           user_id="1501297"
+    #           scores="1"
+    #           nicoru="1"
+    #   />
+    #   <thread_leaves
+    #           thread="1345476375"
+    #           waybackkey="1417346808.E9d0LUF9gvFvt3Rrf5TP91Pa0LA"
+    #           when="1417346804" # 起点
+    #           user_id="1501297"
+    #           res_before="8541"
+    #           scores="1"
+    #           nicoru="1" >0-14:100,1000</thread_leaves>
+    # </packet>
+    # <chat thread="1345476375" no="8540" vpos="55658" date="1417346426" mail="184" user_id="tzaiW5hp-SvJG6UGkEa0kELQd3w" anonymity="1" leaf="9">白いレースのハンカチかな？</chat>
+    # <chat thread="1345476375" no="8539" vpos="41534" date="1417233687" mail="184" user_id="1p_4U9fr-YvliRaUl3E6XGEavp4" premium="1" anonymity="1" leaf="6">くっそｗｗｗｗ</chat>
+    def download_comments(output=".")
+      escaped_title  = escape_string(thumb.title)
+      escaped_output = escape_string(output)
+
+      filename = sprintf OUTPUT_NAME, {:title => escaped_title, :id => thumb.video_id, :extension => 'comments'}
+      filepath = File.join(escaped_output, filename)
+
+      Dir.mkdir(escaped_output) unless Dir.exist? escaped_output
+
+      url = URI.parse(flv.ms)
+
+      thread_id = flv.thread_id
+      length = (flv.l.to_i / 60).round
+      res = Net::HTTP.new(url.host).start do |http|
+        req = Net::HTTP::Post.new(url.path, {'Cookie' => flv.history_cookies})
+        req.body = %|<packet><thread thread="#{thread_id}" version="20090904" scores="1" nicoru="1" with_global="1"/><thread_leaves thread="#{thread_id}" scores="1" nicoru="1">0-#{length}:10</thread_leaves></packet>|
+        http.request(req)
       end
+
+      open(filepath, 'w') do |f|
+        f.write res.body
+      end
+
+      # TODO: Comment parser
+      # doc = REXML::Document.new(res.body)
+      # chats = doc.elements.to_a('/packet/chat')
+      # chats.each do |chat|
+      #   puts chat.attribute('vpos')
+      #   puts chat.text
+      # end
     end
 
     # Combined parameter fetcher
@@ -78,7 +164,6 @@ module Niconico
 
     def flv(id=@id)
       return @flv if @flv
-
       @agent.get("http://www.nicovideo.jp/watch/#{id}")
       history_cookie = @agent.cookies.map(&:to_s).join('; ')
 

data/lib/nv/version.rb

@@ -1,3 +1,3 @@
 module Nv
-  VERSION = "1.0.1"
+  VERSION = "1.2.1"
 end

data/nv.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "activesupport"
   spec.add_dependency "mechanize"
   spec.add_dependency "thor"
   spec.add_dependency "ruby-progressbar"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Yasuaki Uechi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement