|
3 | 3 | LibraryDependency,
|
4 | 4 | LibraryLocation,
|
5 | 5 | LibraryPackage,
|
| 6 | + LibrarySearch, |
6 | 7 | LibraryService,
|
7 | 8 | } from '../common/protocol/library-service';
|
8 | 9 | import { CoreClientAware } from './core-client-provider';
|
@@ -46,7 +47,7 @@ export class LibraryServiceImpl
|
46 | 47 | protected readonly notificationServer: NotificationServiceServer;
|
47 | 48 |
|
48 | 49 | @duration()
|
49 |
| - async search(options: { query?: string }): Promise<LibraryPackage[]> { |
| 50 | + async search(options: LibrarySearch): Promise<LibraryPackage[]> { |
50 | 51 | const coreClient = await this.coreClient;
|
51 | 52 | const { client, instance } = coreClient;
|
52 | 53 |
|
@@ -104,7 +105,60 @@ export class LibraryServiceImpl
|
104 | 105 | );
|
105 | 106 | });
|
106 | 107 |
|
107 |
| - return items; |
| 108 | + const typePredicate = this.typePredicate(options); |
| 109 | + const topicPredicate = this.topicPredicate(options); |
| 110 | + return items.filter((item) => typePredicate(item) && topicPredicate(item)); |
| 111 | + } |
| 112 | + |
| 113 | + private typePredicate( |
| 114 | + options: LibrarySearch |
| 115 | + ): (item: LibraryPackage) => boolean { |
| 116 | + if (!options.type) { |
| 117 | + return () => true; |
| 118 | + } |
| 119 | + switch (options.type) { |
| 120 | + case 'All': |
| 121 | + return () => true; |
| 122 | + case 'Arduino': |
| 123 | + return ({ maintainer }: LibraryPackage) => |
| 124 | + maintainer === 'Arduino <[email protected]>'; |
| 125 | + case 'Installed': |
| 126 | + return ({ installedVersion }: LibraryPackage) => !!installedVersion; |
| 127 | + case 'Retired': |
| 128 | + return ({ deprecated }: LibraryPackage) => deprecated; |
| 129 | + case 'Updatable': |
| 130 | + return (item: LibraryPackage) => { |
| 131 | + const { installedVersion } = item; |
| 132 | + if (!installedVersion) { |
| 133 | + return false; |
| 134 | + } |
| 135 | + const latestVersion = item.availableVersions[0]; |
| 136 | + if (!latestVersion) { |
| 137 | + console.warn( |
| 138 | + `Installed version ${installedVersion} is available for ${item.name}, but available versions are mission. Skipping.` |
| 139 | + ); |
| 140 | + return false; |
| 141 | + } |
| 142 | + const result = Installable.Version.COMPARATOR( |
| 143 | + latestVersion, |
| 144 | + installedVersion |
| 145 | + ); |
| 146 | + return result > 0; |
| 147 | + }; |
| 148 | + default: { |
| 149 | + console.error('unhandled type: ' + options.type); |
| 150 | + return () => true; |
| 151 | + } |
| 152 | + } |
| 153 | + } |
| 154 | + |
| 155 | + private topicPredicate( |
| 156 | + options: LibrarySearch |
| 157 | + ): (item: LibraryPackage) => boolean { |
| 158 | + if (!options.topic || options.topic === 'All') { |
| 159 | + return () => true; |
| 160 | + } |
| 161 | + return (item: LibraryPackage) => item.category === options.topic; |
108 | 162 | }
|
109 | 163 |
|
110 | 164 | async list({
|
@@ -409,5 +463,7 @@ function toLibrary(
|
409 | 463 | description: lib.getSentence(),
|
410 | 464 | moreInfoLink: lib.getWebsite(),
|
411 | 465 | summary: lib.getParagraph(),
|
| 466 | + category: lib.getCategory(), |
| 467 | + maintainer: lib.getMaintainer(), |
412 | 468 | };
|
413 | 469 | }
|
0 commit comments