From a17545789642e5a538e92108b94710b2d50375dd Mon Sep 17 00:00:00 2001 From: Devlin Leonard Date: Mon, 22 Apr 2024 20:37:13 -0400 Subject: [PATCH] genre reciept sharing genre across reciepts in session --- receiptifyv1/app.js | 13 +++++-------- receiptifyv1/public/server.js | 16 +++++++++++++--- receiptifyv1/users.csv | 3 --- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/receiptifyv1/app.js b/receiptifyv1/app.js index 17e2490..51dd6bf 100644 --- a/receiptifyv1/app.js +++ b/receiptifyv1/app.js @@ -27,8 +27,8 @@ const cors = require('cors'); require('dotenv').config(); -const client_id = '792207d6524f4255a1730e478d8b66f6'; -const client_secret = 'fd5c90696d984ca7a65a54853f340c70'; +const client_id = 'ed86dba0999b415e8c50d26b13fb29f8'; +const client_secret = 'f1421f43be4644dca0076e500d9ed0a6'; //const privateKey = fs.readFileSync('AuthKey_A8FKGGUQP3.p8').toString(); const teamId = process.env.teamId; const keyId = process.env.keyId; @@ -258,13 +258,7 @@ async function processFile(filePath, sessionID, col) { }); const users = []; var newDB = ""; - var first = true; for await (const line of rl) { - if(first){ - newDB += line + "\n"; - first = false; - continue; - } const row = line.split(','); if (row[2] == sessionID) { users.push(row[col]); @@ -297,6 +291,9 @@ app.get('/callback', function (req, res) { if (req.cookies[sessionIDString] != null){ sessionID = req.cookies[sessionIDString]; } + + //res.sendFile(__dirname + '/public/join.html'); + var code = req.query.code || null; var state = req.query.state || null; diff --git a/receiptifyv1/public/server.js b/receiptifyv1/public/server.js index 40ff1a3..6f06dfc 100644 --- a/receiptifyv1/public/server.js +++ b/receiptifyv1/public/server.js @@ -622,9 +622,18 @@ function getTopGenres(artists) { genreArr.sort(function (first, second) { return second.duration_ms - first.duration_ms; }); + let totalTime = 0; + for(let i = 0; i < 10; i++){ + console.log("helloe"); + totalTime += genreArr[i].duration_ms; + } + for(let i = 0; i < 10; i++){ + genreArr[i].duration_ms = genreArr[i].duration_ms * (100 / totalTime); + } return genreArr.slice(0, 10); } + const removeTrack = (i) => { console.log(i); if (i >= 0 && i < customReceipt.length) { @@ -1042,7 +1051,7 @@ function retrieveItems(stats, state) { const timeRangeSlug = getPeriod(); const limit = num; - if ( type === 'artists') { + if ( type === 'artists' || type === 'genres') { const promises = []; let combined = []; const timeRangeSlug = "short_term"; @@ -1091,7 +1100,7 @@ function retrieveItems(stats, state) { console.error('Errors:', errors); // Handle any errors }); } - + /* if (type === 'genres') { $.ajax({ url: `${SPOTIFY_ROOT}/me/top/artists?limit=49&time_range=${timeRangeSlug}`, @@ -1117,7 +1126,8 @@ function retrieveItems(stats, state) { }, }); //console.log(item); - } //else { // shows tracks + }*/ + //} //else { // shows tracks else if(type === 'tracks'){ //console.log('ajax call else'); $.ajax({ diff --git a/receiptifyv1/users.csv b/receiptifyv1/users.csv index 4802544..e69de29 100644 --- a/receiptifyv1/users.csv +++ b/receiptifyv1/users.csv @@ -1,3 +0,0 @@ - -Ari,BQA8fwaaWA87EUZvia5emYjOq0IyC0_9rePt7Dsnvs6shbeWFRssWwAfsHYvJAbtnYxDO9vi1YRYs7WUXsd6yzX1UgQE9wMgAJ_VksmJThckhV5qVbQG-Z4zG64YVEHNodfeQoTPWvgCEgC4Rjnb5aWphBYHKcBpseuMAERYqeWxxvWerddgmS22u4D0lpiyqTpKaKzbeiRaY-IuhhzrZfFv8hCSJM1dfPVpUXmTIJ2GkC2_GphugfE6,763656,1713334863450, -Ari,BQBP9W-1YdtEPiN84p4PnEXDc658wfuhYs2LsCMNm9mR3c2HGjVGTMmQHG5fSxYJVRhPE995RPlGXrx8tZlbux2YDC1LvBCmoh3ntfgiqKkkOmGoIPAUoV8V0ygebaQDRKD3V_uDuCuhbpSb8NIqwV4KbP8ezBQ3zGmU_vtAtULeNjPTbc-QGXK38tOj9M8bBUPQOBqGJkG_HbQqOcd0POBQmNk3OeDdhDOzYcqnZtF5b6y-LMjFJXOm,763656,1713334879131,