jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate concerns of reading screenshot into buffer & execing screenshot function

Browse Source 
Summary: This allows us to change the way that the command is itself exec'd (for instance to change the idb exec'ing in D33818298)

Reviewed By: passy

Differential Revision: D33818822

fbshipit-source-id: c90b7e58c7476f5db08da0e74e9791230ff97f6f
This commit is contained in:
Lawrence Lomax
2022-01-28 00:34:05 -08:00
committed by Facebook GitHub Bot
parent 4f886448e0
commit e2abe1c89a
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop/flipper-server-core/src/devices/ios/IOSBridge.tsx
View File

@@ -47,8 +47,8 @@ class IDBBridge implements IOSBridge {
async screenshot(serial: string): Promise<Buffer> { async screenshot(serial: string): Promise<Buffer> {
const imagePath = makeTempScreenshotFilePath(); const imagePath = makeTempScreenshotFilePath();
const command = `idb screenshot --udid ${serial} ${imagePath}`; await exec(`idb screenshot --udid ${serial} ${imagePath}`);
return runScreenshotCommand(command, imagePath); return readScreenshotIntoBuffer(imagePath);
} }
startLogListener( startLogListener(
@@ -95,8 +95,8 @@ class SimctlBridge implements IOSBridge {
async screenshot(serial: string): Promise<Buffer> { async screenshot(serial: string): Promise<Buffer> {
const imagePath = makeTempScreenshotFilePath(); const imagePath = makeTempScreenshotFilePath();
const command = `xcrun simctl io ${serial} screenshot ${imagePath}`; await exec(`xcrun simctl io ${serial} screenshot ${imagePath}`);
return runScreenshotCommand(command, imagePath); return readScreenshotIntoBuffer(imagePath);
} }
async navigate(serial: string, location: string): Promise<void> { async navigate(serial: string, location: string): Promise<void> {
@@ -144,11 +144,7 @@ function makeTempScreenshotFilePath() {
return path.join(getFlipperServerConfig().paths.tempPath, imageName); return path.join(getFlipperServerConfig().paths.tempPath, imageName);
} }
async function runScreenshotCommand( async function readScreenshotIntoBuffer(imagePath: string): Promise<Buffer> {
command: string,
imagePath: string,
): Promise<Buffer> {
await exec(command);
const buffer = await fs.readFile(imagePath); const buffer = await fs.readFile(imagePath);
await fs.unlink(imagePath); await fs.unlink(imagePath);
return buffer; return buffer;