if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-11-25 10:20:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-3079 Use built-in screen snippet tool on windows if available

Browse Source
This commit is contained in:
Mattias Gustavsson 2021-04-13 09:28:17 +02:00
parent 0f131c30ff
commit 26c4eeb473
2 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -177,7 +177,7 @@
},
"optionalDependencies": {
"auto-update": "file:auto_update",
"screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.11",
"screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v2.0.0",
"screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.10",
"swift-search": "2.0.2"
},

76
src/app/screen-snippet-handler.ts
View File

@ -1,4 +1,4 @@
import { app, BrowserWindow, ipcMain, nativeImage } from 'electron';
import { app, BrowserWindow, clipboard, ipcMain, nativeImage } from 'electron';
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
@ -28,9 +28,10 @@ const readFile = util.promisify(fs.readFile);
class ScreenSnippet {
private readonly tempDir: string;
private readonly captureUtil: string;
private readonly isOldWindows: boolean;
private outputFilePath: string | undefined;
private captureUtilArgs: ReadonlyArray<string> | undefined;
private captureUtil: string;
private captureUtilArgs: ReadonlyArray<string>;
private child: ChildProcess | undefined;
private focusedWindow: BrowserWindow | null = null;
private shouldUpdateAlwaysOnTop: boolean = false;
@ -44,18 +45,16 @@ class ScreenSnippet {
fs.mkdirSync(this.tempDir);
}
}
this.captureUtil = isMac
? '/usr/sbin/screencapture'
: isDevEnv
? path.join(
__dirname,
'../../../node_modules/screen-snippet/ScreenSnippet.exe',
)
: path.join(path.dirname(app.getPath('exe')), 'ScreenSnippet.exe');
this.isOldWindows =
isWindowsOS && parseInt(os.release().split('.')[0], 10) < 10;
logger.info(
`screen-snippet-handler: isOldWindows ${
this.isOldWindows
} os.release: ${os.release()}`,
);
if (isLinux) {
this.captureUtil = '/usr/bin/gnome-screenshot';
}
this.captureUtil = '';
this.captureUtilArgs = [];
ipcMain.on(
'snippet-analytics-data',
@ -93,23 +92,44 @@ class ScreenSnippet {
this.tempDir,
'symphonyImage-' + Date.now() + '.png',
);
let usingClipboard = false;
if (isMac) {
this.captureUtil = '/usr/sbin/screencapture';
this.captureUtilArgs = ['-i', '-s', '-t', 'png', this.outputFilePath];
} else if (isWindowsOS) {
if (windowHandler.isMana) {
this.captureUtilArgs = [
'--no-annotate',
this.outputFilePath,
i18n.getLocale(),
];
if (this.isOldWindows) {
this.captureUtil = isDevEnv
? path.join(
__dirname,
'../../../node_modules/screen-snippet/ScreenSnippet.exe',
)
: path.join(path.dirname(app.getPath('exe')), 'ScreenSnippet.exe');
this.captureUtilArgs = [
'--no-annotate',
this.outputFilePath,
i18n.getLocale(),
];
} else {
this.captureUtil = 'SnippingTool';
this.captureUtilArgs = ['/clip'];
usingClipboard = true;
}
} else {
this.captureUtil = isDevEnv
? path.join(
__dirname,
'../../../node_modules/screen-snippet/ScreenSnippet.exe',
)
: path.join(path.dirname(app.getPath('exe')), 'ScreenSnippet.exe');
this.captureUtilArgs = [this.outputFilePath, i18n.getLocale()];
}
} else if (isLinux) {
this.captureUtil = '/usr/bin/gnome-screenshot';
this.captureUtilArgs = ['-a', '-f', this.outputFilePath];
} else {
this.captureUtilArgs = [];
}
this.focusedWindow = BrowserWindow.getFocusedWindow();
logger.info(
@ -124,7 +144,17 @@ class ScreenSnippet {
this.killChildProcess();
}
try {
await this.execCmd(this.captureUtil, this.captureUtilArgs);
if (usingClipboard) {
logger.info(
`screen-snippet-handler: Using clipboard when capturing screen snippet`,
);
clipboard.clear();
await this.execCmd(this.captureUtil, this.captureUtilArgs);
fs.writeFileSync(this.outputFilePath, clipboard.readImage().toPNG());
clipboard.clear();
} else {
await this.execCmd(this.captureUtil, this.captureUtilArgs);
}
if (windowHandler.isMana) {
logger.info(
'screen-snippet-handler: Attempting to extract image dimensions from: ' +
@ -172,7 +202,7 @@ class ScreenSnippet {
* Cancels a screen capture and closes the snippet window
*/
public async cancelCapture() {
if (!isWindowsOS) {
if (!isWindowsOS || windowHandler.isMana || this.captureUtil === '') {
return;
}
logger.info(`screen-snippet-handler: Cancel screen capture!`);