jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-19 17:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factorize duplicated configUrl code

Browse Source 
Change-type: patch
This commit is contained in:
Alexis Svinartchouk 2020-04-29 17:52:45 +02:00
parent ffe281f25d
commit 44fc429f64
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/gui/app/modules/analytics.ts
View File

@ -55,10 +55,7 @@ async function initConfig() {
await installCorvus(); await installCorvus();
let validatedConfig = null; let validatedConfig = null;
try { try {
const configUrl = const config = await getConfig();
(await settings.get('configUrl')) ||
'https://balena.io/etcher/static/config.json';
const config = await getConfig(configUrl);
const mixpanel = _.get(config, ['analytics', 'mixpanel'], {}); const mixpanel = _.get(config, ['analytics', 'mixpanel'], {});
mixpanelSample = mixpanel.probability || DEFAULT_PROBABILITY; mixpanelSample = mixpanel.probability || DEFAULT_PROBABILITY;
if (isClientEligible(mixpanelSample)) { if (isClientEligible(mixpanelSample)) {

5
lib/gui/etcher.ts
View File

@ -114,10 +114,7 @@ async function createMainWindow() {
}); });
if (packageUpdatable) { if (packageUpdatable) {
try { try {
const configUrl = const onlineConfig = await getConfig();
(await settings.get('configUrl')) ||
'https://balena.io/etcher/static/config.json';
const onlineConfig = await getConfig(configUrl);
const autoUpdaterConfig = _.get( const autoUpdaterConfig = _.get(
onlineConfig, onlineConfig,
['autoUpdates', 'autoUpdaterConfig'], ['autoUpdates', 'autoUpdaterConfig'],

6
lib/shared/utils.ts
View File

@ -21,6 +21,7 @@ import * as tmp from 'tmp';
import { promisify } from 'util'; import { promisify } from 'util';
import * as errors from './errors'; import * as errors from './errors';
import * as settings from '../gui/app/models/settings';
const getAsync = promisify(request.get); const getAsync = promisify(request.get);
@ -50,7 +51,10 @@ export function hasProps(obj: any, props: string[]): boolean {
* @summary Get etcher configs stored online * @summary Get etcher configs stored online
* @param {String} - url where config.json is stored * @param {String} - url where config.json is stored
*/ */
export async function getConfig(configUrl: string): Promise<any> { export async function getConfig(): Promise<_.Dictionary<any>> {
const configUrl =
(await settings.get('configUrl')) ||
'https://balena.io/etcher/static/config.json';
return (await getAsync({ url: configUrl, json: true })).body; return (await getAsync({ url: configUrl, json: true })).body;
} }