flv-dl 0.1.1 → 0.2.0

data/ChangeLog.md

@@ -1,3 +1,15 @@
+### 0.2.0 / 2012-08-14
+
+#### flv-dl
+
+* Made the default behaviour to download the video.
+* Fixed the `--play` option.
+* Added the `-P --player` option.
+
+### 0.1.1 / 2012-07-14
+
+* Forgot to add uri-query_params as a dependency.
+
 ### 0.1.0 / 2012-07-14
 
 * Initial release:

data/README.md

@@ -30,11 +30,13 @@ Because **fuck flash**, that's why.
 
 Downloads a video:
 
+    flv-dl "URL"
     flv-dl -o video.flv "URL"
 
 Plays a video:
 
-    flv-dl -p totem "URL"
+    export VIDEO_PLAYER=mplayer
+    flv-dl -p "URL"
 
 List available formats / URLs:
 

data/bin/flv-dl

@@ -7,7 +7,7 @@ require 'pp'
 require 'flv/video'
 
 options = {
-  :mode   => :play,
+  :mode   => :download,
   :player => ENV['VIDEO_PLAYER'],
   :format => :flv
 }
@@ -20,9 +20,12 @@ optparser = OptionParser.new do |opts|
     options[:output] = output
   end
 
-  opts.on('-p','--play [COMMAND]','Play the video URL') do |player|
-    options[:mode]   = :play
-    options[:player] = player if player
+  opts.on('-p','--play','Play the video URL') do
+    options[:mode] = :play
+  end
+
+  opts.on('-P','--player COMMAND','Video player command') do |player|
+    options[:player] = player
   end
 
   opts.on('-f',"--format [#{FLV::Video::FORMATS.keys.join(', ')}]",'The video format') do |format|
@@ -76,17 +79,12 @@ else
   case options[:mode]
   when :play
     unless options[:player]
-      $stderr.puts "Must specify the video player via --play or $VIDEO_PLAYER"
+      $stderr.puts "Must specify the video player via --player or $VIDEO_PLAYER"
       exit -1
     end
 
-    system(options[:player],video_url)
+    system(options[:player],video_url.to_s)
   when :download
-    unless options[:output]
-      $stderr.puts "Must specify --output PATH"
-      exit -1
-    end
-
     puts ">>> Requesting #{video_url} ..."
 
     http = Net::HTTP.new(video_url.host,video_url.port)
@@ -105,7 +103,9 @@ else
     http.request(request) do |response|
       size, total = 0, response.header['Content-Length'].to_i
 
-      video_path = options.fetch(:output)
+      video_path = options.fetch(:output) do
+        "#{video.title}.#{options[:format]}"
+      end
 
       puts ">>> Downloading to #{video_path.dump} ..."
 

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: flv-dl
-version: 0.1.1
+version: 0.2.0
 summary: Downloads Flash Video (flv) files from web-pages.
 description:
   Downloads or plays Flash Video (flv) files directly from web-pages.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flv-dl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri-query_params