soundcloud_streamer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8df81a25b54abb3fdaefef7ff3fdbb1bd1d3d97
-  data.tar.gz: cc6c03a8f59fd55986e72c568a0dcfd47a7c18ff
+  metadata.gz: 8d9f17867544bc5f60639e9e4adc21a431d09855
+  data.tar.gz: a14b1342c5fadc88c88adb2565e8ad438e26936e
 SHA512:
-  metadata.gz: 16e3b86dd43ee665a2752793924cf4bf61218007f5a4d272669eb03c23c7572283b492a9066be6cefa67d1abc62cc5299f840a85d331f3dc3c89c4749f909873
-  data.tar.gz: 6f335df7c52911361be0cf90f84e621fb2d0a6f4880076069e8f0239d912b6610db4db35391b9c0bfd7f1d1fd0b83373e9f895a4d2d919ccb95b017419d11a90
+  metadata.gz: 6865ecb3a4c13fd56b4c0eb5b289ce07d0856ab10c8a4fe9b902ac166f0c2841e87bd4c8169926a600b47dc5d479f00c0189d5f7e5d554e72d8f1ab67d941736
+  data.tar.gz: 9d8bafdb8a589913c36cf9eb01a45d68ed2dd12b9bbeb655fe40e09842a9dd6dd70c115e76d3f3dd2f8200148cee8cd8092b7cef726641dcd09c1ad36a27caa8

data/README.md

@@ -18,13 +18,13 @@ Or install it yourself as:
 
 ## Usage
 
-    $ soundcloud_stream help
+    $ soundcloud_streamer help
 
-    $ soundcloud_stream help playlist
+    $ soundcloud_streamer help playlist
 
 ### Example
 
-    $ soundcloud_stream playlist https://soundcloud.com/mathew-steven-klein/sets/her-soundtrack --client-id=07b516960d652769d2a00c9a6a26f27d --target-dir="Her Soundtrack by Arcade Fire"
+    $ soundcloud_streamer playlist https://soundcloud.com/mathew-steven-klein/sets/her-soundtrack --client-id=07b516960d652769d2a00c9a6a26f27d --target-dir="Her Soundtrack by Arcade Fire"
 
 ## Contributing
 

data/lib/soundcloud_streamer/cli.rb

@@ -3,9 +3,9 @@ module SoundcloudStreamer
     package_name "Soundcloud Streamer v#{SoundcloudStreamer::VERSION}"
 
     desc "playlist <URL>", "streams and saves all tracks from the playlist"
-    method_options client_id: :string, target_dir: :string
+    method_options client_id: :string, target_dir: :string, overwrite: :boolean
     def playlist(url)
-      response = playlist = client.get('/resolve', url: url)
+      response = playlist = client.get('/resolve', url: url, limit: 100)
 
       if response.kind == 'playlist'
         instant_print "Going to Stream all #{playlist.tracks.count} Tracks from Playlist ...\r\n"
@@ -14,17 +14,27 @@ module SoundcloudStreamer
         exit(-8)
       end
 
-      track_num_justr = (playlist.tracks.count / 10.0).ceil
+      track_num_justr = playlist.tracks.count.to_s.length
       playlist.tracks.each_with_index do |track, track_idx|
         track_num = track_idx + 1
         track_num_str = track_num.to_s.rjust(track_num_justr, '0')
 
-        uri = URI.parse(track.stream_url)
-        uri.query = URI.encode_www_form(SoundCloud::Client::CLIENT_ID_PARAM_NAME => client_id)
+        unless track.streamable?
+          instant_print "Unstreamable-#{track_num}.\r\n"
+          next
+        end
 
         download_name = File.join(target_dir, [ track_num_str, ' ', track.title, '.mp3' ].join.gsub('/',' - ') )
         download_file = nil
 
+        if File.exist?(download_name) && !overwrite?
+          instant_print "Exisiting-#{track_num}.\r\n"
+          next
+        end
+
+        uri = URI.parse(track.stream_url)
+        uri.query = URI.encode_www_form(client_id: client_id)
+
         request = Typhoeus::Request.new(uri, followlocation: true)
         request.on_headers do |response|
           if response.code == 200
@@ -126,6 +136,10 @@ module SoundcloudStreamer
       target_dir
     end
 
+    def overwrite?
+      options[:overwrite] || false
+    end
+
     def instant_print(*params)
       print(*params) { STDOUT.flush }
     end

data/lib/soundcloud_streamer/version.rb

@@ -1,3 +1,3 @@
 module SoundcloudStreamer
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soundcloud_streamer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Nowak