desu
/
konogonka
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now possible to set location of the exported files via Settings.

master
Dmitry Isaenko 2019-08-28 04:54:35 +03:00
parent 3fc0aad7a1
commit 4eace88e86
10 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/konogonka/AppPreferences.java
View File

@ -1,5 +1,6 @@
package konogonka;
import java.io.File;
import java.util.prefs.Preferences;
public class AppPreferences {
@ -25,6 +26,9 @@ public class AppPreferences {
titleKeysCount = getTitleKeysCount();
}
public void setExtractFilesDir(String path){preferences.put("extract_path", path);}
public String getExtractFilesDir(){return preferences.get("extract_path", System.getProperty("user.dir"));}
public void setAll(
String xciHeaderKey,
String headerKey

2
src/main/java/konogonka/Controllers/MainController.java
View File

@ -89,7 +89,7 @@ public class MainController implements Initializable {
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NS files", "*.nsp", "*.xci", "*.nca", "*.tik", "*.xml", "*.npdm"));
this.selectedFile = fileChooser.showOpenDialog(analyzeBtn.getScene().getWindow());
// todo: fix
analyzeBtn.setDisable(true);
NSPTabController.resetTab();
XCITabController.resetTab();

13
src/main/java/konogonka/Controllers/NPDM/ServiceAccessControlController.java
View File

@ -6,10 +6,10 @@ import javafx.geometry.Insets;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import konogonka.Tools.NPDM.LCollectionEntry;
import java.net.URL;
import java.util.LinkedList;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.ResourceBundle;
public class ServiceAccessControlController implements Initializable {
@ -25,13 +25,12 @@ public class ServiceAccessControlController implements Initializable {
SACPane.getChildren().clear();
}
public void populateFields(LinkedList<LCollectionEntry> collection){
public void populateFields(LinkedHashMap<String, Byte> collection){
resetTab();
for (LCollectionEntry entry : collection) {
Label control = new Label(String.format("0x%02x", entry.getKey()));
Label serviceName = new Label(entry.getValue());
for (Map.Entry entry : collection.entrySet()) {
Label control = new Label(String.format("0x%02x", (Byte) entry.getValue()));
Label serviceName = new Label((String) entry.getKey());
control.setPadding(new Insets(5.0, 5.0, 5.0, 5.0));
serviceName.setPadding(new Insets(5.0, 5.0, 5.0, 5.0));

6
src/main/java/konogonka/Controllers/NSP/NSPController.java
View File

@ -4,6 +4,7 @@ import javafx.concurrent.Task;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import konogonka.AppPreferences;
import konogonka.Controllers.IRowModel;
import konogonka.Controllers.ITabController;
import konogonka.MediatorControl;
@ -51,9 +52,7 @@ public class NSPController implements ITabController {
List<IRowModel> models = tableFilesListController.getFilesForDump();
ISuperProvider provider = tableFilesListController.getProvider();
if (models != null && !models.isEmpty() && (provider != null)){
//File dir = new File(System.getProperty("user.dir")+File.separator+selectedFile.getName()+" extracted"); // todo: move option to settings
File dir = new File(System.getProperty("user.dir")+File.separator+provider.getFile().getName()+" extracted"); // todo: move option to settings
File dir = new File(AppPreferences.getInstance().getExtractFilesDir()+File.separator+provider.getFile().getName()+" extracted");
try {
dir.mkdir();
}
@ -65,7 +64,6 @@ public class NSPController implements ITabController {
extractBtn.setDisable(true);
//Extractor extractor = new Extractor(rawFileDataStart, models, dir.getAbsolutePath()+File.separator, selectedFile); //TODO: REMOVE
Extractor extractor = new Extractor(provider, models, dir.getAbsolutePath()+File.separator);
extractor.setOnSucceeded(e->{
extractBtn.setDisable(false);

3
src/main/java/konogonka/Controllers/XCI/HFSBlockController.java
View File

@ -5,6 +5,7 @@ import javafx.fxml.Initializable;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TitledPane;
import konogonka.AppPreferences;
import konogonka.Controllers.IRowModel;
import konogonka.MediatorControl;
import konogonka.Tools.ISuperProvider;
@ -94,7 +95,7 @@ public class HFSBlockController implements Initializable {
ISuperProvider provider = hfs0tableFilesListMainController.getProvider();
if (models != null && !models.isEmpty() && (provider != null)){
File dir = new File(System.getProperty("user.dir")+File.separator+selectedFile.getName()+" "+type+" extracted");
File dir = new File(AppPreferences.getInstance().getExtractFilesDir()+File.separator+selectedFile.getName()+" "+type+" extracted");
try {
dir.mkdir();
}

17
src/main/java/konogonka/Settings/SettingsController.java
View File

@ -3,8 +3,10 @@ package konogonka.Settings;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.TextFormatter;
import javafx.stage.DirectoryChooser;
import javafx.stage.FileChooser;
import javafx.stage.Stage;
import konogonka.AppPreferences;
@ -33,8 +35,22 @@ public class SettingsController implements Initializable {
xciHdrKeyTF,
hdrKeyTF;
@FXML
private Button extractFilesToBtn;
@FXML
private Label extractFilesPathLbl;
@Override
public void initialize(URL url, ResourceBundle resourceBundle) {
extractFilesPathLbl.setText(AppPreferences.getInstance().getExtractFilesDir());
extractFilesToBtn.setOnAction(e -> {
DirectoryChooser dirChooser = new DirectoryChooser();
dirChooser.setTitle("Extract files to...");
dirChooser.setInitialDirectory(new File(System.getProperty("user.home")));
File dir = dirChooser.showDialog(extractFilesToBtn.getScene().getWindow());
if (dir != null && dir.exists())
extractFilesPathLbl.setText(dir.getAbsolutePath());
});
ListSelectorKAEKAppController.initSelector(32, "key_area_key_application_");
ListSelectorKAEKOceanController.initSelector(32, "key_area_key_ocean_");
ListSelectorKAEKSysController.initSelector(32, "key_area_key_system_");
@ -227,6 +243,7 @@ public class SettingsController implements Initializable {
for (int i = 0; i < titleKeysSet.length; i++)
AppPreferences.getInstance().setTitleKey(i, titleKeysSet[i]);
}
AppPreferences.getInstance().setExtractFilesDir(extractFilesPathLbl.getText());
thisStage.close();
});
}

4
src/main/java/konogonka/Tools/NPDM/ACID/KernelAccessControlProvider.java
View File

@ -1,8 +1,10 @@
package konogonka.Tools.NPDM.ACID;
import konogonka.RainbowHexDump;
public class KernelAccessControlProvider {
KernelAccessControlProvider(byte[] bytes){
RainbowHexDump.hexDumpUTF8(bytes);
}
}

12
src/main/java/konogonka/Tools/NPDM/ACID/ServiceAccessControlProvider.java
View File

@ -1,16 +1,14 @@
package konogonka.Tools.NPDM.ACID;
import konogonka.Tools.NPDM.LCollectionEntry;
import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.LinkedHashMap;
public class ServiceAccessControlProvider {
private LinkedList<LCollectionEntry> collection;
private LinkedHashMap<String, Byte> collection;
public ServiceAccessControlProvider(byte[] bytes){
collection = new LinkedList<>();
collection = new LinkedHashMap<>();
byte key;
String value;
@ -19,7 +17,7 @@ public class ServiceAccessControlProvider {
while (i < bytes.length){
key = bytes[i];
value = new String(bytes, i+1, getSize(key), StandardCharsets.UTF_8);
collection.add(new LCollectionEntry(key, value));
collection.put(value, key);
i += getSize(key)+1;
}
}
@ -28,5 +26,5 @@ public class ServiceAccessControlProvider {
return ((byte) 0x7 & control) + (byte) 0x01;
}
public LinkedList<LCollectionEntry> getCollection() { return collection; }
public LinkedHashMap<String, Byte> getCollection() { return collection; }
}

15
src/main/java/konogonka/Tools/NPDM/LCollectionEntry.java
View File

@ -1,15 +0,0 @@
package konogonka.Tools.NPDM;
public class LCollectionEntry {
private byte key;
private String value;
public LCollectionEntry(byte key, String value){
this.key = key;
this.value = value;
}
public byte getKey() { return key; }
public String getValue() { return value; }
}

31
src/main/resources/FXML/Settings/SettingsLayout.fxml
View File

@ -22,7 +22,36 @@
<content>
<ScrollPane fitToWidth="true">
<content>
<VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
<VBox spacing="5.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<children>
<HBox alignment="CENTER_LEFT" spacing="5.0">
<children>
<Button fx:id="extractFilesToBtn" mnemonicParsing="false" text="Extract files to:" />
<Label fx:id="extractFilesPathLbl" />
</children>
</HBox>
</children>
</VBox>
</content>
</ScrollPane>
</content>
<graphic>
<VBox alignment="TOP_CENTER" spacing="5.0">
<children>
<SVGPath content="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
<Label text="Application" />
</children>
</VBox>
</graphic>
</Tab>
<Tab closable="false">
<content>
<ScrollPane fitToWidth="true">
<content>
<VBox prefHeight="100.0" spacing="5.0">
<children>
<Label text="Used for XCI" />
<HBox alignment="CENTER_LEFT" spacing="5.0">