diff --git a/scripts/buildAssets/tankModels.ts b/scripts/buildAssets/tankModels.ts index e9295b04f..187468a3e 100644 --- a/scripts/buildAssets/tankModels.ts +++ b/scripts/buildAssets/tankModels.ts @@ -5,8 +5,8 @@ import { extractModel } from '../../src/core/blitz/extractModel'; import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL'; import { toUniqueId } from '../../src/core/blitz/toUniqueId'; +import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { AssetCommit } from '../../src/core/github/assetCommit'; import { DATA, POI } from './constants'; import { VehicleDefinitionList } from './definitions'; import { TankParameters } from './tankIcons'; @@ -26,7 +26,7 @@ export async function tankModels(production: boolean) { for (const nationIndex in nations) { const nation = nations[nationIndex]; const changes: FileChange[] = []; - const assetCommit = new AssetCommit(`tank models ${nation}`, production); + // const assetCommit = new AssetCommit(`tank models ${nation}`, production); const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>( `${DATA}/${POI.vehicleDefinitions}/${nation}/list.xml.dvpl`, ); @@ -68,7 +68,7 @@ export async function tankModels(production: boolean) { }), ); - assetCommit.push(); - // await commitAssets(`tank models ${nation}`, changes, production); + // assetCommit.push(); + await commitAssets(`tank models ${nation}`, changes, production); } } diff --git a/scripts/setupDepotDownloader.ts b/scripts/setupDepotDownloader.ts index 13fdf2c23..79f10f235 100644 --- a/scripts/setupDepotDownloader.ts +++ b/scripts/setupDepotDownloader.ts @@ -1,6 +1,6 @@ import decompress from 'decompress'; import { existsSync } from 'fs'; -import { mkdir, writeFile } from 'fs/promises'; +import { mkdir, readdir, writeFile } from 'fs/promises'; if (!existsSync('temp')) { console.log('Creating temp directory...'); @@ -25,3 +25,5 @@ await fetch( console.log('Unzipping...'); decompress('temp/depotDownloader.zip', 'temp/depotDownloader'); + +console.log(await readdir('temp/depotDownloader')); diff --git a/src/core/blitzkrieg/createBlob.ts b/src/core/blitzkrieg/createBlob.ts index 743820083..524bf646f 100644 --- a/src/core/blitzkrieg/createBlob.ts +++ b/src/core/blitzkrieg/createBlob.ts @@ -40,6 +40,6 @@ export const createBlob = throttle( } } }, - (5000 / (60 * 60 * 1000)) * 0.95, // 5% less than max rate + (5000 / (60 * 60 * 1000)) * 0.9, { trailing: true }, ); diff --git a/src/core/github/assetCommit.ts b/src/core/github/assetCommit.ts index e1efe963e..ad5af7ce2 100644 --- a/src/core/github/assetCommit.ts +++ b/src/core/github/assetCommit.ts @@ -21,6 +21,8 @@ export class AssetCommit { } async push() { + if (this.blobs.length === 0) return; + const latestCommitSha = ( await octokit.git.getRef({ owner: 'tresabhi',