jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-08 03:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatically check for updates only once (#863)

Browse Source 
* Automatically check for updates only once

* set windows version to 2019 on CI
This commit is contained in:
Alberto Iannaccone 2022-02-24 14:04:36 +00:00 committed by GitHub
parent 481497e384
commit baa9b5f7ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
strategy: strategy:
matrix: matrix:
config: config:
- os: windows-latest - os: windows-2019
- os: ubuntu-18.04 # https://github.com/arduino/arduino-ide/issues/259 - os: ubuntu-18.04 # https://github.com/arduino/arduino-ide/issues/259
- os: macos-latest - os: macos-latest
runs-on: ${{ matrix.config.os }} runs-on: ${{ matrix.config.os }}

2
arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
View File

@ -282,7 +282,7 @@ export class ArduinoFrontendContribution
this.updaterService.init( this.updaterService.init(
this.arduinoPreferences.get('arduino.ide.updateChannel') this.arduinoPreferences.get('arduino.ide.updateChannel')
); );
this.updater.checkForUpdates().then(async (updateInfo) => { this.updater.checkForUpdates(true).then(async (updateInfo) => {
if (!updateInfo) return; if (!updateInfo) return;
const versionToSkip = await this.localStorageService.getData<string>( const versionToSkip = await this.localStorageService.getData<string>(
SKIP_IDE_VERSION SKIP_IDE_VERSION

4
arduino-ide-extension/src/browser/ide-updater/ide-updater-commands.ts
View File

@ -31,8 +31,8 @@ export class IDEUpdaterCommands implements CommandContribution {
}); });
} }
async checkForUpdates(): Promise<UpdateInfo | void> { async checkForUpdates(initialCheck?: boolean): Promise<UpdateInfo | void> {
return await this.updater.checkForUpdates(); return await this.updater.checkForUpdates(initialCheck);
} }
async downloadUpdate(): Promise<void> { async downloadUpdate(): Promise<void> {

2
arduino-ide-extension/src/common/protocol/ide-updater.ts
View File

@ -47,7 +47,7 @@ export const IDEUpdaterPath = '/services/ide-updater';
export const IDEUpdater = Symbol('IDEUpdater'); export const IDEUpdater = Symbol('IDEUpdater');
export interface IDEUpdater extends JsonRpcServer<IDEUpdaterClient> { export interface IDEUpdater extends JsonRpcServer<IDEUpdaterClient> {
init(channel: UpdateChannel): void; init(channel: UpdateChannel): void;
checkForUpdates(): Promise<UpdateInfo | void>; checkForUpdates(initialCheck?: boolean): Promise<UpdateInfo | void>;
downloadUpdate(): Promise<void>; downloadUpdate(): Promise<void>;
quitAndInstall(): void; quitAndInstall(): void;
stopDownload(): void; stopDownload(): void;

16
arduino-ide-extension/src/electron-main/ide-updater/ide-updater-impl.ts
View File

@ -12,12 +12,13 @@ const IDE_DOWNLOAD_BASE_URL = 'https://downloads.arduino.cc/arduino-ide';
@injectable() @injectable()
export class IDEUpdaterImpl implements IDEUpdater { export class IDEUpdaterImpl implements IDEUpdater {
private isAlreadyChecked = false;
private updater = autoUpdater; private updater = autoUpdater;
private cancellationToken?: CancellationToken; private cancellationToken?: CancellationToken;
protected theiaFEClient?: IDEUpdaterClient; protected theiaFEClient?: IDEUpdaterClient;
protected clients: Array<IDEUpdaterClient> = []; protected clients: Array<IDEUpdaterClient> = [];
init(channel: UpdateChannel) { init(channel: UpdateChannel): void {
this.updater.autoDownload = false; this.updater.autoDownload = false;
this.updater.channel = channel; this.updater.channel = channel;
this.updater.setFeedURL({ this.updater.setFeedURL({
@ -52,9 +53,16 @@ export class IDEUpdaterImpl implements IDEUpdater {
if (client) this.clients.push(client); if (client) this.clients.push(client);
} }
async checkForUpdates(): Promise<UpdateInfo | void> { async checkForUpdates(initialCheck?: boolean): Promise<UpdateInfo | void> {
const { updateInfo, cancellationToken } = if (initialCheck) {
await this.updater.checkForUpdates(); if (this.isAlreadyChecked) return Promise.resolve();
this.isAlreadyChecked = true;
}
const {
updateInfo,
cancellationToken,
} = await this.updater.checkForUpdates();
this.cancellationToken = cancellationToken; this.cancellationToken = cancellationToken;
if (this.updater.currentVersion.compare(updateInfo.version) === -1) { if (this.updater.currentVersion.compare(updateInfo.version) === -1) {