Seil0
/
cemu_UI
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Wiki Activity

smmdb api integration rework 

* fixed wrong placment of the downloaded courses
This commit is contained in:
Seil0 2017-08-27 17:25:41 +02:00
parent 4c8a0a51e9
commit dbd52cbe9c
8 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/application/MainWindowController$1.class
View File

Binary file not shown.

BIN
bin/application/MainWindowController$10.class
View File

Binary file not shown.

BIN
bin/application/MainWindowController$11.class
View File

Binary file not shown.

BIN
bin/application/MainWindowController$12.class
View File

Binary file not shown.

BIN
bin/application/MainWindowController$2.class
View File

Binary file not shown.

BIN
bin/application/MainWindowController.class
View File

Binary file not shown.

BIN
bin/libraries/junrar-0.7.jar
View File

Binary file not shown.

37
src/application/MainWindowController.java
View File

@ -40,6 +40,7 @@ import javax.swing.ProgressMonitor;
import javax.swing.ProgressMonitorInputStream; import javax.swing.ProgressMonitorInputStream;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXColorPicker; import com.jfoenix.controls.JFXColorPicker;
import com.jfoenix.controls.JFXDialog; import com.jfoenix.controls.JFXDialog;
@ -215,7 +216,7 @@ public class MainWindowController {
private String color; private String color;
private String dialogBtnStyle; private String dialogBtnStyle;
private String version = "0.1.6"; private String version = "0.1.6";
private String buildNumber = "031"; private String buildNumber = "033";
private String versionName = "Throwback Galaxy"; private String versionName = "Throwback Galaxy";
private int xPos = -200; private int xPos = -200;
private int yPos = 17; private int yPos = 17;
@ -344,7 +345,6 @@ public class MainWindowController {
}); });
remove.setOnAction(new EventHandler<ActionEvent>() { remove.setOnAction(new EventHandler<ActionEvent>() {
@SuppressWarnings("unlikely-arg-type") //FIXME SuppressWarnings("unlikely-arg-type")
@Override @Override
public void handle(ActionEvent event) { public void handle(ActionEvent event) {
System.out.println("remove "+selectedGameTitleID); System.out.println("remove "+selectedGameTitleID);
@ -729,26 +729,45 @@ public class MainWindowController {
String source = downloadFileURL; String source = downloadFileURL;
String destination = null; String destination = null;
int highestCourseNumber = 0;
String courseName = null;
for (int i = 0; i < smmIDs.size(); i++) { for (int i = 0; i < smmIDs.size(); i++) {
if (new File(outputFile + "mlc01/emulatorSave/" + smmIDs.get(i)).exists()) { File smmDirectory = new File(outputFile + "mlc01/emulatorSave/" + smmIDs.get(i));
File courseDirectory = new File(outputFile + "mlc01/emulatorSave/" + smmIDs.get(i) + "/" + id);
System.out.println("Path: " + courseDirectory.getAbsolutePath()); if (smmDirectory.exists()) {
if (!courseDirectory.exists()) { File[] courses = smmDirectory.listFiles(File::isDirectory);
courseDirectory.mkdir();
//get all existing courses in smm directory, new name is highest number +1
for (int j = 0; j < courses.length; j++) {
System.out.println(courses[j].getName());
int courseNumber = Integer.parseInt(courses[j].getName().substring(6));
if (courseNumber > highestCourseNumber) {
highestCourseNumber = courseNumber;
}
} }
String number = "000" + (highestCourseNumber +1);
courseName = "course" + number.substring(number.length() -3, number.length());
File courseDirectory = new File(outputFile + "mlc01/emulatorSave/" + smmIDs.get(i) + "/");
System.out.println("Path: " + courseDirectory.getPath());
destination = courseDirectory.getPath(); destination = courseDirectory.getPath();
} }
} }
try { try {
ZipFile zipFile = new ZipFile(source); ZipFile zipFile = new ZipFile(source);
zipFile.extractAll(destination); zipFile.extractAll(destination);
//rename zipfile
File course = new File(destination + "/course000");
course.renameTo( new File(destination + "/" + courseName));
} catch (ZipException e) { } catch (ZipException e) {
e.printStackTrace(); e.printStackTrace();
System.err.println("an error occurred during unziping the file!"); System.err.println("an error occurred during unziping the file!");
} }
downloadFile.delete(); downloadFile.delete();
} catch (IOException e) { } catch (IOException e) {
System.err.println("something went wrong during downloading the course"); System.err.println("something went wrong during downloading the course");