mumbletune 0.1.3 → 0.2.1

data/lib/mumbletune/handle_sp_error.rb

@@ -1,23 +0,0 @@
-module Mumbletune
-
-	# The Spotify Metadata API seems to throw 502 (Bad Gateway) errors *a lot*.
-	# 	There's some complaint about this online, and I can reproduce it with
-	# 	plenty of REST clients, so I am sure it's Spotify's problem. But they
-	# 	don't seem too interested in fixing what appears to be a long-standing
-	# 	issue. Ho hum.
-	def self.handle_sp_error
-		begin
-			yield
-		rescue MetaSpotify::ServerError => err
-			puts "Caught ServerError: #{err}"
-			failed ||= 0
-			failed += 1
-			if failed < 4
-				sleep 1
-				retry
-			else
-				raise
-			end
-		end
-	end
-end

data/lib/mumbletune/mpd_client.rb

@@ -1,171 +0,0 @@
-require 'ruby-mpd'
-
-module Mumbletune
-
-	class Player
-
-		attr_accessor :history
-
-		def initialize(host=Mumbletune.config['mpd']['host'], port=Mumbletune.config['mpd']['port'])
-			@mpd = MPD.new(host, port)
-			self.connect
-			self.clear_all
-
-			@history = Array.new
-			@prev_id = 0
-
-			self.defaults
-			self.establish_callbacks
-		end
-
-		def connect
-			@disconnecting = false
-			@mpd.connect true # 'true' enables callbacks
-		end
-
-		def disconnect
-			@disconnecting = true
-			@mpd.disconnect
-			puts ">> Disconnected from MPD"
-		end
-
-		# Setup
-
-		def defaults
-			@mpd.volume = Mumbletune.config["mpd"]["default_volume"] || 100
-			@mpd.consume = true
-		end
-
-		def establish_callbacks
-			@mpd.on :connection do |status|
-				if status == false && !@disconnecting
-					self.connect
-				else
-					puts ">> MPD happens to be connected."
-				end
-			end
-
-			# Fires when currently playing song changes.
-			@mpd.on :songid do |id|
-				
-				# Clear old tracks from the store.
-				Track.store.delete_if { |t| t.mpd_id == @prev_id }
-
-				@prev_id = id
-			end
-		end
-
-		# Status methods
-
-		def playing?
-			state = @mpd.status[:state]
-			if state =~ /^(play|pause)$/i
-				true
-			else
-				false
-			end
-		end
-
-		def paused?
-			state = @mpd.status[:state]
-			if state == :pause
-				true
-			else
-				false
-			end
-		end
-
-
-		# MPD Settings
-
-		def volume?
-			@mpd.volume
-		end
-
-		def volume(percent)
-			@mpd.volume = percent
-		end
-
-
-
-		# Queue
-
-		def add_collection(col, now=false)
-			col.tracks.each do |t|
-				id = @mpd.addid t.url,
-					 (now) ? col.tracks.index(t)+1 : nil
-				t.mpd_id = id
-			end
-
-			@history.push col
-
-			@mpd.next if now
-		end
-
-		def queue
-			# Combine the future queue with the current track.
-			#   MPD puts the current track in its queue only if
-			#   other tracks are queued to play. Account for this.
-			queue = @mpd.queue
-			queue.unshift @mpd.current_song if @mpd.current_song
-
-			# Delete index 0 if first queue position and current song are duplicates.
-			queue.delete_at(0) if queue[1] && queue[0] == queue[1]
-
-			# Associate known Tracks with Queue items.
-			mapped_queue = queue.map do |mpd_song|
-				t = Track.retreive_from_mpd_id(mpd_song.id)
-				if t
-					t.queue_pos = mpd_song.pos
-					t
-				end
-			end
-			mapped_queue
-		end
-
-		def current_song
-			Track.retreive_from_mpd_id(@mpd.current_song.id) if @mpd.playing?
-		end
-
-		def undo
-			last_collection = @history.pop
-
-			last_collection.tracks.each do |t|
-				to_delete = @mpd.queue.select { |mpd_song| mpd_song.id == t.mpd_id }.first
-				@mpd.delete(to_delete.pos) if to_delete
-			end
-			last_collection
-		end
-
-		def clear_all
-			@mpd.clear
-		end
-
-		def clear_queue
-			current = @mpd.current_song
-			@mpd.queue.each do |t|
-				@mpd.delete :id => t.id unless t.id == current.id
-			end
-		end
-
-		# Playback commands
-
-		def play
-			@mpd.play
-		end
-
-		def pause
-			@mpd.pause = (@mpd.playing?) ? true : false
-		end
-
-		def next
-			@mpd.next
-		end
-
-		def stop
-			@mpd.stop
-		end
-
-	end
-
-end

data/lib/mumbletune/sp_uri_server.rb

@@ -1,42 +0,0 @@
-require 'sinatra/base'
-
-module Mumbletune
-
-	module SPURIServer
-
-		class Server < Sinatra::Base
-			set :run, true
-			set :server, :thin
-			set :logging, false
-			set :app_file, __FILE__
-			set :bind, 'localhost'
-			set :port, 8081
-
-			get '/play/:uri' do
-				cred = Mumbletune.config['spotify']
-				sp = Mumbletune::Spotify.new(cred['username'], cred['password'])
-
-				track = sp.objectFromURI(params[:uri])
-				halt 404, "Could not find a track with that URI." if track == nil
-
-				url = track.getFileURL().to_s
-				halt 404, "Could not find a track URL for that URI." if track == nil
-
-				sp.logout
-				redirect url, 303
-			end
-		end
-
-		def self.url_for(uri)
-			bind = Server::bind
-			port = Server::port
-			"http://#{bind}:#{port}/play/#{uri}"
-		end
-
-		def self.sp_uri_for(url)
-			regexp = /(.+)(<sp_uri>spotify:\w+:\w+)/i
-			matched = regexp.match(url)
-			matched[:sp_uri]
-		end
-	end
-end

data/lib/mumbletune/spotify_track.rb

@@ -1,90 +0,0 @@
-require 'uri'
-
-module Mumbletune
-
-	class SpotifyTrack < Track
-		def initialize(params)
-			super
-
-			@uri = params[:uri]
-			@url = SPURIServer.url_for(@uri)
-		end
-
-		def self.track_from_uri(track)
-			track = MetaSpotify::Track.lookup(track) unless track.class == MetaSpotify::Track
-
-			# force track to be playable within region
-			unless track.album.available_territories.include? Mumbletune.config["spotify"]["region"]
-				raise "#{track.name}: Not available in this region."
-			end
-
-			song = SpotifyTrack.new({
-				:name => track.name,
-				:artist => track.artists.first.name,
-				:album => track.album.name,
-				:uri => track.uri
-			})
-
-			# Technically, a collection of one.
-			Collection.new(
-				:TRACK,
-				song,
-				"<b>#{song.name}</b> by <b>#{song.artist}</b>"
-				)
-		end
-
-		def self.tracks_from_album(album_ref)	
-			album_uri = album_ref.uri if album_ref.class == MetaSpotify::Album
-			album = MetaSpotify::Album.lookup(album_uri, {:extras => "track"})
-
-			# force album to be playable in region
-			unless album.available_territories.include? Mumbletune.config["spotify"]["region"]
-				raise "#{album.name}: Not available in this region."
-			end
-
-			tracks = []
-			album.tracks.each do |track|
-				tracks.push SpotifyTrack.new({
-					:name => track.name,
-					:artist => track.artists.first.name,
-					:album => album.name,
-					:uri => track.uri
-				})
-			end
-
-			Collection.new(
-				:ALBUM,
-				tracks,
-				"the album <b>#{album.name}</b> by <b>#{album.artists.first.name}</b>"
-				)
-		end
-
-		def self.tracks_from_artist(artist)
-			artist = MetaSpotify::Artist.lookup(artist) unless artist.class == MetaSpotify::Artist
-
-			# spotify metadata api still error-prone
-			search_result = Mumbletune.handle_sp_error { MetaSpotify::Track.search("artist:\"#{artist.name}\"") }
-
-			# filter out tracks outside region
-			search_result[:tracks].select! do |track|
-				track.album.available_territories.include? Mumbletune.config["spotify"]["region"]
-			end
-
-			tracks = []
-			search_result[:tracks][0...10].each do |track|
-				tracks.push SpotifyTrack.new({
-					:name => track.name,
-					:artist => track.artists.first.name,
-					:album => track.album.name,
-					:uri => track.uri
-				})
-			end
-
-			Collection.new(
-				:ARTIST_TOP,
-				tracks,
-				"#{tracks.length} tracks by <b>#{artist.name}</b>"
-				)
-		end
-	end
-end

data/lib/mumbletune/track.rb

@@ -1,32 +0,0 @@
-module Mumbletune
-	class Track
-		attr_accessor :name, :artist, :album, :url, :mpd_id, :queue_pos
-
-		class << self
-			attr_accessor :store
-		end
-		self.store = []
-
-		def initialize(params)
-			@name = params[:name]
-			@artist = params[:artist]
-			@album = params[:album]
-			@url = params[:url]
-
-			Track.store.push self
-		end
-
-		def playing?
-			if self == Mumbletune.player.current_song
-				true
-			else
-				false
-			end
-		end
-
-		def self.retreive_from_mpd_id(id)
-			Track.store.select { |t| t.mpd_id == id }.first
-		end
-
-	end
-end