Blaster4385/adevtool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

frontend: source: Clean up paths and progress text

Browse source
This commit is contained in:
Danny Lin 2021-12-16 19:15:44 -08:00
parent 8046f18f15
commit b0526ab92f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/frontend/source.ts
View file

@ -33,7 +33,7 @@ async function mountImg(
// Convert sparse image to raw
if (await isSparseImage(img)) {
spinner.text = `converting sparse image: ${img}`
let sparseTmp = await createSubTmp(mountTmp.rootTmp!, `sparse_img/${path.dirname(img)}`)
let sparseTmp = await createSubTmp(mountTmp.rootTmp!, `sparse_img/${path.basename(path.dirname(img))}`)
let rawImg = `${sparseTmp.dir}/${path.basename(img)}`
await run(`simg2img ${img} ${rawImg}`)
img = rawImg
@ -67,11 +67,11 @@ async function wrapFileSrc(
tmp: TempState,
spinner: ora.Ora,
): Promise<string | null> {
let imagesTmp = await createSubTmp(tmp, `src_images/${file}`)
let imagesTmp = await createSubTmp(tmp, `src_images/${path.basename(file)}`)
// Extract images from OTA payload
if (path.basename(file) == 'payload.bin') {
spinner.text = `extracting images: ${file}`
spinner.text = `extracting OTA images: ${file}`
await run(`cd ${imagesTmp.dir}; payload-dumper-go ${file}`)
let extractedDir = (await fs.readdir(imagesTmp.dir))[0]
@ -86,7 +86,7 @@ async function wrapFileSrc(
// Factory images
// Extract nested images zip
spinner.text = `extracting nested images: ${file}`
spinner.text = `extracting factory images: ${file}`
let imagesFile = `${imagesTmp.dir}/${imagesEntry}`
await run(`unzip -d ${imagesTmp.dir} ${file} ${imagesEntry}`)
return await wrapFileSrc(imagesFile, tmp, spinner)
@ -128,14 +128,14 @@ async function searchLeafDir(
// Mount raw images: <images>.img.raw
// Mount the images
let mountTmp = await createSubTmp(tmp, `sysroot/${src}`)
let mountTmp = await createSubTmp(tmp, `sysroot/${path.basename(src)}`)
await mountParts(src, mountTmp, spinner, '.img.raw')
return mountTmp.dir
} else if (await containsParts(src, '.img')) {
// Mount potentially-sparse images: <images>.img
// Mount the images
let mountTmp = await createSubTmp(tmp, `sysroot/${src}`)
let mountTmp = await createSubTmp(tmp, `sysroot/${path.basename(src)}`)
await mountParts(src, mountTmp, spinner)
return mountTmp.dir
} else if (device != null && buildId != null) {