From 194b1d50251314265423414a85f3483cb4ffe83d Mon Sep 17 00:00:00 2001
From: adamoutler <adamoutler@92934c8e-e715-5ac5-4622-ca3692a7682f>
Date: Sun, 24 Nov 2013 02:16:47 +0000
Subject: [PATCH] Updating print-pit output

---
 .../src/CASUAL/archiving/libpit/PitEntry.java |  17 ++-
 .../src/CASUAL/resources/CASUALApp.properties |   4 +-
 .../src/com/casual_dev/libpitX/PitData.java   |  51 ++++++-
 .../src/com/casual_dev/libpitX/PitEntry.java  | 142 ++++++++++++++++--
 4 files changed, 188 insertions(+), 26 deletions(-)

diff --git a/CASUALcore/src/CASUAL/archiving/libpit/PitEntry.java b/CASUALcore/src/CASUAL/archiving/libpit/PitEntry.java
index 07ad5cde..fda6d96f 100644
--- a/CASUALcore/src/CASUAL/archiving/libpit/PitEntry.java
+++ b/CASUALcore/src/CASUAL/archiving/libpit/PitEntry.java
@@ -306,7 +306,7 @@ public String getPartitionFriendlyName() {
                 while(part_name[i]==0 && i<part_name.length-1){
                     i++;
                     if (part_name[i]!=0){
-                        filename=filename+"\nPartition Parameter: "+part_name[i];
+                        filename=filename+"   param: "+part_name[i];
                         break;
                     }
                 }
@@ -377,7 +377,7 @@ public String getFriendlyFileName() {
                 while(file_name[i]==0 && i<file_name.length-1){
                     i++;
                     if (file_name[i]!=0){
-                        filename=filename+"\nFilename Parameter: "+file_name[i];
+                        filename=filename+"   param: "+file_name[i];
                         break;
                     }
                 }
@@ -448,7 +448,7 @@ public String getFOTAFriendlyName() {
                 while(fota_name[i]==0 && i<fota_name.length-1){
                     i++;
                     if (fota_name[i]!=0){
-                        fotaname=fotaname+"\nFOTA Parameter: "+part_name[i];
+                        fotaname=fotaname+"   param: "+part_name[i];
                         break;
                     }
                 }
@@ -604,9 +604,14 @@ File Size (Obsolete): 0
         sb.append("Filename: ").append(this.getFriendlyFileName()).append(n);
         sb.append("Block Size: ").append(this.block_count).append(" (").append(getBlockCountFriendly(true)).append(")").append(n);
         sb.append("Block range: ").append(this.block_start).append(" - ").append(getPartitionEndBlock());
-        sb.append("(ofs 0x").append(Integer.toHexString(this.block_start)).append(" - 0x").append(Integer.toHexString(getPartitionEndBlock())).append(")").append(n); 
-        sb.append("Part/Dev/Filesystem/Bin/:").append(this.part_type).append(this.bin_type).append(this.filesystem).append(this.bin_type).append(n);
-        sb.append("FOTA Filename: ").append(this.getFotaName()).append(n);
+        sb.append(" (hex 0x").append(Integer.toHexString(this.block_start)).append(" - 0x").append(Integer.toHexString(getPartitionEndBlock())).append(")").append(n); 
+        sb.append("PartType: ").append(this.part_type);
+        sb.append("   DevType: ").append(this.device_type);
+        sb.append("   FilesystemType: ").append(this.filesystem);
+        sb.append("   BinType: ").append(this.bin_type).append(n);
+        sb.append("Offset:").append(this.file_offset);
+        sb.append("   Size: ").append(this.file_size);
+        sb.append("   FOTA: ").append(this.getFotaName()).append(n);
         sb.append(getPartitionDescritpion());
         if (this.getFotaName().contains("remained")){
             sb.append(" and the partition will expand to fill the remainder of the ").append(this.getHardwareTypeFriendlyName());
diff --git a/CASUALcore/src/CASUAL/resources/CASUALApp.properties b/CASUALcore/src/CASUAL/resources/CASUALApp.properties
index 766c155c..ce464a72 100644
--- a/CASUALcore/src/CASUAL/resources/CASUALApp.properties
+++ b/CASUALcore/src/CASUAL/resources/CASUALApp.properties
@@ -1,4 +1,4 @@
-#Sat, 23 Nov 2013 14:01:27 -0600
+#Sat, 23 Nov 2013 20:14:59 -0600
 #Application.buildnumber=7476
 #Wed Nov 20 21:33:54 CST 2013
 Application.buildnumber=7476
@@ -11,6 +11,6 @@ Application.vendor=AdamOutler
 Application.id=${Application.name}
 Application.vendorId=AdamOutler
 Application.interactions=GUI.development.CASUALShowJFrameMessageObject
-Application.revision=912
+Application.revision=915
 Application.description=CASUAL Cross-platform Android Scripting and Unified Auxiliary Loader
 Application.title=CASUAL R
diff --git a/X/libpitX/src/com/casual_dev/libpitX/PitData.java b/X/libpitX/src/com/casual_dev/libpitX/PitData.java
index b03a30c0..c70569fb 100644
--- a/X/libpitX/src/com/casual_dev/libpitX/PitData.java
+++ b/X/libpitX/src/com/casual_dev/libpitX/PitData.java
@@ -197,7 +197,7 @@ public boolean matches(PitData otherPitData) {
     }
 
     /**
-     *
+     * clears all data in the pit file.
      */
     public void clear() {
         entryCount = 0;
@@ -323,20 +323,65 @@ public char[] getPhone() {
         return pitName;
     }
 
+    /**
+     * returns pit name with parameters
+     * @return PIT friendly name with parameters
+     */
+    public String getPITFriendlyName() {
+        String pitFriendlyName = "";
+        for (int i = 0; i < pitName.length; i++) {
+            //first part of file will be filename
+            if (pitName[i] != 0) {
+                pitFriendlyName = pitFriendlyName + pitName[i];
+            } else { //anything after first 0 byte will be a parameter
+                while (pitName[i] == 0 && i < pitName.length - 1) {
+                    i++;
+                    if (pitName[i] != 0) {
+                        pitFriendlyName = pitFriendlyName + "\nPIT Parameter: " + pitName[i];
+                        break;
+                    }
+                }
+            }
+        }
+        return pitFriendlyName;
+    }
+    /**
+     * returns filetype friendly name with parameters 
+     * @return File Type friendly name with parameters
+     */
+    public String getFileTypeFriendlyName() {
+        String filetypeFriendlyName = "";
+        for (int i = 0; i < fileType.length; i++) {
+            //first part of file will be filename
+            if (fileType[i] != 0) {
+                filetypeFriendlyName = filetypeFriendlyName + fileType[i];
+            } else { //anything after first 0 byte will be a parameter
+                while (fileType[i] == 0 && i < fileType.length - 1) {
+                    i++;
+                    if (fileType[i] != 0) {
+                        filetypeFriendlyName = filetypeFriendlyName + "\nPIT Parameter: " + fileType[i];
+                        break;
+                    }
+                }
+            }
+        }
+        return filetypeFriendlyName;
+    }
     @Override
     public String toString() {
         String n = System.getProperty("line.separator");
         StringBuilder sb = new StringBuilder();
         sb.append(n);
-        sb.append("PIT Name: ").append(this.pitName).append(n);
+        sb.append("PIT Name: ").append(getPITFriendlyName()).append(n);
         sb.append("Entry Count: ").append(this.entryCount).append(n);
-        sb.append("File Type: ").append(this.fileType).append(n);
+        sb.append("File Type: ").append(getFileTypeFriendlyName()).append(n);
         sb.append(n);
         sb.append(n);
         for (int i = 0; i < this.entries.size(); i++) {
             sb.append("--- Entry #").append(i).append(" ---").append(n);
             sb.append(entries.get(i).toString());
         }
+        sb.append(n).append(n);
         return sb.toString();
     }
 
diff --git a/X/libpitX/src/com/casual_dev/libpitX/PitEntry.java b/X/libpitX/src/com/casual_dev/libpitX/PitEntry.java
index d92a6058..178b8f61 100644
--- a/X/libpitX/src/com/casual_dev/libpitX/PitEntry.java
+++ b/X/libpitX/src/com/casual_dev/libpitX/PitEntry.java
@@ -106,6 +106,19 @@ public boolean matches(PitEntry otherPitEntry) {
     public int getBinType() {
         return bin_type;
     }
+    
+    /**
+     * gets the friendly name of bin
+     * AP or CP
+     * @return AP or CP
+     */
+    public String getBinFriendlyType(){
+        if (bin_type==0){
+            return "AP";
+        } else {
+            return "CP";
+        }
+    }
 
     /**
      * binary type
@@ -278,7 +291,30 @@ public String getPartitionName() {
         String partitionName = "";
         return new String(part_name).trim();
     }
-
+        /**
+     * Proper Friendly name and parameters of partition used to reference flash location
+     *
+     * @return partition name
+     */
+    public String getPartitionFriendlyName() {
+ String filename = "";
+        for (int i = 0; i < part_name.length; i++) {
+            //first part of file will be filename
+            if (part_name[i] != 0) {
+                filename = filename + part_name[i];
+            } else { //anything after first 0 byte will be a parameter
+                while(part_name[i]==0 && i<part_name.length-1){
+                    i++;
+                    if (part_name[i]!=0){
+                        filename=filename+"   param: "+part_name[i];
+                        break;
+                    }
+                }
+            }
+            
+        }
+        return (filename);
+    }
     /**
      * Proper name of partition used to reference flash location
      *
@@ -316,12 +352,37 @@ public byte[] getFileNameBytes() {
      *
      * @return file name
      */
-    public String getFilename() {
+    public String getFilenameString() {
+        String filename = "";
+        for (int i = 0; i < file_name.length; i++) {
+            if (file_name[i] != 0) {
+                filename = filename + file_name[i];
+            }
+        }
+        return (filename);
+    }
+    
+     /**
+     * Name of file when transferred from device
+     *
+     * @return file name
+     */
+    public String getFriendlyFileName() {
         String filename = "";
         for (int i = 0; i < file_name.length; i++) {
+            //first part of file will be filename
             if (file_name[i] != 0) {
                 filename = filename + file_name[i];
+            } else { //anything after first 0 byte will be a parameter
+                while(file_name[i]==0 && i<file_name.length-1){
+                    i++;
+                    if (file_name[i]!=0){
+                        filename=filename+"   param: "+file_name[i];
+                        break;
+                    }
+                }
             }
+            
         }
         return (filename);
     }
@@ -372,7 +433,30 @@ public String getFotaName() {
         }
         return fotaname;
     }
-
+        /**
+     * Proper Friendly name and parameters of partition used to reference flash location
+     *
+     * @return partition name
+     */
+    public String getFOTAFriendlyName() {
+ String fotaname = "";
+        for (int i = 0; i < fota_name.length; i++) {
+            //first part of file will be filename
+            if (fota_name[i] != 0) {
+                fotaname = fotaname + fota_name[i];
+            } else { //anything after first 0 byte will be a parameter
+                while(fota_name[i]==0 && i<fota_name.length-1){
+                    i++;
+                    if (fota_name[i]!=0){
+                        fotaname=fotaname+"   param: "+part_name[i];
+                        break;
+                    }
+                }
+            }
+            
+        }
+        return (fotaname);
+    }
     /**
      * Name of file when receiving an OTA update
      *
@@ -396,6 +480,11 @@ public void setFotaName(String fotaName) {
         }
     }
 
+    /**
+     * returns partition type friendly name
+     *  bct, bootloader, data, mbr, ebr, gp1, gpt, unknown
+     * @return friendly name of the partition type
+     */
     public String getPartitionTypeFriendlyName() {
         switch (this.part_type) {
             case 1:
@@ -418,7 +507,11 @@ public String getPartitionTypeFriendlyName() {
                 return "unknown";
         }
     }
-
+    /**
+     * gets the friendly name of the filesystem type
+     * raw, basic, enhanced, ext2, yaffs2, unknown
+     * @return friendly filesystem type name
+     */
     public String getFilesystemTypeFriendlyName() {
         switch (this.filesystem) {
             case 0:
@@ -438,6 +531,11 @@ public String getFilesystemTypeFriendlyName() {
         }
     }
 
+    /**
+     * returns the friendly hardware type
+     * nand, emmc, spi, ide, nand_x16, unknown
+     * @return the name of the hardware device
+     */
     public String getHardwareTypeFriendlyName() {
         switch (this.device_type) {
             case 1:
@@ -475,6 +573,14 @@ public String getBlockCountFriendly(boolean si) {
 
     }
 
+    
+    public String getPartitionDescritpion(){
+        String n = System.getProperty("line.separator");
+        StringBuilder sb=new StringBuilder();
+        sb.append("This ").append(this.getPartitionTypeFriendlyName()).append(" partion has a ").append(this.getFilesystemTypeFriendlyName()).append(" partition and resides on the ").append(this.getBinFriendlyType()).append(" ").append(this.getHardwareTypeFriendlyName());
+        return sb.toString();
+    }
+    
     @Override
     public String toString() {
         /*  original entry from Heimdall
@@ -494,17 +600,23 @@ File Size (Obsolete): 0
         StringBuilder sb = new StringBuilder();
         String n = System.getProperty("line.separator");
         sb.append("Partition ID: ").append(this.part_id).append(n);
-        sb.append("Partition Name: ").append(this.getPartitionName()).append(n);
-        sb.append("Flash Filename: ").append(this.getFilename()).append(n);
-        sb.append("Block Count: ").append(this.block_count).append(" (").append(getBlockCountFriendly(true)).append(")").append(n);
-        sb.append("Block Start: ").append(this.block_start).append(n);
-        sb.append("Last Block: ").append(getPartitionEndBlock()).append(n);
-        sb.append("Filesystem Type: ").append(this.filesystem).append(" (").append(this.getFilesystemTypeFriendlyName()).append(")").append(n);
-        sb.append("Partition Type: ").append(this.part_type).append(" (").append(this.getPartitionTypeFriendlyName()).append(")").append(n);
-        sb.append("Device Type: ").append(this.device_type).append(" (").append(this.getHardwareTypeFriendlyName()).append(")").append(n);
-        sb.append("Binary Type: ").append(this.bin_type).append(n);
-        sb.append("FOTA Filename: ").append(this.getFotaName()).append(n);
-        sb.append(n).append(n);
+        sb.append("Partition Name: ").append(this.getPartitionFriendlyName()).append(n);
+        sb.append("Filename: ").append(this.getFriendlyFileName()).append(n);
+        sb.append("Block Size: ").append(this.block_count).append(" (").append(getBlockCountFriendly(true)).append(")").append(n);
+        sb.append("Block range: ").append(this.block_start).append(" - ").append(getPartitionEndBlock());
+        sb.append(" (hex 0x").append(Integer.toHexString(this.block_start)).append(" - 0x").append(Integer.toHexString(getPartitionEndBlock())).append(")").append(n); 
+        sb.append("PartType: ").append(this.part_type);
+        sb.append("   DevType: ").append(this.device_type);
+        sb.append("   FilesystemType: ").append(this.filesystem);
+        sb.append("   BinType: ").append(this.bin_type).append(n);
+        sb.append("Offset:").append(this.file_offset);
+        sb.append("   Size: ").append(this.file_size);
+        sb.append("   FOTA: ").append(this.getFotaName()).append(n);
+        sb.append(getPartitionDescritpion());
+        if (this.getFotaName().contains("remained")){
+            sb.append(" and the partition will expand to fill the remainder of the ").append(this.getHardwareTypeFriendlyName());
+        }
+        sb.append(n).append(n).append(n);
         return sb.toString();
     }