diff options
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/filetransfer')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java | 8 | ||||
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java | 18 |
2 files changed, 24 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java index 8ace390..6947b5a 100644 --- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java +++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java @@ -2,15 +2,16 @@ package org.openslx.satellitedaemon.filetransfer; import java.io.IOException; import java.util.List; -import java.util.UUID; import org.apache.log4j.Logger; import org.openslx.filetransfer.Uploader; import org.openslx.imagemaster.thrift.iface.ImageData; import org.openslx.imagemaster.thrift.iface.UploadData; +import org.openslx.imagemaster.thrift.iface.UserInfo; import org.openslx.satellitedaemon.Globals; import org.openslx.satellitedaemon.db.DbImage; import org.openslx.satellitedaemon.db.DbImage.Status; +import org.openslx.satellitedaemon.db.DbUser; public class FileUploadWorker implements Runnable { @@ -35,7 +36,10 @@ public class FileUploadWorker implements Runnable String path = Globals.getImageFolder() + "/" + image.path; // ThriftConnection.getUploadInfos returns uploadInfo and handles ThriftAuthentication - UploadData upInfos = ThriftConnection.getUploadInfos( imDat, path ); + DbUser dbUser = DbUser.getUserById(imDat.ownerLogin); + UserInfo userInfo = new UserInfo(dbUser.userId, dbUser.firstName, dbUser.lastName, dbUser.email, null); + ThriftConnection.publishUser(userInfo); + UploadData upInfos = ThriftConnection.getUploadInfos( imDat, path); if ( upInfos == null ) { log.error( "The UploadInfos returned by ThriftConnection Class are null" ); continue; diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java index 18462be..5cae49b 100644 --- a/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java +++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java @@ -27,6 +27,7 @@ import org.openslx.imagemaster.thrift.iface.ServerSessionData; import org.openslx.imagemaster.thrift.iface.UploadData; import org.openslx.imagemaster.thrift.iface.UploadError; import org.openslx.imagemaster.thrift.iface.UploadException; +import org.openslx.imagemaster.thrift.iface.UserInfo; import org.openslx.satellitedaemon.Globals; import org.openslx.satellitedaemon.db.DbImage; import org.openslx.satellitedaemon.db.DbImage.Status; @@ -252,4 +253,21 @@ public class ThriftConnection client.set( newClient ); return newClient; } + + public static boolean publishUser(UserInfo userInfo) { + ImageServer.Client theClient = null; + theClient = getConnection(); + if ( theClient == null ) { + log.error( "Client was null!" ); + return false; + } + try { + return theClient.publishUser( sSD.sessionId, userInfo ); + } catch ( AuthorizationException e ) { + log.error( "AutorizationException", e ); + } catch ( TException e ) { + log.error( "TException", e ); + } + return false; + } } |