monkeymusic 0.0.11 → 0.0.12

data/levels/testlevel.rb

@@ -1,15 +1,15 @@
 carrying_capacity 3
 turn_limit 100
-time_limit 300
+time_limit 10000
 
 legend({ 
   "1" => Monkey.player(1),
   "2" => Monkey.player(2),
-  "X" => Track.worth(-2),
-  "x" => Track.worth(-1),
-  "l" => Track.worth(1),
-  "t" => Track.worth(2),
-  "T" => Track.worth(3),
+  "X" => Track.tier(-2),
+  "x" => Track.tier(-1),
+  "l" => Track.tier(1),
+  "t" => Track.tier(2),
+  "T" => Track.tier(3),
   "U" => User,
   "W" => Wall,
 })

data/lib/monkey_music.rb

@@ -9,7 +9,6 @@ require 'monkey_music/level'
 require 'monkey_music/level_loader'
 
 require 'monkey_music/ui/console'
-require 'monkey_music/ui/browser'
 
 require 'monkey_music/metadata/track'
 require 'monkey_music/metadata/album'

data/lib/monkey_music/metadata/track.rb

@@ -1,6 +1,6 @@
 module MonkeyMusic::Metadata
   class Track
-    attr_reader :uri, :name, :artist, :album, :year, :multiplier, :value
+    attr_reader :uri, :name, :artist, :album, :year, :tier, :value
 
     def initialize(args = {})
       @name = args[:name]
@@ -10,8 +10,8 @@ module MonkeyMusic::Metadata
       @uri = args[:uri]
     end
 
-    def set_value(multiplier, value)
-      @multiplier = multiplier
+    def set_value(tier, value)
+      @tier = tier
       @value = value
     end
     

data/lib/monkey_music/player.rb

@@ -2,7 +2,7 @@ require 'benchmark'
 
 module MonkeyMusic
   class Player
-    attr_accessor :monkey, :level, :has_boost, :remaining_time
+    attr_accessor :monkey, :level, :has_boost, :remaining_time, :command_line_argument
     
     def initialize(file)
       @file = file
@@ -11,10 +11,13 @@ module MonkeyMusic
       @penalty = 0
       @moves = []
       @queries = []
+      @command_line_argument = ""
     end
 
     def init!
-      IO.popen(@file, "r+") {|io| io.puts initial_output }
+      IO.popen([@file, @command_line_argument], "r+") do |io| 
+        io.puts initial_output
+      end
     end
 
     def query!(turn)
@@ -26,8 +29,6 @@ module MonkeyMusic
           io.puts turn_output(turn)
           @remaining_time -= (Benchmark.realtime { @input = io.gets } * 1000).round
           parse!(@input) if @input
-          io.puts response_to(@queries) unless @queries.empty?
-          @queries = []
         end
         @penalty = 5 if @remaining_time < 0
       end
@@ -54,14 +55,17 @@ module MonkeyMusic
 
     def turn_output(turn)
       [ "TURN",
+        @monkey.id,
         turn,
         @monkey.remaining_capacity,
         @remaining_time,
+        response_to(@queries),
         @monkey.level.serialize,
       ].join("\n")
     end
 
     def parse!(s)
+      @queries = []
       @tokens = s.chomp.split(",")
       parse_next_token!
     end

data/lib/monkey_music/runner.rb

@@ -8,15 +8,14 @@ module MonkeyMusic
     @@default_user = 'demo_user.yaml'
     @@default_player = 'demo_player'
 
-    def initialize(arguments)
-      @arguments = arguments
+    def initialize
       @opt_parser = OptionParser.new
       @players = []
       @delay = 1
       init_parser(@opt_parser)
     end
 
-    def run
+    def run(ui_class)
       if ARGV[0] == "demo"
         puts "\tcreate ./#{@@default_level}"
         FileUtils.cp(
@@ -70,16 +69,9 @@ module MonkeyMusic
       # Load level
       level = Level.new(@players, user)
       level.load_from_file(@level_file)
-      ## Initialize UI
-      if browser_ui?
-        print "Using browser UI. Press the enter key to start game. "
-        gets
-        puts "Starting game..."
-        ui = UI::Browser.new(@delay)
-      else
-        ui = UI::Console.new(@delay)
-      end
-      ## Start game
+      # Initialize UI
+      ui = ui_class.new(@delay)
+      # Start game
       @game = Game.new(level, @players, ui)
       @game.start
     end
@@ -92,10 +84,6 @@ module MonkeyMusic
         (not @players.empty?)
     end
 
-    def browser_ui?
-      @browser_ui == true
-    end
-
     def init_parser(opts)
       opts.banner = "Usage: monkeymusic [demo] [-p PLAYER_FILE -n PLAYER_NAME [-u USER_FILE] [-l LEVEL_FILE]]"
 
@@ -112,6 +100,12 @@ module MonkeyMusic
         @players[-1].monkey.name = name unless @players.empty?
       end
 
+      opts.on('-c',
+              '--command-line-argument ARG',
+              'An argument that will be passed to the last entered program on every execution.') do |arg|
+        @players[-1].command_line_argument = arg
+      end
+
       opts.on('-l',
               '--level LEVEL',
               'The level to play.') do |file|
@@ -129,14 +123,9 @@ module MonkeyMusic
         @delay = delay
       end
 
-      #opts.on('-b', '--browser-ui', 
-              #'View the game through the browser instead of the console.') do |password|
-        #@browser_ui = true
-      #end
-
       opts.on('-v', '--version', 
               'Show the current version.') do |password|
-        puts '0.0.11' # TODO: Find out how to extract version from GemSpec
+        puts '0.0.12' # TODO: Find out how to extract version from GemSpec
         exit
       end
 

data/lib/monkey_music/ui/browser.rb

@@ -1,11 +1,13 @@
 require 'em-websocket'
-require 'json'
 
 module MonkeyMusic::UI
   class Browser
 
     def initialize(delay = 1)
       @delay = delay
+      print "Using browser UI. Press the enter key to start game. "
+      gets
+      puts "Starting game..."
       puts "Initializing websockets..."
       Thread.new {
         EM.run {
@@ -22,11 +24,11 @@ module MonkeyMusic::UI
           end
         }
       }
-      sleep 1 # TODO: Asynchronous acknowledge that ui is ready
+      sleep 1.5 # TODO: Asynchronous acknowledge that ui is ready
       puts "Websockets initialized!"
     end
 
-    def update(level, query_time = 0)
+    def update(level, turn = 0, turn_time = 0)
       @ws.send(level.as_json) if @ws
       sleep 1
     end

data/lib/monkey_music/ui/console.rb

@@ -14,7 +14,7 @@ module MonkeyMusic::UI
     
     def update(level, turn = 0, query_time = 0)
       # Clear screen
-      puts "\e[H\e[2J"
+      #puts "\e[H\e[2J"
       # Level
       puts level.to_s
       # Score

data/lib/monkey_music/units/monkey.rb

@@ -71,11 +71,11 @@ module MonkeyMusic
     end
 
     def serialize
-      @id
+      "M#{@id}"
     end
 
     def name
-      @name || "monkey#{@id}"
+      @name || serialize
     end
 
     def to_json(options = {})

data/lib/monkey_music/units/track.rb

@@ -2,14 +2,14 @@ module MonkeyMusic
   class Track < Base
     attr_accessor :metadata
 
-    def self.worth(n)
-      Class.new Track do @worth = n end
+    def self.tier(n)
+      Class.new Track do @tier = n end
     end
 
     def self.from_user(user)
       track = Track.new
-      track.metadata = if @worth
-        user.recommend!(@worth) || user.recommendations.sample
+      track.metadata = if @tier
+        user.recommend!(@tier) || user.recommendations.sample
       else
         user.recommendations.sample
       end
@@ -35,7 +35,7 @@ module MonkeyMusic
         :y => @y,
         :type => self.class.name.split('::').last,
         :name => @metadata.name,
-        :multiplier => @metadata.multiplier,
+        :tier => @metadata.tier,
         :value => @metadata.value,
       }.to_json
     end

data/lib/monkey_music/units/user.rb

@@ -9,14 +9,14 @@ module MonkeyMusic
       @recommendations = @remaining_recommendations = []
     end
 
-    def recommend!(worth)
+    def recommend!(tier)
       index = @remaining_recommendations.index do |r|
-        r.multiplier == worth
+        r.tier == tier
       end
       if index
         @remaining_recommendations.delete_at(index)
       else
-        @recommendations.find { |r| r.multiplier == worth }
+        @recommendations.find { |r| r.tier == tier }
       end
     end
 

data/lib/monkey_music_generate/runner.rb

@@ -52,7 +52,7 @@ module MonkeyMusic
           # Create user
           user = User.new
           # Connect to libspotify
-          Hallon.load_timeout = 0
+          #Hallon.load_timeout = 0
           session = Hallon::Session.initialize(IO.read(@spotify_appkey_file))
           session.login!(@spotify_account, @spotify_password)
           # Load toplists
@@ -72,15 +72,16 @@ module MonkeyMusic
           score_system.evaluate_user_recommendations!(user)
           # Dump and print the user
           File.open(@out_file, 'w') do |f|
-            f.write(user.dump)
+            # Clean out all commas before writing
+            f.write(user.dump.gsub(',', ''))
           end
           puts "====="
           puts "DONE!"
           puts "====="
-          #puts "Loaded tracks:"
-          #user.recommendations.group_by(&:multiplier).sort.each do |k,v| 
-            #puts "#Multiplier #{k}:\t#{v.length}"
-          #end
+          puts "Loaded tracks:"
+          user.recommendations.group_by(&:multiplier).sort.each do |k,v| 
+            puts "#Multiplier #{k}:\t#{v.length}"
+          end
           exit
         end
       end

data/lib/monkey_music_generate/score_system.rb

@@ -9,23 +9,23 @@ module MonkeyMusic::Generate
     end
 
     def evaluate!(track)
-      multiplier = 0
+      tier = 0
       if @user.toplists[:top_tracks].any? {|t| t.name == track.name }
-        multiplier = -1
+        tier = -1
       elsif @user.toplists[:disliked_artists].any? {|ar| ar.name == track.artist }
-        multiplier = -2
+        tier = -2
       else
         if @user.toplists[:top_albums].any? {|al| al.name == track.album }
-          multiplier += 1
+          tier += 1
         end
         if @user.toplists[:top_artists].any? {|ar| ar.name == track.artist }
-          multiplier += 1
+          tier += 1
         end
         if @top_decade == decade_of(track.year)
-          multiplier += 1
+          tier += 1
         end
       end
-      track.set_value(multiplier, 4**multiplier.abs * sign(multiplier))
+      track.set_value(tier, 4**tier.abs * sign(tier))
     end
 
     private

data/users/demo_user.yaml

@@ -960,19 +960,19 @@
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Angel
+  name: Soothe My Soul
   artist: Depeche Mode
   album: Delta Machine
   year: 2013
-  uri: spotify:track:24nDMmzJlHcDfF8iSXWFnA
+  uri: spotify:track:2AxI7waLrZSY9KkL3D2huk
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Soothe My Soul
+  name: Angel
   artist: Depeche Mode
   album: Delta Machine
   year: 2013
-  uri: spotify:track:2AxI7waLrZSY9KkL3D2huk
+  uri: spotify:track:24nDMmzJlHcDfF8iSXWFnA
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -991,14 +991,6 @@
   uri: spotify:track:62nmAEHbcpxxwnwAlb1Z7a
   multiplier: 2
   value: 16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Broken
-  artist: Depeche Mode
-  album: Delta Machine
-  year: 2013
-  uri: spotify:track:1Hm9pX5iwwS7jJLLPad9yJ
-  multiplier: 2
-  value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Just Can't Get Enough - Single Version;2006 Digital Remaster
   artist: Depeche Mode
@@ -1007,6 +999,14 @@
   uri: spotify:track:2FpyKkCFIfqmp6eQx4Rn1V
   multiplier: 2
   value: 16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Broken
+  artist: Depeche Mode
+  album: Delta Machine
+  year: 2013
+  uri: spotify:track:1Hm9pX5iwwS7jJLLPad9yJ
+  multiplier: 2
+  value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: My Little Universe
   artist: Depeche Mode
@@ -1023,14 +1023,6 @@
   uri: spotify:track:6VzfdkKU7J6ideJPwVJnAN
   multiplier: 2
   value: 16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Electricity
-  artist: Orchestral Manoeuvres In The Dark
-  album: The OMD Singles
-  year: 1998
-  uri: spotify:track:3vy2QK19RCnS4Egaq9fGhy
-  multiplier: 1
-  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Enola Gay - 2003 - Remaster
   artist: Orchestral Manoeuvres In The Dark
@@ -1039,6 +1031,14 @@
   uri: spotify:track:7tEDqanTZ8NWxV7zzqth3m
   multiplier: -1
   value: -4
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Electricity
+  artist: Orchestral Manoeuvres In The Dark
+  album: The OMD Singles
+  year: 1998
+  uri: spotify:track:3vy2QK19RCnS4Egaq9fGhy
+  multiplier: 1
+  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Enola Gay
   artist: Orchestral Manoeuvres In The Dark
@@ -1064,19 +1064,19 @@
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Walking On The Milky Way
+  name: Souvenir
   artist: Orchestral Manoeuvres In The Dark
   album: The OMD Singles
   year: 1998
-  uri: spotify:track:5rN6eummWzwLTQxXZcyeCY
+  uri: spotify:track:1H6dcVdpMiMIydKdykY6W0
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Souvenir
+  name: Walking On The Milky Way
   artist: Orchestral Manoeuvres In The Dark
   album: The OMD Singles
   year: 1998
-  uri: spotify:track:1H6dcVdpMiMIydKdykY6W0
+  uri: spotify:track:5rN6eummWzwLTQxXZcyeCY
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1159,14 +1159,6 @@
   uri: spotify:track:7t2DtwDaxiuZDulbXsWrnO
   multiplier: 2
   value: 16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Love Action (I Believe in Love)
-  artist: The Human League
-  album: The Best Of
-  year: 1998
-  uri: spotify:track:7ttwrfe807K63aXv3VSKU1
-  multiplier: 1
-  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Mirror Man - 2003 - Remaster
   artist: The Human League
@@ -1175,6 +1167,14 @@
   uri: spotify:track:3pI8laGp6QKWVfPfuQIhy3
   multiplier: 2
   value: 16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Love Action (I Believe in Love)
+  artist: The Human League
+  album: The Best Of
+  year: 1998
+  uri: spotify:track:7ttwrfe807K63aXv3VSKU1
+  multiplier: 1
+  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Bizarre Love Triangle
   artist: New Order
@@ -1191,14 +1191,6 @@
   uri: spotify:track:6tzeMSH4TRGBTzdNvbF5hr
   multiplier: 1
   value: 4
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Age Of Consent
-  artist: New Order
-  album: Power, Corruption & Lies [Collector's Edition]
-  year: 2008
-  uri: spotify:track:1iKCbLGTa0uNJ3AZhfoFOL
-  multiplier: 2
-  value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Blue Monday [88]
   artist: New Order
@@ -1207,6 +1199,14 @@
   uri: spotify:track:31MOjWj3CT3dCQsMV2b8Wu
   multiplier: 2
   value: 16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Age Of Consent
+  artist: New Order
+  album: Power Corruption & Lies [Collector's Edition]
+  year: 2008
+  uri: spotify:track:1iKCbLGTa0uNJ3AZhfoFOL
+  multiplier: 2
+  value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: True Faith - '94
   artist: New Order
@@ -1231,14 +1231,6 @@
   uri: spotify:track:0NvJy5gPR591Qh2z22EAak
   multiplier: 2
   value: 16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Temptation [7" Version]
-  artist: New Order
-  album: Movement [Collector's Edition]
-  year: 2008
-  uri: spotify:track:6aydUK6llaiRoKQyQTDNPY
-  multiplier: 2
-  value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Ceremony
   artist: New Order
@@ -1255,6 +1247,14 @@
   uri: spotify:track:58IihaOsYb2riCPEVabDol
   multiplier: 1
   value: 4
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Temptation [7" Version]
+  artist: New Order
+  album: Movement [Collector's Edition]
+  year: 2008
+  uri: spotify:track:6aydUK6llaiRoKQyQTDNPY
+  multiplier: 2
+  value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Such Great Heights
   artist: The Postal Service
@@ -1400,19 +1400,19 @@
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Prologue - 2009 - Remaster
+  name: The Man Machine - 2009 Digital Remaster
   artist: Kraftwerk
-  album: Tour De France - 2009 Digital Remaster
+  album: The Man Machine - 2009 Digital Remaster
   year: 2009
-  uri: spotify:track:5bRcU0Jo1gyCBOsSln1War
+  uri: spotify:track:4rbt9xJMIYwjTyMUYSvEL2
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: The Man Machine - 2009 Digital Remaster
+  name: The Robots
   artist: Kraftwerk
-  album: The Man Machine - 2009 Digital Remaster
+  album: The Mix (2009 Digital Remaster)
   year: 2009
-  uri: spotify:track:4rbt9xJMIYwjTyMUYSvEL2
+  uri: spotify:track:2Dx4OYlS0zhjSm0z43midb
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1472,19 +1472,19 @@
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Dead Sun Rising (Sonoio Remix) - Sonoio Remix
+  name: Music For Chameleons
   artist: Gary Numan
-  album: Dead Moon Falling
-  year: 2013
-  uri: spotify:track:5t8sVFvTOpR8rl8u4dcFcW
+  album: I Assassin
+  year: 1982
+  uri: spotify:track:4fqRCykZ9uVe4PNSjWIR2f
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Music For Chameleons
+  name: Dead Sun Rising (Sonoio Remix) - Sonoio Remix
   artist: Gary Numan
-  album: I, Assassin
-  year: 1982
-  uri: spotify:track:4fqRCykZ9uVe4PNSjWIR2f
+  album: Dead Moon Falling
+  year: 2013
+  uri: spotify:track:5t8sVFvTOpR8rl8u4dcFcW
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1536,19 +1536,19 @@
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: The Youth
+  name: Pieces of What
   artist: MGMT
   album: Oracular Spectacular
   year: 2007
-  uri: spotify:track:5nv854ey1k43KaZ0kHmE4Z
+  uri: spotify:track:6wxDu7ISgm5nppPMea4W7D
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Pieces of What
+  name: The Youth
   artist: MGMT
   album: Oracular Spectacular
   year: 2007
-  uri: spotify:track:6wxDu7ISgm5nppPMea4W7D
+  uri: spotify:track:5nv854ey1k43KaZ0kHmE4Z
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1560,7 +1560,7 @@
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Of Moons, Birds & Monsters
+  name: Of Moons Birds & Monsters
   artist: MGMT
   album: Oracular Spectacular
   year: 2007
@@ -1578,19 +1578,11 @@
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Midnight City
   artist: M83
-  album: Hurry Up, We're Dreaming
+  album: Hurry Up We're Dreaming
   year: 2011
   uri: spotify:track:4kO7mrAPfqIrsKwUOK5BFx
   multiplier: 1
   value: 4
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Oblivion (feat. Susanne Sundfør)
-  artist: M83
-  album: Oblivion (feat. Susanne Sundfør)
-  year: 2013
-  uri: spotify:track:66fKIbn90iaQZ0jEuurozt
-  multiplier: 1
-  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: We Own The Sky
   artist: M83
@@ -1600,19 +1592,19 @@
   multiplier: 2
   value: 16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Jack's Dream
+  name: Oblivion (feat. Susanne Sundfør)
   artist: M83
-  album: Oblivion - Original Motion Picture Soundtrack
+  album: Oblivion (feat. Susanne Sundfør)
   year: 2013
-  uri: spotify:track:2OsVwe7SubQyge9LJFTh0Y
+  uri: spotify:track:66fKIbn90iaQZ0jEuurozt
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Waking Up
+  name: Jack's Dream
   artist: M83
   album: Oblivion - Original Motion Picture Soundtrack
   year: 2013
-  uri: spotify:track:7fco9ocFesu9I09AMmpWkW
+  uri: spotify:track:2OsVwe7SubQyge9LJFTh0Y
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1623,6 +1615,14 @@
   uri: spotify:track:5pCTXoSYslXKP2D21e3ZJK
   multiplier: 2
   value: 16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Waking Up
+  artist: M83
+  album: Oblivion - Original Motion Picture Soundtrack
+  year: 2013
+  uri: spotify:track:7fco9ocFesu9I09AMmpWkW
+  multiplier: 1
+  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Midnight City [Eric Prydz Private Remix] - Eric Prydz Private Remix
   artist: M83
@@ -1648,11 +1648,11 @@
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Odyssey Rescue
+  name: Reunion
   artist: M83
-  album: Oblivion - Original Motion Picture Soundtrack
-  year: 2013
-  uri: spotify:track:1E3O3g7xZsFAGyK4g7ott4
+  album: Hurry Up We're Dreaming
+  year: 2011
+  uri: spotify:track:4dNCg774LzE2kmtbMOLdP7
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1695,14 +1695,6 @@
   uri: spotify:track:0wokCRaKD0zPNhMRXAgVsr
   multiplier: 1
   value: 4
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Girls on Film
-  artist: Duran Duran
-  album: Duran Duran
-  year: 1993
-  uri: spotify:track:5KE4iIOeucoLMnkF6NEwKM
-  multiplier: 1
-  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: The Wild Boys
   artist: Duran Duran
@@ -1712,11 +1704,11 @@
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: The Reflex
+  name: Girls on Film
   artist: Duran Duran
-  album: Greatest
-  year: 1998
-  uri: spotify:track:0OsWMTxDjtpmJjX43113oq
+  album: Duran Duran
+  year: 1993
+  uri: spotify:track:5KE4iIOeucoLMnkF6NEwKM
   multiplier: 1
   value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1727,6 +1719,14 @@
   uri: spotify:track:1stJclD9IGUbxtUnl8CzG3
   multiplier: 1
   value: 4
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: The Reflex
+  artist: Duran Duran
+  album: Greatest
+  year: 1998
+  uri: spotify:track:0OsWMTxDjtpmJjX43113oq
+  multiplier: 1
+  value: 4
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Save A Prayer - 2009 Digital Remaster
   artist: Duran Duran
@@ -1760,7 +1760,7 @@
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Die, Die My Darling - Fox Studio 1983
+  name: Die Die My Darling - Fox Studio 1983
   artist: Misfits
   album: Collection
   year: 1986
@@ -1775,14 +1775,6 @@
   uri: spotify:track:0PTP53h7PvqEMeGyGClkOk
   multiplier: -2
   value: -16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Scream
-  artist: Misfits
-  album: Famous Monsters
-  year: 1999
-  uri: spotify:track:2uqQXl3CWniLE0Uhfb7izu
-  multiplier: -2
-  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Saturday Night
   artist: Misfits
@@ -1792,11 +1784,11 @@
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Dig Up Her Bones
+  name: Scream
   artist: Misfits
-  album: American Psycho
-  year: 1997
-  uri: spotify:track:16MPZDpM5JTtIBs3pOMSWx
+  album: Famous Monsters
+  year: 1999
+  uri: spotify:track:2uqQXl3CWniLE0Uhfb7izu
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -1807,6 +1799,14 @@
   uri: spotify:track:38T3oJ4ykhLtoHFjhpjOoL
   multiplier: -2
   value: -16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Dig Up Her Bones
+  artist: Misfits
+  album: American Psycho
+  year: 1997
+  uri: spotify:track:16MPZDpM5JTtIBs3pOMSWx
+  multiplier: -2
+  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: We Are 138 - 1995 Digital Remaster
   artist: Misfits
@@ -1855,6 +1855,22 @@
   uri: spotify:track:2JcUB7LyS4MDI5fvSWU6se
   multiplier: -2
   value: -16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: She Talks to Rainbows
+  artist: The Ramones
+  album: Adios Amigos
+  year: 1995
+  uri: spotify:track:0GVcm9IeiuWWOQk3yXI7yx
+  multiplier: -2
+  value: -16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Have You Ever Seen The Rain
+  artist: The Ramones
+  album: Acid Eaters
+  year: 1993
+  uri: spotify:track:4Ri7GhJiAHy9dCYnxxWuzM
+  multiplier: -2
+  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Merry Christmas (I Don't Want to Fight Tonight)
   artist: The Ramones
@@ -1871,14 +1887,6 @@
   uri: spotify:track:5KAII1Bt2SgySRfPByKgcJ
   multiplier: -2
   value: -16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: She Talks to Rainbows
-  artist: The Ramones
-  album: Adios Amigos
-  year: 1995
-  uri: spotify:track:0GVcm9IeiuWWOQk3yXI7yx
-  multiplier: -2
-  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: The Kkk Took My Baby Away - Live
   artist: The Ramones
@@ -1887,14 +1895,6 @@
   uri: spotify:track:29KP3ieVXuw7rahzuK422u
   multiplier: -2
   value: -16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Have You Ever Seen The Rain
-  artist: The Ramones
-  album: Acid Eaters
-  year: 1993
-  uri: spotify:track:4Ri7GhJiAHy9dCYnxxWuzM
-  multiplier: -2
-  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: 21st Century
   artist: Bad Religion
@@ -1911,6 +1911,14 @@
   uri: spotify:track:5VQg5YHgCAjJTIBtEZHacQ
   multiplier: -2
   value: -16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: Los Angeles Is Burning
+  artist: Bad Religion
+  album: The Empire Strikes First
+  year: 2004
+  uri: spotify:track:27KrzUfX8fHDEYyvmZdrqa
+  multiplier: -2
+  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: True North
   artist: Bad Religion
@@ -1927,22 +1935,6 @@
   uri: spotify:track:3qriuhIxVQXmdHRIIzP4Fe
   multiplier: -2
   value: -16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Los Angeles Is Burning
-  artist: Bad Religion
-  album: The Empire Strikes First
-  year: 2004
-  uri: spotify:track:27KrzUfX8fHDEYyvmZdrqa
-  multiplier: -2
-  value: -16
-- !ruby/object:MonkeyMusic::Metadata::Track
-  name: Past is Dead
-  artist: Bad Religion
-  album: True North
-  year: 2013
-  uri: spotify:track:0yC8t1Rd1RbscJAZI4n8aD
-  multiplier: -2
-  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Punk Rock Song
   artist: Bad Religion
@@ -1951,6 +1943,14 @@
   uri: spotify:track:3cAeRRvExh8FwzWPQqMhsS
   multiplier: -2
   value: -16
+- !ruby/object:MonkeyMusic::Metadata::Track
+  name: You
+  artist: Bad Religion
+  album: Punk-O-Rama 3
+  year: 1998
+  uri: spotify:track:2taLSL36n5j5BxOqBAILMN
+  multiplier: -2
+  value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: I Want to Conquer the World
   artist: Bad Religion
@@ -1960,19 +1960,19 @@
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Robin Hood in Reverse
+  name: Past is Dead
   artist: Bad Religion
   album: True North
   year: 2013
-  uri: spotify:track:6nWNZQeEMgkM0al5pmxazN
+  uri: spotify:track:0yC8t1Rd1RbscJAZI4n8aD
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: You
+  name: Sorrow
   artist: Bad Religion
-  album: Punk-O-Rama 3
-  year: 1998
-  uri: spotify:track:2taLSL36n5j5BxOqBAILMN
+  album: The Process Of Belief
+  year: 2002
+  uri: spotify:track:2ccdGN0u41iaveyQeae9Iy
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -2008,11 +2008,11 @@
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Bankrobber
+  name: Should I Stay Or Should I Go
   artist: The Clash
-  album: The Story Of The Clash Volume 1
-  year: 1988
-  uri: spotify:track:326OKIhvo9ZJBcjGah2e1E
+  album: The Essential Clash
+  year: 2001
+  uri: spotify:track:7EwcNyYIMehlWfjk0yprbj
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -2024,11 +2024,11 @@
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
-  name: Should I Stay Or Should I Go
+  name: Bankrobber
   artist: The Clash
-  album: The Essential Clash
-  year: 2001
-  uri: spotify:track:7EwcNyYIMehlWfjk0yprbj
+  album: The Story Of The Clash Volume 1
+  year: 1988
+  uri: spotify:track:326OKIhvo9ZJBcjGah2e1E
   multiplier: -2
   value: -16
 - !ruby/object:MonkeyMusic::Metadata::Track
@@ -2058,7 +2058,7 @@
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: God Save The Queen
   artist: Sex Pistols
-  album: Never Mind The Bollocks, Here’s The Sex Pistols
+  album: Never Mind The Bollocks Here’s The Sex Pistols
   year: 2012
   uri: spotify:track:2mHchPRtQWet3iIS3jANr1
   multiplier: -2
@@ -2074,7 +2074,7 @@
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Anarchy In The UK
   artist: Sex Pistols
-  album: Never Mind The Bollocks, Here’s The Sex Pistols
+  album: Never Mind The Bollocks Here’s The Sex Pistols
   year: 2012
   uri: spotify:track:5moTxUGPZXgGmosl4rIELm
   multiplier: -2
@@ -2098,7 +2098,7 @@
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Holidays In The Sun
   artist: Sex Pistols
-  album: Never Mind The Bollocks, Here’s The Sex Pistols
+  album: Never Mind The Bollocks Here’s The Sex Pistols
   year: 2012
   uri: spotify:track:4e3TIXJcX3oQJnLup57I0r
   multiplier: -2
@@ -2106,7 +2106,7 @@
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Bodies
   artist: Sex Pistols
-  album: Never Mind The Bollocks, Here’s The Sex Pistols
+  album: Never Mind The Bollocks Here’s The Sex Pistols
   year: 2012
   uri: spotify:track:4kU7cIlf4FDrWrs99AcaWS
   multiplier: -2
@@ -2122,7 +2122,7 @@
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: No Feelings
   artist: Sex Pistols
-  album: Never Mind The Bollocks, Here’s The Sex Pistols
+  album: Never Mind The Bollocks Here’s The Sex Pistols
   year: 2012
   uri: spotify:track:5Pl46yccvPXXcIiXps3qHl
   multiplier: -2
@@ -2130,7 +2130,7 @@
 - !ruby/object:MonkeyMusic::Metadata::Track
   name: Problems
   artist: Sex Pistols
-  album: Never Mind The Bollocks, Here’s The Sex Pistols
+  album: Never Mind The Bollocks Here’s The Sex Pistols
   year: 2012
   uri: spotify:track:5dI4YIBXUmat0Kp6N1SjuV
   multiplier: -2