*** MAYBE NOT WORKING ***

Added Hostname for Booth identification while Upload

Removed Date Structure inside Images Folder
--> CHECK IN BACKUP IF FILES GET OVERWRITTEN

Changed Event date structure with upload Date structure in upload
--> ALSO TESTING NECCESSARY

Changed Splash Screen JPG for Logo PNG in Capture and Picture Panels
--> Testing
This commit is contained in:
2016-12-12 21:07:55 +01:00
parent c459938a9a
commit c3db9d0166
15 changed files with 98 additions and 46 deletions
+5 -30
View File
@@ -16,8 +16,6 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.file.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -52,7 +50,7 @@ public class FilesWorker {
* @return
*/
public static File getSourcePath() {
File src = new File(getEventPicDir().toString() + "/src");
File src = new File(SOMConfig.PICTURES_PATH.toString() + "/src");
// TODO catch possible fail
src.mkdirs();
@@ -66,7 +64,7 @@ public class FilesWorker {
* @return
*/
public static File getPreviewPath() {
File prv = new File(getEventPicDir().toString() + "/prv");
File prv = new File(SOMConfig.PICTURES_PATH.toString() + "/prv");
// TODO catch possible fail
prv.mkdirs();
@@ -80,7 +78,7 @@ public class FilesWorker {
* @return
*/
public static File getThumbPath() {
File tmb = new File(getEventPicDir().toString() + "/tmb");
File tmb = new File(SOMConfig.PICTURES_PATH.toString() + "/tmb");
// TODO catch possible fail
tmb.mkdirs();
@@ -94,7 +92,7 @@ public class FilesWorker {
* @return
*/
public static File getFinalPath() {
File fnl = new File(getEventPicDir().toString() + "/fnl");
File fnl = new File(SOMConfig.PICTURES_PATH.toString() + "/fnl");
// TODO catch possible fail
fnl.mkdirs();
@@ -108,36 +106,13 @@ public class FilesWorker {
* @return
*/
public static File getTempPath() {
File tmp = new File(getEventPicDir().toString() + "/tmp");
File tmp = new File(SOMConfig.PICTURES_PATH.toString() + "/tmp");
// TODO catch possible fail
tmp.mkdirs();
return tmp;
}
/**
* Gets the Directory for the Event and Creates the Folders
*
* @return
*/
private static File getEventPicDir() {
DateFormat df = new SimpleDateFormat("yyyy/MM/dd");
String timeString = df.format(event.getDate());
String boxID = SOMConfig.BOX_ID;
File picturesPath = SOMConfig.PICTURES_PATH;
File eventPicDir = new File(picturesPath.toString() + "/" + timeString
+ "/" + boxID);
// TODO catch possible fail
eventPicDir.mkdirs();
return eventPicDir;
}
private static boolean internet() {
Socket sock = new Socket();