renovating api for encore

FNLookup · Jul 30, 2024 · 720d2e3 · 720d2e3
1 parent 30d864c
commit 720d2e3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/encore/js/songs.js b/encore/js/songs.js
@@ -114,7 +114,8 @@ async function extractFilesFromZip(data, rurl) {
 }
 
 function loadSongs() {
-    songs = fetch('https://raw.githubusercontent.com/FNLookup/encore/main/encore.json').then(r => r.json()).then(r => {
+    let data = getApiRequestData('https://fnlookup-apiv2.vercel.app/api?encore-songs=true');
+    songs = fetch(data.url, data.data).then(r => r.json()).then(r => {
         for (let song of r.songs) {
             //console.log(song)
 
@@ -123,10 +124,6 @@ function loadSongs() {
     }).catch(err => {
         console.error(err)
     })
-
-    fetch('https://fnlookup-apiv2.vercel.app/api?notify-encore-main=true').catch(err => {
-        console.error(err)
-    })
 }
 
 function searchForSong() {

diff --git a/encore/search/js/find.js b/encore/search/js/find.js
@@ -119,7 +119,8 @@ function loadSongs() {
     let keyword = new URLSearchParams(window.location.search).get('keyword')
     document.getElementById('resultsfor').innerText = 'Results for ' + keyword
 
-    songs = fetch('https://raw.githubusercontent.com/FNLookup/encore/main/encore.json').then(r => r.json()).then(r => {
+    let data = getApiRequestData('https://fnlookup-apiv2.vercel.app/api?encore-songs=true');
+    songs = fetch(data.url, data.data).then(r => r.json()).then(r => {
         let totalresults = 0
         for (let song of r.songs) {
             //console.log(song)

diff --git a/encore/view/js/song.js b/encore/view/js/song.js
@@ -8,17 +8,17 @@ function loadSong() {
 
     async function extractFilesFromZip(data) {
         let loading = document.createElement('p')
-        loading.innerText = 'Downloading ' + data.zip + ', please wait...'
+        loading.innerText = 'Downloading ' + data.song.zip + ', please wait...'
         document.getElementById('song').append(loading)
 
-        let zipUrl = data.zip;
-        let response = await fetch('https://raw.githubusercontent.com/Encore-Developers/songs/main/' + zipUrl);
+        let zipUrl = data.song.zip;
+        let response = await fetch(data.raw + zipUrl);
         let size = response.headers.get('Content-Length');
         let zipData = await response.arrayBuffer();
 
         let jszip = new JSZip();
         let zip = await jszip.loadAsync(zipData);
-        let root = data.isRootFirstDir ? '' : data.root + '/'
+        let root = data.song.isRootFirstDir ? '' : data.song.root + '/'
 
         //console.log(zip)
 
@@ -206,28 +206,19 @@ function loadSong() {
 
         downloadButton.title = 'Size: ' + mbs + ' MB'
 
-        downloadButton.href = 'https://raw.githubusercontent.com/Encore-Developers/songs/main/' + zipUrl
+        downloadButton.href = data.raw + zipUrl
 
         trackDetails.append(document.createElement('hr'), trackAnalysisTable)
 
         trackDetails.append(downloadButton)
 
         loading.remove()
-
-        fetch('https://fnlookup-apiv2.vercel.app/api?notify-encore=' + data.id).catch(err => {
-            console.error(err)
-        })
     }
 
-    fetch('https://raw.githubusercontent.com/FNLookup/encore/main/encore.json').then(r => r.json()).then(r => {
-        for (let song of r.songs) {
-            //console.log(song)
-
-            if (firstKey == song.id) {
-                //console.log('found song')
-                extractFilesFromZip(song)
-            }
-        }
+    let data = getApiRequestData('https://fnlookup-apiv2.vercel.app/api?encore-songs=true&songid=' + firstKey);
+    fetch(data.url, data.data).then(r => r.json()).then(r => {
+        console.log(r);
+        extractFilesFromZip(r);
     }).catch(err => {
         console.error(err)
     })

diff --git a/js/backend.js b/js/backend.js
@@ -139,10 +139,19 @@ function getApiURL(endpoint) {
 function getRequestData(urlEndpoint) {
     return {
         url: geturllang(getApiURL(urlEndpoint), 1),
-        data: {}
+        data: {
+        }
     };
 }
 
+function getApiRequestData(url) {
+    return {
+        url: url,
+        data: {
+        }
+    }
+}
+
 function itemFetch(small = true) {
     return {
         url: `https://raw.githubusercontent.com/FNLookup/data/main/fnapiio/items_${small ? 'smaller' : 'all'}_${getLang()}.json`,