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

frontend: source: Prepare for class-based refactor

Browse source
This commit is contained in:
Danny Lin 2021-12-18 02:05:08 -08:00
parent 1b9ed766f6
commit c956526f8f
1 changed files with 56 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/frontend/source.ts
View file

@ -176,39 +176,42 @@ async function searchLeafDir(
}
}
export async function wrapSystemSrc(
src: string,
device: string,
buildId: string | null,
tmp: TempState,
spinner: ora.Ora,
): Promise<WrappedSource> {
class SourceResolver {
constructor(
readonly device: string,
readonly buildId: string | null,
readonly useTemp: boolean,
readonly tmp: TempState,
readonly spinner: ora.Ora,
) {}
async wrapSystemSrc(src: string) {
let stat = await fs.stat(src)
if (stat.isDirectory()) {
// Directory
let tryDirs = [
...(buildId != null && [
`${src}/${buildId}`,
`${src}/${device}/${buildId}`,
`${src}/${buildId}/${device}`,
...(this.buildId != null && [
`${src}/${this.buildId}`,
`${src}/${this.device}/${this.buildId}`,
`${src}/${this.buildId}/${this.device}`,
] || []),
`${src}/${device}`,
`${src}/${this.device}`,
src,
]
// Also try to find extracted factory images first: device-buildId
if (buildId != null) {
if (this.buildId != null) {
tryDirs = [
...tryDirs.map(p => `${p}/${device}-${buildId}`),
...tryDirs.map(p => `${p}/${this.device}-${this.buildId}`),
...tryDirs,
]
}
for (let dir of tryDirs) {
let { src: wrapped, factoryZip } = await searchLeafDir(dir, null, device, buildId, tmp, spinner)
let { src: wrapped, factoryZip } = await searchLeafDir(dir, null, this.device, this.buildId, this.tmp, this.spinner)
if (wrapped != null) {
spinner.text = wrapped.startsWith(tmp.dir) ? path.relative(tmp.dir, wrapped) : wrapped
this.spinner.text = wrapped.startsWith(this.tmp.dir) ? path.relative(this.tmp.dir, wrapped) : wrapped
return { src: wrapped, factoryZip }
}
}
@ -218,12 +221,25 @@ export async function wrapSystemSrc(
// File
// Attempt to extract factory images or OTA
let { src: wrapped, factoryZip } = await wrapLeafFile(src, null, tmp, spinner)
let { src: wrapped, factoryZip } = await wrapLeafFile(src, null, this.tmp, this.spinner)
if (wrapped != null) {
spinner.text = wrapped.startsWith(tmp.dir) ? path.relative(tmp.dir, wrapped) : wrapped
this.spinner.text = wrapped.startsWith(this.tmp.dir) ? path.relative(this.tmp.dir, wrapped) : wrapped
return { src: wrapped, factoryZip }
}
}
throw new Error(`Source '${src}' has unknown type`)
}
}
export async function wrapSystemSrc(
src: string,
device: string,
buildId: string | null,
useTemp: boolean,
tmp: TempState,
spinner: ora.Ora,
): Promise<WrappedSource> {
let resolver = new SourceResolver(device, buildId, useTemp, tmp, spinner)
return await resolver.wrapSystemSrc(src)
}