viddl-rb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: aff24988a745ce18c4928aca3c4e50fb47232f1d
-  data.tar.gz: c0fff623ca863b24999582c94d582a2de1288c1f
+  data.tar.gz: d497fc050ace12babbf349b9a784bc4d25f575b6
+  metadata.gz: f762d1748ff20ddecf6a8a243934ed8002c2bf7b
 SHA512: 
-  metadata.gz: 04af8ad42b49b38d890fb2e1536a2e8de0573c6a419c984bb3135078c18cc98a1f3fd9c760d885c540372ebdbf303d164147f240e3ca760edf0161bac16042b7
-  data.tar.gz: 9a7b77633e663298a5ea5872afef78491de249906ff598d73401c15e9f2db4ba99635118e83e74fcebb61ca65da30d59b0955b03846595fd9720c4b70d357b63
+  data.tar.gz: ec1be57e9dfbb1e44489fa6cca3af761ab3433b012a7e7984a21fa09a1011155b7141939f3770e40a369a3b714f2dba8ac205630e1af9a4a98244422b4cead93
+  metadata.gz: 584785893e0f19ee4da9b374619e878c726297847cf3f7f2dfbd8cedf18338c1806d68a3d3f6690c9d678ad8b08bcba76de3fb3ca2204394d4bad5eddc06ef99

data/README.md

@@ -16,15 +16,15 @@ Download a video:
 
 Viddl-rb supports the following command line options:
 ```
--e, --extract-audio              Save video audio to file
--a, --abort-on-failure           Abort download queue if one of the videos fail to download
--u, --url-only                   Prints url without downloading
--t, --title-only                 Prints title without downloading
+-e, --extract-audio              Extract the audio track of the download to a separate file
+-a, --abort-on-failure           Abort if one of the videos in a list fails to download
+-u, --url-only                   Just display the download url without downloading the file.
+-t, --title-only                 Just display the title without downloading the file.
 -f, --filter REGEX               Filters a video playlist according to the regex (Youtube only right now)
 -s, --save-dir DIRECTORY         Specifies the directory where videos should be saved
--d, --downloader TOOL            Specifies the tool to download with. Supports 'wget', 'curl' and 'net-http'
--q, --quality QUALITY            Specifies the video format and resolution in the following way: width:height:res (e.g. 1280:720:mp4)
-                                 The width, height and resolution may be omitted with a *.
+-d, --downloader TOOL            Specifies the tool to download with. Supports 'wget', 'curl', 'aria2c' and 'net-http'
+-q, --quality QUALITY            Specifies the video format and resolution in the following way: width:height:format (e.g. 1280:720:mp4)
+                                 The width, height and format may be omitted with a *.
                                  For example, to match any quality with a height of 720 pixels in any format specify --quality *:720:*
 -h, --help                       Displays the help screen
 ```
@@ -128,6 +128,7 @@ __Co Maintainers:__
 * [farleyknight](https://github.com/farleyknight): Various small fixes and improvements
 
 __Contributors:__
+* [albertoboni](https://github.com/albertoboni) bandcamp plugin, soundcloud improvements
 * [divout](https://github.com/divout) aka Ivan K: blip.tv plugin, bugfixes
 * Sniper: bugfixes
 * [Serabe](https://github.com/Serabe) aka Sergio Arbeo: packaging viddl as a binary

data/plugins/bandcamp.rb

@@ -0,0 +1,40 @@
+require 'open-uri'
+require 'json'
+
+class Bandcamp < PluginBase
+  
+  # this will be called by the main app to check whether this plugin is responsible for the url passed
+  def self.matches_provider?(url)
+    url.include?("bandcamp.com")
+  end
+
+
+  # return the url for original video file and title
+  def self.get_urls_and_filenames(url, options = {})
+    # locate the js object with all the tracks data
+    url_and_files = []
+    doc           = Nokogiri::HTML(open(get_http_url(url)))
+    js            = doc.at("script:contains('var TralbumData')").text
+    match         = js[/trackinfo.*(\[.*\])/,1]
+
+    # parse the js object
+    JSON.parse(match).each do |track_data|
+      track_url   = ''
+
+      # hopefully the last is the best
+      track_url  = track_data["file"].values.last
+      
+      # create a good mp3 name
+      track_name  = self.make_filename_safe(track_data['title']) + '.mp3'
+      
+      # add to the response
+      url_and_files << {url: track_url, name: track_name}
+    end
+
+    url_and_files
+  end
+  
+  def self.get_http_url(url)
+    url.sub(/https?:\/\//, "http:\/\/")
+  end
+end

data/plugins/soundcloud.rb

@@ -1,40 +1,32 @@
+require 'nokogiri'
 require 'open-uri'
+require 'json'
+
 class Soundcloud < PluginBase
   # this will be called by the main app to check whether this plugin is responsible for the url passed
   def self.matches_provider?(url)
     url.include?("soundcloud.com")
   end
 
+
   # return the url for original video file and title
   def self.get_urls_and_filenames(url, options = {})
-    doc               = Nokogiri::HTML(open(get_http_url(url)))
-    download_filename = doc.at("#main-content-inner img[class=waveform]").attributes["src"].value.to_s.match(/\.com\/(.+)\_/)[1]
-    download_url      = "http://media.soundcloud.com/stream/#{download_filename}"
-    final_url         = UtilityHelper.get_final_location(download_url)
-    file_name         = transliterate("#{doc.at('//h1/em').text.chomp}") + ".mp3"
-
-    [{:url => final_url, :name => file_name}]
-  end
-
-  def self.transliterate(str)
-    # Based on permalink_fu by Rick Olsen
-
-    # Downcase string
-    str.downcase!
-
-    # Remove apostrophes so isn't changes to isnt
-    str.gsub!(/'/, '')
-
-    # Replace any non-letter or non-number character with a space
-    str.gsub!(/[^A-Za-z0-9]+/, ' ')
-
-    # Remove spaces from beginning and end of string
-    str.strip!
-
-    # Replace groups of spaces with single hyphen
-    str.gsub!(/\ +/, '-')
-
-    str
+    url_and_files = []
+    doc           = Nokogiri::HTML(open(get_http_url(url)))
+
+    # locate the controller script that contains all the tracks data
+    # this will work for either artist's or track's pages
+    doc.css('#main-content-inner .container + script').each do |container|
+      match       = container.text.to_s.match(/\((\{.*\})\)/).to_a
+      track_data  = JSON.parse(match[1])
+      
+      file_url    = track_data['streamUrl']
+      file_name   = self.make_filename_safe(track_data['title'].to_s) + '.mp3'
+
+      url_and_files << {url: file_url, name: file_name}
+    end
+
+    url_and_files
   end
 
   def self.get_http_url(url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Marc Seeger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-07 00:00:00 Z
+date: 2014-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -79,22 +79,28 @@ extensions: []
 extra_rdoc_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/bandcamp.rb
 - plugins/blip.rb
 - plugins/dailymotion.rb
 - plugins/metacafe.rb
 - plugins/soundcloud.rb
 - plugins/veoh.rb
 - plugins/vimeo.rb
+- plugins/youtube.rb
 - plugins/youtube/cipher_guesser.rb
 - plugins/youtube/cipher_io.rb
 - plugins/youtube/ciphers.yml
@@ -103,11 +109,6 @@ files:
 - plugins/youtube/format_picker.rb
 - plugins/youtube/url_resolver.rb
 - plugins/youtube/video_resolver.rb
-- plugins/youtube.rb
-- Gemfile
-- Gemfile.lock
-- Rakefile
-- README.md
 homepage: https://github.com/rb2k/viddl-rb
 licenses: 
 - MIT
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viddl-rb
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An extendable commandline video downloader for flash video sites.