Skip to content

base64 checkbox #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
psenough wants to merge 1 commit into
base: master
Choose a base branch
from
Open

base64 checkbox #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions harextract.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,12 @@
harent.pathcomps = fullpath; // .path string will be set below
if (!ent.response.content.text)
harent.error = 'No content.';
else if (ent.response.content.encoding != 'base64')
harent.error = "Can't decode.";
let cb64 = document.getElementById("checkBase64Only");
if (cb64 && cb64.checked) {
if (ent.response.content.encoding != 'base64')
harent.error = "Can't decode.";
}
if (harent.name == "") harent.name ="index.html"
if (harent.error) {
console.log(`harextract: skipped ${harent.name} (${id}): ${harent.error}`);
skipped.push(harent);
Expand Down Expand Up @@ -278,10 +282,18 @@
let filepath = `${ent.path}/${ent.name}`;
if (filepath.startsWith('/'))
filepath = filepath.substring(1);
let encoding = data[ent.id].response.content.encoding;
if (encoding != 'base64')
throw new Error(`Unsupported encoding for ${ent.name} (${ent.id}): ${encoding}`);
zip.file(filepath, data[ent.id].response.content.text, { base64: true });
let encoding = data[ent.id].response.content.encoding;
let cb64 = document.getElementById("checkBase64Only");
if (cb64 && cb64.checked) {
if (encoding != 'base64')
throw new Error(`Unsupported encoding for ${ent.name} (${ent.id}): ${encoding}`);
zip.file(filepath, data[ent.id].response.content.text, { base64: true });
} else {
if (encoding != 'base64')
zip.file(filepath, data[ent.id].response.content.text, { base64: false });
else
zip.file(filepath, data[ent.id].response.content.text, { base64: true });
}
} catch (e) {
console.log(e);
}
Expand All @@ -297,7 +309,7 @@
if (!loaded.entries)
throw new Error('No file loaded.');
uiSetZipState(true);
if (!loaded.zip)
//if (!loaded.zip) // was ignoring zip base64 only checkbox changes
loaded.zip = buildZIP(loaded.entries, loaded.data, 0);
let comp = parseInt(document.getElementById('compression').value);
loaded.zip.generateAsync({
Expand Down Expand Up @@ -367,6 +379,7 @@
<label class="ifzipidle" for="harfileinput"><button onclick="this.parentElement.click()">Choose File...</button></label>
<label class="ifzipbusy"><button disabled>Choose File...</button><!-- hack to "disable" button without having to code stuff --></label>
<span class="clearme" id="harfilename"></span>
<input type="checkbox" id="checkBase64Only" name="checkBase64Only" unchecked><label for="checkBase64Only">zip base64 only</label>
</div>
<div class="section ifopen">
<table class="fileinfo">
Expand Down