EZPPFarm/EZPPLauncher
2
0
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases 14 Activity

small bugfixes #18

Merged
HorizonCode merged 3 commits from dev into master 2024-04-23 07:57:29 +00:00
Conversation 0 Commits 3 Files Changed 2 +18 -11
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6881a0d1d5 - Show all commits

14
electron/osuUtil.js
View File

@ -264,23 +264,28 @@ async function getEZPPLauncherUpdateFiles(osuPath) {
filesToDownload.push(updateFile); filesToDownload.push(updateFile);
} }
} }
return filesToDownload; return [filesToDownload, updateFiles];
} }
async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles) { async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles, allFiles) {
const eventEmitter = new EventEmitter(); const eventEmitter = new EventEmitter();
const startDownload = async () => { const startDownload = async () => {
//NOTE: delete files that are not in the updateFiles array //NOTE: delete files that are not in the updateFiles array
const foldersToPrune = updateFiles.map(file => path.dirname(path.join(osuPath, ...file.folder.split("/"), file.name))).filter((folder, index, self) => self.indexOf(folder) === index); const foldersToPrune = allFiles.map(file => path.dirname(path.join(osuPath, ...file.folder.split("/"), file.name))).filter((folder, index, self) => self.indexOf(folder) === index);
for (const pruneFolder of foldersToPrune) { for (const pruneFolder of foldersToPrune) {
console.log("Pruning folder:", pruneFolder);
//NOTE: check if the folder is not the osu root folder. //NOTE: check if the folder is not the osu root folder.
if (path.basename(pruneFolder) == "osu!") if (path.basename(pruneFolder) == "osu!")
continue; continue;
if (fs.existsSync(pruneFolder)) { if (fs.existsSync(pruneFolder)) {
for (const files of await fs.promises.readdir(pruneFolder)) { for (const files of await fs.promises.readdir(pruneFolder)) {
const filePath = path.join(pruneFolder, files); const filePath = path.join(pruneFolder, files);
if (!updateFiles.some(file => path.join(osuPath, ...file.folder.split("/"), file.name) === filePath)) { const validFolder = allFiles.find(file => path.dirname(filePath).endsWith(file.folder));
if (!validFolder) {
if (allFiles.find(file => file.name == path.basename(filePath)) === undefined) {
console.log("Deleting file:", filePath);
console.log(allFiles.find(file => file.name == path.basename(filePath)));
eventEmitter.emit("data", { eventEmitter.emit("data", {
fileName: path.basename(filePath), fileName: path.basename(filePath),
}); });
@ -291,6 +296,7 @@ async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles) {
} }
} }
} }
}
for (const updateFile of updateFiles) { for (const updateFile of updateFiles) {
try { try {

3
main.js
View File

@ -557,12 +557,13 @@ function registerIPCPipes() {
status: "Looking for patcher updates...", status: "Looking for patcher updates...",
}); });
await new Promise((res) => setTimeout(res, 1000)); await new Promise((res) => setTimeout(res, 1000));
const patchFiles = await getEZPPLauncherUpdateFiles(osuPath); const [patchFiles, allUpdateFiles] = await getEZPPLauncherUpdateFiles(osuPath);
if (patchFiles.length > 0) { if (patchFiles.length > 0) {
logger.log("EZPPLauncher updates found."); logger.log("EZPPLauncher updates found.");
const patcherDownloader = await downloadEZPPLauncherUpdateFiles( const patcherDownloader = await downloadEZPPLauncherUpdateFiles(
osuPath, osuPath,
patchFiles, patchFiles,
allUpdateFiles
); );
let errored = false; let errored = false;
patcherDownloader.eventEmitter.on("error", (data) => { patcherDownloader.eventEmitter.on("error", (data) => {