extensions model: first steps

src/vs/platform/extensionManagement/common/extensionManagement.ts

@@ -8,6 +8,7 @@
 import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
 import Event from 'vs/base/common/event';
+import { IPager } from 'vs/base/common/paging';
 import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
 export interface IExtensionManifest {
@@ -70,17 +71,10 @@ export interface IQueryOptions {
 	pageSize?: number;
 }
 
-export interface IQueryResult {
-	firstPage: IGalleryExtension[];
-	total: number;
-	pageSize: number;
-	getPage(pageNumber: number): TPromise<IGalleryExtension[]>;
-}
-
 export interface IExtensionGalleryService {
 	serviceId: ServiceIdentifier<any>;
 	isEnabled(): boolean;
-	query(options?: IQueryOptions): TPromise<IQueryResult>;
+	query(options?: IQueryOptions): TPromise<IPager<IGalleryExtension>>;
 }
 
 export type DidInstallExtensionEvent = { id: string; error?: Error; };

src/vs/platform/extensionManagement/node/extensionGalleryService.ts

@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IGalleryExtension, IExtensionGalleryService, IGalleryVersion, IQueryOptions, IQueryResult } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IGalleryExtension, IExtensionGalleryService, IGalleryVersion, IQueryOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { isUndefined } from 'vs/base/common/types';
 import { assign, getOrDefault } from 'vs/base/common/objects';
 import { IRequestService } from 'vs/platform/request/common/request';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IPager } from 'vs/base/common/paging';
 import pkg from 'vs/platform/package';
 import product from 'vs/platform/product';
 
@@ -208,7 +209,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		return !!this.extensionsGalleryUrl;
 	}
 
-	query(options: IQueryOptions = {}): TPromise<IQueryResult> {
+	query(options: IQueryOptions = {}): TPromise<IPager<IGalleryExtension>> {
 		if (!this.isEnabled()) {
 			return TPromise.wrapError(new Error('No extension gallery service configured.'));
 		}

src/vs/workbench/parts/extensions/electron-browser/extensionsModel.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./media/extensionsViewlet';
+import Event, { Emitter } from 'vs/base/common/event';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IPager } from 'vs/base/common/paging';
+import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
+
+export enum ExtensionState {
+	Installing,
+	Installed,
+	Uninstalling,
+	Uninstalled
+}
+
+export interface IExtension {
+	name: string;
+	publisher: string;
+	displayName: string;
+	version: string;
+	description: string;
+	iconUrl: string;
+}
+
+class Extension implements IExtension {
+
+	local: ILocalExtension;
+	gallery: IGalleryExtension;
+
+	constructor() {
+
+	}
+
+	get name(): string {
+		return this.local ? this.local.manifest.name : this.gallery.name;
+	}
+
+	get publisher(): string {
+		if (this.local) {
+			if (this.local.metadata && this.local.metadata.publisherDisplayName) {
+				return this.local.metadata.publisherDisplayName;
+			}
+
+			return this.local.manifest.publisher;
+		}
+
+		return this.gallery.publisherDisplayName || this.gallery.publisher;
+	}
+
+	get displayName(): string {
+		if (this.local) {
+			return this.local.manifest.displayName || this.local.manifest.name;
+		}
+
+		return this.gallery.displayName || this.gallery.name;
+	}
+
+	get version(): string {
+		return this.local ? this.local.manifest.version : this.gallery.versions[0].version;
+	}
+
+	get description(): string {
+		return this.local ? this.local.manifest.description : this.gallery.description;
+	}
+
+	get iconUrl(): string {
+		if (this.local && this.local.manifest.icon) {
+			return `file://${ this.local.path }/${ this.local.manifest.icon }`;
+		}
+
+		if (this.gallery && this.gallery.versions[0].iconUrl) {
+			return this.gallery.versions[0].iconUrl;
+		}
+
+		return require.toUrl('./media/defaultIcon.png');
+	}
+}
+
+export class ExtensionsModel {
+
+	private disposables: IDisposable[] = [];
+
+	// private installing: Extension[];
+	// private installed: Extension[];
+
+	private _onChange: Emitter<void>;
+	get onChange(): Event<void> { return this._onChange.event; }
+
+	constructor(
+		@IExtensionManagementService private extensionService: IExtensionManagementService,
+		@IExtensionGalleryService private galleryService: IExtensionGalleryService
+	) {
+		// todo
+	}
+
+	getInstalled(): IExtension[] {
+		throw new Error('not implemented');
+	}
+
+	queryGallery(options: IQueryOptions = {}): TPromise<IPager<IExtension>> {
+		throw new Error('not implemented');
+	}
+
+	getState(extension: IExtension): ExtensionState {
+		throw new Error('not implemented');
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+	}
+}