Skip to content

Commit c9f27ad

Browse files
MilchreisMilchreis
committed
Version v.1.0.0
1 parent c043209 commit c9f27ad

File tree

17 files changed

+2378
-2162
lines changed

17 files changed

+2378
-2162
lines changed

‎phobox-frontend/package-lock.json

Lines changed: 2138 additions & 2152 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phobox-frontend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>de.milchreis</groupId>
99
<artifactId>phobox</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
10+
<version>1.0.0</version>
1111
</parent>
1212

1313
<properties>

‎phobox-frontend/target/dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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.fe7c7f368ed67f40d89e.js></script><script type=text/javascript src=/static/js/app.3f59b1f651a8190415c6.js></script></body></html>

‎phobox-frontend/target/maven-archiver/pom.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Created by Apache Maven 3.3.9
2-
version=1.0.0-SNAPSHOT
2+
version=1.0.0
33
groupId=de.milchreis
44
artifactId=phobox-frontend

‎phobox-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>de.milchreis</groupId>
1111
<artifactId>phobox</artifactId>
12-
<version>1.0.0-SNAPSHOT</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<name>phobox-server</name>

‎phobox-server/src/main/java/de/milchreis/phobox/PhoboxServerApplication.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public static void main(String[] args) {
6666
}
6767

6868
StorageConfiguration config = Phobox.getModel().getStorageConfiguration();
69+
Phobox.getModel().writeStorageConfig();
6970

7071
// Setup the spring params depending on storage path
7172
System.setProperty("server.port", config.getPhoboxPort()+"");

‎phobox-server/src/main/java/de/milchreis/phobox/db/DBManager.java renamed to ‎phobox-server/src/main/java/de/milchreis/phobox/db/DBConnectionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import de.milchreis.phobox.core.Phobox;
1111

1212
@Component
13-
public class DBManager {
13+
public class DBConnectionConfiguration {
1414

1515
@Bean
1616
@Primary

‎phobox-server/src/main/java/de/milchreis/phobox/utils/exif/ExifHelper.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,21 @@ public enum ImageRotation {
4242
}};
4343

4444
public static Date getCreationDate(File file) throws IOException, ImageProcessingException {
45+
checkNullFile(file);
4546
Metadata metadata = ImageMetadataReader.readMetadata(file);
4647
ExifSubIFDDirectory directory = metadata.getFirstDirectoryOfType(ExifSubIFDDirectory.class);
4748
return directory.getDate(ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL, TimeZone.getDefault());
4849
}
4950

5051
public static int getOrientation(File file) throws ImageProcessingException, IOException, MetadataException {
52+
checkNullFile(file);
5153
Metadata metadata = ImageMetadataReader.readMetadata(file);
5254
ExifIFD0Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
5355
return directory.getInt(ExifIFD0Directory.TAG_ORIENTATION);
5456
}
5557

5658
public static int[] getDimension(File file) throws ImageProcessingException, IOException, MetadataException {
59+
checkNullFile(file);
5760
Metadata metadata = ImageMetadataReader.readMetadata(file);
5861
ExifSubIFDDirectory directory = metadata.getFirstDirectoryOfType(ExifSubIFDDirectory.class);
5962
int width = directory.getInt(ExifSubIFDDirectory.TAG_EXIF_IMAGE_WIDTH);
@@ -62,6 +65,7 @@ public static int[] getDimension(File file) throws ImageProcessingException, IOE
6265
}
6366

6467
public static String[] getCamera(File file) throws ImageProcessingException, IOException {
68+
checkNullFile(file);
6569
Metadata metadata = ImageMetadataReader.readMetadata(file);
6670
ExifIFD0Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
6771
return new String[]{
@@ -70,9 +74,9 @@ public static String[] getCamera(File file) throws ImageProcessingException, IOE
7074
}
7175

7276
public static Map<String, String> getExifDataMap(File file) throws ImageProcessingException, IOException {
73-
77+
checkNullFile(file);
78+
7479
Map<String, String> map = new TreeMap<>();
75-
7680
Metadata metadata = ImageMetadataReader.readMetadata(file);
7781
metadata.getDirectories().forEach(directory -> {
7882
directory.getTags().forEach(tag -> {
@@ -83,4 +87,10 @@ public static Map<String, String> getExifDataMap(File file) throws ImageProcessi
8387
return map;
8488
}
8589

90+
private static void checkNullFile(File file) {
91+
if(file == null)
92+
throw new IllegalArgumentException("No file passed");
93+
94+
}
95+
8696
}

‎phobox-server/src/main/resources/img/phobox_logo.xcf

2.44 MB
Binary file not shown.

‎phobox-server/src/main/resources/public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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.fe7c7f368ed67f40d89e.js></script><script type=text/javascript src=/static/js/app.3f59b1f651a8190415c6.js></script></body></html>

0 commit comments

Comments
 (0)