mumbletune 0.1.3 → 0.2.1

data/lib/mumbletune/messages.rb

@@ -2,8 +2,6 @@ require 'uri'
 require 'text'
 require 'mustache'
 
-Thread.abort_on_exception=true # development only
-
 module Mumbletune
 
 	class Message
@@ -29,9 +27,6 @@ module Mumbletune
 						else
 							play_now = false
 						end
-
-						# reassurance that it's working
-						message.respond "I'm searching. Hang tight."
 						
 						collection = Mumbletune.resolve(message.argument)
 
@@ -49,9 +44,6 @@ module Mumbletune
 						else
 							message.respond_all "#{message.sender.name} added #{collection.description} to the queue."
 						end
-
-						Mumbletune.player.play unless Mumbletune.player.playing?
-
 						
 					else # user wants to unpause
 						if Mumbletune.player.paused?
@@ -77,9 +69,13 @@ module Mumbletune
 
 
 				when /^next$/i
-					Mumbletune.player.next
-					current = Mumbletune.player.current_song
-					message.respond_all "#{message.sender.name} skipped to #{current.artist} - #{current.name}" if current
+					if Mumbletune.player.any?
+						Mumbletune.player.next
+						current = Mumbletune.player.current_track
+						message.respond_all "#{message.sender.name} skipped to #{current.artist.name} - #{current.name}" if current
+					else
+						message.respond "We're at the end of the queue. Try adding something to play!"
+					end
 
 				when /^clear$/i
 					Mumbletune.player.clear_queue
@@ -96,22 +92,29 @@ module Mumbletune
 
 				when /^(what|queue)$/i
 					queue = Mumbletune.player.queue
+					current = Mumbletune.player.current_track
+					template_queue = Array.new
+					queue.each do |col|
+						template_col = {description: col.description, tracks: Array.new}
+						col.tracks.each { |t| template_col[:tracks] << {name: t.name, artist: t.artist.name, playing?: current == t, username: col.user} }
+						template_queue << template_col
+					end
 
 					# Now, a template.
 					rendered = Mustache.render Message.template[:queue],
-						:queue => queue,
+						:queue => template_queue,
 						:anything? => (queue.empty?) ? false : true
 					message.respond rendered
 
 				when /^volume\?$/i
-					message.respond "The volume is #{Mumbletune.player.volume?}."
+					message.respond "The volume is #{Mumbletune.mumble.volume}."
 
 				when /^volume/i
 					if message.argument.length == 0
-						message.respond "The volume is #{Mumbletune.player.volume?}."
+						message.respond "The volume is #{Mumbletune.mumble.volume}."
 					else
-						Mumbletune.player.volume(message.argument)
-						message.respond "Now the volume is #{Mumbletune.player.volume?}."
+						Mumbletune.mumble.volume = message.argument
+						message.respond "Now the volume is #{Mumbletune.mumble.volume}."
 					end
 
 				when /^help$/i
@@ -126,8 +129,10 @@ module Mumbletune
 
 			rescue => err # Catch any command that errored.
 				message.respond "Woah, an error occurred: #{err.message}"
-				puts "#{err.class}: #{err.message}"
-				puts err.backtrace
+				unless Mumbletune.verbose
+					puts "#{err.class}: #{err.message}"
+					puts err.backtrace
+				end
 			end
 		end
 
@@ -157,7 +162,7 @@ module Mumbletune
 	end
 
 	# load templates
-	Dir.glob(File.dirname(__FILE__) + "/templates/*.mustache").each do |f_path|
+	Dir.glob(File.dirname(__FILE__) + "/template/*.mustache").each do |f_path|
 		f = File.open(f_path)
 		Message.template[File.basename(f_path, ".mustache").to_sym] = f.read
 	end

data/lib/mumbletune/mumble_client.rb

@@ -4,16 +4,16 @@ module Mumbletune
 	class MumbleClient
 
 		def initialize
-			opts = Mumbletune.config['mumble']
-			@cli = Mumble::Client.new(opts['host'], opts['port'], opts['username'], opts['password'])
+			m_conf = Mumbletune.config["mumble"]
+			format = {rate: 44100, channels: 2} # Format used by spotify
+			@cli = Mumble::Client.new(m_conf['host'], m_conf['port'], m_conf['username'], m_conf['password'], format)
 
 			@cli.on_server_sync do |message| # Once connected.
 				@cli.session = message.session # housekeeping for mumble-ruby
-				connect_to = @cli.channels.select { |key, hash| hash["name"] == opts['channel'] }.first[1][:name]
-				@cli.join_channel(connect_to)
+				connect_to = @cli.channels.select { |key, hash| hash["name"] == m_conf["channel"] }.first[1][:name]
+				@cli.join_channel connect_to
 
 				@ready = true
-				puts ">> Connected to Mumble server at #{opts['host']}."
 			end
 
 			@cli.on_text_message do |data|
@@ -35,15 +35,34 @@ module Mumbletune
 
 		def stream
 			@ready_wait.join
-			input = Mumbletune.config['mpd']['fifo_out']
 			Thread.current.priority = 5
-			puts ">> Streaming to Mumble from #{input}"
-			@cli.stream_raw_audio(input)
+			queue = Mumbletune.player.audio_queue
+
+			@audio_stream = @cli.stream_from_queue(queue)
+
+			self.volume = Mumbletune.config["player"]["default_volume"]
 		end
 
 		def disconnect
+			@audio_stream.stop if @audio_stream
 			@cli.disconnect
-			puts ">> Disconnected from Mumble"
+		end
+
+		def message(users, text)
+			users = Array(users) # force into array
+			users.each { |u| @cli.text_user(u.session, text) }
+		end
+
+		def broadcast(text)
+			@cli.text_channel(@cli.me.channel_id, text)
+		end
+
+		def volume
+			(@audio_stream.volume * 100).to_i
+		end
+
+		def volume=(vol)
+			@audio_stream.volume = vol.to_i
 		end
 	end
 

data/lib/mumbletune/resolver.rb

@@ -1,8 +1,6 @@
 require 'uri'
-require 'meta-spotify'
 require 'text'
 
-
 module Mumbletune
 	def self.resolve(argument)
 		Resolvers.workers.each do |r|
@@ -56,11 +54,14 @@ module Mumbletune
 				# behave according to URI type
 				case type
 				when "track" # Return this track
-					SpotifyTrack::track_from_uri(sp_uri)
+					obj = Hallon::Track.new(sp_uri)
+					SpotifyResolver.track(obj)
 				when "album" # Return all tracks of the album to queue
-					SpotifyTrack::tracks_from_album(sp_uri)
+					obj = Hallon::Album.new(sp_uri)
+					SpotifyResolver.tracks_from_album(obj)
 				when "artist" # Return 10 tracks for this artist
-					SpotifyTrack::tracks_from_artist(sp_uri)
+					obj = Hallon::Artist.new(sp_uri)
+					SpotifyResolver.tracks_from_artist(obj)
 				end
 			end
 		end
@@ -89,35 +90,21 @@ module Mumbletune
 				region = Mumbletune.config["spotify"]["region"]
 
 				# determine result based on a type in the first word
+				search = Hallon::Search.new(query, artists: 1, albums: 1, tracks: 1).load
 				if first_word =~ /^artist$/i
-					artist = Mumbletune.handle_sp_error { MetaSpotify::Artist.search(query) }
-					result = artist[:artists].first
+					result = search.artists.first
 
 				elsif first_word =~ /^album$/i
-					album = Mumbletune.handle_sp_error { MetaSpotify::Album.search(query) }
-					album[:albums].select! { |a| a.available_territories.include? region }
-					result = album[:albums].first
+					result = search.albums.first
 
 				elsif first_word =~ /^track$/i
-					track = Mumbletune.handle_sp_error { MetaSpotify::Track.search(query) }
-					track[:tracks].select! { |t| t.album.available_territories.include? region }
-					result = track[:tracks].first
+					result = search.tracks.first
 
 				else # determine intended result by similarity to the query
-					artist = Mumbletune.handle_sp_error { MetaSpotify::Artist.search(query) }
-					album = Mumbletune.handle_sp_error { MetaSpotify::Album.search(query) }
-					track = Mumbletune.handle_sp_error { MetaSpotify::Track.search(query) }
-
-					# searches now finished
-
-					# remove anything out-of-region
-					album[:albums].select! { |a| a.available_territories.include? region } if album[:albums].any?
-					track[:tracks].select! { |t| t.album.available_territories.include? region } if track[:tracks].any?
-
 					compare = []
-					compare.push track[:tracks].first if track[:tracks].any?
-					compare.push album[:albums].first if album[:albums].any?
-					compare.push artist[:artists].first if artist[:artists].any?
+					compare.push search.tracks.first if search.tracks.any?
+					compare.push search.albums.first if search.albums.any?
+					compare.push search.artists.first if search.artists.any?
 					
 					white = Text::WhiteSimilarity.new
 					compare.sort! do |a, b|
@@ -134,12 +121,12 @@ module Mumbletune
 					result = compare.first
 				end
 
-				if result.class == MetaSpotify::Artist
-					SpotifyTrack.tracks_from_artist(result)
-				elsif result.class == MetaSpotify::Album
-					SpotifyTrack.tracks_from_album(result)
-				elsif result.class == MetaSpotify::Track
-					SpotifyTrack.track_from_uri(result)
+				if result.class == Hallon::Artist
+					SpotifyResolver.tracks_from_artist(result)
+				elsif result.class == Hallon::Album
+					SpotifyResolver.tracks_from_album(result)
+				elsif result.class == Hallon::Track
+					SpotifyResolver.track(result)
 				end
 
 			end

data/lib/mumbletune/spotify_resolver.rb

@@ -0,0 +1,51 @@
+require "hallon"
+
+module Mumbletune
+	class SpotifyResolver
+		def self.track(track)
+			track.load
+
+			raise "#{track.name}: Not available in this region." unless track.available?
+
+			# Technically, a collection of one.
+			Collection.new(
+				:TRACK,
+				track,
+				"<b>#{track.name}</b> by <b>#{track.artist.name}</b>"
+				)
+		end
+
+		def self.tracks_from_album(album)	
+			album.load
+
+			raise "#{album.name}: Not available in this region." unless album.available?
+
+			browse = album.browse
+			browse.load
+
+			Collection.new(
+				:ALBUM,
+				browse.tracks.to_a,
+				"the album <b>#{album.name}</b> by <b>#{album.artist.name}</b>"
+				)
+		end
+
+		def self.tracks_from_artist(artist)
+			artist.load
+
+			tracks_needed = Mumbletune.config["player"]["tracks_for_artist"] || 5
+
+			search = Hallon::Search.new("artist:\"#{artist.name}\"",
+				tracks: tracks_needed,
+				artists: 0,
+				albums: 0,
+				playlists: 0).load
+
+			Collection.new(
+				:ARTIST_TOP,
+				search.tracks.to_a,
+				"#{search.tracks.size} tracks by <b>#{artist.name}</b>"
+				)
+		end
+	end
+end

data/lib/mumbletune/{templates → template}/commands.mustache

@@ -63,6 +63,7 @@
 </tbody>
 </table>
 <p><br> For example:</p>
-<pre><code>play coldplay
-play nicki minaj starships</code></pre>
-<p>Mumbletune uses Spotify to find music.</p>
+<p><code>play coldplay</code> plays the top 5 tracks by Coldplay.</p>
+<p><code>play nicki minaj starships</code> will play the (excellent) song Starships.</p>
+<p>Mumbletune uses Spotify to find and play music. You can <code>play</code> a Spotify URL directly instead of searching, like</p>
+<p><code>play spotify:album:1HjSyGjmLNjRAKgT9t1cna</code></p>

data/lib/mumbletune/{templates → template}/queue.mustache

@@ -18,17 +18,19 @@
 {{/anything?}}
 
 		{{#queue}}
-		<tr class="odd">
-			<td align="left">
-				{{#playing?}} &#9658; {{/playing?}}
-			</td>
-			<td align="left">
-				{{name}}
-			</td>
-			<td align="left">
-				{{artist}}
-			</td>
-		</tr>
+			{{#tracks}}
+			<tr>
+				<td align="left">
+					{{#playing?}} <span style="#a5a5a5">►</span> {{/playing?}}
+				</td>
+				<td align="left">
+					{{name}}
+				</td>
+				<td align="left">
+					{{artist}} <small style="color:#a5a5a5">{{username}}</small>
+				</td>
+			</tr>
+			{{/tracks}}
 		{{/queue}}
 
 {{#anything?}}

data/lib/mumbletune/version.rb

@@ -1,3 +1,3 @@
 module Mumbletune
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

data/logs/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

data/mumbletune.gemspec

@@ -9,9 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Elliott Williams"]
   spec.email         = ["e@elliottwillia.ms"]
   spec.description   = "Mumbletune connects to a mumble server and allows users to"\
-                       " interact with and play a queue of music. Currently plays"\
-                       " from Spotify alone."
-  spec.summary       = "A mumble server bot that plays music"
+                       " interact with and play a queue of music from Spotify."
+  spec.summary       = "A Mumble VOIP bot that plays Spotify."
   spec.homepage      = "http://github.com/elliottwilliams/mumbletune"
   spec.license       = "MIT"
 
@@ -24,14 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_runtime_dependency "mumble-ruby"
-  spec.add_runtime_dependency "ruby-mpd"
-  spec.add_runtime_dependency "sinatra"
-  spec.add_runtime_dependency "meta-spotify"
-  spec.add_runtime_dependency "rubypython"
+  spec.add_runtime_dependency "hallon"
+  spec.add_runtime_dependency "ffi", "~>1.3.0"
 
-  spec.add_runtime_dependency "thin"
-  spec.add_runtime_dependency "eventmachine"
+  spec.add_runtime_dependency "daemons"
   spec.add_runtime_dependency "text"
   spec.add_runtime_dependency "mustache"
-  spec.add_development_dependency "debugger"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumbletune
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-mpd
+  name: hallon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,71 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: meta-spotify
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubypython
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -187,28 +139,13 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Mumbletune connects to a mumble server and allows users to interact with
-  and play a queue of music. Currently plays from Spotify alone.
+  and play a queue of music from Spotify.
 email:
 - e@elliottwillia.ms
 executables:
 - mumbletune
+- mumbletune-ctl
 extensions: []
 extra_rdoc_files: []
 files:
@@ -219,21 +156,20 @@ files:
 - README.md
 - Rakefile
 - bin/mumbletune
+- bin/mumbletune-ctl
 - conf.example.yaml
 - docs/commands.md
 - lib/mumbletune.rb
 - lib/mumbletune/collection.rb
-- lib/mumbletune/handle_sp_error.rb
+- lib/mumbletune/hallon_player.rb
 - lib/mumbletune/messages.rb
-- lib/mumbletune/mpd_client.rb
 - lib/mumbletune/mumble_client.rb
 - lib/mumbletune/resolver.rb
-- lib/mumbletune/sp_uri_server.rb
-- lib/mumbletune/spotify_track.rb
-- lib/mumbletune/templates/commands.mustache
-- lib/mumbletune/templates/queue.mustache
-- lib/mumbletune/track.rb
+- lib/mumbletune/spotify_resolver.rb
+- lib/mumbletune/template/commands.mustache
+- lib/mumbletune/template/queue.mustache
 - lib/mumbletune/version.rb
+- logs/.gitignore
 - mumbletune.gemspec
 homepage: http://github.com/elliottwilliams/mumbletune
 licenses:
@@ -259,5 +195,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A mumble server bot that plays music
+summary: A Mumble VOIP bot that plays Spotify.
 test_files: []