From df1244f2b130d4b495220972e44c7c7ae420d132 Mon Sep 17 00:00:00 2001 From: Lucas Teske Date: Sat, 21 Nov 2015 00:12:59 -0200 Subject: [PATCH] JPAK 2.0 Refactor * Changed the Github URLs in ALL files to the correct one under TeskeVirtualSystem github * Separated the class files in jssrc folder * Made a grunt task to compile it into one file * Adapted extpacker to the changes --- .bowerrc | 4 + .gitignore | 3 + Gruntfile.js | 94 +++++ bower.json | 29 ++ doc/JPAK1.0.txt | 2 +- doc/JPAK2/Extended Mode/README.md | 2 +- doc/JPAK2/README.md | 2 +- js/jpak.js | 3 +- jsdoc/symbols/src/jpak.js.html | 2 +- jssrc/alpha.js | 138 ++++++++ jssrc/directory-entry.js | 85 +++++ jssrc/file-entry.js | 54 +++ jssrc/jds.js | 94 +++++ jssrc/jms.js | 147 ++++++++ jssrc/volume-entry.js | 47 +++ jssrc/zzzz.js | 40 +++ package.json | 30 ++ .../JPAK Explorer Win/Explorer.cs | 2 +- .../JPAKTool/DirectoryEntry.cs | 2 +- .../JPAK Explorer Win/JPAKTool/Extensions.cs | 2 +- tools/JPAK Explorer Win/JPAKTool/FileEntry.cs | 2 +- tools/JPAK Explorer Win/JPAKTool/jpaktool.cs | 2 +- tools/extpacker.js | 6 +- tools/jpaktool.py | 2 +- tools/jpaktools.js | 333 ------------------ tools/packer.py | 2 +- tools/packer1.py | 2 +- tools/unpacker.py | 2 +- 28 files changed, 783 insertions(+), 350 deletions(-) create mode 100644 .bowerrc create mode 100644 .gitignore create mode 100644 Gruntfile.js create mode 100644 bower.json create mode 100644 jssrc/alpha.js create mode 100644 jssrc/directory-entry.js create mode 100644 jssrc/file-entry.js create mode 100644 jssrc/jds.js create mode 100644 jssrc/jms.js create mode 100644 jssrc/volume-entry.js create mode 100644 jssrc/zzzz.js create mode 100644 package.json delete mode 100644 tools/jpaktools.js diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..0a9a035 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,4 @@ +{ + "directory": "3rdparty", + "json": "bower.json" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed1d49a --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules +3rdparty +dist \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..6191327 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,94 @@ +/*jslint node: true */ +"use strict"; + + +module.exports = function(grunt) { + + grunt.initConfig({ + pkg: grunt.file.readJSON("package.json"), + + uglify: { + dist: { + files: { + "dist/jpak.min.js": [ "dist/jpak.js" ] + }, + options: { + mangle: false + } + } + }, + + clean: { + temp: { + src: [ "tmp" ] + }, + dist: { + src: [ "dist/*.js" ] + } + }, + + concat: { + dist: { + src: ["jssrc/*.js" ], + dest: "dist/jpak.js" + } + }, + + jshint: { + all: [ "Gruntfile.js", "jssrc/*.js" ] + }, + + connect: { + server: { + options: { + hostname: "localhost", + port: 8082 + } + } + }, + + watch: { + dev: { + files: [ "Gruntfile.js", "jssrc/*.js" ], + tasks: [ "jshint", "concat:dist", "clean:temp" ], + options: { + atBegin: true + } + }, + min: { + files: [ "Gruntfile.js", "jssrc/*.js" ], + tasks: [ "jshint", "concat:dist", "clean:temp", "uglify:dist" ], + options: { + atBegin: true + } + } + }, + + compress: { + dist: { + options: { + archive: "dist/<%= pkg.name %>-<%= pkg.version %>.zip" + }, + files: [{ + src: [ "dist/*.js", "dist/*.css" ] + }] + } + }, + }); + + grunt.loadNpmTasks("grunt-contrib-jshint"); + grunt.loadNpmTasks("grunt-contrib-less"); + grunt.loadNpmTasks("grunt-contrib-clean"); + grunt.loadNpmTasks("grunt-contrib-connect"); + grunt.loadNpmTasks("grunt-contrib-compress"); + grunt.loadNpmTasks("grunt-contrib-concat"); + grunt.loadNpmTasks("grunt-contrib-uglify"); + grunt.loadNpmTasks("grunt-contrib-watch"); + + grunt.registerTask("dev", [ "clean:dist", "connect:server", "watch:dev" ]); + grunt.registerTask("test", [ "clean:dist", "jshint" ]); + grunt.registerTask("junit", [ "clean:dist", "jshint" ] ); + grunt.registerTask("minified", [ "clean:dist", "connect:server", "watch:min" ]); + grunt.registerTask("package", [ "clean:dist", "jshint", "concat:dist", + "uglify:dist", "less:dist", "clean:temp", "compress:dist" ]); +}; diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..d700b0d --- /dev/null +++ b/bower.json @@ -0,0 +1,29 @@ +{ + "name": "JPAK", + "version": "2.0.0", + "homepage": "https://github.com/TeskeVirtualSystem/jpak", + "authors": [ + "Lucas Teske" + ], + "description": "JPAK is a multi-use Javascript Package System, developed for loading several files at once with only one package.", + "keywords" : [ + "file system", + "distribuited", + "package" + ], + "dependencies" : { + + }, + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "cpp", + "doc", + "test", + "tests", + "spec", + "example" + ] +} \ No newline at end of file diff --git a/doc/JPAK1.0.txt b/doc/JPAK1.0.txt index 389c657..f27d99a 100755 --- a/doc/JPAK1.0.txt +++ b/doc/JPAK1.0.txt @@ -6,7 +6,7 @@ Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak JPAK v1.0 Specification File diff --git a/doc/JPAK2/Extended Mode/README.md b/doc/JPAK2/Extended Mode/README.md index bc442cd..e4bd3d2 100644 --- a/doc/JPAK2/Extended Mode/README.md +++ b/doc/JPAK2/Extended Mode/README.md @@ -12,7 +12,7 @@ Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak #JPAK v2.0 Extended Mode diff --git a/doc/JPAK2/README.md b/doc/JPAK2/README.md index 321ab8b..2d49393 100644 --- a/doc/JPAK2/README.md +++ b/doc/JPAK2/README.md @@ -6,7 +6,7 @@ Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak #JPAK v2.0 Specification File diff --git a/js/jpak.js b/js/jpak.js index d350e37..e74f11b 100644 --- a/js/jpak.js +++ b/js/jpak.js @@ -7,7 +7,7 @@ Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak */ @@ -150,6 +150,7 @@ JPAK.ArrayBufferToBase64 = function(arrayBuffer) { return base64; }; + /** * Logs a message, if enabled * @expose diff --git a/jsdoc/symbols/src/jpak.js.html b/jsdoc/symbols/src/jpak.js.html index 2d9515d..01d69f0 100644 --- a/jsdoc/symbols/src/jpak.js.html +++ b/jsdoc/symbols/src/jpak.js.html @@ -15,7 +15,7 @@ 8 9 Multiuse Javascript Package 10 By: Lucas Teske - 11 https://github.com/racerxdl/jpak + 11 https://github.com/TeskeVirtualSystem/jpak 12 */ 13 14 /** diff --git a/jssrc/alpha.js b/jssrc/alpha.js new file mode 100644 index 0000000..397ea9f --- /dev/null +++ b/jssrc/alpha.js @@ -0,0 +1,138 @@ +/** + _ ____ _ _ __ ____ ___ + | | _ \ / \ | |/ / __ _|___ \ / _ \ + _ | | |_) / _ \ | ' / \ \ / / __) || | | | +| |_| | __/ ___ \| . \ \ V / / __/ | |_| | + \___/|_| /_/ \_\_|\_\ \_/ |_____(_)___/ + +Multiuse Javascript Package +https://github.com/TeskeVirtualSystem/jpak + +The MIT License (MIT) + +Copyright (c) 2013 Lucas Teske + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +**/ + +var JPAK = { + Generics: {}, + Loader: {}, + Classes: {}, + Tools : {} +}; + +(function() { + + var inNode = (typeof module !== 'undefined' && typeof module.exports !== 'undefined'); + + if (inNode) { + JPAK.Tools.toBuffer = function(ab) { + var buffer = new Buffer(ab.byteLength); + var view = new Uint8Array(ab); + for (var i = 0; i < buffer.length; ++i) { + buffer[i] = view[i]; + } + return buffer; + }; + + JPAK.Tools.toArrayBuffer = function(buffer) { + var ab = new ArrayBuffer(buffer.length); + var view = new Uint8Array(ab); + for (var i = 0; i < buffer.length; ++i) { + view[i] = buffer[i]; + } + return ab; + }; + } + + /* + * Extends the Uint8Array to be able to be converted to a string + */ + Uint8Array.prototype.asString = function() { + var o = ""; + for(var i=0;i this.CHUNK ? this.CHUNK : size - c; + fs.readSync(newFd, data, 0, chunk); + fs.writeSync(this.fd, data, 0, chunk); + c += chunk; + this.currentPosition += chunk; + } + fs.closeSync(newFd); + return [offset, size]; + }; + + JDS.prototype.close = function() { + fs.closeSync(this.fd); + }; + + JPAK.Classes.JDS = JDS; + } + +})(); \ No newline at end of file diff --git a/jssrc/jms.js b/jssrc/jms.js new file mode 100644 index 0000000..9ef5628 --- /dev/null +++ b/jssrc/jms.js @@ -0,0 +1,147 @@ +/** + _ ____ _ _ __ ____ ___ + | | _ \ / \ | |/ / __ _|___ \ / _ \ + _ | | |_) / _ \ | ' / \ \ / / __) || | | | +| |_| | __/ ___ \| . \ \ V / / __/ | |_| | + \___/|_| /_/ \_\_|\_\ \_/ |_____(_)___/ + +Multiuse Javascript Package +https://github.com/TeskeVirtualSystem/jpak + +The MIT License (MIT) + +Copyright (c) 2013 Lucas Teske + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +**/ + +(function() { + + var inNode = (typeof module !== 'undefined' && typeof module.exports !== 'undefined'); + + var JMS = function(volumeTable, fileTable, producerId, flags, userflags) { + this.volumeTable = volumeTable || {}; + this.fileTable = fileTable || new JPAK.Classes.JPKDirectoryEntry("root"); + this.producerId = producerId || 0; + this.userflags = userflags || 0; + this.MAGIC = "JMS1"; + }; + + JMS.prototype.toObject = JPAK.Generics.genericToObject; + JMS.prototype.fromObject = JPAK.Generics.genericFromObject; + JMS.prototype.jToJSON = JPAK.Generics.genericjToJSON; + JMS.prototype.jFromJSON = JPAK.Generics.genericjFromJSON; + + JMS.prototype.fromBinary = function(data) { + if (inNode) + data = JPAK.Tools.toArrayBuffer(data); + + var MagicNumber = (new Uint8Array(data.slice(0,4))).asString(); + + if (MagicNumber !== this.MAGIC) { + console.error("MagicNumber doesn't match! Expected: "+this.MAGIC+" got "+MagicNumber); + return; + } + + var dV = new DataView(data); + var fileTableOffset = dV.getUint32(data.byteLength-4); + var volumeTableSize = fileTableOffset - 0xC; + var fileTableSize = data.byteLength - fileTableOffset - 12; + var fileTable = (new Uint8Array(data.slice(fileTableOffset,data.byteLength-16))).asString(); + var volumes = (new Uint8Array(data.slice(0xC,volumeTableSize+0xC))).asString(); + var volumeTable = JSON.parse((new Uint8Array(data.slice(0xC,volumeTableSize+0xC))).asString()); + + this.fileTable = new JPAK.Classes.JPKDirectoryEntry(); + this.fileTable.jFromJSON(fileTable); + this.volumeTable = {}; + + for (var v in volumeTable) { + var newVolume = new JPAK.Classes.JPKVolumeEntry(); + newVolume.fromObject(volumeTable[v]); + this.volumeTable[v] = newVolume; + } + }; + + JMS.prototype.toBinary = function() { + var fileTable = this.fileTable.jToJSON(); + + var volumeTable = {}; + for (var v in this.volumeTable) { + volumeTable[v] = this.volumeTable[v].toObject(); + } + volumeTable = JSON.stringify(volumeTable); + + var buffer = new ArrayBuffer(12 + volumeTable.length + fileTable.length + 16); + var u8 = new Uint8Array(buffer); + var dv = new DataView(buffer); + + dv.setUint32(buffer.byteLength-16, this.producerId); + dv.setUint32(buffer.byteLength-12, this.flags); + dv.setUint32(buffer.byteLength-8, this.userflags); + + u8.putString(this.MAGIC); + var fileTableOffset = u8.putString(0xC, volumeTable); + u8.putString(fileTableOffset, fileTable); + dv.setUint32(buffer.byteLength-4, fileTableOffset); + + return buffer; + }; + + if (inNode) { + var fs = require("fs"); + var path = require("path"); + + JMS.prototype.fromDirectory = function(folder, jds) { + this.fileTable.fromDirectory(folder, jds); + }; + + JMS.prototype.fromArgs = function(args, jds) { + for(var i in args) { + var folder = args[i]; + console.log("Adding from arg "+folder); + if(fs.lstatSync(folder).isDirectory()) { + if (!this.fileTable.directories.hasOwnProperty(path.basename(folder))) + this.fileTable.directories[path.basename(folder)] = new JPAK.Classes.JPKDirectoryEntry(path.basename(folder)); + + this.fileTable.directories[path.basename(folder)].fromDirectory(folder, jds); + } else + this.fileTable.addFile(folder, jds, true); + } + }; + + JMS.prototype.addVolume = function (jds) { + if (jds.name in this.volumeTable) { + console.error(jds.name+" already in volumes list."); + process.exit(1); + } + + this.volumeTable[jds.name] = new JPAK.Classes.JPKVolumeEntry(jds.filename); + }; + + JMS.prototype.toFile = function (filename) { + var fd = fs.openSync(filename, "w"); + var binData = this.toBinary(); + fs.writeSync(fd, JPAK.Tools.toBuffer(binData), 0, binData.byteLength); + fs.closeSync(fd); + }; + } + + JPAK.Classes.JMS = JMS; + +}()); \ No newline at end of file diff --git a/jssrc/volume-entry.js b/jssrc/volume-entry.js new file mode 100644 index 0000000..7a183b6 --- /dev/null +++ b/jssrc/volume-entry.js @@ -0,0 +1,47 @@ +/** + _ ____ _ _ __ ____ ___ + | | _ \ / \ | |/ / __ _|___ \ / _ \ + _ | | |_) / _ \ | ' / \ \ / / __) || | | | +| |_| | __/ ___ \| . \ \ V / / __/ | |_| | + \___/|_| /_/ \_\_|\_\ \_/ |_____(_)___/ + +Multiuse Javascript Package +https://github.com/TeskeVirtualSystem/jpak + +The MIT License (MIT) + +Copyright (c) 2013 Lucas Teske + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +**/ + +(function() { + + var JPKVolumeEntry = function(filename) { + this.filename = filename; + }; + + JPKVolumeEntry.prototype.toObject = JPAK.Generics.genericToObject; + JPKVolumeEntry.prototype.fromObject = JPAK.Generics.genericFromObject; + JPKVolumeEntry.prototype.jToJSON = JPAK.Generics.genericjToJSON; + JPKVolumeEntry.prototype.jFromJSON = JPAK.Generics.genericjFromJSON; + + JPAK.Classes.JPKVolumeEntry = JPKVolumeEntry; + +})(); \ No newline at end of file diff --git a/jssrc/zzzz.js b/jssrc/zzzz.js new file mode 100644 index 0000000..6efd7ad --- /dev/null +++ b/jssrc/zzzz.js @@ -0,0 +1,40 @@ +/** + _ ____ _ _ __ ____ ___ + | | _ \ / \ | |/ / __ _|___ \ / _ \ + _ | | |_) / _ \ | ' / \ \ / / __) || | | | +| |_| | __/ ___ \| . \ \ V / / __/ | |_| | + \___/|_| /_/ \_\_|\_\ \_/ |_____(_)___/ + +Multiuse Javascript Package +https://github.com/TeskeVirtualSystem/jpak + +The MIT License (MIT) + +Copyright (c) 2013 Lucas Teske + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +**/ + +/** + I know, this a very XGH approach. But works fined and I like it. I dare you put a file after this one! +**/ +if ((typeof module !== 'undefined' && typeof module.exports !== 'undefined')) + module.exports.JPAK = JPAK; +else + window.JPAK = JPAK; \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..b0fb7f6 --- /dev/null +++ b/package.json @@ -0,0 +1,30 @@ +{ + "name": "JPAK", + "version": "2.0.0", + "repository" : { + "type" : "git", + "url" : "https://github.com/TeskeVirtualSystem/jpak" + }, + "dependencies" : { + }, + "keywords" : [ + "file system", + "distributed", + "package" + ], + "devDependencies": { + "grunt": "~0.4.5", + "grunt-cli": "~0.1.13", + "grunt-html2js": "~0.2.7", + "grunt-contrib-uglify": "~0.5.0", + "grunt-contrib-less": "~0.11.2", + "grunt-contrib-clean": "~0.5.0", + "grunt-contrib-connect": "~0.8.0", + "grunt-contrib-compress": "~0.9.1", + "grunt-contrib-concat": "~0.4.0", + "grunt-contrib-jshint": "~0.10.0", + "grunt-contrib-watch": "~0.6.1", + "grunt-bower-task": "~0.3.4" + }, + "license": "MIT" +} diff --git a/tools/JPAK Explorer Win/JPAK Explorer Win/Explorer.cs b/tools/JPAK Explorer Win/JPAK Explorer Win/Explorer.cs index 6e9abb8..bd30282 100644 --- a/tools/JPAK Explorer Win/JPAK Explorer Win/Explorer.cs +++ b/tools/JPAK Explorer Win/JPAK Explorer Win/Explorer.cs @@ -7,7 +7,7 @@ * * *Multiuse Javascript Package * *By: Lucas Teske * - *https://github.com/racerxdl/jpak * + *https://github.com/TeskeVirtualSystem/jpak * **********************************************/ using System; using System.Collections.Generic; diff --git a/tools/JPAK Explorer Win/JPAKTool/DirectoryEntry.cs b/tools/JPAK Explorer Win/JPAKTool/DirectoryEntry.cs index 4235019..82efe92 100644 --- a/tools/JPAK Explorer Win/JPAKTool/DirectoryEntry.cs +++ b/tools/JPAK Explorer Win/JPAKTool/DirectoryEntry.cs @@ -7,7 +7,7 @@ * * *Multiuse Javascript Package * *By: Lucas Teske * - *https://github.com/racerxdl/jpak * + *https://github.com/TeskeVirtualSystem/jpak * **********************************************/ using System; using System.Collections.Generic; diff --git a/tools/JPAK Explorer Win/JPAKTool/Extensions.cs b/tools/JPAK Explorer Win/JPAKTool/Extensions.cs index 4172484..8abdb39 100644 --- a/tools/JPAK Explorer Win/JPAKTool/Extensions.cs +++ b/tools/JPAK Explorer Win/JPAKTool/Extensions.cs @@ -7,7 +7,7 @@ * * *Multiuse Javascript Package * *By: Lucas Teske * - *https://github.com/racerxdl/jpak * + *https://github.com/TeskeVirtualSystem/jpak * **********************************************/ using System; using System.Collections.Generic; diff --git a/tools/JPAK Explorer Win/JPAKTool/FileEntry.cs b/tools/JPAK Explorer Win/JPAKTool/FileEntry.cs index a41fa75..de6e3ce 100644 --- a/tools/JPAK Explorer Win/JPAKTool/FileEntry.cs +++ b/tools/JPAK Explorer Win/JPAKTool/FileEntry.cs @@ -7,7 +7,7 @@ * * *Multiuse Javascript Package * *By: Lucas Teske * - *https://github.com/racerxdl/jpak * + *https://github.com/TeskeVirtualSystem/jpak * **********************************************/ using System; using System.Collections.Generic; diff --git a/tools/JPAK Explorer Win/JPAKTool/jpaktool.cs b/tools/JPAK Explorer Win/JPAKTool/jpaktool.cs index b89d431..4bcb8ac 100644 --- a/tools/JPAK Explorer Win/JPAKTool/jpaktool.cs +++ b/tools/JPAK Explorer Win/JPAKTool/jpaktool.cs @@ -7,7 +7,7 @@ * * *Multiuse Javascript Package * *By: Lucas Teske * - *https://github.com/racerxdl/jpak * + *https://github.com/TeskeVirtualSystem/jpak * **********************************************/ using System; using System.Collections.Generic; diff --git a/tools/extpacker.js b/tools/extpacker.js index c0bf7f7..29afd4f 100755 --- a/tools/extpacker.js +++ b/tools/extpacker.js @@ -1,7 +1,7 @@ #!/usr/bin/nodejs var fs = require("fs"); -var jpaktool = require("./jpaktools").JPAK; +var jpaktool = require("../dist/jpak.min").JPAK; var fs = require("fs"); var path = require("path"); @@ -15,14 +15,14 @@ if (process.argv.length < 3) { var user_args = process.argv; console.log("Metadata File: "+metadataF+" - Volume: "+volume+" Args: ",user_args); - var metadata = new jpaktool.JMS(); + var metadata = new jpaktool.Classes.JMS(); if (fs.existsSync(metadataF) && fs.statSync(metadataF).isFile()) { var data = fs.readFileSync(metadataF, {flag: "r"}); metadata.fromBinary(data); } - var jdata = new jpaktool.JDS(path.basename(volume), volume); + var jdata = new jpaktool.Classes.JDS(path.basename(volume), volume); metadata.addVolume(jdata); metadata.fromArgs(user_args, jdata); metadata.toFile(metadataF); diff --git a/tools/jpaktool.py b/tools/jpaktool.py index d2e0a4b..860f890 100755 --- a/tools/jpaktool.py +++ b/tools/jpaktool.py @@ -9,7 +9,7 @@ Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak ''' import struct, os, json, sys, zlib, md5, base64 diff --git a/tools/jpaktools.js b/tools/jpaktools.js deleted file mode 100644 index 39bd002..0000000 --- a/tools/jpaktools.js +++ /dev/null @@ -1,333 +0,0 @@ -/** - _ ____ _ _ __ ____ ___ - | | _ \ / \ | |/ / __ _|___ \ / _ \ - _ | | |_) / _ \ | ' / \ \ / / __) || | | | -| |_| | __/ ___ \| . \ \ V / / __/ | |_| | - \___/|_| /_/ \_\_|\_\ \_/ |_____(_)___/ - -Multiuse Javascript Package -https://github.com/racerxdl/jpak - -The MIT License (MIT) - -Copyright (c) 2013 Lucas Teske - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**/ - -(function() { - - var inNode = (typeof module !== 'undefined' && typeof module.exports !== 'undefined'); - var JPAK = {}; - - Uint8Array.prototype.asString = function() { - var o = ""; - for(var i=0;i this.CHUNK ? this.CHUNK : size - c; - var r = fs.readSync(newFd, data, 0, chunk); - fs.writeSync(this.fd, data, chunk); - c += chunk; - this.currentPosition += chunk; - } - fs.closeSync(newFd); - return [offset, size]; - }; - - JDS.prototype.close = function() { - fs.closeSync(this.fd); - }; - - JPAK.JMS = JMS; - JPAK.JDS = JDS; - JPAK.JPKDirectoryEntry = JPKDirectoryEntry; - JPAK.JPKFileEntry = JPKFileEntry; - JPAK.JPKVolumeEntry = JPKVolumeEntry; - - if (inNode) - module.exports.JPAK = JPAK; - else - window.JPAK = JPAK; - -}()); \ No newline at end of file diff --git a/tools/packer.py b/tools/packer.py index d76ed5e..7e1663c 100755 --- a/tools/packer.py +++ b/tools/packer.py @@ -9,7 +9,7 @@ Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak ''' import struct, os, json, sys diff --git a/tools/packer1.py b/tools/packer1.py index 2445195..407e697 100644 --- a/tools/packer1.py +++ b/tools/packer1.py @@ -9,7 +9,7 @@ Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak ''' import struct, os, json, sys diff --git a/tools/unpacker.py b/tools/unpacker.py index f8fa874..0790566 100755 --- a/tools/unpacker.py +++ b/tools/unpacker.py @@ -9,7 +9,7 @@ |_| Multiuse Javascript Package By: Lucas Teske -https://github.com/racerxdl/jpak +https://github.com/TeskeVirtualSystem/jpak ''' import struct, os, json, sys