diff options
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java index f8a0578..09e412a 100644 --- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java +++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java @@ -11,6 +11,7 @@ import org.openslx.imagemaster.thrift.iface.ImageData; import org.openslx.imagemaster.thrift.iface.UploadData; import org.openslx.satellitedaemon.Globals; import org.openslx.satellitedaemon.db.DbImage; +import org.openslx.satellitedaemon.db.DbImage.Status; public class FileUploadWorker implements Runnable { @@ -36,14 +37,14 @@ public class FileUploadWorker implements Runnable // Only for testing because a random UUID is used. Later the method above should be used. ImageData imDat = new ImageData( UUID.randomUUID().toString(), image.rid, - image.name, System.currentTimeMillis(), - System.currentTimeMillis(), image.creator, "anyThing", + image.name, (System.currentTimeMillis() / 1000), + (System.currentTimeMillis() / 1000), image.creator, "anyThing", true, false, "best", "theVeryBest", image.fileSize ); - String crcPath = image.path.concat( ".crc" ); + String path = Globals.getImageFolder() + "/" + image.path; // ThriftConnection.getUploadInfos returns uploadInfo and handles ThriftAuthentication - UploadData upInfos = ThriftConnection.getUploadInfos( imDat, crcPath ); + UploadData upInfos = ThriftConnection.getUploadInfos( imDat, path ); if ( upInfos == null ) { log.error( "The UploadInfos returned by ThriftConnection Class are null" ); continue; @@ -62,8 +63,12 @@ public class FileUploadWorker implements Runnable } // Start upload process. - u.upload(image.path); - u.close(null); + if (u.upload(path)) { + u.close(null); + log.info("Uploaded image successfuly."); + image.updateStatus(Status.successfully_published); + } + } try { Thread.sleep( 1 * 60 * 1000 ); |