From bc5c84498e6971f559a9fdea3e0eff257b3bb52f Mon Sep 17 00:00:00 2001 From: Maschell Date: Wed, 2 Mar 2016 21:13:13 +0100 Subject: [PATCH] Other small fixes --- jar/JNUSTool.jar | Bin 78009 -> 78104 bytes src/de/mas/jnustool/NUSTitle.java | 39 ++++++++++++++----------- src/de/mas/jnustool/TitleMetaData.java | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/jar/JNUSTool.jar b/jar/JNUSTool.jar index caf54dd2e44f912cb44b44eb7acd9ff714765dad..b54ec3bafb7751d0b5e351ca9f5cb8e64f71f5c0 100644 GIT binary patch delta 9484 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 delta 9411 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 GW&a1;G~Dw5 diff --git a/src/de/mas/jnustool/NUSTitle.java b/src/de/mas/jnustool/NUSTitle.java index a6feaf2..fac0705 100644 --- a/src/de/mas/jnustool/NUSTitle.java +++ b/src/de/mas/jnustool/NUSTitle.java @@ -169,16 +169,16 @@ public class NUSTitle { setLongNameFolder(String.format("%016X", getTitleID())); - if(tmd.isUpdate()){ - byte[] metaxml = fst.metaFENtry.downloadAsByteArray(); - if(metaxml != null){ - InputStream bis = new ByteArrayInputStream(metaxml); - NUSTitleInformation nusinfo = readMeta(bis); - String folder = nusinfo.getLongnameEN() + " [" + nusinfo.getID6() + "]"; - String subfolder = "/" + "updates" + "/" + "v" + tmd.titleVersion; - setTargetPath(folder + subfolder); - setLongNameFolder(folder); - } + + byte[] metaxml = fst.metaFENtry.downloadAsByteArray(); + if(metaxml != null){ + InputStream bis = new ByteArrayInputStream(metaxml); + NUSTitleInformation nusinfo = readMeta(bis); + String folder = nusinfo.getLongnameEN() + " [" + nusinfo.getID6() + "]"; + String subfolder = ""; + if(tmd.isUpdate()) subfolder = "/" + "updates" + "/" + "v" + tmd.titleVersion; + setTargetPath(folder + subfolder); + setLongNameFolder(folder); } if(Settings.downloadContent){ @@ -201,15 +201,20 @@ public class NUSTitle { Util.createSubfolder(getContentPath()); Downloader.getInstance().downloadTMD(titleID,version,getContentPath()); - Downloader.getInstance().downloadTicket(titleID,getContentPath()); - tmd.downloadContents(progress); + try{ + Downloader.getInstance().downloadTicket(titleID,getContentPath()); + FileOutputStream fos = new FileOutputStream(getContentPath() + "/title.cert"); + fos.write(ticket.cert0); + fos.write(tmd.cert); + fos.write(ticket.cert1); + fos.close(); + }catch(Exception e){ + Logger.log("Random error."); + } + + - FileOutputStream fos = new FileOutputStream(getContentPath() +"/title.cert"); - fos.write(ticket.cert0); - fos.write(tmd.cert); - fos.write(ticket.cert1); - fos.close(); } NUSTitleInformation readMeta(InputStream bis) { diff --git a/src/de/mas/jnustool/TitleMetaData.java b/src/de/mas/jnustool/TitleMetaData.java index e38c9d6..fc86641 100644 --- a/src/de/mas/jnustool/TitleMetaData.java +++ b/src/de/mas/jnustool/TitleMetaData.java @@ -164,7 +164,7 @@ public class TitleMetaData { } public boolean isUpdate() { - return (titleID & 0x5000000000000L) == 0x5000000000000L; + return (titleID & 0x5000E00000000L) == 0x5000E00000000L; } public void downloadContents(Progress progress) throws IOException{