viddl-rb 0.93 → 0.94

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 8fb50f14d1549e3f6db7dd502c8fc912f3d55f27
-  data.tar.gz: 0a4dcc19bb0d2fc17f28722041aa7ea930c2b6a7
-SHA512: 
-  metadata.gz: 99fd447ea4287875aca446e1e8fad11cd56d9f2a899d1fa06c53dd964247a8c90c6227e9e0ac8508ddde2af3be4e082abbf85d5ff771dc793ce87c76c84f1073
-  data.tar.gz: 30f6225573ac116c54c04f090b296ffc4eaca2c0f06569d268f3e6834e4315235f775985a95fc1f517c6758b375a3e2748d0825459c44968d0fe06f874ae937c
+---
+SHA1:
+  metadata.gz: de58e6fcb2fc70e8074588144fb452e02a5eb6d4
+  data.tar.gz: 2914138014499efe44b37c31ef127091d1d89b1f
+SHA512:
+  metadata.gz: ef3f1096fe776c7b5692fd1d3e78437638b1ef874e3dde25860ad525efa47bba796fcc24b587b73ca77f2c7de57a252daf6017c0054d7f0e54589cc96a039ff9
+  data.tar.gz: f7495ce3416925fd415c89d661bb986a95cd98440fa5c1371ec42f27435997d8975e415af9c21fbeef29c5b699171b4466d2eecd86ad9f183e8e8cc40c92f67c

data/Gemfile.lock

@@ -0,0 +1,237 @@
+PATH
+  remote: .
+  specs:
+    viddl-rb (0.93)
+      mime-types
+      multi_json
+      nokogiri
+      progressbar
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ffi2-generators (0.1.1)
+    mime-types (2.1)
+    mini_portile (0.5.2)
+    minitest (5.2.2)
+    multi_json (1.8.4)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    progressbar (0.21.0)
+    racc (1.4.11)
+    rake (10.1.1)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rubysl (2.0.15)
+      rubysl-abbrev (~> 2.0)
+      rubysl-base64 (~> 2.0)
+      rubysl-benchmark (~> 2.0)
+      rubysl-bigdecimal (~> 2.0)
+      rubysl-cgi (~> 2.0)
+      rubysl-cgi-session (~> 2.0)
+      rubysl-cmath (~> 2.0)
+      rubysl-complex (~> 2.0)
+      rubysl-continuation (~> 2.0)
+      rubysl-coverage (~> 2.0)
+      rubysl-csv (~> 2.0)
+      rubysl-curses (~> 2.0)
+      rubysl-date (~> 2.0)
+      rubysl-delegate (~> 2.0)
+      rubysl-digest (~> 2.0)
+      rubysl-drb (~> 2.0)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-english (~> 2.0)
+      rubysl-enumerator (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-etc (~> 2.0)
+      rubysl-expect (~> 2.0)
+      rubysl-fcntl (~> 2.0)
+      rubysl-fiber (~> 2.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-find (~> 2.0)
+      rubysl-forwardable (~> 2.0)
+      rubysl-getoptlong (~> 2.0)
+      rubysl-gserver (~> 2.0)
+      rubysl-io-console (~> 2.0)
+      rubysl-io-nonblock (~> 2.0)
+      rubysl-io-wait (~> 2.0)
+      rubysl-ipaddr (~> 2.0)
+      rubysl-irb (~> 2.0)
+      rubysl-logger (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-matrix (~> 2.0)
+      rubysl-mkmf (~> 2.0)
+      rubysl-monitor (~> 2.0)
+      rubysl-mutex_m (~> 2.0)
+      rubysl-net-ftp (~> 2.0)
+      rubysl-net-http (~> 2.0)
+      rubysl-net-imap (~> 2.0)
+      rubysl-net-pop (~> 2.0)
+      rubysl-net-protocol (~> 2.0)
+      rubysl-net-smtp (~> 2.0)
+      rubysl-net-telnet (~> 2.0)
+      rubysl-nkf (~> 2.0)
+      rubysl-observer (~> 2.0)
+      rubysl-open-uri (~> 2.0)
+      rubysl-open3 (~> 2.0)
+      rubysl-openssl (~> 2.0)
+      rubysl-optparse (~> 2.0)
+      rubysl-ostruct (~> 2.0)
+      rubysl-pathname (~> 2.0)
+      rubysl-prettyprint (~> 2.0)
+      rubysl-prime (~> 2.0)
+      rubysl-profile (~> 2.0)
+      rubysl-profiler (~> 2.0)
+      rubysl-pstore (~> 2.0)
+      rubysl-pty (~> 2.0)
+      rubysl-rational (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-resolv (~> 2.0)
+      rubysl-rexml (~> 2.0)
+      rubysl-rinda (~> 2.0)
+      rubysl-rss (~> 2.0)
+      rubysl-scanf (~> 2.0)
+      rubysl-securerandom (~> 2.0)
+      rubysl-set (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+      rubysl-singleton (~> 2.0)
+      rubysl-socket (~> 2.0)
+      rubysl-stringio (~> 2.0)
+      rubysl-strscan (~> 2.0)
+      rubysl-sync (~> 2.0)
+      rubysl-syslog (~> 2.0)
+      rubysl-tempfile (~> 2.0)
+      rubysl-thread (~> 2.0)
+      rubysl-thwait (~> 2.0)
+      rubysl-time (~> 2.0)
+      rubysl-timeout (~> 2.0)
+      rubysl-tmpdir (~> 2.0)
+      rubysl-tsort (~> 2.0)
+      rubysl-un (~> 2.0)
+      rubysl-uri (~> 2.0)
+      rubysl-weakref (~> 2.0)
+      rubysl-webrick (~> 2.0)
+      rubysl-xmlrpc (~> 2.0)
+      rubysl-yaml (~> 2.0)
+      rubysl-zlib (~> 2.0)
+    rubysl-abbrev (2.0.4)
+    rubysl-base64 (2.0.0)
+    rubysl-benchmark (2.0.1)
+    rubysl-bigdecimal (2.0.2)
+    rubysl-cgi (2.0.1)
+    rubysl-cgi-session (2.0.1)
+    rubysl-cmath (2.0.0)
+    rubysl-complex (2.0.0)
+    rubysl-continuation (2.0.0)
+    rubysl-coverage (2.0.3)
+    rubysl-csv (2.0.2)
+      rubysl-english (~> 2.0)
+    rubysl-curses (2.0.1)
+    rubysl-date (2.0.6)
+    rubysl-delegate (2.0.1)
+    rubysl-digest (2.0.3)
+    rubysl-drb (2.0.1)
+    rubysl-e2mmap (2.0.0)
+    rubysl-english (2.0.0)
+    rubysl-enumerator (2.0.0)
+    rubysl-erb (2.0.1)
+    rubysl-etc (2.0.3)
+      ffi2-generators (~> 0.1)
+    rubysl-expect (2.0.0)
+    rubysl-fcntl (2.0.4)
+      ffi2-generators (~> 0.1)
+    rubysl-fiber (2.0.0)
+    rubysl-fileutils (2.0.3)
+    rubysl-find (2.0.1)
+    rubysl-forwardable (2.0.1)
+    rubysl-getoptlong (2.0.0)
+    rubysl-gserver (2.0.0)
+      rubysl-socket (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-io-console (2.0.0)
+    rubysl-io-nonblock (2.0.0)
+    rubysl-io-wait (2.0.0)
+    rubysl-ipaddr (2.0.0)
+    rubysl-irb (2.0.4)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-logger (2.0.0)
+    rubysl-mathn (2.0.0)
+    rubysl-matrix (2.1.0)
+      rubysl-e2mmap (~> 2.0)
+    rubysl-mkmf (2.0.1)
+      rubysl-fileutils (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+    rubysl-monitor (2.0.0)
+    rubysl-mutex_m (2.0.0)
+    rubysl-net-ftp (2.0.1)
+    rubysl-net-http (2.0.4)
+      rubysl-cgi (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-singleton (~> 2.0)
+    rubysl-net-imap (2.0.1)
+    rubysl-net-pop (2.0.1)
+    rubysl-net-protocol (2.0.1)
+    rubysl-net-smtp (2.0.1)
+    rubysl-net-telnet (2.0.0)
+    rubysl-nkf (2.0.1)
+    rubysl-observer (2.0.0)
+    rubysl-open-uri (2.0.0)
+    rubysl-open3 (2.0.0)
+    rubysl-openssl (2.1.0)
+    rubysl-optparse (2.0.1)
+      rubysl-shellwords (~> 2.0)
+    rubysl-ostruct (2.0.4)
+    rubysl-pathname (2.0.0)
+    rubysl-prettyprint (2.0.2)
+    rubysl-prime (2.0.1)
+    rubysl-profile (2.0.0)
+    rubysl-profiler (2.0.1)
+    rubysl-pstore (2.0.0)
+    rubysl-pty (2.0.2)
+    rubysl-rational (2.0.1)
+    rubysl-readline (2.0.2)
+    rubysl-resolv (2.0.0)
+    rubysl-rexml (2.0.2)
+    rubysl-rinda (2.0.1)
+    rubysl-rss (2.0.0)
+    rubysl-scanf (2.0.0)
+    rubysl-securerandom (2.0.0)
+    rubysl-set (2.0.1)
+    rubysl-shellwords (2.0.0)
+    rubysl-singleton (2.0.0)
+    rubysl-socket (2.0.1)
+    rubysl-stringio (2.0.0)
+    rubysl-strscan (2.0.0)
+    rubysl-sync (2.0.0)
+    rubysl-syslog (2.0.1)
+      ffi2-generators (~> 0.1)
+    rubysl-tempfile (2.0.1)
+    rubysl-thread (2.0.2)
+    rubysl-thwait (2.0.0)
+    rubysl-time (2.0.3)
+    rubysl-timeout (2.0.0)
+    rubysl-tmpdir (2.0.0)
+    rubysl-tsort (2.0.1)
+    rubysl-un (2.0.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-optparse (~> 2.0)
+    rubysl-uri (2.0.0)
+    rubysl-weakref (2.0.0)
+    rubysl-webrick (2.0.0)
+    rubysl-xmlrpc (2.0.0)
+    rubysl-yaml (2.0.4)
+    rubysl-zlib (2.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minitest
+  racc
+  rake
+  rest-client
+  rubysl (~> 2.0)
+  viddl-rb!

data/bin/helper/downloader.rb

@@ -1,10 +1,13 @@
-
 # 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|
+      # Skip invalid invalid link
+      next unless url_name
+
+      # Url
       url = url_name[:url]
       name = url_name[:name]
 

data/bin/viddl-rb

@@ -4,12 +4,10 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'helper')  	     # bin-specific
 
 require "rubygems"
 require "nokogiri"
-require "mechanize"
 require "cgi"
 require "open-uri"
 require "open3"
 require "optparse"
-
 require "driver.rb"
 require "downloader.rb"
 require "download-helper.rb"

data/helper/audio-helper.rb

@@ -1,13 +1,15 @@
+require 'shellwords'
+
 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
+    def self.extract(file_name, save_dir)
+      # 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.join(save_dir, file_path)}") {|stdin, stdout, stderr, wait_thr| stderr.read }
+      escaped_input_file_path = Shellwords.escape(File.join(save_dir, file_name))
+      file_info = Open3.popen3("ffmpeg -i #{escaped_input_file_path}") {|stdin, stdout, stderr, wait_thr| stderr.read }
       puts "Done gathering information about the downloaded file."
 
       if !file_info.to_s.empty?
@@ -32,13 +34,15 @@ module ViddlRb
           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)
+        no_ext_filename = File.basename(file_name, File.extname(file_name))
+        output_file_path = File.join(save_dir, "#{no_ext_filename}.#{output_extension}")
+        escaped_output_file_path = Shellwords.escape(output_file_path)
+        if File.exist?(output_file_path)
           puts "Audio file seems to exist already, removing it before extraction."
-          File.delete(output_filename)
+          File.delete(output_file_path)
         end
-        Open3.popen3("ffmpeg -i #{File.join(save_dir, file_path)} -vn -acodec copy #{output_filename}") { |stdin, stdout, stderr, wait_thr| stdout.read }
-        puts "Done extracting audio to #{output_filename}"
+        Open3.popen3("ffmpeg -i #{escaped_input_file_path} -vn -acodec copy #{escaped_output_file_path}") { |stdin, stdout, stderr, wait_thr| stdout.read }
+        puts "Done extracting audio to #{output_file_path}"
       else
         raise "ERROR: Error while checking audio track of #{file_path}"
       end

data/helper/plugin-helper.rb

@@ -21,10 +21,10 @@ module ViddlRb
       PluginBase.registered_plugins << child
     end
 
-    #takes a string a returns a new string that is file name safe
-    #deletes \"' and replaces anything else that is not a digit or letter with _
+    #takes a string a returns a new string that is file name safe on Windows and Unix systems.
     def self.make_filename_safe(string)
-      string.delete("\"'").gsub(/[^\d\w]/, '_')
+      safe = UtilityHelper.windows? ? string.gsub(/[:*?"<>^|\/\\]/, "_") : string.gsub(/[\/\\0]/, "_")
+      safe.squeeze("_")
     end
 
     #the following methods redirects the Kernel printing methods (except #p) to the

data/helper/utility-helper.rb

@@ -11,13 +11,16 @@ module ViddlRb
       end
     end
 
+    def self.windows?
+      (RbConfig::CONFIG["host_os"] =~ /windows|mingw/i) != nil
+    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
+      
+      unless windows?
         `which #{utility}`.include?(utility.to_s)
       else
         if !system("where /q where").nil?   #if Windows has the where utility

data/lib/viddl-rb.rb

@@ -5,7 +5,6 @@ require "rubygems"
 require "net/http"
 require "nokogiri"
 require "multi_json"
-require "mechanize"
 require "cgi"
 require "open-uri"
 require "stringio"

data/plugins/youtube.rb

@@ -116,6 +116,13 @@ class Youtube < PluginBase
     def grab_url_non_embeddable(url)
       video_info      = open(url).read
       stream_map      = video_info[/url_encoded_fmt_stream_map\" *: *\"([^\"]+)\"/,1]
+
+      # Video has been deleted!
+      if stream_map.nil? or !stream_map.index("been+removed").nil?
+        Youtube.notify("VIDEO IS REMOVED")
+        return false
+      end
+
       urls_formats    = parse_stream_map(url_decode(stream_map))
       selected_format = choose_format(urls_formats)
       title           = video_info[/<meta name="title" content="([^"]*)">/, 1]

metadata

@@ -1,107 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: viddl-rb
-version: !ruby/object:Gem::Version 
-  version: "0.93"
+version: !ruby/object:Gem::Version
+  version: '0.94'
 platform: ruby
-authors: 
+authors:
 - Marc Seeger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mime-types
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mechanize
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.7.2
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: progressbar
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id005 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube, dailymotion and more
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: An extendable commandline video downloader for flash video sites. Includes
+  plugins for vimeo, youtube, dailymotion and more
 email: mail@marc-seeger.de
-executables: 
+executables:
 - viddl-rb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- Gemfile
+- Gemfile.lock
+- README.md
+- Rakefile
 - 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
+- lib/viddl-rb.rb
 - plugins/arte_plus_seven.rb
 - plugins/blip.rb
 - plugins/dailymotion.rb
@@ -110,34 +137,29 @@ files:
 - plugins/veoh.rb
 - plugins/vimeo.rb
 - plugins/youtube.rb
-- Gemfile
-- Rakefile
-- README.md
 homepage: https://github.com/rb2k/viddl-rb
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id005
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 1.9.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: viddl-rb
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: An extendable commandline video downloader for flash video sites.
 test_files: []
-
 has_rdoc: false