Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions packages/uhk-agent/src/util/save-extract-firmware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { dirSync } from 'tmp';
import decompress from 'decompress';
import decompressTarbz from 'decompress-tarbz2';
import decompressTargz from 'decompress-targz';
import decompressUnzip from 'decompress-unzip';
import { UploadFileData } from 'uhk-common';
import { TmpFirmware } from 'uhk-usb';

Expand All @@ -26,6 +27,28 @@ export async function saveTmpFirmware(fileData: UploadFileData): Promise<TmpFirm
break;
}

case '.zip': {
const unzipOptions: decompress.DecompressOptions = {
filter: file => {
const fileName = path.basename(file.path);

return fileName.startsWith('uhk-firmware-') && fileName.endsWith('.tar.gz');
},
plugins: [decompressUnzip()]
}

const unzippedFiles = await decompress(zipFilePath, tmpDirectory.name, unzipOptions);
if (unzippedFiles.length === 0) {
throw new Error('Zip file does not contain uhk-firmware-*.tar.gz file.');
}

return saveTmpFirmware({
data: unzippedFiles[0].data as any,
filename: path.basename(unzippedFiles[0].path),
saveInHistory: fileData.saveInHistory,
})
}

default:
throw new Error(`Unsupported firmware file extension: ${extension}`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
(confirm)="onForceClick()"
(isOpenChange)="onOpenChange($event)"
>
Flash firmware from file (uhk-firmware-*.tar.gz)
Flash firmware from file (uhk-firmware-*.tar.gz, firmware*.zip)
</button>
<input #inputControl
class="d-none"
type="file"
accept=".bz2,.gz"
accept=".bz2,.gz,.zip"
[disabled]="disabled"
(change)="changeFile($event)">