ruby-mpd-client 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c219fde56c4ab0036953aa05ace720270ca119a
-  data.tar.gz: 408ded419edd17ce2774425f53a01cf427ca2892
+  metadata.gz: 5d038318cf899183f6ed52cc1f3c13294b87d899
+  data.tar.gz: 1c19d632d7c424d08ba14a5df9be67ca64217213
 SHA512:
-  metadata.gz: 3686f11d2f2e8992f3eda5854a60edbf1f6b82847adb1ad12509430ee89f1c77e65e8f6586fb1b1227b0b212a00ffb32b1336016510bb4bdac2848faefeb5794
-  data.tar.gz: d9437d5abdc6ecf9a6a6f9ceeb1e8086617f63f39c5caf6269cd9347c737601ba47679d043179625ad7bca43f4bb66375cab622de11d6c7231711f0e41bc5bfa
+  metadata.gz: 8ebe86c126933033f19be9e25b1c1e1a7e1c2b76856f1e65b60e16e0b685781d6c9f554688e3799a34221072b10b88495a3be94eb296d51f14d97b1092ba2e6b
+  data.tar.gz: 93ae6e1f0904011acf8976c26bfc8616d64d7a3336bb382fd076b6e80747e464fbadab11af69a608a0822f84108ca0ba6922645298aacdf51890d820ddd5e95d

data/lib/mpd/client.rb

@@ -40,6 +40,10 @@ module MPD
       raise(ConnectionError) unless connection.gets =~ /^OK/
     end
 
+    def disconnect
+      connection.disconnect
+    end
+
     private
 
     attr_reader :connection

data/lib/mpd/client/commands/current_playlist.rb

@@ -0,0 +1,17 @@
+require 'mpd/playlist'
+
+module MPD
+  class Client
+    module Commands
+      # https://www.musicpd.org/doc/protocol/queue.html
+      module CurrentPlaylist
+        # songs - integer or range
+        def playlist_info(songs = nil)
+          argument = songs.is_a?(Range) ? "#{songs.begin}:#{songs.end}" : songs
+          response = execute "playlistinfo #{argument}"
+          Playlist.from_response(response)
+        end
+      end
+    end
+  end
+end

data/lib/mpd/client/connection.rb

@@ -12,9 +12,15 @@ module MPD
       end
 
       def connect
+        disconnect if socket
         @socket = TCPSocket.open(host, port)
       end
 
+      def disconnect
+        socket && socket.close
+        @socket = nil
+      end
+
       def puts(text)
         raise ConnectionError unless socket
         socket.puts(text)

data/lib/mpd/playlist.rb

@@ -0,0 +1,27 @@
+require 'mpd/song'
+
+module MPD
+  # Array<SongInfo> with some useful methods
+  class Playlist < Array
+    def self.from_response(response)
+      data = []
+      info = {}
+      response.key_value_pairs.each do |key, value|
+        if info.key?(key) # next song info
+          data << info
+          info = {}
+        end
+
+        info[key] = value
+      end
+
+      data << info
+      new(data)
+    end
+
+    # data - array of hashes from MPD
+    def initialize(data)
+      super(data.map { |info| Song.new(info) })
+    end
+  end
+end

data/lib/mpd/song.rb

@@ -0,0 +1,28 @@
+module MPD
+  # Hash with predefined structure (see MAPPINGS) created from
+  # basic MPD song info
+  # Additionaly it stores base data via #data
+  class Song < Hash
+    MAPPINGS = { file: 'file',
+                 artist: 'Artist',
+                 album: 'Album',
+                 title: 'Title',
+                 year: 'Date',
+                 genre: 'Genre',
+                 id: 'Id',
+                 position: 'Pos',
+                 time: 'Time' }.freeze
+
+    attr_reader :data
+
+    def initialize(data)
+      super()
+      @data = data
+      MAPPINGS.each { |key, data_key| self[key] = data[data_key] }
+    end
+
+    MAPPINGS.each do |method_name, data_key|
+      define_method(method_name) { data[data_key] }
+    end
+  end
+end

data/lib/mpd/version.rb

@@ -1,3 +1,3 @@
 module MPD
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpd-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitriy Non
@@ -54,11 +54,14 @@ files:
 - bin/setup
 - lib/mpd/client.rb
 - lib/mpd/client/commands.rb
+- lib/mpd/client/commands/current_playlist.rb
 - lib/mpd/client/commands/playback_control.rb
 - lib/mpd/client/commands/playback_options.rb
 - lib/mpd/client/connection.rb
 - lib/mpd/client/server_response.rb
 - lib/mpd/errors.rb
+- lib/mpd/playlist.rb
+- lib/mpd/song.rb
 - lib/mpd/version.rb
 - lib/ruby-mpd-client.rb
 - ruby-mpd-client.gemspec