@arkts/image-manager 0.5.4 → 0.5.6

package/dist/index.cjs

@@ -32,7 +32,7 @@ let base64_js = require("base64-js");
 let vscode_fs = require("vscode-fs");
 
 //#region package.json
-var version = "0.5.4";
+var version = "0.5.6";
 
 //#endregion
 //#region src/common/serializable-content.ts
@@ -283,6 +283,22 @@ var EmulatorFileImpl = class extends SerializableFileImpl {
 		else this.getDeviceItems(item.getChildren());
 		return items;
 	}
+	findRemoteImageByDeviceItem(deviceItem, remoteImages) {
+		return remoteImages.find((image) => {
+			if (image.getApiVersion() !== deviceItem.getContent().api) return false;
+			if (image.getFullDeviceType() === deviceItem.getContent().deviceType) return true;
+			if (image.getFullDeviceType() === "pc_all") {
+				if (deviceItem.getContent().deviceType === "2in1") return true;
+				else if (deviceItem.getContent().deviceType === "2in1_foldable") return true;
+			} else if (image.getFullDeviceType() === "phone_all") {
+				if (deviceItem.getContent().deviceType === "phone") return true;
+				else if (deviceItem.getContent().deviceType === "foldable") return true;
+				else if (deviceItem.getContent().deviceType === "widefold") return true;
+				else if (deviceItem.getContent().deviceType === "triplefold") return true;
+			}
+			return false;
+		});
+	}
 	findDeviceItems(options = {}) {
 		const items = [];
 		const pushDeviceItem = (item) => {
@@ -1327,16 +1343,16 @@ let OptionsResolver;
 				default: return join(URI.file(os.homedir()), ".huawei", "Emulator");
 			}
 		}
-		const imageBasePath = typeof options.imageBasePath === "string" ? URI.file(options.imageBasePath) : options.imageBasePath || resolveDefaultImageBasePath();
-		const cachePath = typeof options.cachePath === "string" ? URI.file(options.cachePath) : options.cachePath || join(imageBasePath, "cache");
+		const imageBasePath = typeof options.imageBasePath === "string" ? options.imageBasePath ? URI.file(options.imageBasePath) : resolveDefaultImageBasePath() : options.imageBasePath ? options.imageBasePath : resolveDefaultImageBasePath();
+		const cachePath = typeof options.cachePath === "string" ? options.cachePath ? URI.file(options.cachePath) : join(imageBasePath, "cache") : options.cachePath ? options.cachePath : join(imageBasePath, "cache");
 		return {
 			imageBasePath,
-			deployedPath: typeof options.deployedPath === "string" ? URI.file(options.deployedPath) : options.deployedPath || resolveDefaultDeployedPath(),
+			deployedPath: typeof options.deployedPath === "string" ? options.deployedPath ? URI.file(options.deployedPath) : resolveDefaultDeployedPath() : options.deployedPath ? options.deployedPath : resolveDefaultDeployedPath(),
 			cachePath,
-			sdkPath: typeof options.sdkPath === "string" ? URI.file(options.sdkPath) : options.sdkPath || resolveDefaultSdkPath(),
-			configPath: typeof options.configPath === "string" ? URI.file(options.configPath) : options.configPath || resolveDefaultConfigPath(),
-			logPath: typeof options.logPath === "string" ? URI.file(options.logPath) : options.logPath || resolveDefaultLogPath(),
-			emulatorPath: typeof options.emulatorPath === "string" ? URI.file(options.emulatorPath) : options.emulatorPath || resolveDefaultEmulatorPath(),
+			sdkPath: typeof options.sdkPath === "string" ? options.sdkPath ? URI.file(options.sdkPath) : resolveDefaultSdkPath() : options.sdkPath ? options.sdkPath : resolveDefaultSdkPath(),
+			configPath: typeof options.configPath === "string" ? options.configPath ? URI.file(options.configPath) : resolveDefaultConfigPath() : options.configPath ? options.configPath : resolveDefaultConfigPath(),
+			logPath: typeof options.logPath === "string" ? options.logPath ? URI.file(options.logPath) : resolveDefaultLogPath() : options.logPath ? options.logPath : resolveDefaultLogPath(),
+			emulatorPath: typeof options.emulatorPath === "string" ? options.emulatorPath ? URI.file(options.emulatorPath) : resolveDefaultEmulatorPath() : options.emulatorPath ? options.emulatorPath : resolveDefaultEmulatorPath(),
 			adapter
 		};
 	}