nehm 1.6.1 → 2.0.1

data/lib/nehm/command.rb

@@ -5,32 +5,32 @@ module Nehm
   ##
   # Base class for all Nehm commands. When creating a new nehm command, define
   # #initialize, #execute, #arguments, #program_name, #summary and #usage
-  # (as appropriate).
-  # See the above mentioned methods for details.
+  # (as appropriate)
+  # See the above mentioned methods for details
 
   class Command
 
     ##
-    # Hash with options of the command.
+    # Hash with options of the command
 
     attr_accessor :options
 
     ##
-    # Hash with descriptions of each options.
+    # Hash with descriptions of each option
 
     attr_accessor :options_descs
 
     ##
-    # In 'initialize' should be defined all options by method 'add_option'.
-    #
-    # See get_command.rb as example.
+    # In 'initialize' should be defined all options by method 'add_option'
+    # See get_command.rb as example
 
     def initialize
       @options = {}
+      @options_descs = {}
     end
 
     ##
-    # Invoke the command with the given list of arguments.
+    # Invoke the command with the given list of arguments
 
     def invoke(args)
       handle_options(args)
@@ -39,7 +39,7 @@ module Nehm
 
     ##
     # Handle the given list of arguments by parsing them and recording the
-    # results.
+    # results
 
     def handle_options(args)
       parser = OptionParser.new(args, self)
@@ -47,16 +47,16 @@ module Nehm
     end
 
     ##
-    # Override to provide command handling.
+    # Override to provide command handling
     #
     # #options will be filled in with your parsed options, unparsed options will
-    # be left in #options[:args].
+    # be left in #options[:args]
 
     def execute
     end
 
     ##
-    # Override to provide details of the arguments a command takes.
+    # Override to provide details of the arguments a command takes
     #
     # For example:
     #
@@ -73,51 +73,36 @@ module Nehm
     end
 
     ##
-    # The name of the command for command-line invocation.
+    # The name of the command for command-line invocation
 
     def program_name
     end
 
     ##
-    # Override to display a short description of what this command does.
+    # Override to display a short description of what this command does
 
     def summary
     end
 
     ##
-    # Override to display the usage for an individual nehm command.
+    # Override to display the usage for an individual nehm command
     #
-    # The text "[options]" is automatically appended to the usage text.
+    # The text "[options]" is automatically appended to the usage text
 
     def usage
     end
 
     ##
-    # Add a command-line option.
+    # Add a command-line option
     #
-    # Nehm don't use options with dashes to be more user-friendly.
+    # Nehm don't use options with dashes to be more user-friendly
     #
-    # See 'get_command.rb' as example.
+    # See 'get_command.rb' as example
 
     def add_option(option, usage, desc)
-      @options_descs ||= {}
-
       @options[option] = nil
       @options_descs[usage] = desc
     end
 
-    HELP = <<-EOF
-#{'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
-
-#{'Avalaible nehm commands:'.yellow}
-  #{'get'.green}        Download, set tags and add to your iTunes library last post or like from your profile
-  #{'dl'.green}         Download and set tags last post or like from your profile
-  #{'configure'.green}  Configure application
-  #{'help'.green}       Show help for specified command
-  #{'version'.green}    Show version of installed nehm
-
-See #{'nehm help [command]'.yellow} to read about a specific subcommand
-    EOF
-
   end
 end

data/lib/nehm/command_manager.rb

@@ -3,8 +3,8 @@ require 'nehm/command'
 module Nehm
 
   ##
-  # The command manager contains information about all nehm commands, find
-  # and run them
+  # The command manager contains information about all nehm commands
+  # It also find and run them
 
   module CommandManager
 
@@ -13,18 +13,15 @@ module Nehm
       :dl,
       :get,
       :help,
+      :search,
+      :select,
       :version
     ]
 
     ##
-    # Run the command specified by 'args'.
+    # Run the command specified by 'args'
 
     def self.run(args)
-      if args.empty?
-        UI.say Nehm::Command::HELP
-        UI.term
-      end
-
       cmd_name = args.shift.downcase
       cmd = find_command(cmd_name)
       cmd.invoke(args)
@@ -42,25 +39,18 @@ module Nehm
       command_instance(possibilities.first)
     end
 
-    module_function
-
-    def find_command_possibilities(cmd_name)
+    def self.find_command_possibilities(cmd_name)
       len = cmd_name.length
       COMMANDS.select { |command| command[0, len] == cmd_name }
     end
 
-    def command_instance(command_name)
+    def self.command_instance(command_name)
       command_name = command_name.to_s
       const_name = command_name.capitalize << 'Command'
 
-      require_commands
+      require "nehm/commands/#{command_name}_command"
       Nehm.const_get(const_name).new
     end
 
-    def require_commands
-      project_root = File.dirname(File.absolute_path(__FILE__))
-      Dir.glob(project_root + '/commands/*') { |file| require file }
-    end
-
   end
 end

data/lib/nehm/commands/configure_command.rb

@@ -3,15 +3,10 @@ module Nehm
 
     def execute
       loop do
-        UI.say "Download path: #{Cfg[:dl_path].magenta}" if Cfg[:dl_path]
-        UI.say "Permalink: #{Cfg[:permalink].cyan}" if Cfg[:permalink]
-        UI.say "iTunes playlist: #{PlaylistManager.default_playlist.to_s.cyan}" if !OS.linux? && PlaylistManager.default_playlist
+        show_info
         UI.newline
-
         show_menu
-
-        sleep(1)
-        UI.newline
+        sleep(UI::SLEEP_PERIOD)
       end
     end
 
@@ -29,14 +24,22 @@ module Nehm
 
     private
 
-    def show_menu
-      HighLine.new.choose do |menu|
-        menu.prompt = 'Choose setting'.yellow
+    def show_info
+      dl_path = PathManager.default_dl_path
+      UI.say "Download path: #{dl_path.magenta}" if dl_path
 
-        menu.choice('Edit download path'.freeze) { PathManager.set_dl_path }
-        menu.choice('Edit permalink'.freeze) { UserManager.set_uid }
-        menu.choice('Edit iTunes playlist'.freeze) { PlaylistManager.set_playlist } unless OS.linux?
-        menu.choice('Exit'.freeze) { fail Interrupt }
+      permalink = UserManager.default_permalink
+      UI.say "Permalink: #{permalink.cyan}" if permalink
+
+      playlist = PlaylistManager.default_playlist
+      UI.say "iTunes playlist: #{playlist.to_s.cyan}" if playlist
+    end
+
+    def show_menu
+      UI.menu do |menu|
+        menu.choice(:inc, 'Edit download path'.freeze) { PathManager.set_dl_path }
+        menu.choice(:inc, 'Edit permalink'.freeze) { UserManager.set_uid }
+        menu.choice(:inc, 'Edit iTunes playlist'.freeze) { PlaylistManager.set_playlist } if OS.mac?
       end
     end
 

data/lib/nehm/commands/dl_command.rb

@@ -1,28 +1,30 @@
-require 'nehm/tracks'
-
 module Nehm
   class DlCommand < Command
 
     def initialize
       super
 
-      add_option(:from, 'from PERMALINK'.green,
+      add_option(:from, 'from PERMALINK',
                  'Get track(s) from user with PERMALINK')
 
-      add_option(:to, 'to PATH'.green,
+      add_option(:to, 'to PATH',
                  'Download track(s) to PATH')
     end
 
     def execute
-      Tracks[:dl, @options]
+      @options[:dl] = true
+
+      get_cmd = CommandManager.command_instance('get')
+      get_cmd.options = @options
+      get_cmd.execute
     end
 
     def arguments
-      { "#{'post'.green}"           => 'Download last post (track or repost) from your profile',
-        "#{'<number> posts'.green}" => 'Download last <number> posts from your profile',
-        "#{'like'.green}"           => 'Download your last like',
-        "#{'<number> likes'.green}" => 'Download your last <number> likes',
-        "#{'URL'.magenta}"          => 'Download track from entered URL' }
+      { 'post'         => 'Download last post (track or repost) from your profile',
+        'NUMBER posts' => 'Download last NUMBER posts from your profile',
+        'like'         => 'Download your last like',
+        'NUMBER likes' => 'Download your last NUMBER likes',
+        'URL'          => 'Download track from entered URL' }
     end
 
     def program_name
@@ -30,7 +32,7 @@ module Nehm
     end
 
     def summary
-      'Download and set tags any track from Soundcloud'
+      'Download and set tags any track from SoundCloud'
     end
 
     def usage

data/lib/nehm/commands/get_command.rb

@@ -1,31 +1,55 @@
-require 'nehm/tracks'
-
 module Nehm
   class GetCommand < Command
 
     def initialize
       super
 
-      add_option(:from, 'from PERMALINK'.green,
+      add_option(:from, 'from PERMALINK',
                  'Get track(s) from user with PERMALINK')
 
-      add_option(:to, 'to PATH'.green,
+      add_option(:to, 'to PATH',
                  'Download track(s) to PATH')
 
-      add_option(:playlist, 'playlist PLAYLIST'.green,
+      add_option(:pl, 'pl PLAYLIST',
                  'Add track(s) to iTunes playlist with PLAYLIST name')
     end
 
     def execute
-      Tracks[:get, @options]
+      track_manager = TrackManager.new(@options)
+
+      UI.say 'Getting information about track(s)'
+      arg = @options[:args].pop
+      tracks =
+        case arg
+        when /^l.*s$/
+          count = @options[:args].pop.to_i
+          track_manager.likes(count, 0)
+        when /^p.*s$/
+          count = @options[:args].pop.to_i
+          track_manager.posts(count, 0)
+        when /^l/
+          track_manager.likes(1, 0)
+        when /^p/
+          track_manager.posts(1, 0)
+        when /https:\/\/soundcloud.com\//
+          track_manager.track_from_url(arg)
+        when nil
+          UI.term 'You must provide an argument'
+        else
+          UI.term "Invalid argument/option '#{arg}'"
+        end
+
+      UI.term 'There are no tracks yet' if tracks.nil?
+
+      track_manager.process_tracks(tracks)
     end
 
     def arguments
-      { "#{'post'.green}"           => 'Get last post (track or repost) from your profile',
-        "#{'<number> posts'.green}" => 'Get last <number> posts from your profile',
-        "#{'like'.green}"           => 'Get your last like',
-        "#{'<number> likes'.green}" => 'Get your last <number> likes',
-        "#{'URL'.magenta}"          => 'Get track from entered URL' }
+      { 'post'         => 'Get last post (track or repost) from your profile',
+        'NUMBER posts' => 'Get last NUMBER posts from your profile',
+        'like'         => 'Get your last like',
+        'NUMBER likes' => 'Get your last NUMBER likes',
+        'URL'          => 'Get track from entered URL' }
     end
 
     def program_name
@@ -33,7 +57,7 @@ module Nehm
     end
 
     def summary
-      'Download tracks, set tags and add to your iTunes library tracks from Soundcloud'
+      'Download tracks, set tags and add to your iTunes library tracks from SoundCloud'
     end
 
     def usage

data/lib/nehm/commands/help_command.rb

@@ -1,12 +1,12 @@
 module Nehm
   class HelpCommand < Command
 
-    SPACES_BTW_NAME_AND_DESC = 5
+    SPACES_BTWN_NAME_AND_DESC = 3
 
     def execute
       command_name = options[:args].pop
       if command_name.nil?
-        UI.say Nehm::Command::HELP
+        UI.say HELP
         UI.term
       end
 
@@ -19,7 +19,7 @@ module Nehm
     end
 
     def arguments
-      { 'COMMAND'.magenta => 'name of command to show help' }
+      { 'COMMAND' => 'name of command to show help' }
     end
 
     def program_name
@@ -70,14 +70,14 @@ module Nehm
       unless @longest
         names = []
         names += @cmd.arguments.keys unless @cmd.arguments.empty?
-        names += @cmd.options.keys unless @cmd.options.empty?
+        names += @cmd.options_descs.keys unless @cmd.options_descs.empty?
         @longest ||= find_longest_name(names).length
       end
 
       hash.each do |name, desc|
         need_spaces = @longest - name.length
 
-        UI.say "  #{name}#{' ' * (need_spaces + SPACES_BTW_NAME_AND_DESC)}#{desc}"
+        UI.say "  #{name.green}#{' ' * (need_spaces + SPACES_BTWN_NAME_AND_DESC)}#{desc}"
       end
     end
 

data/lib/nehm/commands/search_command.rb

@@ -0,0 +1,41 @@
+require 'nehm/tracks_view_command'
+
+module Nehm
+
+  class SearchCommand < TracksViewCommand
+
+    def initialize
+      super
+    end
+
+    def execute
+      @query = @options[:args].join(' ')
+      super
+    end
+
+    def arguments
+      { 'QUERY' => 'Search query' }
+    end
+
+    def program_name
+      'nehm search'
+    end
+
+    def summary
+      'Search tracks, print them nicely and download selected tracks'
+    end
+
+    def usage
+      "#{program_name} QUERY [OPTIONS]"
+    end
+
+    protected
+
+    def get_tracks
+      UI.term 'You must provide an argument' if @query.empty?
+
+      @track_manager.search(@query, @limit, @offset)
+    end
+
+  end
+end

data/lib/nehm/commands/select_command.rb

@@ -0,0 +1,56 @@
+require 'nehm/tracks_view_command'
+
+module Nehm
+
+  ##
+  # This command gets likes/posts from user's account,
+  # Prints as menu, and downloads selected tracks
+
+  class SelectCommand < TracksViewCommand
+
+    def initialize
+      super
+
+      add_option(:from, 'from PERMALINK',
+                 'Select track(s) from user with PERMALINK')
+    end
+
+    def arguments
+      { 'likes' => 'Select likes',
+        'posts' => 'Select posts' }
+    end
+
+    def program_name
+      'nehm select'
+    end
+
+    def execute
+      @type = @options[:args].shift
+      super
+    end
+
+    def summary
+      'Get likes or posts from your account, nicely print them and download selected tracks'
+    end
+
+    def usage
+      "#{program_name} ARGUMENT [OPTIONS]"
+    end
+
+    protected
+
+    def get_tracks
+      case @type
+      when /l/
+        @track_manager.likes(@limit, @offset)
+      when /p/
+        @track_manager.posts(@limit, @offset)
+      when nil
+        UI.term 'You must provide an argument'
+      else
+        UI.term "Invalid argument/option '#{type}'"
+      end
+    end
+
+  end
+end