linted

lyricsnode/routes/round.js

@@ -4,71 +4,69 @@
 
 var sqlite3 = require('sqlite3');
 var path = require('path');
-var db;		// make it global
+var db;     // make it global
 
 /**
  * db name
  */
-function dbName()
+function dbName() {
-{
+  return path.join(__dirname, '../../db/lyrics.sq3');
-	return path.join(__dirname, '../../db/lyrics.sq3');
 }
 
 /**
  * turn a phrase into a list of acronyms
  */
-function acronymize(phrase)
+function acronymize(phrase) {
-{
+  var letters = [];
-	var letters = [];
+  phrase.split(' ').forEach(function (elem, idx, array) {
-	phrase.split(' ').forEach(function(elem, idx, array) {
+    letters.push(elem[0].toUpperCase());
-		letters.push(elem[0].toUpperCase());
+  });
-	})
 
-	return letters.join('');
+  return letters.join('');
 }
 
 /**
  * Pick a song
  */
 function getSong(res) {
-	var name = dbName();
+  var name = dbName();
-	console.log('Opening the database ' + name + '...');
+  console.log('Opening the database ' + name + '...');
-	db = new sqlite3.Database(name, sqlite3.OPEN_READWRITE, function(error) {
+  db = new sqlite3.Database(name, sqlite3.OPEN_READWRITE, function (error) {
-		if (error) {
+    if (error) {
-			throw error;
+      throw error;
-		}
+    }
 
-		console.log('Pickling a song...');
+    console.log('Pickling a song...');
-		db.get('SELECT * FROM songs WHERE done_in IS NULL ORDER BY random() LIMIT 1', function(err, song) {
+    db.get('SELECT * FROM songs WHERE done_in IS NULL ORDER BY random() LIMIT 1', function (err, song) {
-			if (err) {
+      if (err) {
-				throw err;
+        throw err;
-			}
+      }
 
-			db.get('SELECT * FROM artists WHERE id = ' + song.artist, function(err, artist) {
+      db.get('SELECT * FROM artists WHERE id = ' + song.artist, function (err, artist) {
-				if (err) {
+        if (err) {
-					throw err;
+          throw err;
-				}
+        }
 
-				db.get('SELECT * FROM lyrics WHERE song = ' + song.id, function(err, lyrics) {
+        db.get('SELECT * FROM lyrics WHERE song = ' + song.id, function (err, lyrics) {
-					if (err) {
+          if (err) {
-						throw err;
+            throw err;
-					}
+          }
 
-					params = {title: 'Round',
+          var params = {title: 'Round',
-						      lyrics: lyrics.lyrics,
+                    lyrics: lyrics.lyrics,
-							  song_title: song.title,
+                    song_title: song.title,
-					          song_artist: artist.name,
+                    song_artist: artist.name,
-					          acronym_title: acronymize(song.title),
+                    acronym_title: acronymize(song.title),
-					          acronym_artist: acronymize(artist.name)
+                    acronym_artist: acronymize(artist.name),
-					};
+                    id: song.id
-					res.render('index', params);
+              };
-				});
+          res.render('index', params);
-			});
+        });
-		});
+      });
-	});
+    });
+  });
 }
 
-exports.index = function(req, res) {
+exports.index = function (req, res) {
-	// res.render('index', { title: 'Round'} );
+  getSong(res);
-	getSong(res);
+};
-}