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

added support for cemu 1.11 save path change 

see https://github.com/Seil0/cemu_UI/issues/6
This commit is contained in:
Jannik 2017-10-28 16:43:04 +02:00
parent f53055db7e
commit 6169a5e7cd
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/.gitignore vendored
View File

@ -1 +1,2 @@
/application/ /application/
/cloudControllerInstances/

BIN
bin/cloudControllerInstances/GoogleDriveController.class
View File

Binary file not shown.

39
src/cloudControllerInstances/GoogleDriveController.java
View File

@ -56,7 +56,7 @@ import com.google.api.services.drive.model.FileList;
public class GoogleDriveController { public class GoogleDriveController {
Drive service; Drive service;
private String cemuDirectory; private String saveDirectory;
private String folderID; private String folderID;
private ArrayList<java.io.File> localSavegames = new ArrayList<>(); private ArrayList<java.io.File> localSavegames = new ArrayList<>();
private ArrayList<File> cloudSavegames = new ArrayList<>(); private ArrayList<File> cloudSavegames = new ArrayList<>();
@ -64,7 +64,7 @@ public class GoogleDriveController {
private ArrayList<String> cloudSavegamesName = new ArrayList<>(); private ArrayList<String> cloudSavegamesName = new ArrayList<>();
private static final Logger LOGGER = LogManager.getLogger(GoogleDriveController.class.getName()); private static final Logger LOGGER = LogManager.getLogger(GoogleDriveController.class.getName());
private final String APPLICATION_NAME ="cemu_Ui Drive API Controller"; private final String APPLICATION_NAME ="cemu_Ui Drive API Controller"; //TODO add Google
//Directory to store user credentials for this application //Directory to store user credentials for this application
private final java.io.File DATA_STORE_DIR = new java.io.File(System.getProperty("user.home"), ".credentials/cemu_UI_credential"); private final java.io.File DATA_STORE_DIR = new java.io.File(System.getProperty("user.home"), ".credentials/cemu_UI_credential");
@ -104,6 +104,7 @@ public class GoogleDriveController {
InputStream in = getClass().getClassLoader().getResourceAsStream("resources/client_secret.json"); InputStream in = getClass().getClassLoader().getResourceAsStream("resources/client_secret.json");
GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in)); GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));
//FIXME Linux fails to open a new browser window, application crashes
// Build flow and trigger user authorization request. // Build flow and trigger user authorization request.
GoogleAuthorizationCodeFlow flow = GoogleAuthorizationCodeFlow flow =
new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES) new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES)
@ -129,8 +130,18 @@ public class GoogleDriveController {
public void main(String cemuDirectory) throws IOException { public void main(String cemuDirectory) throws IOException {
java.io.File dir = new java.io.File(cemuDirectory + "/mlc01/usr/save");
service = getDriveService(); service = getDriveService();
this.cemuDirectory = cemuDirectory;
// cemu >= 1.11 uses /mlc01/usr/save/... instead of /mlc01/emulatorSave/...
if (dir.exists()) {
LOGGER.info("using new save path");
saveDirectory = cemuDirectory + "/mlc01/usr/save";
} else {
LOGGER.info("using old save path");
saveDirectory = cemuDirectory + "/mlc01/emulatorSave";
}
} }
public void sync(String cemuDirectory) throws IOException { public void sync(String cemuDirectory) throws IOException {
@ -209,7 +220,7 @@ public class GoogleDriveController {
//reading all local savegames //reading all local savegames
private void getLocalSavegames() throws IOException { private void getLocalSavegames() throws IOException {
java.io.File dir = new java.io.File(cemuDirectory+"/mlc01/emulatorSave"); java.io.File dir = new java.io.File(saveDirectory);
String[] extensions = new String[] { "dat","sav","bin" }; String[] extensions = new String[] { "dat","sav","bin" };
localSavegames.removeAll(localSavegames); localSavegames.removeAll(localSavegames);
localSavegamesName.removeAll(localSavegamesName); localSavegamesName.removeAll(localSavegamesName);
@ -263,17 +274,17 @@ public class GoogleDriveController {
//download a file from the cloud to the local savegames folder //download a file from the cloud to the local savegames folder
private void downloadFile(File downloadFile) throws IOException{ private void downloadFile(File downloadFile) throws IOException{
LOGGER.info("downloading "+downloadFile.getName()+" ..."); LOGGER.info("downloading "+downloadFile.getName()+" ...");
java.io.File directory = new java.io.File(cemuDirectory+"/mlc01/emulatorSave/"+ downloadFile.getName().substring(0,8)); java.io.File directory = new java.io.File(saveDirectory + "/" + downloadFile.getName().substring(0,8));
String file = downloadFile.getName().substring(9,downloadFile.getName().length()); String file = downloadFile.getName().substring(9,downloadFile.getName().length());
if(!directory.exists()) { if(!directory.exists()) {
LOGGER.info("dir dosent exist"); LOGGER.info("dir dosent exist");
directory.mkdir(); directory.mkdir();
} }
OutputStream outputStream = new FileOutputStream(directory +"/"+ file); OutputStream outputStream = new FileOutputStream(directory +"/"+ file);
service.files().get(downloadFile.getId()).executeMediaAndDownloadTo(outputStream); service.files().get(downloadFile.getId()).executeMediaAndDownloadTo(outputStream);
outputStream.close(); outputStream.close();
LOGGER.info("download successfull, File ID: " + file); //TODO add FileID LOGGER.info("download successfull, File ID: " + file); //TODO add FileID
} }
//update a file in the cloud, by deleting the old one and uploading an new with the same id //update a file in the cloud, by deleting the old one and uploading an new with the same id