Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-26 09:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1773 - Fix duplicate file extensions

Browse Source 
For some time now, filenames have included the extension, so there's no need to append ".js" either on a single-file download or zip download.

While I was in the area, I also fixed .txt files in a folder - they had the same bug as scripts used to (appear in the zip as an underscore). I consolidated the code since it was the same for script files and text files.

I also added the ability to download *.js and *.ns (previously only supported *, *.script, and *.txt)

I also made the wildcard matching just a bit more flexible, so if someone really wanted to, they could go "download *blah.js" and get all scripts ending with that pattern ¯\_(ツ)_/¯
This commit is contained in:
Alain Bryden 2021-11-25 23:06:13 -04:00
parent f0a004e75b
commit ef23033b2c
2 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Script/Script.ts
View File

@ -56,7 +56,7 @@ export class Script {
* Download the script as a file * Download the script as a file
*/ */
download(): void { download(): void {
const filename = this.filename + ".js"; const filename = this.filename;
const file = new Blob([this.code], { type: "text/plain" }); const file = new Blob([this.code], { type: "text/plain" });
const navigator = window.navigator as any; const navigator = window.navigator as any;
if (navigator.msSaveOrOpenBlob) { if (navigator.msSaveOrOpenBlob) {

56
src/Terminal/commands/download.ts
View File

@ -19,43 +19,29 @@ export function download(
return; return;
} }
const fn = args[0] + ""; const fn = args[0] + "";
if (fn === "*" || fn === "*.script" || fn === "*.txt") { // If the parameter starts with *, download all files that match the wildcard pattern
// Download all scripts as a zip if (fn.startsWith("*")) {
const matchEnding = fn.length == 1 || fn === "*.*" ? null : fn.slice(1); // Treat *.* the same as *
const zip = new JSZip(); const zip = new JSZip();
if (fn === "*" || fn === "*.script") { // Helper function to zip any file contents whose name matches the pattern
for (let i = 0; i < server.scripts.length; ++i) { let zipFiles = (fileNames: string[], fileContents: string[]) => {
const file = new Blob([server.scripts[i].code], { for (let i = 0; i < fileContents.length; ++i) {
type: "text/plain", let name = fileNames[i];
}); if (name.startsWith("/")) name = name.slice(1);
let name = server.scripts[i].filename; if (!matchEnding || name.endsWith(matchEnding))
if (name.startsWith("/")) { zip.file(name, new Blob([fileContents[i]], { type: "text/plain" }));
name = name.slice(1);
} }
zip.file(name + ".js", file); };
} // In the case of script files, we pull from the server.scripts array
} if (!matchEnding || isScriptFilename(matchEnding))
if (fn === "*" || fn === "*.txt") { zipFiles(server.scripts.map(s => s.filename), server.scripts.map(s => s.code));
for (let i = 0; i < server.textFiles.length; ++i) { // In the case of text files, we pull from the server.scripts array
const file = new Blob([server.textFiles[i].text], { if (!matchEnding || matchEnding.endsWith(".txt"))
type: "text/plain", zipFiles(server.textFiles.map(s => s.fn), server.textFiles.map(s => s.text));
}); // Return an error if no files matched, rather than an empty zip folder
zip.file(server.textFiles[i].fn, file); if (Object.keys(zip.files).length == 0)
} return terminal.error(`No files match the pattern ${fn}`);
} const zipFn = `bitburner${isScriptFilename(fn) ? "Scripts" : fn === "*.txt" ? "Texts" : "Files"}.zip`;
let zipFn = "";
switch (fn) {
case "*.script":
zipFn = "bitburnerScripts.zip";
break;
case "*.txt":
zipFn = "bitburnerTexts.zip";
break;
default:
zipFn = "bitburnerFiles.zip";
break;
}
zip.generateAsync({ type: "blob" }).then((content: any) => FileSaver.saveAs(content, zipFn)); zip.generateAsync({ type: "blob" }).then((content: any) => FileSaver.saveAs(content, zipFn));
return; return;
} else if (isScriptFilename(fn)) { } else if (isScriptFilename(fn)) {