Merge pull request #2 from TeskeVirtualSystem/JPKExt

Jpk ext

Author: racerxdl

doc/JPAK2/Extended Mode/README.md

@@ -31,7 +31,7 @@ The JPAK Meta Storage is similar to JPAK Filetable Structure, but aditionally ha
 | ------------ | ------------- | ------------------------------------------------- |
 |  0x0         |  0x4          | JMS1 Magic Number                                 |
 |  0x4         |  0xC          | Padding (0x00)                                    |
-|  0x**V**     |  0x**U**      | JSON Volume Table                                 |
+|  0xC         |  0x**U**      | JSON Volume Table                                 |
 |  0x**U**     |  0x**W**      | JSON File Table                                   |
 |  0x**X**     |  0x**X+4**    | `uint32_t` Producer ID (Look JPAK2.0 spec at 2.1) |
 |  0x**X+4**   |  0x**X+8**    | `uint32_t` JPAK Flags  (Look JPAK2.0 spec at 2.1) |
@@ -41,15 +41,11 @@ The JPAK Meta Storage is similar to JPAK Filetable Structure, but aditionally ha
 The JSON Filetable is the same, the offset is relative to the first volume. The JSON Volume Table is as follow:
 
     {
-        "0" :   {
+        "vol0.jds" :   {
             "filename"  :   "vol0.jds",     //  Volume Filename
-            "start"     :   "0",            //  Start of volume in Bytes
-            "end"       :   "1024",         //  End of volume in Bytes
         },
-        "1" :   {
+        "vol1.jds" :   {
             "filename"  :   "vol1.jds",     //  Volume Filename
-            "start"     :   "1024",         //  Start of volume in Bytes
-            "end"       :   "4096",         //  End of volume in Bytes
         }
     }
 

doc/JPAK2/README.md

@@ -31,6 +31,7 @@ And for the file entries:
         "size"          :   FILESIZE                //  The file size
         "aeskey"        :   AESKEY                  //  File key if != false
         "zlib"          :   FALSE/TRUE              //  If file is compressed
+        "volume"        :   VOLUMEID                //  ID from VolumeTable
         "md5"           :   MD5SUM                  //  Uncompresssed/unencrypted file MD5SUM
     }
 
@@ -47,11 +48,13 @@ Example of JPAK Filesystem Table:
                 'path': '/whatisthis',
                 'offset': 13,
                 'name': 'whatisthis',
+                'volume': 'vol0.jdt',
                 'size': 55
             },
             'test.html': {
                 'path': '/test.html',
                 'offset': 81,
+                'volume': 'vol1.jdt',
                 'name': 'test.html',
                 'size': 49
             },
@@ -66,6 +69,7 @@ Example of JPAK Filesystem Table:
                     't': {
                         'path': '/3/t',
                         'offset': 9104,
+                        'volume': 'vol0.jdt',
                         'name': 't',
                         'size': 0
                     }

js/jpak.js

@@ -217,6 +217,7 @@ JPAK.jpakloader.prototype.Load = function() {
             if (this.status === 200) {
                 var data = this.response;
                 var MagicNumber = u8as(new Uint8Array(data.slice(0,5)));
+                var MagicNumber2 = u8as(new Uint8Array(data.slice(0,4)));
                 if(MagicNumber === "JPAK1")  {
                     JPAK.log("JPAK::jpakloader - Loaded file "+_this.jpakfile+" successfully. JPAK1 Format");
                     var filetableoffset = new DataView(data.slice(data.byteLength-4,data.byteLength)).getUint32(0, true);
@@ -227,6 +228,10 @@ JPAK.jpakloader.prototype.Load = function() {
                     _this.dataloaded = true;
                     if(_this.onload !== undefined)   
                         _this.onload();
+                } else if(MagicNumber === "JMS1") {
+                  JPAK.log("JPAK::jpakloader - Loaded JPAK Metadata File "+_this.jpakfile+" successfully.");
+                } else if(MagicNumber2 === "JDS1") {
+                  JPAK.log("JPAK::jpakloader - Loaded JPAK Storage File "+_this.jpakfile+" successfully.");
                 }else{
                     JPAK.log("JPAK::jpakloader - Error loading file "+_this.jpakfile+" (8000): Wrong File Magic. Expected JPAK1 got "+MagicNumber);
                     if(_this.onerror !== undefined)

tools/extpacker.js

@@ -0,0 +1 @@
+var fs = require("fs");

tools/extpacker.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+
+print '''
+     _ ____   _    _  __  _____      _     ____            _             
+    | |  _ \ / \  | |/ / | ____|_  _| |_  |  _ \ __ _  ___| | _____ _ __ 
+ _  | | |_) / _ \ | ' /  |  _| \ \/ / __| | |_) / _` |/ __| |/ / _ \ '__|
+| |_| |  __/ ___ \| . \  | |___ >  <| |_  |  __/ (_| | (__|   <  __/ |   
+ \___/|_| /_/   \_\_|\_\ |_____/_/\_\\__| |_|   \__,_|\___|_|\_\___|_|                                                      
+                                                        
+Multiuse Javascript Package 
+By: Lucas Teske
+https://github.com/racerxdl/jpak
+'''
+
+
+import struct, os, json, sys
+from jpaktool import *
+from jpakmodels import *
+
+if len(sys.argv) > 3:
+    metadataF = sys.argv[1]
+    volume = sys.argv[2]
+    user_args = sys.argv[3:]
+    metadata = JMS()
+    if os.path.isfile(metadataF):
+      print "Metadata %s has been found. Appending volume %s to JPAK" %(metadata, volume)
+      f = open(metadataF, "rb")
+      data = f.read()
+      f.close()
+      metadata.fromBinary(data)
+
+    jdata = JDS(os.path.basename(volume), volume)
+    metadata.addVolume(jdata)
+
+    for ua in user_args:
+      metadata.fromDirectory(ua, jdata)
+
+    metadata.toFile(metadataF)
+
+else:
+  print '''
+Usage: python packer.py metadata.jms volumeX.jds folder ...
+Ex: python extpacker.py myproject.jms volume0.jds /home/lucas/
+This will generate myproject.jms (or append a new volume) with contents of folder /home/lucas'''