viddl-rb 0.8 → 0.61

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 113
+  prerelease: 
   segments: 
   - 0
-  - 8
-  version: "0.8"
+  - 61
+  version: "0.61"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -13,84 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-17 00:00:00 +02:00
-default_executable: 
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 5
         - 0
-        version: 1.5.0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mechanize
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: progressbar
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
-description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube, dailymotion and more
+description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube and megavideo
 email: mail@marc-seeger.de
 executables: 
 - viddl-rb
@@ -99,28 +81,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/helper/downloader.rb
-- bin/helper/driver.rb
-- bin/helper/parameter-parser.rb
 - bin/viddl-rb
-- lib/viddl-rb.rb
-- helper/audio-helper.rb
 - helper/download-helper.rb
 - helper/plugin-helper.rb
-- helper/utility-helper.rb
 - plugins/blip.rb
-- plugins/dailymotion.rb
 - plugins/metacafe.rb
 - plugins/soundcloud.rb
 - plugins/veoh.rb
 - plugins/vimeo.rb
 - plugins/youtube.rb
+- CHANGELOG.txt
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - README.md
-- TODO.txt
-has_rdoc: true
 homepage: https://github.com/rb2k/viddl-rb
 licenses: []
 
@@ -128,18 +102,22 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+- .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 19
       segments: 
       - 1
       - 3
@@ -148,9 +126,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viddl-rb
-rubygems_version: 1.3.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: An extendable commandline video downloader for flash video sites.
 test_files: []
 
+has_rdoc: false

data/TODO.txt

@@ -1,3 +0,0 @@
-* wrap all classes used by the lib in a module (for namespace reasons)
-* add save_file method to library
-

data/bin/helper/downloader.rb

@@ -1,20 +0,0 @@
-
-# Downloader iterates over a download queue and downloads and saves each video in the queue.
-class Downloader
-  class DownloadFailedError < StandardError; end
-
-  def download(download_queue, params)
-    download_queue.each do |url_name|
-      url = url_name[:url]
-      name = url_name[:name]
-
-      result = ViddlRb::DownloadHelper.save_file(url, name, :save_dir => params[:save_dir], :tool => params[:tool])
-      unless result
-        raise DownloadFailedError, "Download for #{name} failed."
-      else
-        puts "Download for #{name} successful."
-        ViddlRb::AudioHelper.extract(name, params[:save_dir]) if params[:extract_audio]
-      end
-    end
-  end
-end

data/bin/helper/driver.rb

@@ -1,47 +0,0 @@
-
-# The Driver class drives the application logic in the viddl-rb utility.
-# It gets the correct plugin for the given url and passes a download queue
-# (that it gets from the plugin) to the Downloader object which downloads the videos.
-class Driver
-
-  def initialize(param_hash)
-    @params = param_hash
-    @downloader = Downloader.new
-  end
-
-  #starts the downloading process or print just the urls or names.
-  def start
-    queue = get_download_queue
-
-    if @params[:url_only]
-      queue.each { |url_name| puts url_name[:url] }
-    elsif @params[:title_only]
-      queue.each { |url_name| puts url_name[:name] }
-    else
-      @downloader.download(queue, @params)
-    end
-  end
-
-  private
-
-  #finds the right plugins and returns the download queue.
-  def get_download_queue
-    url = @params[:url]
-    plugin = ViddlRb::PluginBase.registered_plugins.find { |p| p.matches_provider?(url) }
-    raise "ERROR: No plugin seems to feel responsible for this URL." unless plugin
-    puts "Using plugin: #{plugin}"
-
-    begin
-      #we'll end up with an array of hashes with they keys :url and :name 
-      plugin.get_urls_and_filenames(url, @params)
-      
-    rescue ViddlRb::PluginBase::CouldNotDownloadVideoError => e
-      raise "ERROR: The video could not be downloaded.\n" +
-            "Reason: #{e.message}"
-    rescue StandardError => e
-      raise "Error while running the #{plugin.name.inspect} plugin. Maybe it has to be updated?\n" +
-            "Error: #{e.message}.\n" +
-            "Backtrace:\n#{e.backtrace.join("\n")}"  
-    end
-  end
-end

data/bin/helper/parameter-parser.rb

@@ -1,109 +0,0 @@
-
-# ParameterParser parses the program parameters.
-# If the parameters are not valid in some way an exception is raised.
-# The exceptions raised by this class are handeled in the bin program.
-
-class ParameterParser
-
-  DEFAULT_SAVE_DIR = "."
-
-  #returns a hash with the parameters in it:
-  # :url              => the video url
-  # :extract_audio    => should attempt to extract audio? (true/false)
-  # :url_only         => do not download, only print the urls to stdout
-  # :title_only       => do not download, only print the titles to stdout
-  # :playlist_filter  => a regular expression used to filter playlists
-  # :save_dir         => the directory where the videos are saved
-  # :tool             => the download tool (wget, curl, net/http) to use
-  # :quality          => the resolution and format to download
-  def self.parse_app_parameters(args)
-
-    # Default option values are set here
-    options = {
-      :extract_audio    => false,
-      :url_only         => false,
-      :title_only       => false,
-      :playlist_filter  => nil,
-      :save_dir         => DEFAULT_SAVE_DIR,
-      :tool             => nil,
-      :quality          => nil
-    }
-
-    optparse = OptionParser.new do |opts|
-      opts.banner = "Usage: viddl-rb URL [options]"
-
-      opts.on("-e", "--extract-audio", "Save video audio to file") do
-        if ViddlRb::UtilityHelper.os_has?("ffmpeg")
-          options[:extract_audio] = true
-        else
-          raise OptionParser::ParseError.new("to extract audio you need to have ffmpeg on your PATH")
-        end
-      end
-
-      opts.on("-u", "--url-only", "Prints url without downloading") do
-        options[:url_only] = true
-      end
-
-      opts.on("-t", "--title-only", "Prints title without downloading") do
-        options[:title_only] = true
-      end
-
-      opts.on("-f", "--filter REGEX", Regexp, "Filters a video playlist according to the regex") do |regex|
-        options[:filter] = regex
-      end
-
-      opts.on("-s", "--save-dir DIRECTORY", "Specifies the directory where videos should be saved") do |dir|
-        if File.directory?(dir)
-          options[:save_dir] = dir
-        else
-          raise OptionParser::InvalidArgument.new("'#{dir}' is not a valid directory")
-        end
-      end
-
-      opts.on("-d", "--downloader TOOL", "Specifies the tool to download with. Supports 'wget', 'curl' and 'net-http'") do |tool|
-        if tool =~ /(^wget$)|(^curl$)|(^net-http$)/
-          options[:tool] = tool
-        else
-          raise OptionParser::InvalidArgument.new("'#{tool}' is not a valid tool.")
-        end
-      end
-
-      opts.on("-q", "--quality QUALITY", 
-          "Specifies the video format and resolution in the following way => resolution:extension (e.g. 720:mp4)") do |quality|
-        if match = quality.match(/(\d+):(.*)/)
-          res = match[1]
-          ext = match[2]
-        elsif match = quality.match(/\d+/)
-          res = match[0]
-          ext = nil
-        else
-          raise OptionParse.InvalidArgument.new("#{quality} is not a valid argument.")
-        end
-        options[:quality] = {:extension => ext, :resolution => res}
-      end
-
-      opts.on_tail('-h', '--help', 'Display this screen') do
-        print_help_and_exit(opts)
-      end
-    end
-
-    optparse.parse!(args)                           # removes all options from args
-    print_help_and_exit(optparse) if args.empty?    # exit if no video url
-    url = args.first                                # the url is the only element left
-    validate_url!(url)                              # raise exception if invalid url
-    options[:url] = url                     
-    options
-  end
-
-  def self.print_help_and_exit(opts)
-    puts opts
-    exit(0)
-  end
-
-  def self.validate_url!(url)
-    unless url =~ /^http/
-      raise OptionParser::InvalidArgument.new(
-        "please include 'http' with your URL e.g. http://www.youtube.com/watch?v=QH2-TGUlwu4")
-    end
-  end
-end

data/helper/audio-helper.rb

@@ -1,48 +0,0 @@
-module ViddlRb
-
-  # This class is responsible for extracting audio from video files using ffmpeg.
-  class AudioHelper
-
-    def self.extract(file_path, save_dir)
-      no_ext_filename = file_path.split('.')[0..-1][0]
-      #capture stderr because ffmpeg expects an output param and will error out
-      puts "Gathering information about the downloaded file."
-      file_info = Open3.popen3("ffmpeg -i #{file_path}") {|stdin, stdout, stderr, wait_thr| stderr.read }
-      puts "Done gathering information about the downloaded file."
-
-      if !file_info.to_s.empty?
-        audio_format_matches = file_info.match(/Audio: (\w*)/)
-        if audio_format_matches
-          audio_format = audio_format_matches[1]
-          puts "detected audio format: #{audio_format}"
-        else
-          raise "ERROR: Couldn't find any audio:\n#{file_info.inspect}"
-        end
-        
-        extension_mapper = {
-        'aac' => 'm4a',
-        'mp3' => 'mp3',
-        'vorbis' => 'ogg'
-        }
-
-        if extension_mapper.key?(audio_format)
-          output_extension = extension_mapper[audio_format]
-        else
-          #lame fallback
-          puts "Unknown audio format: #{audio_format}, using name as extension: '.#{audio_format}'."
-          output_extension = audio_format
-        end
-        output_filename = File.join(save_dir, "#{no_ext_filename}.#{output_extension}")
-        if File.exist?(output_filename)
-          puts "Audio file seems to exist already, removing it before extraction."
-          File.delete(output_filename)
-        end
-        Open3.popen3("ffmpeg -i #{file_path} -vn -acodec copy #{output_filename}") { |stdin, stdout, stderr, wait_thr| stdout.read }
-        puts "Done extracting audio to #{output_filename}"
-      else
-        raise "ERROR: Error while checking audio track of #{file_path}"
-      end
-    end
-  end
-
-end

data/helper/utility-helper.rb

@@ -1,45 +0,0 @@
-# This class contains utility methods that are used by both the bin utility and the library.
-
-module ViddlRb
-
-  class UtilityHelper
-    #loads all plugins in the plugin directory.
-    #the plugin classes are dynamically added to the ViddlRb module.
-    def self.load_plugins
-      Dir[File.join(File.dirname(__FILE__), "../plugins/*.rb")].each do |plugin|
-        ViddlRb.class_eval(File.read(plugin))
-      end
-    end
-
-    #checks to see whether the os has a certain utility like wget or curl
-    #`` returns the standard output of the process
-    #system returns the exit code of the process
-    def self.os_has?(utility)
-      windows = ENV['OS'] =~ /windows/i
-
-      unless windows
-        `which #{utility}`.include?(utility.to_s)
-      else
-        if !system("where /q where").nil?   #if Windows has the where utility
-          system("where /q #{utility}")     #/q is the quiet mode flag
-        else
-          begin                             #as a fallback we just run the utility itself
-            system(utility)
-          rescue Errno::ENOENT
-            false
-          end
-        end
-      end
-    end
-
-    #recursively get the final location (after following all redirects) for an url.
-    def self.get_final_location(url)
-      Net::HTTP.get_response(URI(url)) do |res|
-        location = res["location"]
-        return url if location.nil?
-        return get_final_location(location)
-      end
-    end
-
-  end
-end