rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Screen the files a User tries to add to the Editor Defintion Manager

This commit is contained in:
Dale Schultz 2022-05-18 08:56:28 -04:00
parent 2f89436bc0
commit 16dbe71471
No known key found for this signature in database
GPG Key ID: EA2C8AD6CB5C2AF2
3 changed files with 109 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize/nameSequences.properties Normal file
View File

@ -0,0 +1,6 @@
RomRaider = <roms>
Profile = <profile
Dyno = <dyno>
Logger = <logger
EcuFlash = <include>
EcuFlashBase = <scaling name

3
i18n/com/romraider/swing/DefinitionManager.properties
View File

@ -9,4 +9,5 @@ CANCEL = Cancel
APPLY = Apply
UNDO = Undo
CONVERSIONTITLE = Conversion Layer Warning
INVALIDFILE = Invalid RomRaider Editor definition file
INVALIDMSG = {0}: ''{1}'' is not a valid RomRaider Editor definition file

131
src/main/java/com/romraider/swing/DefinitionManager.java
View File

@ -1,6 +1,6 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2020 RomRaider.com
* Copyright (C) 2006-2022 RomRaider.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -23,7 +23,13 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.Properties;
import java.util.ResourceBundle;
import java.util.Scanner;
import java.util.Vector;
import javax.swing.*;
@ -213,39 +219,80 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
}
public void addFile() {
Settings settings = SettingsManager.getSettings();
JFileChooser fc = new JFileChooser(settings.getLastDefinitionDir());
final Settings settings = SettingsManager.getSettings();
final JFileChooser fc = new JFileChooser(settings.getLastDefinitionDir());
fc.setMultiSelectionEnabled(true);
fc.setFileFilter(new DefinitionFilter());
if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
for(File f: fc.getSelectedFiles()) {
boolean alreadyAdded = false;
//Check if it already exists in the list
for(String path: fileNames) {
if(path.equalsIgnoreCase(f.getAbsolutePath())) {
alreadyAdded = true;
break;
}
}
if(!alreadyAdded) {
//If its a file that needs to be converted sometimes a warning
//should be displayed to the user
if(ConversionLayerFactory.requiresConversionLayer(f)) {
ConversionLayer layer = ConversionLayerFactory.getConversionLayerForFile(f);
if(layer.getDefinitionPickerInfo() != null) {
JOptionPane.showMessageDialog(null, layer.getDefinitionPickerInfo(),
rb.getString("CONVERSIONTITLE"), JOptionPane.WARNING_MESSAGE);
}
}
fileNames.add(f.getAbsolutePath());
}
settings.setLastDefinitionDir(f.getParentFile());
}
for (File f : fc.getSelectedFiles()) {
boolean alreadyAdded = false;
//Check if it already exists in the list
for (String path : fileNames) {
if (path.equalsIgnoreCase(f.getAbsolutePath())) {
alreadyAdded = true;
break;
}
}
if (!alreadyAdded) {
//If its a file that needs to be converted sometimes a warning
//should be displayed to the user
if (ConversionLayerFactory.requiresConversionLayer(f)) {
ConversionLayer layer = ConversionLayerFactory.getConversionLayerForFile(f);
if (layer.getDefinitionPickerInfo() != null) {
JOptionPane.showMessageDialog(null, layer.getDefinitionPickerInfo(),
rb.getString("CONVERSIONTITLE"), JOptionPane.WARNING_MESSAGE);
}
}
}
else {
continue;
}
// Try to determine if the selected file is valid, refuse to
// add invalid types.
// File types and search sequences are loaded from a properties file.
final Properties props = loadSequences();
if (props.size() > 0) {
String fileType = "RomRaider";
boolean breakSearch = false;
try {
final Scanner scan = new Scanner(f);
// Scan the file looking for invalid string sequences,
// the value of a properties file key.
while(scan.hasNext()) {
breakSearch = false;
final String line = scan.nextLine().toLowerCase().toString();
for (Object key : props.keySet()) {
if (line.contains(props.getProperty((String) key))) {
fileType = (String) key;
breakSearch = true;
break;
}
}
if (breakSearch) break;
}
scan.close();
} catch (FileNotFoundException e) {
// Since the user selected it, it should be found.
e.printStackTrace();
}
if (!fileType.equalsIgnoreCase("RomRaider")) {
JOptionPane.showMessageDialog(this, MessageFormat.format(
rb.getString("INVALIDMSG"), fileType, f.getName()),
rb.getString("INVALIDFILE"),
JOptionPane.WARNING_MESSAGE);
continue;
}
}
fileNames.add(f.getAbsolutePath());
settings.setLastDefinitionDir(f.getParentFile());
}
updateListModel();
}
@ -294,4 +341,28 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
private javax.swing.JScrollPane jScrollPane1;
// End of variables declaration//GEN-END:variables
/**
* Load String search sequences from a user customized properties file.
* The file will populate a search list if it is present.
* String search Sequences in the file are in type=sequence sets.
* @exception FileNotFoundException if the directory or file is not present
* @exception IOException if there's some kind of IO error
*/
private Properties loadSequences() {
final Properties sequences = new Properties();
try {
final FileInputStream propFile = new FileInputStream("./customize/nameSequences.properties");
sequences.load(propFile);
propFile.close();
} catch (FileNotFoundException e) {
JOptionPane.showMessageDialog(null, e.getLocalizedMessage(),
"FileNotFoundException",
JOptionPane.ERROR_MESSAGE);
} catch (IOException e) {
JOptionPane.showMessageDialog(null, e.getLocalizedMessage(),
"IOException",
JOptionPane.ERROR_MESSAGE);
}
return sequences;
}
}