fix isPackageInstalled

Author: Maxim Lobanov

dist/index.js

@@ -36236,9 +36236,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmptyDirectory = exports.getBooleanInput = exports.getListInput = exports.splitByEOL = void 0;
+exports.getBooleanInput = exports.getListInput = exports.splitByEOL = void 0;
 const core = __importStar(__webpack_require__(470));
-const fs = __importStar(__webpack_require__(747));
 exports.splitByEOL = (stdout) => {
     return stdout.split(/[\r\n]/);
 };
@@ -36249,10 +36248,6 @@ exports.getListInput = (inputName) => {
 exports.getBooleanInput = (inputName) => {
     return (core.getInput(inputName) || "false").toUpperCase() === "TRUE";
 };
-exports.isEmptyDirectory = (directoryPath) => {
-    const children = fs.readdirSync(directoryPath);
-    return children.length === 0;
-};
 
 
 /***/ }),
@@ -42050,6 +42045,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDKManager = void 0;
 const core = __importStar(__webpack_require__(470));
 const exec = __importStar(__webpack_require__(986));
+const fs = __importStar(__webpack_require__(747));
 const path_1 = __importDefault(__webpack_require__(622));
 const sdk_manager_parser_1 = __webpack_require__(551);
 const utils_1 = __webpack_require__(611);
@@ -42074,6 +42070,13 @@ class SDKManager {
         const relativePath = packageInfo.name.replace(";", "/");
         return path_1.default.join(this.androidHome, relativePath);
     }
+    isPackageInstalled(packageInfo) {
+        const packagePath = this.getPackagePath(packageInfo);
+        if (!fs.existsSync(packagePath)) {
+            return false;
+        }
+        return fs.readdirSync(packagePath).length > 0;
+    }
     async run(args, printOutputInDebug) {
         let stdout = "";
         let previousPrintedLine = "";
@@ -47580,7 +47583,7 @@ const run = async () => {
                 core.info("Trying to restore package from cache...");
                 const cacheHitKey = await cache.restoreCache([localPackagePath], cacheKey);
                 cacheHit = Boolean(cacheHitKey);
-                if (cacheHit && utils_1.isEmptyDirectory(localPackagePath)) {
+                if (cacheHit && !sdkmanager.isPackageInstalled(foundPackage)) {
                     core.debug("  [WARNING] Cache is invalid and contains empty folder. ");
                     cacheHit = false;
                 }

src/sdk-manager.ts

@@ -1,5 +1,6 @@
 import * as core from "@actions/core";
 import * as exec from "@actions/exec";
+import * as fs from "fs";
 import path from "path";
 import { parseSDKManagerOutput, AndroidPackageInfo } from "./sdk-manager-parser";
 import { splitByEOL } from "./utils";
@@ -31,6 +32,15 @@ export class SDKManager {
         return path.join(this.androidHome, relativePath);
     }
 
+    public isPackageInstalled(packageInfo: AndroidPackageInfo): boolean {
+        const packagePath = this.getPackagePath(packageInfo);
+        if (!fs.existsSync(packagePath)) {
+            return false;
+        }
+
+        return fs.readdirSync(packagePath).length > 0;
+    }
+
     private async run(args: string[], printOutputInDebug: boolean): Promise<string> {
         let stdout = "";
         let previousPrintedLine = "";

src/setup-android-tools.ts

@@ -3,7 +3,7 @@ import * as core from "@actions/core";
 import * as exec from "@actions/exec";
 import * as os from "os";
 import { SDKManager } from "./sdk-manager";
-import { getListInput, getBooleanInput, isEmptyDirectory } from "./utils";
+import { getListInput, getBooleanInput } from "./utils";
 
 const patchUbuntuPermissions = async(androidHome: string): Promise<void> => {
     core.info("Patch permissions for $ANDROID_HOME on Ubuntu");
@@ -44,7 +44,7 @@ const run = async(): Promise<void> => {
                 core.info("Trying to restore package from cache...");
                 const cacheHitKey = await cache.restoreCache([localPackagePath], cacheKey);
                 cacheHit = Boolean(cacheHitKey);
-                if (cacheHit && isEmptyDirectory(localPackagePath)) {
+                if (cacheHit && !sdkmanager.isPackageInstalled(foundPackage)) {
                     core.debug("  [WARNING] Cache is invalid and contains empty folder. ");
                     cacheHit = false;
                 }

src/utils.ts

@@ -1,5 +1,4 @@
 import * as core from "@actions/core";
-import * as fs from "fs";
 
 export const splitByEOL = (stdout: string): string[] => {
     return stdout.split(/[\r\n]/);
@@ -12,9 +11,4 @@ export const getListInput = (inputName: string): string[] => {
 
 export const getBooleanInput = (inputName: string): boolean => {
     return (core.getInput(inputName) || "false").toUpperCase() === "TRUE";
-};
-
-export const isEmptyDirectory = (directoryPath: string): boolean => {
-    const children = fs.readdirSync(directoryPath);
-    return children.length === 0;
-}
+};