ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-20 17:52:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused local mode parameter from images.getAvailable

Browse Source 
Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-08-16 14:26:33 +01:00
parent 384e0e37bc
commit 55ee5a468f
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compose/images.ts
View File

@ -262,7 +262,7 @@ export class Images extends (EventEmitter as new () => ImageEventEmitter) {
);
}
public async getAvailable(_localMode: boolean): Promise<Image[]> {
public async getAvailable(): Promise<Image[]> {
const images = await this.withImagesFromDockerAndDB(
(dockerImages, supervisedImages) =>
_.filter(supervisedImages, image =>
@ -320,8 +320,8 @@ export class Images extends (EventEmitter as new () => ImageEventEmitter) {
.whereIn('id', ids);
}
public async getStatus(localMode: boolean) {
const images = await this.getAvailable(localMode);
public async getStatus() {
const images = await this.getAvailable();
for (const image of images) {
image.status = 'Downloaded';
image.downloadProgress = null;

38
src/device-api/v2.ts
View File

@ -157,10 +157,9 @@ export function createV2Api(router: Router, applications: ApplicationManager) {
router.get('/v2/applications/state', async (_req: Request, res: Response) => {
// It's kinda hacky to access the services and db via the application manager
// maybe refactor this code
const localMode = await deviceState.config.get('localMode');
Bluebird.join(
applications.services.getStatus(),
applications.images.getStatus(localMode),
applications.images.getStatus(),
applications.db.models('app').select(['appId', 'commit', 'name']),
(
services,
@ -431,7 +430,6 @@ export function createV2Api(router: Router, applications: ApplicationManager) {
});
router.get('/v2/state/status', async (_req, res) => {
const localMode = await applications.config.get('localMode');
const currentRelease = await applications.config.get('currentCommit');
const pending = applications.deviceState.applyInProgress;
@ -450,24 +448,22 @@ export function createV2Api(router: Router, applications: ApplicationManager) {
let downloadProgressTotal = 0;
let downloads = 0;
const imagesStates = (await applications.images.getStatus(localMode)).map(
img => {
if (img.downloadProgress != null) {
downloadProgressTotal += img.downloadProgress;
downloads += 1;
}
return _.pick(
img,
'name',
'appId',
'serviceName',
'imageId',
'dockerImageId',
'status',
'downloadProgress',
);
},
);
const imagesStates = (await applications.images.getStatus()).map(img => {
if (img.downloadProgress != null) {
downloadProgressTotal += img.downloadProgress;
downloads += 1;
}
return _.pick(
img,
'name',
'appId',
'serviceName',
'imageId',
'dockerImageId',
'status',
'downloadProgress',
);
});
let overallDownloadProgress = null;
if (downloads > 0) {