mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2026-05-04 06:37:49 +02:00
FILES: Path rework & typesafety (#479)
* Added new types for various file paths, all in the Paths folder. * TypeSafety and other helper functions related to these types * Added basic globbing support with * and ?. Currently only implemented for Script/Text, on nano and download terminal commands * Enforcing the new types throughout the codebase, plus whatever rewrites happened along the way * Server.textFiles is now a map * TextFile no longer uses a fn property, now it is filename * Added a shared ContentFile interface for shared functionality between TextFile and Script. * related to ContentFile change above, the player is now allowed to move a text file to a script file and vice versa. * File paths no longer conditionally start with slashes, and all directory names other than root have ending slashes. The player is still able to provide paths starting with / but this now indicates that the player is specifying an absolute path instead of one relative to root. * Singularized the MessageFilename and LiteratureName enums * Because they now only accept correct types, server.writeToXFile functions now always succeed (the only reasons they could fail before were invalid filepath). * Fix several issues with tab completion, which included pretty much a complete rewrite * Changed the autocomplete display options so there's less chance it clips outside the display area. * Turned CompletedProgramName into an enum. * Got rid of programsMetadata, and programs and DarkWebItems are now initialized immediately instead of relying on initializers called from the engine. * For any executable (program, cct, or script file) pathing can be used directly to execute without using the run command (previously the command had to start with ./ and it wasn't actually using pathing).
This commit is contained in:
@@ -12,6 +12,7 @@ import { Server } from "./Server/Server";
|
||||
import { BaseServer } from "./Server/BaseServer";
|
||||
|
||||
import { getRandomInt } from "./utils/helpers/getRandomInt";
|
||||
import { ContractFilePath, resolveContractFilePath } from "./Paths/ContractFilePath";
|
||||
|
||||
export function generateRandomContract(): void {
|
||||
// First select a random problem type
|
||||
@@ -57,7 +58,7 @@ export const generateDummyContract = (problemType: string): void => {
|
||||
interface IGenerateContractParams {
|
||||
problemType?: string;
|
||||
server?: string;
|
||||
fn?: string;
|
||||
fn?: ContractFilePath;
|
||||
}
|
||||
|
||||
export function generateContract(params: IGenerateContractParams): void {
|
||||
@@ -84,15 +85,9 @@ export function generateContract(params: IGenerateContractParams): void {
|
||||
server = getRandomServer();
|
||||
}
|
||||
|
||||
// Filename
|
||||
let fn;
|
||||
if (params.fn != null) {
|
||||
fn = params.fn;
|
||||
} else {
|
||||
fn = getRandomFilename(server, reward);
|
||||
}
|
||||
const filename = params.fn ? params.fn : getRandomFilename(server, reward);
|
||||
|
||||
const contract = new CodingContract(fn, problemType, reward);
|
||||
const contract = new CodingContract(filename, problemType, reward);
|
||||
server.addContract(contract);
|
||||
}
|
||||
|
||||
@@ -185,7 +180,10 @@ function getRandomServer(): BaseServer {
|
||||
return randServer;
|
||||
}
|
||||
|
||||
function getRandomFilename(server: BaseServer, reward: ICodingContractReward = { name: "", type: 0 }): string {
|
||||
function getRandomFilename(
|
||||
server: BaseServer,
|
||||
reward: ICodingContractReward = { name: "", type: 0 },
|
||||
): ContractFilePath {
|
||||
let contractFn = `contract-${getRandomInt(0, 1e6)}`;
|
||||
|
||||
for (let i = 0; i < 1000; ++i) {
|
||||
@@ -203,6 +201,8 @@ function getRandomFilename(server: BaseServer, reward: ICodingContractReward = {
|
||||
// Only alphanumeric characters in the reward name.
|
||||
contractFn += `-${reward.name.replace(/[^a-zA-Z0-9]/g, "")}`;
|
||||
}
|
||||
|
||||
return contractFn;
|
||||
contractFn += ".cct";
|
||||
const validatedPath = resolveContractFilePath(contractFn);
|
||||
if (!validatedPath) throw new Error(`Generated contract path could not be validated: ${contractFn}`);
|
||||
return validatedPath;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user