Add CLI support for Tinfoil/Awoo USB-install mode.
This commit is contained in:
parent
51938df434
commit
dc995e1bae
3 changed files with 65 additions and 1 deletions
|
@ -61,6 +61,11 @@ public class CommandLineInterface {
|
||||||
new TinfoilNet(tfnArguments);
|
new TinfoilNet(tfnArguments);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (cli.hasOption("t") || cli.hasOption("tinfoil")){
|
||||||
|
final String[] tfArguments = cli.getOptionValues("tinfoil");
|
||||||
|
new TinfoilUsb(tfArguments);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (ParseException pe){
|
catch (ParseException pe){
|
||||||
System.out.println(pe.getLocalizedMessage() +
|
System.out.println(pe.getLocalizedMessage() +
|
||||||
|
@ -116,6 +121,13 @@ public class CommandLineInterface {
|
||||||
.hasArgs()
|
.hasArgs()
|
||||||
.argName("...")
|
.argName("...")
|
||||||
.build();
|
.build();
|
||||||
|
/* Tinfoil/Awoo USB */
|
||||||
|
final Option tinfoilOption = Option.builder("t")
|
||||||
|
.longOpt("tinfoil")
|
||||||
|
.desc("Install via Tinfoil/Awoo USB mode.")
|
||||||
|
.hasArgs()
|
||||||
|
.argName("FILE1 ...")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
|
||||||
final OptionGroup group = new OptionGroup();
|
final OptionGroup group = new OptionGroup();
|
||||||
|
@ -124,6 +136,7 @@ public class CommandLineInterface {
|
||||||
group.addOption(cleanSettingsOption);
|
group.addOption(cleanSettingsOption);
|
||||||
group.addOption(versionOption);
|
group.addOption(versionOption);
|
||||||
group.addOption(helpOption);
|
group.addOption(helpOption);
|
||||||
|
group.addOption(tinfoilOption);
|
||||||
|
|
||||||
options.addOptionGroup(group);
|
options.addOptionGroup(group);
|
||||||
|
|
||||||
|
|
|
@ -123,7 +123,7 @@ public class TinfoilNet {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (filesList.size() == 0) {
|
if (filesList.size() == 0) {
|
||||||
throw new IncorrectSetupException("File(s) doesn't exists.\n" +
|
throw new IncorrectSetupException("File(s) doesn't exist.\n" +
|
||||||
"Try 'ns-usbloader -n help' for more information.");
|
"Try 'ns-usbloader -n help' for more information.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
51
src/main/java/nsusbloader/cli/TinfoilUsb.java
Normal file
51
src/main/java/nsusbloader/cli/TinfoilUsb.java
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
package nsusbloader.cli;
|
||||||
|
|
||||||
|
import nsusbloader.COM.ICommunications;
|
||||||
|
import nsusbloader.COM.USB.UsbCommunications;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class TinfoilUsb {
|
||||||
|
|
||||||
|
private final String[] arguments;
|
||||||
|
private List<File> filesList;
|
||||||
|
|
||||||
|
public TinfoilUsb(String[] arguments) throws InterruptedException, IncorrectSetupException{
|
||||||
|
this.arguments = arguments;
|
||||||
|
checkArguments();
|
||||||
|
parseFilesArguments();
|
||||||
|
runTinfoilBackend();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkArguments() throws IncorrectSetupException{
|
||||||
|
if (arguments == null || arguments.length == 0) {
|
||||||
|
throw new IncorrectSetupException("No files?\n" +
|
||||||
|
"Try 'ns-usbloader -h' for more information.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void parseFilesArguments() throws IncorrectSetupException{
|
||||||
|
filesList = new ArrayList<>();
|
||||||
|
File file;
|
||||||
|
|
||||||
|
for (String arg : arguments) {
|
||||||
|
file = new File(arg);
|
||||||
|
if (file.exists())
|
||||||
|
filesList.add(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (filesList.size() == 0) {
|
||||||
|
throw new IncorrectSetupException("File(s) doesn't exist.\n" +
|
||||||
|
"Try 'ns-usbloader -n help' for more information.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void runTinfoilBackend() throws InterruptedException{
|
||||||
|
ICommunications task = new UsbCommunications(filesList, "TinFoil", false);
|
||||||
|
Thread thread = new Thread(task);
|
||||||
|
thread.start();
|
||||||
|
thread.join();
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue