diff --git a/bin/.gitignore b/bin/.gitignore index 3f9dc07..b42b859 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1 @@ -/cloudControllerInstances/ /application/ diff --git a/bin/application/CloudController.class b/bin/application/CloudController.class index dafd3ee..0d8a504 100644 Binary files a/bin/application/CloudController.class and b/bin/application/CloudController.class differ diff --git a/bin/application/Main.class b/bin/application/Main.class index f204389..aab0aab 100644 Binary files a/bin/application/Main.class and b/bin/application/Main.class differ diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 5c19893..f75d553 100644 Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index b1c0469..c3ed65c 100644 Binary files a/bin/application/MainWindowController$2.class and b/bin/application/MainWindowController$2.class differ diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index ab45bf0..64ba66a 100644 Binary files a/bin/application/MainWindowController$3.class and b/bin/application/MainWindowController$3.class differ diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index e24a6ca..e961a9a 100644 Binary files a/bin/application/MainWindowController$4.class and b/bin/application/MainWindowController$4.class differ diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index ba50e1c..dcad738 100644 Binary files a/bin/application/MainWindowController$5.class and b/bin/application/MainWindowController$5.class differ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 9ef4306..fbc3933 100644 Binary files a/bin/application/MainWindowController$6.class and b/bin/application/MainWindowController$6.class differ diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 202ce99..461754d 100644 Binary files a/bin/application/MainWindowController$7.class and b/bin/application/MainWindowController$7.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 42a00b9..01d6830 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/src/application/CloudController.java b/src/application/CloudController.java index 8bcf34c..770d893 100644 --- a/src/application/CloudController.java +++ b/src/application/CloudController.java @@ -10,7 +10,6 @@ * you can buy me a chocolate in return. - @Seil0 * (license based in Beer-ware, see https://fedoraproject.org/wiki/Licensing/Beerware ) * - * TODO own thread */ package application; @@ -45,34 +44,52 @@ public class CloudController { } void sync(String cloudService, String cemuDirectory) { - if(cloudService == "GoogleDrive") { - try { - googleDriveController.sync(cemuDirectory); - } catch (IOException e) { - e.printStackTrace(); - } - } - if(cloudService == "Dropbox") { - - } + + //running sync in a new thread, instead of blocking the main thread + new Thread() { + public void run() { + System.out.println("starting sync in new thread..."); + + if(cloudService == "GoogleDrive") { + try { + googleDriveController.sync(cemuDirectory); + } catch (IOException e) { + e.printStackTrace(); + } + } + if(cloudService == "Dropbox") { + + } + } + }.start(); + } void uploadFile(String cloudService, File file) { - if(cloudService == "GoogleDrive") { - try { - googleDriveController.uploadFile(file); - } catch (IOException e) { - e.printStackTrace(); - } - } - if(cloudService == "Dropbox") { + + //running uploadFile in a new thread, instead of blocking the main thread + new Thread() { + public void run() { + System.out.println("starting uploadFile in new thread..."); + + if(cloudService == "GoogleDrive") { + try { + googleDriveController.uploadFile(file); + } catch (IOException e) { + e.printStackTrace(); + } + } + if(cloudService == "Dropbox") { - } + } + } + }.start(); + } - void download(String cloudService) { - - } +// void download(String cloudService) { +// +// } public String getFolderID(String cloudService) { String folderID = ""; diff --git a/src/application/Main.java b/src/application/Main.java index 727e2c1..e28d370 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -20,6 +20,7 @@ import java.net.URL; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; import java.util.Optional; + import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.stage.DirectoryChooser; @@ -81,8 +82,8 @@ public class Main extends Application { } //startup checks - System.out.println(directory.exists()); - System.out.println(configFile.exists()); + System.out.println("Directory: " + directory.exists()); + System.out.println("configfile: " + configFile.exists()); if(directory.exists() != true){ System.out.println("mkdir all"); directory.mkdir(); diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 8c5ace4..585c90e 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -145,10 +145,9 @@ public class MainWindowController { private String selectedGameTitleID; private String selectedGameTitle; private String color; - private String version = "0.1.4"; - private String buildNumber = "007"; - @SuppressWarnings("unused") - private String versionName = ""; + private String version = "0.1.5"; + private String buildNumber = "010"; + private String versionName = "Gusty Garden"; private int xPos = -200; private int yPos = 17; private int xPosHelper; @@ -433,7 +432,7 @@ public class MainWindowController { Alert alert = new Alert(AlertType.INFORMATION); alert.setTitle("about"); alert.setHeaderText("cemu_UI"); - alert.setContentText("cemu_UI by @Seil0 \npre release "+version+" ("+buildNumber+") \nwww.kellerkinder.xyz"); + alert.setContentText("cemu_UI by @Seil0 \nVersion: "+version+" ("+buildNumber+") \""+versionName+"\" \nwww.kellerkinder.xyz"); alert.initOwner(main.primaryStage); alert.showAndWait(); }