nehm 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd2f9e928ec72d11c65ff7e1a8d4ab251e401c8
-  data.tar.gz: 0422b2fceff29c45f852fe547670e6cd17753505
+  metadata.gz: 9da0b37e8738ecc87f3169744ac7bad706e04814
+  data.tar.gz: ccc01546551cd7f5836a59cb16d1323347917470
 SHA512:
-  metadata.gz: fa9bfb36d31c334f211885c42e0c85bc2eae664b4fc7e7ef8000a38f6933124de3bf5be6b0e56762aa83a6974e2770764780483944301c332575833319e7bd50
-  data.tar.gz: 36b2cfedab998142757a7a871868fa1d885b718a25560c468d80a09f4975a79714936405ebe296b92384d42684dd081f5f406c6e435457663f7255940a40c444
+  metadata.gz: 3a2405ccecfd65c5012471cc694caae4735c92a75e923c77e95f0bf9551309a7a2d5b350d2e7caf50b4cb5015113fe7bc6b3f5924ae3fffe4fff6b3abad0c97c
+  data.tar.gz: 1933d9e9b7430102a13a6b01e423109190fc5559a37c88eb651fe5a321899ad1ea8307d1c7e2a7455d91905718824162fe4b8b0b1b3881f9d6dec35f82869906

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # nehm change log
 
+## 1.5.4
+* Add availability to get/dl 300+ likes and posts
+* More convenient CLI
+* Fix: nehm fails if you try to get/dl playlist
+* Fix: nehm fails if you try to get/dl unstreamable track
+* Minor optimizations and bug fixes
+
 ## 1.5.3
 * Fix bugs, associated with special characters in track's name
 * Minor improvements

data/README.md

@@ -4,6 +4,10 @@
 
 *nehm* is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your SoundCloud posts or likes in convenient way
 
+[![Gem Version](https://badge.fury.io/rb/nehm.svg)](http://badge.fury.io/rb/nehm)
+[![Dependency Status](https://gemnasium.com/bogem/nehm.svg)](https://gemnasium.com/bogem/nehm)
+[![Code Climate](https://codeclimate.com/github/bogem/nehm/badges/gpa.svg)](https://codeclimate.com/github/bogem/nehm)
+
 ## Installation
 
 **1. Install `taglib` library**
@@ -51,6 +55,8 @@ Enter path to desirable download directory (press enter to set it to ...
 
   `nehm get post`
 
+   ***(nehm doesn't get and download playlists. It just skips them)***
+
 * Get multiple last posts or likes
 
   `nehm get 3 posts` or `nehm get 3 likes`
@@ -89,16 +95,16 @@ Enter path to desirable download directory (press enter to set it to ...
 
   `nehm help`
 
+## TODO
+
+* Getting/downloading playlists from posts
+
 ##FAQ
 
 **Q: What is permalink?**
 
 A: Permalink is the last word in your profile url. **Example:** for profile url ***soundcloud.com/qwerty*** permalink is ***qwerty***
 
-## Contributing
-
-Bug reports and pull requests are welcome.
-
 ## License
 
 MIT License

data/lib/nehm.rb

@@ -28,10 +28,10 @@ module App
       Get[:dl, args]
     when 'configure'
       Configure.menu
-    when 'help'
+    when 'help', nil
       Help.show(args.first)
     else
-      puts Paint['Invalid command', :red]
+      puts Paint["Invalid command '#{command}'", :red]
       puts "Input #{Paint['nehm help', :yellow]} for all avalaible commands"
     end
 

data/lib/nehm/applescript.rb

@@ -15,7 +15,7 @@ module AppleScript
   module_function
 
   def script_path(script_name)
-    applescripts_path = File.expand_path(File.join(File.dirname(__FILE__), "applescripts"))
+    applescripts_path = File.expand_path(File.join(File.dirname(__FILE__), 'applescripts'))
     File.join(applescripts_path, "#{script_name.to_s}.applescript")
   end
 end

data/lib/nehm/configure.rb

@@ -2,9 +2,9 @@
 module Configure
   def self.menu
     loop do
-      puts 'Download path: ' + Paint[Cfg[:dl_path], :magenta]
-      puts 'Permalink: ' + Paint[Cfg[:permalink], :cyan]
-      puts 'iTunes playlist: ' + Paint[PlaylistManager.playlist, :cyan] unless OS.linux?
+      puts "Download path: #{Paint[Cfg[:dl_path], :magenta]}"
+      puts "Permalink: #{Paint[Cfg[:permalink], :cyan]}"
+      puts "iTunes playlist: #{Paint[PlaylistManager.playlist, :cyan]}" unless OS.linux?
       puts "\n"
 
       HighLine.new.choose do |menu|

data/lib/nehm/get.rb

@@ -4,9 +4,9 @@ require 'taglib'
 module Get
   def self.[](get_or_dl, args)
     # Processing arguments
-    options = [{ name: 'to', module: PathManager, setter: :temp_dl_path= },
-               { name: 'from', module: UserManager, setter: :temp_user= },
-               { name: 'playlist', module: PlaylistManager, setter: :temp_playlist= }]
+    options = [{ name: 'to', method: PathManager.method(:temp_dl_path=) },
+               { name: 'from', method: UserManager.method(:temp_user=) },
+               { name: 'playlist', method: PlaylistManager.method(:temp_playlist=) }]
 
     options.each do |option|
       if args.include? option[:name]
@@ -15,10 +15,11 @@ module Get
         args.delete_at(index + 1)
         args.delete_at(index)
 
-        option[:module].send(option[:setter], value)
+        option[:method].call(value)
       end
     end
 
+    puts 'Getting information about track(s)'
     user = UserManager.user
     tracks = []
     tracks +=
@@ -35,19 +36,29 @@ module Get
         user.posts(count)
       when %r{https:\/\/soundcloud.com\/}
         track_from_url(args.last)
+      when nil
+        puts Paint['You must provide option', :red]
+        puts "Input #{Paint['nehm help', :yellow]} for help"
+        exit
       else
-        puts Paint['Invalid argument(s)', :red]
+        puts Paint["Invalid argument(s) '#{args.last}'", :red]
         puts "Input #{Paint['nehm help', :yellow]} for help"
         exit
       end
 
     playlist = PlaylistManager.playlist
     tracks.each do |track|
-      dl(track)
-      dl(track.artwork)
-      tag(track)
-      track.artwork.suicide
-      playlist.add_track(track.file_path) if playlist && get_or_dl == :get && !OS.linux?
+      if track.streamable?
+        dl(track)
+        dl(track.artwork)
+        tag(track)
+        track.artwork.suicide
+        playlist.add_track(track.file_path) if playlist && get_or_dl == :get && !OS.linux?
+      else
+        puts "#{Paint['Track', :yellow]} #{Paint[track.name, :cyan]} #{Paint['undownloadable', :yellow]}"
+        puts 'Skip it'
+      end
+      puts "\n"
     end
     puts Paint['Done!', :green]
   end
@@ -63,7 +74,7 @@ module Get
     puts 'Downloading ' + arg.name
     path = arg.file_path
     url = arg.url
-    command = "curl -# -o \"" + path + "\" -L " + url
+    command = "curl -# -o \"#{path}\" -L #{url}"
     `#{command}`
   end
 

data/lib/nehm/help.rb

@@ -2,10 +2,13 @@
 module Help
   def self.available_commands
     puts <<-HELP.gsub(/^ {6}/, '')
+      #{Paint['nehm', :green]} is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your SoundCloud posts or likes in convenient way
+
       #{Paint['Avalaible nehm commands:', :yellow]}
         #{Paint['get', :green]}        Downloading, setting tags and adding to your iTunes library last post or like from your profile
         #{Paint['dl', :green]}         Downloading and setting tags last post or like from your profile
         #{Paint['configure', :green]}  Configuring application
+
       See #{Paint['nehm help [command]', :yellow]} to read about a specific subcommand
     HELP
   end
@@ -17,7 +20,7 @@ module Help
     when nil
       Help.available_commands
     else
-      puts Paint["Command #{command} doesn't exist", :red]
+      puts Paint["Command '#{command}' doesn't exist", :red]
       puts "\n"
       Help.available_commands
     end

data/lib/nehm/track.rb

@@ -19,7 +19,7 @@ class Track
   end
 
   def file_name
-    "#{name}.mp3".tr('/', '')
+    "#{name}.mp3".tr("/'\"", '')
   end
 
   def file_path
@@ -35,6 +35,10 @@ class Track
     artist + ' - ' + title
   end
 
+  def streamable?
+    @hash['streamable']
+  end
+
   def title
     if @hash['title'].include?('-')
       title = @hash['title'].split('-')

data/lib/nehm/user.rb

@@ -2,6 +2,8 @@ require 'json'
 require 'faraday'
 
 class User
+  SOUNDCLOUD_MAX_LIMIT = 180
+
   def initialize(id)
     @id = id
   end
@@ -13,10 +15,20 @@ class User
       exit
     end
 
-    likes = Client.get("/users/#{@id}/favorites?limit=#{count}")
+    d = count / SOUNDCLOUD_MAX_LIMIT
+    m = count % SOUNDCLOUD_MAX_LIMIT
+    d = m == 0 ? d : d + 1
+
+    likes = []
+    d.times do |i|
+      limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
+      count -= SOUNDCLOUD_MAX_LIMIT
+
+      likes += Client.get("/users/#{@id}/favorites?limit=#{limit}&offset=#{(i)*SOUNDCLOUD_MAX_LIMIT}")
+    end
 
     if likes.empty?
-      puts Paint["There are no likes yet :(", :red]
+      puts Paint['There are no likes yet :(', :red]
       exit
     end
 
@@ -31,20 +43,36 @@ class User
       exit
     end
 
-    # Official SC API wrapper doesn't support for posts
+    d = count / SOUNDCLOUD_MAX_LIMIT
+    m = count % SOUNDCLOUD_MAX_LIMIT
+    d = m == 0 ? d : d + 1
+
+    # Official SC API wrapper doesn't support posts
     # So I should get posts by HTTP requests
-    #TODO: Get more than 300 posts (max limit = 300)
     conn = Faraday.new(url: 'https://api-v2.soundcloud.com/')
-    response = conn.get("/profile/soundcloud:users:#{@id}?limit=#{count}&offset=0")
 
-    parsed = JSON.parse(response.body)
-    posts = parsed['collection']
+    posts = []
+    d.times do |i|
+      limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
+      count -= SOUNDCLOUD_MAX_LIMIT
+
+      response = conn.get("/profile/soundcloud:users:#{@id}?limit=#{limit}&offset=#{i*SOUNDCLOUD_MAX_LIMIT}")
+      parsed = JSON.parse(response.body)
+      collection = parsed['collection']
+
+      break if collection.nil?
+
+      posts += collection
+    end
 
     if posts.empty?
-      puts Paint["There are no posts yet :(", :red]
+      puts Paint['There are no posts yet :(', :red]
       exit
     end
 
+    rejected = posts.reject! { |hash| hash['type'] == 'playlist' }
+    puts Paint["Was skipped #{rejected.count} playlist(s) (nehm doesn't download playlists)", :yellow] if rejected
+
     posts.map { |hash| Track.new(hash['track']) }
   end
 end

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.5.4'.freeze
 end

data/nehm.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths         = ['lib']
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency 'soundcloud',  '>= 0.3.2'
-  spec.add_dependency 'taglib-ruby', '>= 0.7.0'
+  spec.add_dependency 'bogy',        '>= 1.1'
+  spec.add_dependency 'certifi'
   spec.add_dependency 'faraday',     '>= 0.9.1'
   spec.add_dependency 'highline',    '>= 1.7.2'
-  spec.add_dependency 'certifi'
   spec.add_dependency 'paint'
-  spec.add_dependency 'bogy'
+  spec.add_dependency 'soundcloud',  '>= 0.3.2'
+  spec.add_dependency 'taglib-ruby', '>= 0.7.0'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: soundcloud
+  name: bogy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: taglib-ruby
+  name: certifi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
-  name: certifi
+  name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: soundcloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: bogy
+  name: taglib-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 description: " nehm is a console tool, which downloads, sets IDv3 tags and adds to
   your iTunes library your SoundCloud posts or likes in convenient way. See homepage
   for instructions "