Version v.1.0.0

phoboxhq · Jul 6, 2019 · c9f27ad · c9f27ad
1 parent c043209
commit c9f27ad
Show file tree

Hide file tree

Showing 17 changed files with 2,378 additions and 2,162 deletions.
diff --git a/phobox-frontend/package-lock.json b/phobox-frontend/package-lock.json
diff --git a/phobox-frontend/pom.xml b/phobox-frontend/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.milchreis</groupId>
 		<artifactId>phobox</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<properties>

diff --git a/phobox-frontend/target/dist/index.html b/phobox-frontend/target/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1"><meta name=mobile-web-app-capable content=yes><meta name=theme-color content=#202020><link rel="shortcut icon" type=image/x-icon href=img/favicon.ico><title>Phobox</title><link href=/static/css/app.f45b2d637917da8267d9f6a8daa561d3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.7c81f55d2ee7b5e1e3b0.js></script><script type=text/javascript src=/static/js/app.3f59b1f651a8190415c6.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1"><meta name=mobile-web-app-capable content=yes><meta name=theme-color content=#202020><link rel="shortcut icon" type=image/x-icon href=img/favicon.ico><title>Phobox</title><link href=/static/css/app.f45b2d637917da8267d9f6a8daa561d3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.fe7c7f368ed67f40d89e.js></script><script type=text/javascript src=/static/js/app.3f59b1f651a8190415c6.js></script></body></html>
diff --git a/phobox-frontend/target/maven-archiver/pom.properties b/phobox-frontend/target/maven-archiver/pom.properties
@@ -1,4 +1,4 @@
 #Created by Apache Maven 3.3.9
-version=1.0.0-SNAPSHOT
+version=1.0.0
 groupId=de.milchreis
 artifactId=phobox-frontend
diff --git a/phobox-server/pom.xml b/phobox-server/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>de.milchreis</groupId>
 		<artifactId>phobox</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<name>phobox-server</name>

diff --git a/phobox-server/src/main/java/de/milchreis/phobox/PhoboxServerApplication.java b/phobox-server/src/main/java/de/milchreis/phobox/PhoboxServerApplication.java
@@ -66,6 +66,7 @@ public static void main(String[] args) {
 			}
 
 			StorageConfiguration config = Phobox.getModel().getStorageConfiguration();
+			Phobox.getModel().writeStorageConfig();
 
 			// Setup the spring params depending on storage path
 			System.setProperty("server.port", config.getPhoboxPort()+"");

diff --git a/...ava/de/milchreis/phobox/db/DBManager.java → .../phobox/db/DBConnectionConfiguration.java b/...ava/de/milchreis/phobox/db/DBManager.java → .../phobox/db/DBConnectionConfiguration.java
@@ -10,7 +10,7 @@
 import de.milchreis.phobox.core.Phobox;
 
 @Component
-public class DBManager {
+public class DBConnectionConfiguration {
 
 	@Bean
 	@Primary

diff --git a/phobox-server/src/main/java/de/milchreis/phobox/utils/exif/ExifHelper.java b/phobox-server/src/main/java/de/milchreis/phobox/utils/exif/ExifHelper.java
@@ -42,18 +42,21 @@ public enum ImageRotation {
 	}};
 
 	public static Date getCreationDate(File file) throws IOException, ImageProcessingException {
+		checkNullFile(file);
 		Metadata metadata = ImageMetadataReader.readMetadata(file);
 		ExifSubIFDDirectory directory = metadata.getFirstDirectoryOfType(ExifSubIFDDirectory.class);
 		return directory.getDate(ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL, TimeZone.getDefault());
 	}
 
 	public static int getOrientation(File file) throws ImageProcessingException, IOException, MetadataException {
+		checkNullFile(file);
 		Metadata metadata = ImageMetadataReader.readMetadata(file);
 		ExifIFD0Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
 		return directory.getInt(ExifIFD0Directory.TAG_ORIENTATION);
 	}
 
 	public static int[] getDimension(File file) throws ImageProcessingException, IOException, MetadataException {
+		checkNullFile(file);
 		Metadata metadata = ImageMetadataReader.readMetadata(file);
 		ExifSubIFDDirectory directory = metadata.getFirstDirectoryOfType(ExifSubIFDDirectory.class);
 		int width = directory.getInt(ExifSubIFDDirectory.TAG_EXIF_IMAGE_WIDTH);
@@ -62,6 +65,7 @@ public static int[] getDimension(File file) throws ImageProcessingException, IOE
 	}
 
 	public static String[] getCamera(File file) throws ImageProcessingException, IOException {
+		checkNullFile(file);
 		Metadata metadata = ImageMetadataReader.readMetadata(file);
 		ExifIFD0Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
 		return new String[]{
@@ -70,9 +74,9 @@ public static String[] getCamera(File file) throws ImageProcessingException, IOE
 	}
 
 	public static Map<String, String> getExifDataMap(File file) throws ImageProcessingException, IOException {
-
+		checkNullFile(file);
+
 		Map<String, String> map = new TreeMap<>();
-
 		Metadata metadata = ImageMetadataReader.readMetadata(file);
 		metadata.getDirectories().forEach(directory -> {
 			directory.getTags().forEach(tag -> {
@@ -83,4 +87,10 @@ public static Map<String, String> getExifDataMap(File file) throws ImageProcessi
 		return map;
 	}
 
+	private static void checkNullFile(File file) {
+		if(file == null)
+			throw new IllegalArgumentException("No file passed");
+
+	}
+
 }
diff --git a/phobox-server/src/main/resources/img/phobox_logo.xcf b/phobox-server/src/main/resources/img/phobox_logo.xcf
diff --git a/phobox-server/src/main/resources/public/index.html b/phobox-server/src/main/resources/public/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1"><meta name=mobile-web-app-capable content=yes><meta name=theme-color content=#202020><link rel="shortcut icon" type=image/x-icon href=img/favicon.ico><title>Phobox</title><link href=/static/css/app.f45b2d637917da8267d9f6a8daa561d3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.7c81f55d2ee7b5e1e3b0.js></script><script type=text/javascript src=/static/js/app.3f59b1f651a8190415c6.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1"><meta name=mobile-web-app-capable content=yes><meta name=theme-color content=#202020><link rel="shortcut icon" type=image/x-icon href=img/favicon.ico><title>Phobox</title><link href=/static/css/app.f45b2d637917da8267d9f6a8daa561d3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.fe7c7f368ed67f40d89e.js></script><script type=text/javascript src=/static/js/app.3f59b1f651a8190415c6.js></script></body></html>
diff --git a/phobox-server/src/main/resources/public/static/js/manifest.2ae2e69a05c33dfc65f8.js.map b/phobox-server/src/main/resources/public/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
diff --git a/phobox-server/src/main/resources/public/static/js/vendor.fe7c7f368ed67f40d89e.js b/phobox-server/src/main/resources/public/static/js/vendor.fe7c7f368ed67f40d89e.js
diff --git a/phobox-server/src/main/resources/public/static/js/vendor.fe7c7f368ed67f40d89e.js.map b/phobox-server/src/main/resources/public/static/js/vendor.fe7c7f368ed67f40d89e.js.map
diff --git a/phobox-server/src/test/java/de/milchreis/phobox/core/PhoboxOperationsTest.java b/phobox-server/src/test/java/de/milchreis/phobox/core/PhoboxOperationsTest.java
@@ -1,6 +1,7 @@
 package de.milchreis.phobox.core;
 
 import de.milchreis.phobox.core.model.PhoboxModel;
+import de.milchreis.phobox.core.operations.PhoboxOperations;
 import de.milchreis.phobox.core.operations.ThumbnailOperations;
 import de.milchreis.phobox.utils.system.OSDetector;
 import org.junit.Test;