From 058bf758cb398d7e82a167166c44e13614b9d58b Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sat, 6 May 2017 04:42:02 -0500
Subject: [PATCH] Merge in live changes

---
 .ruby-version |  2 +-
 app.rb        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 276cbf9..197c4d5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.0
+2.4.0
diff --git a/app.rb b/app.rb
index 308fd9b..762540d 100644
--- a/app.rb
+++ b/app.rb
@@ -4,9 +4,10 @@ require 'yajl'
 require 'yajl/json_gem'
 require 'csv'
 
-$set = "2015-12-19"
+$set = "2017-05-06"
 $metafile = "tmp/songtitle"
-$cuefile = "cue/#{$set}.cues"
+$setfile = "sets/#{$set}/tracklist.csv"
+$cuefile = "sets/#{$set}/#{$set}.cues"
 
 def write_metafile(title)
   File.open($metafile, "a+") do |fp|
@@ -30,8 +31,7 @@ def write_cuefile(title)
 end
 
 def load_tracklist()
-  file = "sets/#{$set}/tracklist.csv"
-  csv = CSV.read(File.open(file), encoding: 'UTF-8')
+  csv = CSV.read(File.open($setfile), encoding: 'UTF-8')
   names = csv.shift.map(&:to_sym)
   csv = csv.reject {|row| row[0].nil? }
   $tracklist = csv.map do |row|
@@ -39,7 +39,7 @@ def load_tracklist()
   end
   $tracklist.unshift({
     index: "0",
-    title: "-"
+    title: " - "
   })
   $tracklist.sort! {|a,b| a[:index].to_i <=> b[:index].to_i }
 end
-- 
2.45.0