diff options
author | Manuel Bentele | 2021-02-25 14:59:33 +0100 |
---|---|---|
committer | Manuel Bentele | 2021-03-11 06:59:43 +0100 |
commit | 9eedf73295ad9e5b9764b2181fc95058d698011d (patch) | |
tree | f1882d97662d8611a94e40ce4d6f4c52b3eeda62 /dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java | |
parent | Merge branch 'feature/vmwarevm-support' into feature-merge (diff) | |
download | tutor-module-9eedf73295ad9e5b9764b2181fc95058d698011d.tar.gz tutor-module-9eedf73295ad9e5b9764b2181fc95058d698011d.tar.xz tutor-module-9eedf73295ad9e5b9764b2181fc95058d698011d.zip |
[client,server] Refactor disk image representation
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", |