bonkmaykr/firestar
bonkmaykr/firestar
2
1
Fork 0
Code Issues 2 Pull Requests Releases 6 Wiki Activity

downloader fixes

Browse Source
This commit is contained in:
Downforce Agent 2024-07-10 01:36:48 -05:00
parent 125fc238b3
commit 34c5f17d71
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
firestar/src/main/java/Bert.java
View File

@ -96,8 +96,8 @@ public class Bert implements ActionListener {
if (result == JOptionPane.NO_OPTION) {return;} if (result == JOptionPane.NO_OPTION) {return;}
System.out.println("User requested download of assets. Deleting existing PSARCs"); System.out.println("User requested download of assets. Deleting existing PSARCs");
new File(Main.inpath + "data.psarc").delete(); new File(Main.inpath + "data.psarc").delete();
new File(Main.inpath + "data01.psarc").delete(); new File(Main.inpath + "data1.psarc").delete();
new File(Main.inpath + "data02.psarc").delete(); new File(Main.inpath + "data2.psarc").delete();
new File(Main.inpath + "dlc1.psarc").delete(); new File(Main.inpath + "dlc1.psarc").delete();
new File(Main.inpath + "dlc2.psarc").delete(); new File(Main.inpath + "dlc2.psarc").delete();
@ -111,7 +111,7 @@ public class Bert implements ActionListener {
if (patchRad.isSelected()) { if (patchRad.isSelected()) {
type = Main.ArcTarget.LATEST; type = Main.ArcTarget.LATEST;
key = Main.ArcKey.LATEST; key = Main.ArcKey.LATEST;
System.out.println("Begin download of data02 (Game version 1.04)"); System.out.println("Begin download of data2 (Game version 1.04)");
} else } else
if (hdRad.isSelected()) { if (hdRad.isSelected()) {
type = Main.ArcTarget.ADDON_HD; type = Main.ArcTarget.ADDON_HD;
@ -152,6 +152,14 @@ public class Bert implements ActionListener {
try { try {
if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + Main.inpath + ";wine pkg2zip.exe -x asset.pkg " + key.toString()});} if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + Main.inpath + ";wine pkg2zip.exe -x asset.pkg " + key.toString()});}
else {p = Runtime.getRuntime().exec(new String[]{Main.inpath + "pkg2zip.exe", "-x", "asset.pkg", key.toString()}, null, new File(Main.inpath));} //inpath cannot change here else {p = Runtime.getRuntime().exec(new String[]{Main.inpath + "pkg2zip.exe", "-x", "asset.pkg", key.toString()}, null, new File(Main.inpath));} //inpath cannot change here
InputStream debugin = new BufferedInputStream(p.getInputStream());
OutputStream debugout = new BufferedOutputStream(System.out);
int c;
while ((c = debugin.read()) != -1) {
debugout.write(c);
}
debugin.close();
debugout.close();
p.waitFor(); p.waitFor();
} catch (Exception e) { } catch (Exception e) {
System.out.println(e.getMessage()); System.out.println(e.getMessage());
@ -173,7 +181,7 @@ public class Bert implements ActionListener {
name = "data.psarc"; name = "data.psarc";
} else if (type == Main.ArcTarget.LATEST) { } else if (type == Main.ArcTarget.LATEST) {
extracted = "patch/PCSA00015"; extracted = "patch/PCSA00015";
name = "data02.psarc"; name = "data2.psarc";
} else if (type == Main.ArcTarget.ADDON_HD) { } else if (type == Main.ArcTarget.ADDON_HD) {
extracted = "addcont/PCSA00015/DLC1W2048PACKAGE"; extracted = "addcont/PCSA00015/DLC1W2048PACKAGE";
name = "dlc1.psarc"; name = "dlc1.psarc";
@ -184,26 +192,35 @@ public class Bert implements ActionListener {
System.out.println("Internal Error: Bert got dementia. Get a programmer!"); System.out.println("Internal Error: Bert got dementia. Get a programmer!");
JOptionPane.showMessageDialog(invoker, "Internal Error: Bert got dementia. Get a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(invoker, "Internal Error: Bert got dementia. Get a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
new File(Main.inpath + "asset.pkg").delete(); new File(Main.inpath + "asset.pkg").delete();
new File(Main.inpath + "app/").delete(); Main.deleteDir(new File(Main.inpath + "app/"));
new File(Main.inpath + "patch/").delete(); Main.deleteDir(new File(Main.inpath + "patch/"));
new File(Main.inpath + "addcont/").delete(); Main.deleteDir(new File(Main.inpath + "addcont/"));
invoker.setEnabled(true); invoker.setEnabled(true);
invoker.setVisible(true); invoker.setVisible(true);
invoker.toFront(); invoker.toFront();
invoker.repaint(); invoker.repaint();
return; return;
} }
try { try {
if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + Main.inpath + ";wine psvpfsparser.exe -i " + extracted + " -o ./temp/ -z " + key.toString() + " -f cma.henkaku.xyz"});} if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + Main.inpath + ";wine psvpfsparser.exe -i " + extracted + " -o ./temp/ -z " + key.toString() + " -f cma.henkaku.xyz"});}
else {p = Runtime.getRuntime().exec(new String[]{Main.inpath + "psvpfsparser.exe", "-i", extracted, "-o", "./temp/", "-z", key.toString(), "-f", "cma.henkaku.xyz"}, null, new File(Main.inpath));} else {p = Runtime.getRuntime().exec(new String[]{Main.inpath + "psvpfsparser.exe", "-i", extracted, "-o", "./temp/", "-z", key.toString(), "-f", "cma.henkaku.xyz"}, null, new File(Main.inpath));}
InputStream debugin = new BufferedInputStream(p.getInputStream());
OutputStream debugout = new BufferedOutputStream(System.out);
int c;
while ((c = debugin.read()) != -1) {
debugout.write(c);
}
debugin.close();
debugout.close();
p.waitFor(); p.waitFor();
} catch (Exception e) { } catch (Exception e) {
System.out.println(e.getMessage()); System.out.println(e.getMessage());
JOptionPane.showMessageDialog(invoker, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(invoker, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
new File(Main.inpath + "asset.pkg").delete(); new File(Main.inpath + "asset.pkg").delete();
new File(Main.inpath + "app/").delete(); Main.deleteDir(new File(Main.inpath + "app/"));
new File(Main.inpath + "patch/").delete(); Main.deleteDir(new File(Main.inpath + "patch/"));
new File(Main.inpath + "addcont/").delete(); Main.deleteDir(new File(Main.inpath + "addcont/"));
invoker.setEnabled(true); invoker.setEnabled(true);
invoker.setVisible(true); invoker.setVisible(true);
invoker.toFront(); invoker.toFront();
@ -215,9 +232,9 @@ public class Bert implements ActionListener {
System.out.println("Cleaning up"); System.out.println("Cleaning up");
new File(Main.inpath + "asset.pkg").delete(); new File(Main.inpath + "asset.pkg").delete();
new File(Main.inpath + "temp/PSP2/" + name).renameTo(new File(Main.inpath + name)); new File(Main.inpath + "temp/PSP2/" + name).renameTo(new File(Main.inpath + name));
Main.deleteDir(new File(Main.inpath + "addcont/"));
Main.deleteDir(new File(Main.inpath + "patch/"));
Main.deleteDir(new File(Main.inpath + "app/")); Main.deleteDir(new File(Main.inpath + "app/"));
Main.deleteDir(new File(Main.inpath + "patch/"));
Main.deleteDir(new File(Main.inpath + "addcont/"));
Main.deleteDir(new File(Main.inpath + "temp/")); Main.deleteDir(new File(Main.inpath + "temp/"));
// restore controls // restore controls