diff options
| author | Simon Rettberg | 2015-09-10 18:51:20 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-10 18:51:20 +0200 |
| commit | 80af9ff6befbbe4204eab259c72c40df5cd5e5a1 (patch) | |
| tree | f1c731d05841a6d2457db68b412f297d72edae76 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java | |
| parent | [client] LectureDetails: moved fields around to keep the same order as in Ima... (diff) | |
| download | tutor-module-80af9ff6befbbe4204eab259c72c40df5cd5e5a1.tar.gz tutor-module-80af9ff6befbbe4204eab259c72c40df5cd5e5a1.tar.xz tutor-module-80af9ff6befbbe4204eab259c72c40df5cd5e5a1.zip | |
[server] Schema changes, distinct delete flag for images
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java index d008f5db..fa8647d9 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java @@ -37,6 +37,8 @@ import org.openslx.filetransfer.util.FileChunk; import org.openslx.filetransfer.util.HashChecker; import org.openslx.filetransfer.util.HashChecker.HashCheckCallback; import org.openslx.filetransfer.util.HashChecker.HashResult; +import org.openslx.util.vm.DiskImage; +import org.openslx.util.vm.DiskImage.UnknownImageFormatException; public class IncomingDataTransfer extends AbstractTransfer implements HashCheckCallback { @@ -311,7 +313,12 @@ public class IncomingDataTransfer extends AbstractTransfer implements HashCheckC return; LOGGER.info("Finalizing uploaded image " + image.imageName); // Ready to go. First step: Rename temp file to something usable - File destination = new File(tmpFileName.getParent(), Formatter.vmName(owner, image.imageName)); + String ext = "img"; + try { + ext = new DiskImage(tmpFileName).format.extension; + } catch (IOException | UnknownImageFormatException e1) { + } + File destination = new File(tmpFileName.getParent(), Formatter.vmName(owner, image.imageName, ext)); // Sanity check: destination should be a sub directory of the vmStorePath String relPath = FileSystem.getRelativePath(destination, Configuration.getVmStoreBasePath()); if (relPath == null) { |