diff --git a/lib/dircrawl.js b/lib/dircrawl.js index 4572f3e..b9d5a9f 100644 --- a/lib/dircrawl.js +++ b/lib/dircrawl.js @@ -28,10 +28,11 @@ export default async function getAllFiles(catList){ singleLineStatus(dirStatus) } } - //add IDs after + //add IDs after and strip full file name let id = 0; for(let file in files){ files[file].id = id++ + delete files[file].name } return files } @@ -49,15 +50,17 @@ async function getFilesAndFolders(url, catList, base = ""){ for(let x = 1; x < fileList.length; x++){ let path = fileList[x].querySelector('.link').firstChild.getAttribute('href') let name = innertext(fileList[x].querySelector('.link').innerHTML).trim() + let fullName = base + name let size = innertext(fileList[x].querySelector('.size').innerHTML).trim() fileArray.push({ filename: name, + name: fullName path: url + path, size: size, - category: findCategory(base + name, catList), - type: findType(base + name, catList), + category: findCategory(fullName, catList), + type: findType(fullName, catList), date: innertext(fileList[x].querySelector('.date').innerHTML).trim(), - region: findRegion(base + name, catList) + region: findRegion(fullName, catList) }) } return fileArray