nehm 1.6.1 → 2.0.1

data/lib/nehm/tracks_view_command.rb

@@ -0,0 +1,123 @@
+module Nehm
+  class TracksViewCommand < Command
+
+    DEFAULT_LIMIT = 10
+
+    DEFAULT_OFFSET = 0
+
+    def initialize
+      super
+
+      add_option(:to, 'to PATH',
+                 'Download track(s) to PATH')
+
+      add_option(:pl, 'pl PLAYLIST',
+                 'Add track(s) to iTunes playlist with PLAYLIST name')
+
+      add_option(:limit, 'limit NUMBER',
+                 'Show NUMBER tracks on each page')
+
+      add_option(:offset, 'offset NUMBER',
+                 'Show from NUMBER track')
+
+    end
+
+    def execute
+      tracks = []
+      old_offset = -1
+
+      @queue = []
+      @track_manager = TrackManager.new(@options)
+
+      setup_environment
+
+      loop do
+        # If offset changed
+        unless old_offset == @offset
+          tracks = get_tracks
+          old_offset = @offset
+        end
+
+        # If tracks == nil, then there is a last page or there aren't tracks
+        if tracks.nil?
+          @msg = 'There are no more tracks'.red
+          prev_page
+          next
+        end
+
+        show_menu(tracks)
+      end
+    end
+
+    protected
+
+    def get_tracks; end
+
+    def show_menu(tracks)
+      UI.menu do |menu|
+        menu.header = 'Enter the number of track to add it to download queue'.green
+
+        menu.msg_bar = @msg
+
+        tracks.each do |track|
+          ids = @queue.map(&:id) # Get ids of tracks in queue
+          if ids.include? track.id
+            menu.choice(:added, track.full_name) { already_added(track) }
+          else
+            menu.choice(:inc, track.full_name) { add_track_to_queue(track) }
+          end
+        end
+
+        menu.newline
+
+        menu.choice('d', 'Download tracks from queue'.green.freeze) { download_tracks_from_queue; UI.term }
+        menu.choice('n', 'Next page'.magenta.freeze) { next_page }
+        menu.choice('p', 'Prev page'.magenta.freeze) { prev_page }
+      end
+    end
+
+    def setup_environment
+      limit = @options[:limit]
+      @limit =
+        if limit
+          limit = limit.to_i
+          UI.term "Invalid limit value\nIt should be more than 0" if limit <= 0
+          limit
+        else
+          DEFAULT_LIMIT
+        end
+
+      offset = @options[:offset]
+      @offset =
+        if offset
+          offset = offset.to_i
+          UI.term "Invalid offset value\nIt should be more or equal 0" if offset < 0
+          offset
+        else
+          DEFAULT_OFFSET
+        end
+    end
+
+    def add_track_to_queue(track)
+      @queue << track
+      @msg = "'#{track.full_name}' added".green
+    end
+
+    def already_added(track)
+      @msg = "'#{track.full_name}' was already added".yellow
+    end
+
+    def download_tracks_from_queue
+      @track_manager.process_tracks(@queue)
+    end
+
+    def next_page
+      @offset += @limit
+    end
+
+    def prev_page
+      @offset -= @limit if @offset >= @limit
+    end
+
+  end
+end

data/lib/nehm/ui.rb

@@ -1,14 +1,26 @@
+require 'nehm/menu'
+
 module Nehm
   module UI
 
-    # TODO: add Highline features to UI module
+    ##
+    # This constant used to set delay between user operation
+    # Because it's more comfortable to have a small delay
+    # between interactions
+
+    SLEEP_PERIOD = 0.7
+
+    def self.ask(arg)
+      say arg
+      $stdin.gets.chomp
+    end
 
     def self.error(msg)
       puts "#{msg}\n".red
     end
 
     def self.newline
-      puts "\n"
+      puts
     end
 
     def self.say(msg)
@@ -19,6 +31,10 @@ module Nehm
       puts msg.green
     end
 
+    def self.menu(&block)
+      Menu.new(&block)
+    end
+
     def self.term(msg = nil)
       if msg
         abort msg.red

data/lib/nehm/user_manager.rb

@@ -5,8 +5,9 @@ module Nehm
 
   module UserManager
 
-    ##
-    # Returns default user id (contains in ~/.nehmconfig)
+    def self.default_permalink
+      Cfg[:permalink]
+    end
 
     def self.default_uid
       Cfg[:default_id]
@@ -21,10 +22,10 @@ module Nehm
 
     def self.set_uid
       loop do
-        permalink = HighLine.new.ask('Please enter your permalink (last word in your profile url): ')
+        permalink = UI.ask('Please enter your permalink (last word in your profile url): ')
         user = Client.user(permalink)
         if user
-          Cfg[:default_id] = user.id
+          Cfg[:default_id] = user['id']
           Cfg[:permalink] = permalink
           UI.success 'Successfully logged in!'
           break

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '1.6.1'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/nehm.gemspec

@@ -9,22 +9,19 @@ Gem::Specification.new do |spec|
   spec.authors = ['Albert Nigmatzianov']
   spec.email   = ['albertnigma@gmail.com']
 
-  spec.summary     = %q{ Convenient way to download tracks from SoundCloud via terminal }
-  spec.description = %q{ 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 }
+  spec.summary     = 'Convenient way to download tracks from SoundCloud via terminal'
+  spec.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'
   spec.homepage    = 'http://www.github.com/bogem/nehm'
   spec.license     = 'MIT'
 
-  spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(Screenshots)/}) }
+  spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(Pictures|Rakefile)/}) }
   spec.bindir                = 'bin'
   spec.executables           = 'nehm'
   spec.require_paths         = ['lib']
   spec.required_ruby_version = '>= 1.9.3'
+  spec.post_install_message  = "Don't forget to install Taglib from OS' package manager!"
 
-  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 'soundcloud',  '>= 0.3.2'
   spec.add_dependency 'taglib-ruby', '>= 0.7.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bogy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: certifi
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-- !ruby/object:Gem::Dependency
-  name: soundcloud
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -108,9 +52,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         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 "
+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
 email:
 - albertnigma@gmail.com
 executables:
@@ -139,14 +83,19 @@ files:
 - lib/nehm/commands/dl_command.rb
 - lib/nehm/commands/get_command.rb
 - lib/nehm/commands/help_command.rb
+- lib/nehm/commands/search_command.rb
+- lib/nehm/commands/select_command.rb
 - lib/nehm/commands/version_command.rb
+- lib/nehm/http_client.rb
+- lib/nehm/menu.rb
 - lib/nehm/option_parser.rb
 - lib/nehm/os.rb
 - lib/nehm/path_manager.rb
 - lib/nehm/playlist.rb
 - lib/nehm/playlist_manager.rb
 - lib/nehm/track.rb
-- lib/nehm/tracks.rb
+- lib/nehm/track_manager.rb
+- lib/nehm/tracks_view_command.rb
 - lib/nehm/ui.rb
 - lib/nehm/user_manager.rb
 - lib/nehm/version.rb
@@ -155,7 +104,7 @@ homepage: http://www.github.com/bogem/nehm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: Don't forget to install Taglib from OS' package manager!
 rdoc_options: []
 require_paths:
 - lib
@@ -171,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Convenient way to download tracks from SoundCloud via terminal

data/lib/nehm/tracks.rb

@@ -1,153 +0,0 @@
-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