hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Make difference between soft and hard quit of application apparent

Browse Source 
Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-04-13 14:03:26 +03:00 committed by Janne Savolainen
parent 4fe77af77f
commit c90ab671ff
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
4 changed files with 33 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/start-main-application/before-application-hard-quit/before-application-hard-quit-injection-token.ts
View File

@ -5,8 +5,7 @@
import { getInjectionToken } from "@ogre-tools/injectable"; import { getInjectionToken } from "@ogre-tools/injectable";
import type { Runnable } from "../run-many-for"; import type { Runnable } from "../run-many-for";
export const beforeApplicationHardQuitInjectionToken = getInjectionToken< export const beforeApplicationHardQuitInjectionToken =
Runnable<{ cancel: () => void }> getInjectionToken<Runnable>({
>({ id: "before-application-hard-quit",
id: "before-application-hard-quit", });
});

29
src/main/start-main-application/before-application-is-ready/implementations/setup-closing-of-application.injectable.ts
View File

@ -7,21 +7,42 @@ import { beforeApplicationIsReadyInjectionToken } from "../before-application-is
import { beforeApplicationSoftQuitInjectionToken } from "../../before-application-soft-quit/before-application-soft-quit-injection-token"; import { beforeApplicationSoftQuitInjectionToken } from "../../before-application-soft-quit/before-application-soft-quit-injection-token";
import { runManyFor } from "../../run-many-for"; import { runManyFor } from "../../run-many-for";
import whenApplicationWillQuitInjectable from "../../../electron-app/when-application-will-quit.injectable"; import whenApplicationWillQuitInjectable from "../../../electron-app/when-application-will-quit.injectable";
import { beforeApplicationHardQuitInjectionToken } from "../../before-application-hard-quit/before-application-hard-quit-injection-token";
import isIntegrationTestingInjectable from "../../../../common/vars/is-integration-testing.injectable";
const setupClosingOfApplicationInjectable = getInjectable({ const setupClosingOfApplicationInjectable = getInjectable({
id: "setup-closing-of-application", id: "setup-closing-of-application",
instantiate: (di) => { instantiate: (di) => {
const whenApplicationWillQuit = di.inject(whenApplicationWillQuitInjectable); const whenApplicationWillQuit = di.inject(
whenApplicationWillQuitInjectable,
);
const runManyForApplicationClose = runManyFor(di)( const runMany = runManyFor(di);
const runRunnablesBeforeApplicationSoftQuit = runMany(
beforeApplicationSoftQuitInjectionToken, beforeApplicationSoftQuitInjectionToken,
); );
const runRunnablesBeforeApplicationHardQuit = runMany(
beforeApplicationHardQuitInjectionToken,
);
const isIntegrationTesting = di.inject(isIntegrationTestingInjectable);
return { return {
run: () => { run: () => {
whenApplicationWillQuit(async args => { whenApplicationWillQuit(async ({ cancel: cancelNativeQuit }) => {
await runManyForApplicationClose(args); await runRunnablesBeforeApplicationSoftQuit();
// &&!autoUpdateIsRunning) {
const shouldDoOnlySoftQuit = !isIntegrationTesting;
if (shouldDoOnlySoftQuit) {
cancelNativeQuit();
} else {
await runRunnablesBeforeApplicationHardQuit();
}
}); });
}, },
}; };

9
src/main/start-main-application/before-application-soft-quit/before-application-soft-quit-injection-token.ts
View File

@ -5,8 +5,7 @@
import { getInjectionToken } from "@ogre-tools/injectable"; import { getInjectionToken } from "@ogre-tools/injectable";
import type { Runnable } from "../run-many-for"; import type { Runnable } from "../run-many-for";
export const beforeApplicationSoftQuitInjectionToken = getInjectionToken< export const beforeApplicationSoftQuitInjectionToken =
Runnable<{ cancel: () => void }> getInjectionToken<Runnable>({
>({ id: "before-application-soft-quit",
id: "before-application-soft-quit", });
});

38
src/main/start-main-application/before-application-soft-quit/implementations/tentative-hard-quit-application.injectable.ts
View File

@ -1,38 +0,0 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { beforeApplicationHardQuitInjectionToken } from "../../before-application-hard-quit/before-application-hard-quit-injection-token";
import { runManyFor } from "../../run-many-for";
import { beforeApplicationSoftQuitInjectionToken } from "../before-application-soft-quit-injection-token";
import isIntegrationTestingInjectable from "../../../../common/vars/is-integration-testing.injectable";
const tentativeHardQuitApplicationInjectable = getInjectable({
id: "tentative-hard-quit-application",
instantiate: (di) => {
const runMany = runManyFor(di);
const runRunnablesBeforeApplicationHardQuit = runMany(beforeApplicationHardQuitInjectionToken);
const isIntegrationTesting = di.inject(isIntegrationTestingInjectable);
return {
run: async (runParameter) => {
if (!isIntegrationTesting) {
// &&!autoUpdateIsRunning) {
runParameter.cancel();
return;
}
await runRunnablesBeforeApplicationHardQuit(runParameter);
},
};
},
causesSideEffects: true,
injectionToken: beforeApplicationSoftQuitInjectionToken,
});
export default tentativeHardQuitApplicationInjectable;