diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java index 05ba40bd..8891bbac 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java @@ -7,7 +7,8 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.model.ContainerDefinition; import org.openslx.thrifthelper.TConst; -import org.openslx.util.vm.DiskImage; +import org.openslx.vm.disk.DiskImage; +import org.openslx.vm.disk.DiskImageException; import java.io.File; import java.io.IOException; @@ -42,6 +43,7 @@ public class ImageWrapper { DiskImage diskImage = null; String ext = virtualizerId; + boolean imageIsCompressed = false; // unwrap each image individually // TODO In future maybe this is a check to distinguish between VM-Image and Container Image @@ -60,16 +62,22 @@ public class ImageWrapper { } else { try { - diskImage = new DiskImage(tmpDiskFile); - } catch (IOException | DiskImage.UnknownImageFormatException e) { + diskImage = DiskImage.newInstance(tmpDiskFile); + } catch (IOException | DiskImageException e) { LOGGER.warn("Could not open downloaded image for analyze step", e); } if (diskImage != null) { - if (diskImage.format != null) { - ext = diskImage.format.extension; + + ext = diskImage.getFormat().getExtension(); + + try { + imageIsCompressed = diskImage.isCompressed(); + } catch (DiskImageException e) { + LOGGER.warn("Could not analyze if image is compressed", e); } - if (diskImage.isCompressed) { + + if (imageIsCompressed) { Gui.asyncMessageBox( I18n.THRIFT.getString("ThriftActions.Message.warning.diskImageCompressed", |