Merge branch 'soundtrack.io' of github.com:martindale/soundtrack.io i…

…nto soundtrack.io
martindale · May 25, 2015 · 7f6bfca · 7f6bfca
2 parents 3f338ea + 63ea8c0
commit 7f6bfca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/util.js b/util.js
@@ -79,6 +79,7 @@ function parseTitleString(string, partsCallback) {
   credits.push(  title.replace(/(.*) \(ft (.*)\)/i,         '$2').trim() );
   credits.push(  title.replace(/(.*) \(feat\.? (.*)\)/i,    '$2').trim() );
   credits.push(  title.replace(/(.*) \(featuring (.*)\)/i,  '$2').trim() );
+  credits.push(  title.replace(/(.*) \(produced by (.*)\)/i,'$2').trim() );
   credits.push( artist.replace(/(.*) ft\.? (.*)/i,          '$1').trim() );
   credits.push( artist.replace(/(.*) ft\.? (.*)/i,          '$2').trim() );
   credits.push( artist.replace(/(.*) feat\.? (.*)/i,        '$1').trim() );
@@ -94,6 +95,7 @@ function parseTitleString(string, partsCallback) {
   credits.push( artist.replace(/(.*) vs\.? (.*)/i,          '$2').trim() );
   credits.push( artist.replace(/(.*) x (.*)/i,              '$1').trim() );
   credits.push( artist.replace(/(.*) x (.*)/i,              '$2').trim() );
+
 
   var creditMap = {};
   credits.forEach(function(credit) {

diff --git a/views/layout.jade b/views/layout.jade
@@ -146,6 +146,8 @@ html(lang="en-US", ng-app="soundtrack-io")
                 a(class="btn btn-default", href="bitcoin:1Ae7wguPTP8Zm3146opVhay4hUS7NiaxYw", alt="B") Donate 
                   i.fa.fa-bitcoin
                   | itcoin &raquo;
+                | &nbsp;
+                img#qrcode(width="30", height="30", src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkAQMAAABKLAcXAAAABlBMVEX///8AAABVwtN+AAABLElEQVQ4T5XSIY6FMAAE0CEVde0Ffn6vgSDhSsWt+q3DsVdqguAaJVyguArSWbH52XyxBcY9N5kM8BFHNgERMGSsykLqmVz8A01dA8eGPgKPfr8pPXtyuiJ0zmScykKqTpPTu+dFOVJ1dl2m9xL/CgBgzTL9jXpJjiMPxzxsizrRgSZosxSTdaxKQe5zegJiSbijxxfpi0yGqq4hSj1/R1lESHXpzavONkEf/R5vCHAJeEovmFCV2zw6ywBD3JE143445hfAWJVjboKOfTL5RFaMnJPJEARuKaP3TwC9jnVBFuHXrJkLqgKgOreGF/rff16UI3WAWaZHm1CVhWyCLbKgxR0NHPXhCjSZzhWwBqA9lxIsrRW53JGFVMIXuW9Z1eVIJRLaIfbpjj7yA/lJP9Nk+R7YAAAAAElFTkSuQmCC", onmouseover="javascript:$('#qrcode').attr('width',100).attr('height',100)", onmouseout="javascript:$('#qrcode').attr('width',30).attr('height',30)")
                 if (user)
                   |  
                   a(class="btn btn-default", href="//#{config.app.host}/#{user.slug}/sets") Manage Sets &raquo;