Started to implement download of images

1 files changed, 11 insertions, 4 deletions

diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java
index 5ab2c4b..2cf3922 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbImage.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java
@@ -24,6 +24,7 @@ public class DbImage
 	public final String longDescription;
 	public final Timestamp timestamp;
 	public final String ftpUser;
+	public final String ftpPassword;
 	public final long fileSize;
 	
 
@@ -43,13 +44,14 @@ public class DbImage
 		this.longDescription = null;
 		this.timestamp = new Timestamp( 0 );
 		this.ftpUser = null;
+		this.ftpPassword = null;
 		this.fileSize = 0;
 	}
 	
 	public DbImage(String UUID, int imageVersion, String imageName, String imagePath,
 			Timestamp imageCreateTime, Timestamp imageUpdateTime, int imageOwner, String contentOperatingSystem,
 			boolean isValid, boolean isDeleted, String shortDescription, String longDescription,
-			Timestamp timestamp, String ftpUser, long fileSize)
+			Timestamp timestamp, String ftpUser, String ftpPassword, long fileSize)
 	{
 		this.UUID = UUID;
 		this.imageVersion = imageVersion;
@@ -65,6 +67,7 @@ public class DbImage
 		this.longDescription = longDescription;
 		this.timestamp = timestamp;
 		this.ftpUser = ftpUser;
+		this.ftpPassword = ftpPassword;
 		this.fileSize = fileSize;
 	}
 
@@ -91,7 +94,7 @@ public class DbImage
 	 * @param ts The timestamp of inserting
 	 * @return Affected rows
 	 */
-	public static int insert( ImageData imageData, long ts, String ftpUser )
+	public static int insert( ImageData imageData, long ts, String ftpUser, String ftpPassword )
 	{
 		Date createTime = new Date( imageData.imageCreateTime );
 		Date updateTime = new Date( imageData.imageUpdateTime );
@@ -102,12 +105,12 @@ public class DbImage
 
 		return MySQL
 				.update(
-						"INSERT INTO images (UUID, image_version, image_name, image_path, image_createTime, image_updateTime, image_owner, content_operatingSystem, status_isValid, status_isDeleted, image_shortDescription, image_longDescription, timestamp, ftpUser, fileSize) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+						"INSERT INTO images (UUID, image_version, image_name, image_path, image_createTime, image_updateTime, image_owner, content_operatingSystem, status_isValid, status_isDeleted, image_shortDescription, image_longDescription, timestamp, ftpUser, ftpPassword, fileSize) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
 						imageData.uuid, imageData.imageVersion, imageData.imageName, "!uploading!",
 						sdf.format( createTime ), sdf.format( updateTime ), ownerId,
 						imageData.conentOperatingSystem, imageData.statusIsValid,
 						imageData.statusIsDeleted, imageData.imageShortDescription,
-						imageData.imageLongDescription, sdf.format( timestamp ), ftpUser, imageData.fileSize );
+						imageData.imageLongDescription, sdf.format( timestamp ), ftpUser, ftpPassword, imageData.fileSize );
 	}
 
 	public String getUUID()
@@ -129,4 +132,8 @@ public class DbImage
 	{
 		return MySQL.findAll( DbImage.class, "SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.timestamp, images.ftpUser, images.fileSize FROM images WHERE image_path = ?", "!uploading!" );
 	}
+	
+	public static DbImage getImageByUUID(String uuid) {
+		return MySQL.findUniqueOrNull( DbImage.class, "SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.timestamp, images.ftpUser, images.fileSize FROM images WHERE uuid = ?", uuid );
+	}
 }