soundcloud_downloader 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583a92d287b6ab514855671337e83b7bf5b1961b
-  data.tar.gz: acca92e3fdf28abeb911e30519d5a4cb4eb3d438
+  metadata.gz: e463e0ae3702a0b02f3917b106c64354e42920f2
+  data.tar.gz: d65c7c79d922960c05a42b74a40f78ea5934f5f9
 SHA512:
-  metadata.gz: 04f243309166576e7af0057eecb4e9bda372e2707ed9ac93cf9a4e207b196f4fcaac5521719a7737e8bc63e8f720909b00de18203ffe7f6ecf8dafe32c701f93
-  data.tar.gz: 2bc3b860d01555ac5f2f34a45a5d43db6cc44426f8e639e68dbe723c5b7d8310c13337c5ba00b819d830a94c9569a03eb1c2b2a396578c4cc9e86d9f45a418d9
+  metadata.gz: 5e11d7757806c0018243f916b7f54e95429d1649c6f85ef53dd780bd08ac6d11a313234bd99046cb679297026e83554ad6b3bcbb7e923a89c7790fd5042cf9f8
+  data.tar.gz: b4f00c07ec43794ec3f03b3f7b5f1d206e68d4dc2034750af0d10b5d5e10a41e69f74ac5f79c0d5921afe3a23309cdfc1d61395be64412542ed5d6aeb2753a31

data/.gitignore

@@ -1,23 +1,23 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-*.mp3
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+*.mp3

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in scdownloader.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in scdownloader.gemspec
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2014 TODO: Write your name
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2014 TODO: Write your name
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,24 +1,26 @@
-# SoundcloudDownloader
-
-SoundcloudDownloader is a tool used to download songs from SoundCloud to your computer as MP3.
-
-## Installation
-
-    $ gem install soundcloud_downloader
-
-## Usage
-
-CLI:
-
-    $ soundcloud-downloader URL
-
-In your own Ruby applications:
-
-    require 'soundcloud_downloader'
-
-    song = Song.new("https://soundcloud.com/example/example-song-name")
-    song.id # => 123456
-    song.stream_url # => https://soundcloud.hs.llnwd.net/Example.128.mp3?AWSAccessKeyId=Example&Expires=Example&Signature=Example%3D&e=Example&h=Example
-    song.name # => example-song-name
-    song.url # => https://soundcloud.com/example/example-song-name
-    song.download # This will download the song as mp3
+# SoundcloudDownloader
+
+SoundcloudDownloader is a tool used to download songs from SoundCloud to your computer as MP3.
+
+## Installation
+
+    $ gem install soundcloud_downloader
+
+## Usage
+
+CLI:
+
+    $  soundcloud-downloader <URL> [OPTIONS]
+      -O, --output-file [filename]      Filename for the MP3, optional (Default: parse from URL)
+      -v, --version                     Show version
+
+In your own Ruby applications:
+
+    require 'soundcloud_downloader'
+
+    song = Song.new("https://soundcloud.com/example/example-song-name")
+    song.id # => 123456
+    song.stream_url # => https://soundcloud.hs.llnwd.net/Example.128.mp3?AWSAccessKeyId=Example&Expires=Example&Signature=Example%3D&e=Example&h=Example
+    song.name # => example-song-name
+    song.url # => https://soundcloud.com/example/example-song-name
+    song.download(file, folder) # This will download the song as mp3 (File and folder arguments are optional)

data/Rakefile

@@ -1,2 +1,2 @@
-require "bundler/gem_tasks"
-
+require "bundler/gem_tasks"
+

data/bin/soundcloud-downloader

@@ -1,28 +1,27 @@
-#!/usr/bin/env ruby
-
-require 'soundcloud_downloader'
-require 'optparse'
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: soundcloud-downloader <URL> [OPTIONS]"
-
-  opts.on("-o", "--out [filename]",
-          "Filename for the MP3, optional") do |t|
-    options[:filename] = t
-  end
-  opts.on("-f", "--folder [folder]",
-          "Folder to save the MP3 to, optional") do |t|
-    options[:folder] = t
-  end
-  opts.on_tail("-v", "--version", "Show version") do
-     puts "Version: #{SoundcloudDownloader::VERSION}"
-     exit
-   end
-
-end.parse!
-
-url = ARGV[0]
-
-song = Song.new(url)
-song.download(options[:filename], options[:folder])
+#!/usr/bin/env ruby
+
+require 'soundcloud_downloader'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: soundcloud-downloader <URL> [OPTIONS]"
+
+  opts.on("-O", "--output-file [filename]",
+          "Filename for the MP3, optional (Default: parse from URL)") do |t|
+    options[:filename] = t
+  end
+  opts.on_tail("-v", "--version", "Show version") do
+     puts "Version: #{SoundcloudDownloader::VERSION}"
+     exit
+   end
+
+end.parse!
+
+url = ARGV[0]
+
+song = Song.new(url)
+dl_options = []
+dl_options << options[:filename] unless options[:filename].nil?
+dl_options << options[:folder] unless options[:folder].nil?
+song.send('download', *dl_options)

data/lib/soundcloud_downloader/song.rb

@@ -1,51 +1,61 @@
 require "excon"
 require "json"
 require "uri"
+require "mp3info"
 
 class Song
-  attr_reader :id, :stream_url, :name, :url
+  attr_reader :metadata, :name, :url, :resolved_url
+
   def initialize(url)
     raise ArgumentError, "Invalid url" if url !~ URI::regexp
     @url = url
     @name = url.split("/").last
-    @id ||= get_id
+    @resolved_url ||= resolve_url
+    @metadata ||= get_metadata
     @stream_url ||= get_stream_url
   end
 
-  def download (file = "#{@name}.mp3", folder = "./")
-    raise ArgumentError, "Invalid folder" if not File.directory?(folder)
-    raise ArgumentError, "Cannot write to this folder" if not File.writable?(folder)
-    raise ArgumentError, "File must have .mp3 extension" if File.extname(file) != ".mp3"
+  def download (filename = "#{@metadata['title']}.mp3")
+    file = File.open(filename, 'wb')
+    
     streamer = lambda do |chunk, remaining_bytes, total_bytes|
       file.write(chunk)
       remaining = ((remaining_bytes.to_f / total_bytes) * 100).to_i
       STDOUT.flush
       print "\rRemaining: #{remaining}%"
     end
-    path = File.join(folder,File.basename(file))
-    file = open(path, 'wb')
+
     Excon.get(@stream_url, :response_block => streamer)
-    puts "\r\nSaved to #{File.realpath(path)}!"
     file.close
+    puts "\r\nSaved to #{File.realpath(filename)}!"
+    Mp3Info.open(File.realpath(filename)) do |mp3|
+      mp3.tag.title = @metadata["title"]
+    end
+
   end
 
   private
 
   def get_stream_url
-    response = Excon.get("https://api.sndcdn.com/i1/tracks/#{@id}/streams", :query => { :client_id => $client_id })
+    response = Excon.get("https://api.sndcdn.com/i1/tracks/#{@metadata['id']}/streams", :query => { :client_id => $client_id })
     JSON.parse(response.body)["http_mp3_128_url"]
   end
 
-  def get_id
-    response = Excon.get("https://api.sndcdn.com/resolve?_status_code_map%5B302%5D=200", 
-    :headers => { "Accept" => "application/json" }, 
+  def resolve_url
+    response = Excon.get("http://api.soundcloud.com/resolve.json", 
     :query => {
       :url => @url,
-      :_status_format => 'json',
       :client_id => $client_id
     })
-    location = JSON.parse(response.body)["location"]
-    uri = URI.parse(location).path.to_s
-    uri.split('/').last
+    JSON.parse(response.body)["location"]
+  end
+
+  def get_metadata
+    response = Excon.get(@resolved_url,
+    :query => {
+      :client_id => $client_id
+    })
+    JSON.parse(response.body)
   end
+
 end

data/lib/soundcloud_downloader/version.rb

@@ -1,3 +1,3 @@
-module SoundcloudDownloader
-  VERSION = "0.1.0"
-end
+module SoundcloudDownloader
+  VERSION = "0.1.1"
+end

data/lib/soundcloud_downloader.rb

@@ -1,9 +1,9 @@
-require "soundcloud_downloader/version"
-require "soundcloud_downloader/song"
-
-$client_id = "2de556d4242efcdb9efb51480a1e59e9"
-
-module SoundcloudDownloader
-
-end
-    
+require "soundcloud_downloader/version"
+require "soundcloud_downloader/song"
+
+$client_id = "2de556d4242efcdb9efb51480a1e59e9"
+
+module SoundcloudDownloader
+
+end
+    

data/soundcloud_downloader.gemspec

@@ -1,26 +1,27 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'soundcloud_downloader/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "soundcloud_downloader"
-  spec.version       = SoundcloudDownloader::VERSION
-  spec.authors       = ["Mico Piira"]
-  spec.email         = ["mico.piira@yahoo.com"]
-  spec.summary       = %q{SoundCloud downloader}
-  spec.description   = %q{Downloads songs from SoundCloud to your 
-computer as MP3 files}
-  spec.homepage      = "https://gitlab.com/mixu/soundcloud-downloader"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency 'excon', '~> 0.38.0'
-  spec.add_runtime_dependency 'json', '~> 1.8.1'
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'soundcloud_downloader/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "soundcloud_downloader"
+  spec.version       = SoundcloudDownloader::VERSION
+  spec.authors       = ["Mico Piira"]
+  spec.email         = ["mico.piira@yahoo.com"]
+  spec.summary       = %q{SoundCloud downloader}
+  spec.description   = %q{Downloads songs from SoundCloud to your 
+computer as MP3 files}
+  spec.homepage      = "https://gitlab.com/mixu/soundcloud-downloader"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency 'excon', '~> 0.38.0'
+  spec.add_runtime_dependency 'json', '~> 1.8.1'
+  spec.add_runtime_dependency 'ruby-mp3info', '~> 0.8.4'
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soundcloud_downloader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mico Piira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: ruby-mp3info
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: SoundCloud downloader