hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Ignore failures due to files in bundled folder (#2661)

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2021-04-28 15:29:02 -04:00 committed by GitHub
parent dfb1dd763c
commit ac963ede6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/extensions/extension-discovery.ts
View File

@ -43,6 +43,10 @@ interface ExtensionDiscoveryChannelMessage {
*/ */
const isDirectoryLike = (lstat: fse.Stats) => lstat.isDirectory() || lstat.isSymbolicLink(); const isDirectoryLike = (lstat: fse.Stats) => lstat.isDirectory() || lstat.isSymbolicLink();
interface LoadFromFolderOptions {
isBundled?: boolean;
}
/** /**
* Discovers installed bundled and local extensions from the filesystem. * Discovers installed bundled and local extensions from the filesystem.
* Also watches for added and removed local extensions by watching the directory. * Also watches for added and removed local extensions by watching the directory.
@ -327,7 +331,12 @@ export class ExtensionDiscovery extends Singleton {
isEnabled isEnabled
}; };
} catch (error) { } catch (error) {
logger.error(`${logModule}: can't load extension manifest at ${manifestPath}: ${error}`); if (error.code === "ENOTDIR") {
// ignore this error, probably from .DS_Store file
logger.debug(`${logModule}: failed to load extension manifest through a not-dir-like at ${manifestPath}`);
} else {
logger.error(`${logModule}: can't load extension manifest at ${manifestPath}: ${error}`);
}
return null; return null;
} }
@ -424,12 +433,10 @@ export class ExtensionDiscovery extends Singleton {
/** /**
* Loads extension from absolute path, updates this.packagesJson to include it and returns the extension. * Loads extension from absolute path, updates this.packagesJson to include it and returns the extension.
* @param absPath Folder path to extension * @param folderPath Folder path to extension
*/ */
async loadExtensionFromFolder(absPath: string, { isBundled = false }: { async loadExtensionFromFolder(folderPath: string, { isBundled = false }: LoadFromFolderOptions = {}): Promise<InstalledExtension | null> {
isBundled?: boolean; const manifestPath = path.resolve(folderPath, manifestFilename);
} = {}): Promise<InstalledExtension | null> {
const manifestPath = path.resolve(absPath, manifestFilename);
return this.getByManifest(manifestPath, { isBundled }); return this.getByManifest(manifestPath, { isBundled });
} }