Fix Docker and Podman show images without containers

rovellipaolo · Oct 31, 2023 · 06ee577 · 06ee577
1 parent 09228d6
commit 06ee577
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/metadata.json b/metadata.json
@@ -14,5 +14,5 @@
         "43",
         "44"
     ],
-    "version": 26
+    "version": 27
 }
diff --git a/src/data/container.js b/src/data/container.js
@@ -61,7 +61,12 @@ var getImages = async (engine) => {
     const result = await CommandLine.execute(
         COMMAND_TEMPLATE_IMAGES.replace(PARAM_ENGINE, engine),
     );
-    return parseImages(result);
+    const images = parseImages(result);
+    if (images.length === 0) {
+        Log.w(LOGTAG, `No ${engine} image detected!`);
+        throw new Error("No image detected!");
+    }
+    return images;
 };
 
 /**

diff --git a/src/data/dockerRepository.js b/src/data/dockerRepository.js
@@ -24,7 +24,12 @@ var isInstalled = () => Container.isInstalled(ENGINE);
  */
 /* exported getContainers */
 var getContainers = async () => {
-    var containers = await Container.getContainers(ENGINE);
+    var containers = [];
+    try {
+        containers = await Container.getContainers(ENGINE);
+    } catch (error) {
+        Log.w(LOGTAG, `Cannot retrieve ${ENGINE} containers: ${error.message}`);
+    }
     if (Settings.shouldShowDockerImages()) {
         try {
             const images = await Container.getImages(ENGINE);
@@ -33,6 +38,9 @@ var getContainers = async () => {
             Log.w(LOGTAG, `Cannot retrieve ${ENGINE} images: ${error.message}`);
         }
     }
+    if (containers.length === 0) {
+        throw new Error("No container detected!");
+    }
     return containers;
 };
 

diff --git a/src/data/podmanRepository.js b/src/data/podmanRepository.js
@@ -24,7 +24,12 @@ var isInstalled = () => Container.isInstalled(ENGINE);
  */
 /* exported getContainers */
 var getContainers = async () => {
-    var containers = await Container.getContainers(ENGINE);
+    var containers = [];
+    try {
+        containers = await Container.getContainers(ENGINE);
+    } catch (error) {
+        Log.w(LOGTAG, `Cannot retrieve ${ENGINE} containers: ${error.message}`);
+    }
     if (Settings.shouldShowPodmanImages()) {
         try {
             const images = await Container.getImages(ENGINE);
@@ -33,6 +38,9 @@ var getContainers = async () => {
             Log.w(LOGTAG, `Cannot retrieve ${ENGINE} images: ${error.message}`);
         }
     }
+    if (containers.length === 0) {
+        throw new Error("No container detected!");
+    }
     return containers;
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,5 +14,5 @@ @@
             "43",
             "44"
         ],
-        "version": 26
+        "version": 27
     }