nehm 1.5.4 → 1.5.5.1

data/lib/nehm/playlist.rb

@@ -1,16 +1,18 @@
-class Playlist
-  attr_reader :name
+module Nehm
+  class Playlist
+    attr_reader :name
 
-  def initialize(name)
-    @name = name
-  end
+    def initialize(name)
+      @name = name
+    end
 
-  def add_track(track_path)
-    puts 'Adding to iTunes'
-    AppleScript.add_track_to_playlist(track_path, @name)
-  end
+    def add_track(track_path)
+      puts 'Adding to iTunes'
+      AppleScript.add_track_to_playlist(track_path, @name)
+    end
 
-  def to_s
-    @name
+    def to_s
+      @name
+    end
   end
 end

data/lib/nehm/playlist_manager.rb

@@ -1,43 +1,47 @@
-module PlaylistManager
-  def self.playlist
-    @temp_playlist || default_user_playlist || music_master_library
-  end
+module Nehm
+  module PlaylistManager
+    def self.playlist
+      @temp_playlist || default_user_playlist || music_master_library unless OS.linux?
+    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)')
 
-  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)')
-      if playlist == ''
-        Cfg[:playlist] = nil
-        puts Paint['Default iTunes playlist unset', :green]
-        break
+        # If entered nothing, unset iTunes playlist
+        if playlist == ''
+          Cfg[:playlist] = nil
+          puts Paint['Default iTunes playlist unset', :green]
+          break
+        end
+
+        if AppleScript.list_of_playlists.include? playlist
+          Cfg[:playlist] = playlist
+          puts Paint["Default iTunes playlist set up to #{playlist}", :green]
+          break
+        else
+          puts Paint['Invalid playlist name. Please enter correct name', :red]
+        end
       end
+    end
 
+    def self.temp_playlist=(playlist)
       if AppleScript.list_of_playlists.include? playlist
-        Cfg[:playlist] = playlist
-        puts Paint["Default iTunes playlist set up to #{playlist}", :green]
-        break
+        @temp_playlist = Playlist.new(playlist)
       else
         puts Paint['Invalid playlist name. Please enter correct name', :red]
+        exit
       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
+    module_function
 
-  def default_user_playlist
-    Playlist.new(Cfg[:playlist]) unless Cfg[:playlist].nil?
-  end
+    def default_user_playlist
+      Playlist.new(Cfg[:playlist]) unless Cfg[:playlist].nil?
+    end
 
-  def music_master_library
-    Playlist.new(AppleScript.music_master_library)
+    def music_master_library
+      Playlist.new(AppleScript.music_master_library)
+    end
   end
 end

data/lib/nehm/track.rb

@@ -1,58 +1,60 @@
-class Track
-  attr_reader :hash
+module Nehm
+  class Track
+    attr_reader :hash
 
-  def initialize(hash)
-    @hash = hash
-  end
+    def initialize(hash)
+      @hash = hash
+    end
 
-  def artist
-    if @hash['title'].include?('-')
-      title = @hash['title'].split('-')
-      title[0].rstrip
-    else
-      @hash['user']['username']
+    def artist
+      if @hash['title'].include?('-')
+        title = @hash['title'].split('-')
+        title[0].rstrip
+      else
+        @hash['user']['username']
+      end
     end
-  end
 
-  def artwork
-    Artwork.new(self)
-  end
+    def artwork
+      Artwork.new(self)
+    end
 
-  def file_name
-    "#{name}.mp3".tr("/'\"", '')
-  end
+    def file_name
+      "#{name}.mp3".tr("/'\"", '')
+    end
 
-  def file_path
-    File.join(PathManager.dl_path, file_name)
-  end
+    def file_path
+      File.join(PathManager.dl_path, file_name)
+    end
 
-  def id
-    @hash['id'].to_s
-  end
+    def id
+      @hash['id']
+    end
 
-  # Use in Get.dl and in Track.file_name
-  def name
-    artist + ' - ' + title
-  end
+    # Used in Get#dl and in Track#file_name
+    def name
+      artist + ' - ' + title
+    end
 
-  def streamable?
-    @hash['streamable']
-  end
+    def streamable?
+      @hash['streamable']
+    end
 
-  def title
-    if @hash['title'].include?('-')
-      title = @hash['title'].split('-')
-      title[1].lstrip
-    else
-      @hash['title']
+    def title
+      if @hash['title'].include?('-')
+        title = @hash['title'].split('-')
+        title[1].lstrip
+      else
+        @hash['title']
+      end
     end
-  end
 
-  def url
-    "#{@hash['stream_url']}?client_id=#{Client::CLIENT_ID}"
-  end
+    def url
+      "#{@hash['stream_url']}?client_id=#{Client::CLIENT_ID}"
+    end
 
-  def year
-    @hash['created_at'][0..3].to_i
+    def year
+      @hash['created_at'][0..3].to_i
+    end
   end
 end

data/lib/nehm/user.rb

@@ -1,78 +1,81 @@
 require 'json'
 require 'faraday'
 
-class User
-  SOUNDCLOUD_MAX_LIMIT = 180
+module Nehm
+  class User
+    # Max limit of tracks for correct SoundCloud requests
+    SOUNDCLOUD_MAX_LIMIT = 180
 
-  def initialize(id)
-    @id = id
-  end
-
-  def likes(count)
-    # Method to_i return 0, if there aren't any numbers in string
-    if count == 0
-      puts Paint['Invalid number of likes!', :red]
-      exit
+    def initialize(id)
+      @id = id
     end
 
-    d = count / SOUNDCLOUD_MAX_LIMIT
-    m = count % SOUNDCLOUD_MAX_LIMIT
-    d = m == 0 ? d : d + 1
+    def likes(count)
+      # Method to_i return 0, if there aren't any numbers in string
+      if count == 0
+        puts Paint['Invalid number of likes!', :red]
+        exit
+      end
 
-    likes = []
-    d.times do |i|
-      limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
-      count -= SOUNDCLOUD_MAX_LIMIT
+      d = count / SOUNDCLOUD_MAX_LIMIT
+      m = count % SOUNDCLOUD_MAX_LIMIT
+      d = m == 0 ? d : d + 1
 
-      likes += Client.get("/users/#{@id}/favorites?limit=#{limit}&offset=#{(i)*SOUNDCLOUD_MAX_LIMIT}")
-    end
+      likes = []
+      d.times do |i|
+        limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
+        count -= SOUNDCLOUD_MAX_LIMIT
 
-    if likes.empty?
-      puts Paint['There are no likes yet :(', :red]
-      exit
-    end
+        likes += Client.get("/users/#{@id}/favorites?limit=#{limit}&offset=#{(i)*SOUNDCLOUD_MAX_LIMIT}")
+      end
 
-    likes.map { |hash| Track.new(hash) }
-  end
+      if likes.empty?
+        puts Paint['There are no likes yet :(', :red]
+        exit
+      end
 
-  # Post is last track/repost in profile
-  def posts(count)
-    # Method to_i return 0, if there aren't any numbers in string
-    if count == 0
-      puts Paint['Invalid number of posts!', :red]
-      exit
+      likes.map! { |hash| Track.new(hash) }
     end
 
-    d = count / SOUNDCLOUD_MAX_LIMIT
-    m = count % SOUNDCLOUD_MAX_LIMIT
-    d = m == 0 ? d : d + 1
+    # Post is last track/repost in profile
+    def posts(count)
+      # Method to_i return 0, if there aren't any numbers in string
+      if count == 0
+        puts Paint['Invalid number of posts!', :red]
+        exit
+      end
 
-    # Official SC API wrapper doesn't support posts
-    # So I should get posts by HTTP requests
-    conn = Faraday.new(url: 'https://api-v2.soundcloud.com/')
+      d = count / SOUNDCLOUD_MAX_LIMIT
+      m = count % SOUNDCLOUD_MAX_LIMIT
+      d = m == 0 ? d : d + 1
 
-    posts = []
-    d.times do |i|
-      limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
-      count -= SOUNDCLOUD_MAX_LIMIT
+      # Official SC API wrapper doesn't support posts
+      # So I should get posts by HTTP requests
+      conn = Faraday.new(url: 'https://api-v2.soundcloud.com/')
 
-      response = conn.get("/profile/soundcloud:users:#{@id}?limit=#{limit}&offset=#{i*SOUNDCLOUD_MAX_LIMIT}")
-      parsed = JSON.parse(response.body)
-      collection = parsed['collection']
+      posts = []
+      d.times do |i|
+        limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
+        count -= SOUNDCLOUD_MAX_LIMIT
 
-      break if collection.nil?
+        response = conn.get("/profile/soundcloud:users:#{@id}?limit=#{limit}&offset=#{i*SOUNDCLOUD_MAX_LIMIT}")
+        parsed = JSON.parse(response.body)
+        collection = parsed['collection']
 
-      posts += collection
-    end
+        break if collection.nil?
 
-    if posts.empty?
-      puts Paint['There are no posts yet :(', :red]
-      exit
-    end
+        posts += collection
+      end
 
-    rejected = posts.reject! { |hash| hash['type'] == 'playlist' }
-    puts Paint["Was skipped #{rejected.count} playlist(s) (nehm doesn't download playlists)", :yellow] if rejected
+      if posts.empty?
+        puts Paint['There are no posts yet :(', :red]
+        exit
+      end
 
-    posts.map { |hash| Track.new(hash['track']) }
+      rejected = posts.reject! { |hash| hash['type'] == 'playlist' }
+      puts Paint["Was skipped #{rejected.length} playlist(s) (nehm doesn't download playlists)", :yellow] if rejected
+
+      posts.map! { |hash| Track.new(hash['track']) }
+    end
   end
 end

data/lib/nehm/user_manager.rb

@@ -1,59 +1,61 @@
-module UserManager
-  def self.user
-    @temp_user || default_user
-  end
+module Nehm
+  module UserManager
+    def self.user
+      @temp_user || default_user
+    end
 
-  def self.logged_in?
-    Cfg.key?(:default_id)
-  end
+    def self.logged_in?
+      Cfg.key?(:default_id)
+    end
 
-  def self.log_in
-    loop do
-      permalink = HighLine.new.ask('Please enter your permalink (last word in your profile url): ')
+    def self.log_in
+      loop do
+        permalink = HighLine.new.ask('Please enter your permalink (last word in your profile url): ')
+        user = get_user(permalink)
+        if user
+          Cfg[:default_id] = user.id
+          Cfg[:permalink] = permalink
+          puts Paint['Successfully logged in!', :green]
+          break
+        else
+          puts Paint['Invalid permalink. Please enter correct permalink', :red]
+        end
+      end
+    end
+
+    def self.temp_user=(permalink)
       user = get_user(permalink)
       if user
-        Cfg[:default_id] = user.id
-        Cfg[:permalink] = permalink
-        puts Paint['Successfully logged in!', :green]
-        break
+        @temp_user = User.new(user.id)
       else
         puts Paint['Invalid permalink. Please enter correct permalink', :red]
+        exit
       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
 
-  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
+    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
-  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
+    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
-    user
   end
 end