diff --git a/modules/glmv.js b/modules/glmv.js index 6d8dea3..0cead75 100644 --- a/modules/glmv.js +++ b/modules/glmv.js @@ -5,44 +5,54 @@ modelLoad.setAttribute('type','module') modelLoad.setAttribute('src','https://ajax.googleapis.com/ajax/libs/model-viewer/3.5.0/model-viewer.min.js') let headElem = document.getElementsByTagName('head')[0] headElem.appendChild(modelLoad) -let urlProm +let urlProm, dataProm let glbElems = document.querySelectorAll('.mw-body-content [href$=".glb"][title$=".glb"') if (glbElems.length > 0) { [...glbElems].forEach(ge => { console.log(ge) - let modelRef = ge.href + const modelRef = ge.href + const modelTitle = ge.title if (modelRef.indexOf('File:') >= 0) { - console.log(`Getting true url of ${ge.title}`) - urlProm = getImageUrl(ge.title) + console.log(`Getting true url of ${modelTitle}`) + urlProm = getModelUrl(modelTitle) + dataProm = getModelMeta(modelTitle) } else { urlProm = new Promise(resolve => { resolve(modelRef) }) + dataProm = getModelMeta('File:' + modelTitle) } - Promise.all([urlProm]).then((imageUrl) => { - console.log(imageUrl[0]) - let newModel = document.createElement('model-viewer') - newModel.src = imageUrl[0] + Promise.all([urlProm, dataProm]).then((modelInfo) => { + console.log(modelInfo[0]) + const newModel = document.createElement('model-viewer') + newModel.src = modelInfo[0] newModel.toggleAttribute('camera-controls') newModel.toggleAttribute('ar') - ge.parentElement.replaceChild(newModel, ge) + ge.parentElement.replaceChild(newModel, ge) console.log(`Replacing ${ge}...`) + console.log(modelInfo[1]) }) }) } -async function getImageUrl(imageTitle) { - if (!imageTitle || typeof imageTitle != 'string') return false - console.log('Making api call...') - const mwApi = new mw.Api - let apiResp = await mwApi.get({ +async function getModelUrl(modelTitle) { + const urlApi = new mw.Api; + let urlApiResp = await urlApi.get({ "action": "query", "format": "json", "prop": "imageinfo", - "titles": imageTitle, + "titles": modelTitle, "iiprop": "url" - }) - console.log(apiResp) - return apiResp.query.pages[Object.keys(apiResp.query.pages)[0]].imageinfo[0].url + }); + return urlApiResp.query.pages[Object.keys(urlApiResp.query.pages)[0]].imageinfo[0].url +} + +async function getModelMeta(modelTitle) { + const metaApi = new mw.Api; + let metaApiResp = await metaApi.get({ + "action": "parse", + "page": modelTitle + }); + return JSON.parse($(metaApiResp.parse.text['*']).find('pre').text()) } \ No newline at end of file