nehm 1.5.6.2 → 1.6.1

data/lib/nehm/playlist_manager.rb

@@ -1,38 +1,51 @@
+require 'nehm/playlist'
+
 module Nehm
+
+  ##
+  # Playlist manager works with iTunes playlists
+
   module PlaylistManager
-    def self.playlist
-      @temp_playlist || default_user_playlist || music_master_library unless OS.linux?
+
+    ##
+    # Returns default iTunes playlist (contains in ~/.nehmconfig)
+
+    def self.default_playlist
+      default_user_playlist || music_master_library unless OS.linux?
+    end
+
+    ##
+    # Checks path for existence and returns it if exists
+
+    def self.get_playlist(playlist_name)
+      if AppleScript.list_of_playlists.include? playlist_name
+        Playlist.new(playlist_name)
+      else
+        UI.term 'Invalid playlist name. Please enter correct name'
+      end
     end
 
     def self.set_playlist
       loop do
-        playlist = HighLine.new.ask('Enter name of default iTunes playlist to which you want add tracks (press Enter to set it to default iTunes Music library)')
+        playlist = HighLine.new.ask('Enter name of default iTunes playlist to that you want add tracks (press Enter to set it to default iTunes Music library):')
 
         # If entered nothing, unset iTunes playlist
         if playlist == ''
           Cfg[:playlist] = nil
-          puts Paint['Default iTunes playlist unset', :green]
+          UI.success 'Default iTunes playlist unset'
           break
         end
 
         if AppleScript.list_of_playlists.include? playlist
           Cfg[:playlist] = playlist
-          puts Paint["Default iTunes playlist set up to #{playlist}", :green]
+          UI.say "#{'Default iTunes playlist set up to'.green} #{playlist.magenta}"
           break
         else
-          puts Paint['Invalid playlist name. Please enter correct name', :red]
+          UI.error 'Invalid playlist name. Please enter correct name'
         end
       end
     end
 
-    def self.temp_playlist=(playlist)
-      if AppleScript.list_of_playlists.include? playlist
-        @temp_playlist = Playlist.new(playlist)
-      else
-        puts Paint['Invalid playlist name. Please enter correct name', :red]
-        exit
-      end
-    end
 
     module_function
 
@@ -40,8 +53,12 @@ module Nehm
       Playlist.new(Cfg[:playlist]) unless Cfg[:playlist].nil?
     end
 
+    ##
+    # Music master library is main iTunes music library
+
     def music_master_library
       Playlist.new(AppleScript.music_master_library)
     end
+
   end
 end

data/lib/nehm/track.rb

@@ -1,5 +1,11 @@
+require 'nehm/artwork'
+
 module Nehm
+
+  # Primitive for SoundCloud track
+
   class Track
+
     attr_reader :hash
 
     def initialize(hash)
@@ -7,13 +13,7 @@ module Nehm
     end
 
     def artist
-      title = @hash['title']
-
-      if title.include? ' - '
-        title.split(' - ')[0]
-      else
-        @hash['user']['username']
-      end
+      name[0]
     end
 
     def artwork
@@ -21,34 +21,35 @@ module Nehm
     end
 
     def file_name
-      "#{name.gsub(/[^0-9A-Za-z -]/, '')}.mp3"
+      "#{full_name.tr(',./\\\'$%"', '')}.mp3"
     end
 
     def file_path
-      File.join(PathManager.dl_path, file_name)
+      File.join(ENV['dl_path'], file_name)
+    end
+
+    def full_name
+      "#{artist} - #{title}"
     end
 
     def id
       @hash['id']
     end
 
-    # Used in Get#dl and in Track#file_name
+    # Returns artist and title in array
     def name
-      artist + ' - ' + title
-    end
+      title = @hash['title']
+
+      separators = [' - ', ' ~ ']
+      separators.each do |sep|
+        return title.split(sep) if title.include? sep
+      end
 
-    def streamable?
-      @hash['streamable']
+      [@hash['user']['username'], title]
     end
 
     def title
-      title = @hash['title']
-
-      if title.include? ' - '
-        title.split(' - ')[1]
-      else
-        title
-      end
+      name[1]
     end
 
     def url
@@ -58,5 +59,6 @@ module Nehm
     def year
       @hash['created_at'][0..3].to_i
     end
+
   end
 end

data/lib/nehm/tracks.rb

@@ -0,0 +1,153 @@
+require 'taglib'
+
+require 'nehm/applescript'
+require 'nehm/os'
+require 'nehm/track'
+
+module Nehm
+
+  ##
+  # Tracks contains logic, that need to 'nehm get/dl ...' commands.
+  #
+  # It used in 'get_command.rb' and 'dl_command.rb'.
+
+  module Tracks
+
+    ##
+    # Main method.
+
+    def self.[](type, options)
+      # Setting up user id
+      permalink = options[:from]
+      uid = permalink ? UserManager.get_uid(permalink) : UserManager.default_uid
+      unless uid
+        UI.error "You didn't logged in"
+        UI.say "Login from #{'nehm configure'.yellow} or use #{'[from PERMALINK]'.yellow} option"
+        UI.term
+      end
+
+      # Setting up iTunes playlist
+      if type == :get && !OS.linux?
+        playlist_name = options[:playlist]
+        playlist = playlist_name ? PlaylistManager.get_playlist(playlist_name) : PlaylistManager.default_playlist
+        itunes_playlist_ready = true if playlist
+      else
+        itunes_playlist_ready = false
+      end
+
+      # Setting up download path
+      temp_path = options[:to]
+      dl_path = temp_path ? PathManager.get_path(temp_path) : PathManager.default_dl_path
+      if dl_path
+        ENV['dl_path'] = dl_path
+      else
+        UI.error "You don't set up download path!"
+        UI.say "Set it up from #{'nehm configure'.yellow} or use #{'[to PATH_TO_DIRECTORY]'.yellow} option"
+        UI.term
+      end
+
+      UI.say 'Getting information about track(s)'
+      arg = options[:args].pop
+      tracks = []
+      tracks +=
+        case arg
+        when 'like'
+          likes(1, uid)
+        when 'post'
+          posts(1, uid)
+        when 'likes'
+          count = options[:args].pop.to_i
+          likes(count, uid)
+        when 'posts'
+          count = options[:args].pop.to_i
+          posts(count, uid)
+        when %r{https:\/\/soundcloud.com\/}
+          track(arg)
+        when nil
+          UI.error 'You must provide argument'
+          UI.say "Use #{'nehm help'.yellow} for help"
+          UI.term
+        else
+          UI.error "Invalid argument/option #{arg}"
+          UI.say "Use #{'nehm help'.yellow} for help"
+          UI.term
+        end
+
+      tracks.each do |track|
+        UI.newline
+        dl(track)
+        tag(track)
+        track.artwork.suicide
+        playlist.add_track(track.file_path) if itunes_playlist_ready
+        UI.newline
+      end
+      UI.success 'Done!'
+    end
+
+    module_function
+
+    def dl(track)
+      # Downloading track
+      UI.say 'Downloading ' + track.full_name
+      `curl -# -o \"#{track.file_path}\" -L #{track.url}`
+
+      # Downloading artwork
+      UI.say 'Downloading artwork'
+      artwork = track.artwork
+      `curl -# -o \"#{artwork.file_path}\" -L #{artwork.url}`
+    end
+
+    def tag(track)
+      UI.say 'Setting tags'
+      path = track.file_path
+      TagLib::MPEG::File.open(path) do |file|
+        tag = file.id3v2_tag
+        tag.artist = track.artist
+        tag.title = track.title
+        tag.year = track.year
+
+        # Adding artwork
+        apic = TagLib::ID3v2::AttachedPictureFrame.new
+        apic.mime_type = 'image/jpeg'
+        apic.description = 'Cover'
+        apic.type = TagLib::ID3v2::AttachedPictureFrame::FrontCover
+        apic.picture = File.open(track.artwork.file_path, 'rb') { |f| f.read }
+        tag.add_frame(apic)
+
+        file.save
+      end
+    end
+
+    def likes(count, uid)
+      likes = Client.tracks(count, :likes, uid)
+      UI.term 'There are no likes yet' if likes.empty?
+
+      # Removing playlists and unstreamable tracks
+      unstreamable_tracks = likes.reject! { |hash| hash['streamable'] == false }
+      UI.warning "Was skipped #{unstreamable_tracks.length} undownloadable track(s)" if unstreamable_tracks
+
+      likes.map! { |hash| Track.new(hash) }
+    end
+
+    def posts(count, uid)
+      posts = Client.tracks(count, :posts, uid)
+      UI.term 'There are no posts yet' if posts.empty?
+
+      # Removing playlists and unstreamable tracks
+      first_count = posts.length
+      playlists = posts.reject! { |hash| hash['type'] == 'playlist' }
+      unstreamable_tracks = posts.reject! { |hash| hash['track']['streamable'] == false }
+      if playlists || unstreamable_tracks
+        UI.warning "Was skipped #{first_count - posts.length} undownloadable track(s) or playlist(s)"
+      end
+
+      posts.map! { |hash| Track.new(hash['track']) }
+    end
+
+    def track(url)
+      hash = Client.track(url)
+      [*Track.new(hash)]
+    end
+
+  end
+end

data/lib/nehm/ui.rb

@@ -0,0 +1,35 @@
+module Nehm
+  module UI
+
+    # TODO: add Highline features to UI module
+
+    def self.error(msg)
+      puts "#{msg}\n".red
+    end
+
+    def self.newline
+      puts "\n"
+    end
+
+    def self.say(msg)
+      puts msg
+    end
+
+    def self.success(msg)
+      puts msg.green
+    end
+
+    def self.term(msg = nil)
+      if msg
+        abort msg.red
+      else
+        exit
+      end
+    end
+
+    def self.warning(msg)
+      puts "#{msg}".yellow
+    end
+
+  end
+end

data/lib/nehm/user_manager.rb

@@ -1,61 +1,38 @@
 module Nehm
+
+  ##
+  # User manager works with SoundCloud users' id
+
   module UserManager
-    def self.user
-      @temp_user || default_user
+
+    ##
+    # Returns default user id (contains in ~/.nehmconfig)
+
+    def self.default_uid
+      Cfg[:default_id]
     end
 
-    def self.logged_in?
-      Cfg.key?(:default_id)
+    def self.get_uid(permalink)
+      user = Client.user(permalink)
+      UI.term 'Invalid permalink. Please enter correct permalink' if user.nil?
+
+      user['id']
     end
 
-    def self.log_in
+    def self.set_uid
       loop do
         permalink = HighLine.new.ask('Please enter your permalink (last word in your profile url): ')
-        user = get_user(permalink)
+        user = Client.user(permalink)
         if user
           Cfg[:default_id] = user.id
           Cfg[:permalink] = permalink
-          puts Paint['Successfully logged in!', :green]
+          UI.success 'Successfully logged in!'
           break
         else
-          puts Paint['Invalid permalink. Please enter correct permalink', :red]
+          UI.error 'Invalid permalink. Please enter correct permalink'
         end
       end
     end
 
-    def self.temp_user=(permalink)
-      user = get_user(permalink)
-      if user
-        @temp_user = User.new(user.id)
-      else
-        puts Paint['Invalid permalink. Please enter correct permalink', :red]
-        exit
-      end
-    end
-
-    module_function
-
-    def default_user
-      if UserManager.logged_in?
-        User.new(Cfg[:default_id])
-      else
-        puts Paint["You didn't logged in", :red]
-        puts "Login from #{Paint['nehm configure', :yellow]} or use #{Paint['[from PERMALINK]', :yellow]} option"
-        exit
-      end
-    end
-
-    def get_user(permalink)
-      begin
-        user = Client.get('/resolve', url: "https://soundcloud.com/#{permalink}")
-      rescue SoundCloud::ResponseError => e
-        if e.message =~ /404/
-          user = nil
-        else
-          raise e
-        end
-      end
-      user
-    end
   end
 end

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '1.5.6.2'.freeze
+  VERSION = '1.6.1'.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 'bogy',        '>= 1.1'
+  spec.add_dependency 'bogy'
   spec.add_dependency 'certifi'
+  spec.add_dependency 'colored'
   spec.add_dependency 'faraday',     '>= 0.9.1'
   spec.add_dependency 'highline',    '>= 1.7.2'
-  spec.add_dependency 'paint'
   spec.add_dependency 'soundcloud',  '>= 0.3.2'
   spec.add_dependency 'taglib-ruby', '>= 0.7.0'
 end