ethanaobrien/EmulatorJS
1
0
Fork 0
mirror of https://github.com/EmulatorJS/EmulatorJS.git synced 2024-09-20 02:46:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rar compression

Browse source
This commit is contained in:
Ethan O'Brien 2023-07-22 19:51:04 -05:00
parent 7d3a2ca043
commit eaa4463735
6 changed files with 518 additions and 474 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -7,6 +7,7 @@
- Made fbneo core the default arcade core (better compatibility) - Made fbneo core the default arcade core (better compatibility)
- Added picodrive core (sega32x) - Added picodrive core (sega32x)
- Cleaned up documentation - Cleaned up documentation
- Fix/update rar de-compression
# 4.0.4 [View Tree](https://github.com/EmulatorJS/EmulatorJS/tree/41491a738cf92ef9cee7d53f323aa2ab9732c053) # 4.0.4 [View Tree](https://github.com/EmulatorJS/EmulatorJS/tree/41491a738cf92ef9cee7d53f323aa2ab9732c053)
- Fix cheats "x" button - Fix cheats "x" button

884
data/compression/libunrar.js
View file

File diff suppressed because one or more lines are too long

BIN
data/compression/libunrar.js.mem
View file

Binary file not shown.

BIN
data/compression/libunrar.wasm Normal file
View file

Binary file not shown.

105
data/emulator.js
View file

@ -443,31 +443,33 @@ class EmulatorJS {
}, null, false, {responseType: "arraybuffer", method: "GET"}); }, null, false, {responseType: "arraybuffer", method: "GET"});
}) })
} }
const files = {};
let res;
const onMessage = (data) => {
if (!data.data) return;
//data.data.t/ 4=progress, 2 is file, 1 is zip done
if (data.data.t === 4 && msg) {
const pg = data.data;
const num = Math.floor(pg.current / pg.total * 100);
if (isNaN(num)) return;
const progress = ' '+num.toString()+'%';
this.textElem.innerText = msg + progress;
}
if (data.data.t === 2) {
if (typeof fileCbFunc === "function") {
fileCbFunc(data.data.file, data.data.data);
files[data.data.file] = true;
} else {
files[data.data.file] = data.data.data;
}
}
if (data.data.t === 1) {
res(files);
}
}
const decompress7z = (file) => { const decompress7z = (file) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const files = {}; res = resolve;
const onMessage = (data) => {
if (!data.data) return;
//data.data.t/ 4=progress, 2 is file, 1 is zip done
if (data.data.t === 4 && msg) {
const pg = data.data;
const num = Math.floor(pg.current / pg.total * 100);
if (isNaN(num)) return;
const progress = ' '+num.toString()+'%';
this.textElem.innerText = msg + progress;
}
if (data.data.t === 2) {
if (typeof fileCbFunc === "function") {
fileCbFunc(data.data.file, data.data.data);
files[data.data.file] = true;
} else {
files[data.data.file] = data.data.data;
}
}
if (data.data.t === 1) {
resolve(files);
}
}
createWorker('compression/extract7z.js').then((worker) => { createWorker('compression/extract7z.js').then((worker) => {
worker.onmessage = onMessage; worker.onmessage = onMessage;
@ -478,39 +480,17 @@ class EmulatorJS {
} }
const decompressRar = (file) => { const decompressRar = (file) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const files = {}; res = resolve;
const onMessage = (data) => {
if (!data.data) return;
//data.data.t/ 4=progress, 2 is file, 1 is zip done
if (data.data.t === 4 && msg) {
const pg = data.data;
const num = Math.floor(pg.current / pg.total * 100);
if (isNaN(num)) return;
const progress = ' '+num.toString()+'%';
this.textElem.innerText = msg + progress;
}
if (data.data.t === 2) {
if (typeof fileCbFunc === "function") {
fileCbFunc(data.data.file, data.data.data);
files[data.data.file] = true;
} else {
files[data.data.file] = data.data.data;
}
}
if (data.data.t === 1) {
resolve(files);
}
}
this.downloadFile("compression/libunrar.js", (res) => { this.downloadFile("compression/libunrar.js", (res) => {
this.downloadFile("compression/libunrar.js.mem", (res2) => { this.downloadFile("compression/libunrar.wasm", (res2) => {
if (res === -1 || res2 === -1) { if (res === -1 || res2 === -1) {
this.textElem.innerText = this.localization('Network Error'); this.textElem.innerText = this.localization('Network Error');
this.textElem.style.color = "red"; this.textElem.style.color = "red";
return; return;
} }
const path = URL.createObjectURL(new Blob([res2])); const path = URL.createObjectURL(new Blob([res2.data], {type: "application/wasm"}));
let data = '\nlet dataToPass = [];\nModule = {\n monitorRunDependencies: function(left) {\n if (left == 0) {\n setTimeout(function() {\n unrar(dataToPass, null);\n }, 100);\n }\n },\n onRuntimeInitialized: function() {\n },\n locateFile: function(file) {\n return \''+path+'\';\n }\n};\n'+res.data+'\nlet unrar = function(data, password) {\n let cb = function(fileName, fileSize, progress) {\n postMessage({"t":4,"current":progress,"total":fileSize, "name": fileName});\n };\n\n let rarContent = readRARContent(data.map(function(d) {\n return {\n name: d.name,\n content: new Uint8Array(d.content)\n }\n }), password, cb)\n let rec = function(entry) {\n if (entry.type === \'file\') {\n postMessage({"t":2,"file":entry.fullFileName,"size":entry.fileSize,"data":entry.fileContent});\n } else if (entry.type === \'dir\') {\n Object.keys(entry.ls).forEach(function(k) {\n rec(entry.ls[k]);\n })\n } else {\n throw "Unknown type";\n }\n }\n rec(rarContent);\n postMessage({"t":1});\n return rarContent;\n};\nonmessage = function(data) {\n dataToPass.push({name: \'test.rar\', content: data.data});\n};\n '; let data = '\nlet dataToPass = [];\nModule = {\n monitorRunDependencies: function(left) {\n if (left == 0) {\n setTimeout(function() {\n unrar(dataToPass, null);\n }, 100);\n }\n },\n onRuntimeInitialized: function() {\n },\n locateFile: function(file) {\n return \''+path+'\';\n }\n};\n'+res.data+'\nlet unrar = function(data, password) {\n let cb = function(fileName, fileSize, progress) {\n postMessage({"t":4,"current":progress,"total":fileSize, "name": fileName});\n };\n\n let rarContent = readRARContent(data.map(function(d) {\n return {\n name: d.name,\n content: new Uint8Array(d.content)\n }\n }), password, cb)\n let rec = function(entry) {\n if (!entry) return;\n if (entry.type === \'file\') {\n postMessage({"t":2,"file":entry.fullFileName,"size":entry.fileSize,"data":entry.fileContent});\n } else if (entry.type === \'dir\') {\n Object.keys(entry.ls).forEach(function(k) {\n rec(entry.ls[k]);\n })\n } else {\n throw "Unknown type";\n }\n }\n rec(rarContent);\n postMessage({"t":1});\n return rarContent;\n};\nonmessage = function(data) {\n dataToPass.push({name: \'test.rar\', content: data.data});\n};\n ';
const blob = new Blob([data], { const blob = new Blob([data], {
'type': 'application/javascript' 'type': 'application/javascript'
}) })
@ -518,37 +498,14 @@ class EmulatorJS {
const worker = new Worker(url); const worker = new Worker(url);
worker.onmessage = onMessage; worker.onmessage = onMessage;
worker.postMessage(file); worker.postMessage(file);
}, null, false, {responseType: "text", method: "GET"}) }, null, false, {responseType: "arraybuffer", method: "GET"})
}, null, false, {responseType: "text", method: "GET"}); }, null, false, {responseType: "text", method: "GET"});
}) })
} }
const decompressZip = (file) => { const decompressZip = (file) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const files = {}; res = resolve;
const onMessage = (data) => {
//console.log(data);
if (!data.data) return;
//data.data.t/ 4=progress, 2 is file, 1 is zip done
if (data.data.t === 4 && msg) {
const pg = data.data;
const num = Math.floor(pg.current / pg.total * 100);
if (isNaN(num)) return;
const progress = ' '+num.toString()+'%';
this.textElem.innerText = msg + progress;
}
if (data.data.t === 2) {
if (typeof fileCbFunc === "function") {
fileCbFunc(data.data.file, data.data.data);
files[data.data.file] = true;
} else {
files[data.data.file] = data.data.data;
}
}
if (data.data.t === 1) {
resolve(files);
}
}
createWorker('compression/extractzip.js').then((worker) => { createWorker('compression/extractzip.js').then((worker) => {
worker.onmessage = onMessage; worker.onmessage = onMessage;

2
data/emulator.min.js vendored
View file

File diff suppressed because one or more lines are too long